summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorPatrick Li <pat@FreeBSD.org>2002-07-12 19:12:02 +0000
committerPatrick Li <pat@FreeBSD.org>2002-07-12 19:12:02 +0000
commit7204ee94e8b581bfbcb5b2d676b2e00a8589af01 (patch)
tree4c303eb5a01db9fa8a17796e5607e6c46c786a60 /databases
parentFix build fault on -CURRENT. (diff)
Add patches to allow port build again and also fix some plist problems.
PR: ports/39899 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=62874
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql-connector-java/Makefile9
-rw-r--r--databases/mysql-connector-java/files/patch-build.xml21
-rw-r--r--databases/mysql-connector-java/files/patch-j1c10
-rw-r--r--databases/mysql-connector-java50/Makefile9
-rw-r--r--databases/mysql-connector-java50/files/patch-build.xml21
-rw-r--r--databases/mysql-connector-java50/files/patch-j1c10
-rw-r--r--databases/mysql-jdbc-mm/Makefile9
-rw-r--r--databases/mysql-jdbc-mm/files/patch-build.xml21
-rw-r--r--databases/mysql-jdbc-mm/files/patch-j1c10
9 files changed, 114 insertions, 6 deletions
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
index a737a603d39e..46d979d1f46f 100644
--- a/databases/mysql-connector-java/Makefile
+++ b/databases/mysql-connector-java/Makefile
@@ -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>
diff --git a/databases/mysql-connector-java/files/patch-build.xml b/databases/mysql-connector-java/files/patch-build.xml
new file mode 100644
index 000000000000..36ede9c61672
--- /dev/null
+++ b/databases/mysql-connector-java/files/patch-build.xml
@@ -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>
+
diff --git a/databases/mysql-connector-java/files/patch-j1c b/databases/mysql-connector-java/files/patch-j1c
new file mode 100644
index 000000000000..e749ca854e1c
--- /dev/null
+++ b/databases/mysql-connector-java/files/patch-j1c
@@ -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" "$@"
diff --git a/databases/mysql-connector-java50/Makefile b/databases/mysql-connector-java50/Makefile
index a737a603d39e..46d979d1f46f 100644
--- a/databases/mysql-connector-java50/Makefile
+++ b/databases/mysql-connector-java50/Makefile
@@ -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>
diff --git a/databases/mysql-connector-java50/files/patch-build.xml b/databases/mysql-connector-java50/files/patch-build.xml
new file mode 100644
index 000000000000..36ede9c61672
--- /dev/null
+++ b/databases/mysql-connector-java50/files/patch-build.xml
@@ -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>
+
diff --git a/databases/mysql-connector-java50/files/patch-j1c b/databases/mysql-connector-java50/files/patch-j1c
new file mode 100644
index 000000000000..e749ca854e1c
--- /dev/null
+++ b/databases/mysql-connector-java50/files/patch-j1c
@@ -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" "$@"
diff --git a/databases/mysql-jdbc-mm/Makefile b/databases/mysql-jdbc-mm/Makefile
index a737a603d39e..46d979d1f46f 100644
--- a/databases/mysql-jdbc-mm/Makefile
+++ b/databases/mysql-jdbc-mm/Makefile
@@ -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>
diff --git a/databases/mysql-jdbc-mm/files/patch-build.xml b/databases/mysql-jdbc-mm/files/patch-build.xml
new file mode 100644
index 000000000000..36ede9c61672
--- /dev/null
+++ b/databases/mysql-jdbc-mm/files/patch-build.xml
@@ -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>
+
diff --git a/databases/mysql-jdbc-mm/files/patch-j1c b/databases/mysql-jdbc-mm/files/patch-j1c
new file mode 100644
index 000000000000..e749ca854e1c
--- /dev/null
+++ b/databases/mysql-jdbc-mm/files/patch-j1c
@@ -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" "$@"
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 21:28:52 +0000