aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2002-04-07 16:32:36 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2002-04-07 16:32:36 +0000
commite7f00632a6b6ad04adc63caaf0206206d7ad42e1 (patch)
treed15ea734639b491ec102784792e7e448e3ecd7fe
parent7737215c0fd030f3d5f2c983982236a3fba85628 (diff)
downloadports-e7f00632a6b6ad04adc63caaf0206206d7ad42e1.tar.gz
ports-e7f00632a6b6ad04adc63caaf0206206d7ad42e1.zip
Notes
-rw-r--r--net-mgmt/confregdecode/Makefile6
-rw-r--r--net-mgmt/confregdecode/files/patch-ab21
-rw-r--r--net/confregdecode/Makefile6
-rw-r--r--net/confregdecode/files/patch-ab21
4 files changed, 40 insertions, 14 deletions
diff --git a/net-mgmt/confregdecode/Makefile b/net-mgmt/confregdecode/Makefile
index d799ca935fb0..ab4f29ed3892 100644
--- a/net-mgmt/confregdecode/Makefile
+++ b/net-mgmt/confregdecode/Makefile
@@ -14,11 +14,9 @@ DISTNAME= confregdecode-src-${PORTVERSION}
MAINTAINER= marcus@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk
-RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk \
- ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-
+USE_JAVA= 1.1+
ALL_TARGET= jar
+MAKE_ENV= JAVAC="${JAVAC}" JAR="${JAR}"
do-install:
@${MKDIR} ${PREFIX}/share/java
diff --git a/net-mgmt/confregdecode/files/patch-ab b/net-mgmt/confregdecode/files/patch-ab
index 9cf991e812af..f0cf9affc5f0 100644
--- a/net-mgmt/confregdecode/files/patch-ab
+++ b/net-mgmt/confregdecode/files/patch-ab
@@ -1,6 +1,21 @@
---- Makefile.orig Thu May 31 16:08:05 2001
-+++ Makefile Sat Jun 2 23:35:58 2001
-@@ -12,8 +12,8 @@
+
+$FreeBSD$
+
+--- Makefile.orig Thu May 31 09:08:05 2001
++++ Makefile Sat Apr 6 18:50:09 2002
+@@ -3,17 +3,17 @@
+ # $Id: Makefile,v 1.1 2001/05/25 04:33:46 jmarcus Exp $
+ #
+
+-JAVAC= /usr/local/jdk1.1.8/bin/javac
+-JAVAC_FLAGS= -O -g
+-JAR= /usr/local/jdk1.1.8/bin/jar
++JAVAC?= /usr/local/jdk1.1.8/bin/javac
++JAVAC_FLAGS?= -O -g
++JAR?= /usr/local/jdk1.1.8/bin/jar
+ RM= /bin/rm
+
+ all:
$(JAVAC) $(JAVAC_FLAGS) com/marcuscom/confregdecode/ConfregDecode.java
jar: all
diff --git a/net/confregdecode/Makefile b/net/confregdecode/Makefile
index d799ca935fb0..ab4f29ed3892 100644
--- a/net/confregdecode/Makefile
+++ b/net/confregdecode/Makefile
@@ -14,11 +14,9 @@ DISTNAME= confregdecode-src-${PORTVERSION}
MAINTAINER= marcus@FreeBSD.org
-BUILD_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/javac:${PORTSDIR}/java/jdk
-RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk \
- ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
-
+USE_JAVA= 1.1+
ALL_TARGET= jar
+MAKE_ENV= JAVAC="${JAVAC}" JAR="${JAR}"
do-install:
@${MKDIR} ${PREFIX}/share/java
diff --git a/net/confregdecode/files/patch-ab b/net/confregdecode/files/patch-ab
index 9cf991e812af..f0cf9affc5f0 100644
--- a/net/confregdecode/files/patch-ab
+++ b/net/confregdecode/files/patch-ab
@@ -1,6 +1,21 @@
---- Makefile.orig Thu May 31 16:08:05 2001
-+++ Makefile Sat Jun 2 23:35:58 2001
-@@ -12,8 +12,8 @@
+
+$FreeBSD$
+
+--- Makefile.orig Thu May 31 09:08:05 2001
++++ Makefile Sat Apr 6 18:50:09 2002
+@@ -3,17 +3,17 @@
+ # $Id: Makefile,v 1.1 2001/05/25 04:33:46 jmarcus Exp $
+ #
+
+-JAVAC= /usr/local/jdk1.1.8/bin/javac
+-JAVAC_FLAGS= -O -g
+-JAR= /usr/local/jdk1.1.8/bin/jar
++JAVAC?= /usr/local/jdk1.1.8/bin/javac
++JAVAC_FLAGS?= -O -g
++JAR?= /usr/local/jdk1.1.8/bin/jar
+ RM= /bin/rm
+
+ all:
$(JAVAC) $(JAVAC_FLAGS) com/marcuscom/confregdecode/ConfregDecode.java
jar: all