Add patches to allow port build again and also fix some plist problems.

PR:		ports/39899
Submitted by:	maintainer
This commit is contained in:
Patrick Li 2002-07-12 19:12:02 +00:00
parent 4747f9a4b5
commit 7204ee94e8
9 changed files with 114 additions and 6 deletions

View file

@ -15,6 +15,8 @@ EXTRACT_SUFX= -you-must-unjar-me.jar
MAINTAINER= dglo@SSEC.WISC.EDU
BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
USE_JAVA= 1.2+
NEED_JAVAC= YES
@ -59,9 +61,12 @@ post-install:
.if !defined(NOPORTDOCS)
@(cd ${PREFIX} \
&& find share/doc/mysql-jdbc -type f -print >> ${TMPPLIST})
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm/mysql/jdbc2" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm/mysql" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc" >> ${TMPPLIST}
.endif
@${ECHO} "@unexec ${RMDIR} %D/share/java/classes 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO} "@unexec ${RMDIR} %D/share/java 2>/dev/null || true" >> ${TMPPLIST}
.include <bsd.port.mk>

View file

@ -0,0 +1,21 @@
--- build.xml.orig Sat May 18 13:50:54 2002
+++ build.xml Sat May 18 13:50:44 2002
@@ -1,7 +1,7 @@
<project name="MM.MySQL" default="dist" basedir=".">
<property name="version" value="2.0.14"/>
- <property name="java1.1.home" value="c:/jdk1.1.8"/>
- <property name="javac.1.1" value="${java1.1.home}/bin/javac"/>
+ <property name="java1.1.home" value="%%PREFIX%%/jdk1.1.8"/>
+ <property name="javac.1.1" value="%%WRKSRC%%/j1c"/>
<target name="init">
<filter token="VERSION" value="${version}"/>
@@ -62,7 +62,7 @@
<target name="compile-jdbc1" depends="init, compile-core">
<exec dir="./build/mm.mysql-${version}/org/gjt/mm/mysql/jdbc1" executable="${javac.1.1}">
- <arg line="-g -classpath ${basedir}/build/mm.mysql-${version};${java1.1.home}/lib/classes.zip *.java"/>
+ <arg line="-g -classpath ${basedir}/build/mm.mysql-${version}:${java1.1.home}/lib/classes.zip *.java"/>
</exec>
</target>

View file

@ -0,0 +1,10 @@
--- j1c.orig Thu Nov 29 16:26:08 2001
+++ j1c Thu Nov 29 16:26:36 2001
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+JAVAC_1=%%PREFIX%%/jdk1.1.8/bin/javac
+
+unset JAVA_HOME LD_LIBRARY_PATH LD_PRELOAD CLASSPATH
+
+exec "$JAVAC_1" "$@"

View file

@ -15,6 +15,8 @@ EXTRACT_SUFX= -you-must-unjar-me.jar
MAINTAINER= dglo@SSEC.WISC.EDU
BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
USE_JAVA= 1.2+
NEED_JAVAC= YES
@ -59,9 +61,12 @@ post-install:
.if !defined(NOPORTDOCS)
@(cd ${PREFIX} \
&& find share/doc/mysql-jdbc -type f -print >> ${TMPPLIST})
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm/mysql/jdbc2" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm/mysql" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc" >> ${TMPPLIST}
.endif
@${ECHO} "@unexec ${RMDIR} %D/share/java/classes 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO} "@unexec ${RMDIR} %D/share/java 2>/dev/null || true" >> ${TMPPLIST}
.include <bsd.port.mk>

View file

@ -0,0 +1,21 @@
--- build.xml.orig Sat May 18 13:50:54 2002
+++ build.xml Sat May 18 13:50:44 2002
@@ -1,7 +1,7 @@
<project name="MM.MySQL" default="dist" basedir=".">
<property name="version" value="2.0.14"/>
- <property name="java1.1.home" value="c:/jdk1.1.8"/>
- <property name="javac.1.1" value="${java1.1.home}/bin/javac"/>
+ <property name="java1.1.home" value="%%PREFIX%%/jdk1.1.8"/>
+ <property name="javac.1.1" value="%%WRKSRC%%/j1c"/>
<target name="init">
<filter token="VERSION" value="${version}"/>
@@ -62,7 +62,7 @@
<target name="compile-jdbc1" depends="init, compile-core">
<exec dir="./build/mm.mysql-${version}/org/gjt/mm/mysql/jdbc1" executable="${javac.1.1}">
- <arg line="-g -classpath ${basedir}/build/mm.mysql-${version};${java1.1.home}/lib/classes.zip *.java"/>
+ <arg line="-g -classpath ${basedir}/build/mm.mysql-${version}:${java1.1.home}/lib/classes.zip *.java"/>
</exec>
</target>

View file

@ -0,0 +1,10 @@
--- j1c.orig Thu Nov 29 16:26:08 2001
+++ j1c Thu Nov 29 16:26:36 2001
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+JAVAC_1=%%PREFIX%%/jdk1.1.8/bin/javac
+
+unset JAVA_HOME LD_LIBRARY_PATH LD_PRELOAD CLASSPATH
+
+exec "$JAVAC_1" "$@"

View file

@ -15,6 +15,8 @@ EXTRACT_SUFX= -you-must-unjar-me.jar
MAINTAINER= dglo@SSEC.WISC.EDU
BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
USE_JAVA= 1.2+
NEED_JAVAC= YES
@ -59,9 +61,12 @@ post-install:
.if !defined(NOPORTDOCS)
@(cd ${PREFIX} \
&& find share/doc/mysql-jdbc -type f -print >> ${TMPPLIST})
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm/mysql/jdbc2" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm/mysql" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt/mm" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org/gjt" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc/org" >> ${TMPPLIST}
@${ECHO} "@dirrm share/doc/mysql-jdbc" >> ${TMPPLIST}
.endif
@${ECHO} "@unexec ${RMDIR} %D/share/java/classes 2>/dev/null || true" >> ${TMPPLIST}
@${ECHO} "@unexec ${RMDIR} %D/share/java 2>/dev/null || true" >> ${TMPPLIST}
.include <bsd.port.mk>

View file

@ -0,0 +1,21 @@
--- build.xml.orig Sat May 18 13:50:54 2002
+++ build.xml Sat May 18 13:50:44 2002
@@ -1,7 +1,7 @@
<project name="MM.MySQL" default="dist" basedir=".">
<property name="version" value="2.0.14"/>
- <property name="java1.1.home" value="c:/jdk1.1.8"/>
- <property name="javac.1.1" value="${java1.1.home}/bin/javac"/>
+ <property name="java1.1.home" value="%%PREFIX%%/jdk1.1.8"/>
+ <property name="javac.1.1" value="%%WRKSRC%%/j1c"/>
<target name="init">
<filter token="VERSION" value="${version}"/>
@@ -62,7 +62,7 @@
<target name="compile-jdbc1" depends="init, compile-core">
<exec dir="./build/mm.mysql-${version}/org/gjt/mm/mysql/jdbc1" executable="${javac.1.1}">
- <arg line="-g -classpath ${basedir}/build/mm.mysql-${version};${java1.1.home}/lib/classes.zip *.java"/>
+ <arg line="-g -classpath ${basedir}/build/mm.mysql-${version}:${java1.1.home}/lib/classes.zip *.java"/>
</exec>
</target>

View file

@ -0,0 +1,10 @@
--- j1c.orig Thu Nov 29 16:26:08 2001
+++ j1c Thu Nov 29 16:26:36 2001
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+JAVAC_1=%%PREFIX%%/jdk1.1.8/bin/javac
+
+unset JAVA_HOME LD_LIBRARY_PATH LD_PRELOAD CLASSPATH
+
+exec "$JAVAC_1" "$@"