diff options
| -rw-r--r-- | net-mgmt/confregdecode/Makefile | 21 | ||||
| -rw-r--r-- | net-mgmt/confregdecode/distinfo | 2 | ||||
| -rw-r--r-- | net-mgmt/confregdecode/files/patch-ab | 21 | ||||
| -rw-r--r-- | net-mgmt/confregdecode/pkg-plist | 6 | ||||
| -rw-r--r-- | net/confregdecode/Makefile | 21 | ||||
| -rw-r--r-- | net/confregdecode/distinfo | 2 | ||||
| -rw-r--r-- | net/confregdecode/files/patch-ab | 21 | ||||
| -rw-r--r-- | net/confregdecode/pkg-plist | 6 |
8 files changed, 50 insertions, 50 deletions
diff --git a/net-mgmt/confregdecode/Makefile b/net-mgmt/confregdecode/Makefile index a809a2960a54..35575560bcd0 100644 --- a/net-mgmt/confregdecode/Makefile +++ b/net-mgmt/confregdecode/Makefile @@ -6,7 +6,7 @@ # PORTNAME= confregdecode -PORTVERSION= 1.0.1 +PORTVERSION= 1.2.1 CATEGORIES= net java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cosi-nms @@ -21,17 +21,20 @@ ALL_TARGET= jar MAKE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" do-install: - @${MKDIR} ${PREFIX}/share/java - @${INSTALL_DATA} ${WRKSRC}/confregdecode.jar ${LOCALBASE}/share/java - @${SED} \ + ${MKDIR} ${PREFIX}/share/java + ${INSTALL_DATA} ${WRKSRC}/confregdecode.jar ${PREFIX}/share/java + ${SED} \ -e s,%%PREFIX%%,${PREFIX}, \ -e s,%%LOCALBASE%%,${LOCALBASE}, \ - < ${FILESDIR}/confregdecode > ${PREFIX}/bin/confregdecode; \ - ${CHMOD} a+x ${PREFIX}/bin/confregdecode + < ${FILESDIR}/confregdecode > ${WRKSRC}/confregdecode; \ + ${INSTALL_SCRIPT} ${WRKSRC}/confregdecode ${PREFIX}/bin post-install: - @${MKDIR} ${PREFIX}/share/doc/confregdecode - @${INSTALL_DATA} ${WRKSRC}/README.txt ${LOCALBASE}/share/doc/confregdecode - @${INSTALL_DATA} ${WRKSRC}/ConfregDecode.html ${LOCALBASE}/share/doc/confregdecode +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for file in README.txt ConfregDecode.html + ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR} +.endfor +.endif .include <bsd.port.mk> diff --git a/net-mgmt/confregdecode/distinfo b/net-mgmt/confregdecode/distinfo index 56248aa22e1d..b26497ff30af 100644 --- a/net-mgmt/confregdecode/distinfo +++ b/net-mgmt/confregdecode/distinfo @@ -1 +1 @@ -MD5 (confregdecode-src-1.0.1.tar.gz) = e2b665ca1e8b69b16284034c01dabcac +MD5 (confregdecode-src-1.2.1.tar.gz) = 42d8bf2ad132a26ed79e98cb8d39f89d diff --git a/net-mgmt/confregdecode/files/patch-ab b/net-mgmt/confregdecode/files/patch-ab index f0cf9affc5f0..892247713a88 100644 --- a/net-mgmt/confregdecode/files/patch-ab +++ b/net-mgmt/confregdecode/files/patch-ab @@ -1,28 +1,25 @@ - -$FreeBSD$ - ---- Makefile.orig Thu May 31 09:08:05 2001 -+++ Makefile Sat Apr 6 18:50:09 2002 +--- Makefile.orig Fri Nov 28 21:00:51 2003 ++++ Makefile Fri Dec 19 01:31:42 2003 @@ -3,17 +3,17 @@ - # $Id: Makefile,v 1.1 2001/05/25 04:33:46 jmarcus Exp $ + # $Id: Makefile,v 1.3 2003/11/29 01:41:36 jmarcus Exp $ # --JAVAC= /usr/local/jdk1.1.8/bin/javac +-JAVAC= /usr/local/jdk1.4.2/bin/javac -JAVAC_FLAGS= -O -g --JAR= /usr/local/jdk1.1.8/bin/jar -+JAVAC?= /usr/local/jdk1.1.8/bin/javac +-JAR= /usr/local/jdk1.4.2/bin/jar ++JAVAC?= /usr/local/jdk1.4.2/bin/javac +JAVAC_FLAGS?= -O -g -+JAR?= /usr/local/jdk1.1.8/bin/jar ++JAR?= /usr/local/jdk1.4.2/bin/jar RM= /bin/rm all: $(JAVAC) $(JAVAC_FLAGS) com/marcuscom/confregdecode/ConfregDecode.java jar: all -- jar -cvf cd.jar com/marcuscom/confregdecode/*.class +- $(JAR) -cvf cd.jar com/marcuscom/confregdecode/*.class + $(JAR) -cvf confregdecode.jar com/marcuscom/confregdecode/*.class clean: $(RM) -f com/marcuscom/confregdecode/*.class - $(RM) -f cd.jar -+ $(RM) -f cconfregdecode.jar ++ $(RM) -f confregdecode.jar diff --git a/net-mgmt/confregdecode/pkg-plist b/net-mgmt/confregdecode/pkg-plist index c4257c3020bb..edd59f8ca670 100644 --- a/net-mgmt/confregdecode/pkg-plist +++ b/net-mgmt/confregdecode/pkg-plist @@ -1,5 +1,5 @@ bin/confregdecode share/java/confregdecode.jar -share/doc/confregdecode/README.txt -share/doc/confregdecode/ConfregDecode.html -@dirrm share/doc/confregdecode +%%PORTDOCS%%%%DOCSDIR%%/README.txt +%%PORTDOCS%%%%DOCSDIR%%/ConfregDecode.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net/confregdecode/Makefile b/net/confregdecode/Makefile index a809a2960a54..35575560bcd0 100644 --- a/net/confregdecode/Makefile +++ b/net/confregdecode/Makefile @@ -6,7 +6,7 @@ # PORTNAME= confregdecode -PORTVERSION= 1.0.1 +PORTVERSION= 1.2.1 CATEGORIES= net java MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cosi-nms @@ -21,17 +21,20 @@ ALL_TARGET= jar MAKE_ENV= JAVAC="${JAVAC}" JAR="${JAR}" do-install: - @${MKDIR} ${PREFIX}/share/java - @${INSTALL_DATA} ${WRKSRC}/confregdecode.jar ${LOCALBASE}/share/java - @${SED} \ + ${MKDIR} ${PREFIX}/share/java + ${INSTALL_DATA} ${WRKSRC}/confregdecode.jar ${PREFIX}/share/java + ${SED} \ -e s,%%PREFIX%%,${PREFIX}, \ -e s,%%LOCALBASE%%,${LOCALBASE}, \ - < ${FILESDIR}/confregdecode > ${PREFIX}/bin/confregdecode; \ - ${CHMOD} a+x ${PREFIX}/bin/confregdecode + < ${FILESDIR}/confregdecode > ${WRKSRC}/confregdecode; \ + ${INSTALL_SCRIPT} ${WRKSRC}/confregdecode ${PREFIX}/bin post-install: - @${MKDIR} ${PREFIX}/share/doc/confregdecode - @${INSTALL_DATA} ${WRKSRC}/README.txt ${LOCALBASE}/share/doc/confregdecode - @${INSTALL_DATA} ${WRKSRC}/ConfregDecode.html ${LOCALBASE}/share/doc/confregdecode +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for file in README.txt ConfregDecode.html + ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR} +.endfor +.endif .include <bsd.port.mk> diff --git a/net/confregdecode/distinfo b/net/confregdecode/distinfo index 56248aa22e1d..b26497ff30af 100644 --- a/net/confregdecode/distinfo +++ b/net/confregdecode/distinfo @@ -1 +1 @@ -MD5 (confregdecode-src-1.0.1.tar.gz) = e2b665ca1e8b69b16284034c01dabcac +MD5 (confregdecode-src-1.2.1.tar.gz) = 42d8bf2ad132a26ed79e98cb8d39f89d diff --git a/net/confregdecode/files/patch-ab b/net/confregdecode/files/patch-ab index f0cf9affc5f0..892247713a88 100644 --- a/net/confregdecode/files/patch-ab +++ b/net/confregdecode/files/patch-ab @@ -1,28 +1,25 @@ - -$FreeBSD$ - ---- Makefile.orig Thu May 31 09:08:05 2001 -+++ Makefile Sat Apr 6 18:50:09 2002 +--- Makefile.orig Fri Nov 28 21:00:51 2003 ++++ Makefile Fri Dec 19 01:31:42 2003 @@ -3,17 +3,17 @@ - # $Id: Makefile,v 1.1 2001/05/25 04:33:46 jmarcus Exp $ + # $Id: Makefile,v 1.3 2003/11/29 01:41:36 jmarcus Exp $ # --JAVAC= /usr/local/jdk1.1.8/bin/javac +-JAVAC= /usr/local/jdk1.4.2/bin/javac -JAVAC_FLAGS= -O -g --JAR= /usr/local/jdk1.1.8/bin/jar -+JAVAC?= /usr/local/jdk1.1.8/bin/javac +-JAR= /usr/local/jdk1.4.2/bin/jar ++JAVAC?= /usr/local/jdk1.4.2/bin/javac +JAVAC_FLAGS?= -O -g -+JAR?= /usr/local/jdk1.1.8/bin/jar ++JAR?= /usr/local/jdk1.4.2/bin/jar RM= /bin/rm all: $(JAVAC) $(JAVAC_FLAGS) com/marcuscom/confregdecode/ConfregDecode.java jar: all -- jar -cvf cd.jar com/marcuscom/confregdecode/*.class +- $(JAR) -cvf cd.jar com/marcuscom/confregdecode/*.class + $(JAR) -cvf confregdecode.jar com/marcuscom/confregdecode/*.class clean: $(RM) -f com/marcuscom/confregdecode/*.class - $(RM) -f cd.jar -+ $(RM) -f cconfregdecode.jar ++ $(RM) -f confregdecode.jar diff --git a/net/confregdecode/pkg-plist b/net/confregdecode/pkg-plist index c4257c3020bb..edd59f8ca670 100644 --- a/net/confregdecode/pkg-plist +++ b/net/confregdecode/pkg-plist @@ -1,5 +1,5 @@ bin/confregdecode share/java/confregdecode.jar -share/doc/confregdecode/README.txt -share/doc/confregdecode/ConfregDecode.html -@dirrm share/doc/confregdecode +%%PORTDOCS%%%%DOCSDIR%%/README.txt +%%PORTDOCS%%%%DOCSDIR%%/ConfregDecode.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% |