diff options
| -rw-r--r-- | dns/domtools/Makefile | 6 | ||||
| -rw-r--r-- | dns/domtools/distinfo | 2 | ||||
| -rw-r--r-- | dns/domtools/files/patch-aa | 21 | ||||
| -rw-r--r-- | dns/domtools/pkg-plist | 3 | ||||
| -rw-r--r-- | net/domtools/Makefile | 6 | ||||
| -rw-r--r-- | net/domtools/distinfo | 2 | ||||
| -rw-r--r-- | net/domtools/files/patch-aa | 21 | ||||
| -rw-r--r-- | net/domtools/pkg-plist | 3 |
8 files changed, 44 insertions, 20 deletions
diff --git a/dns/domtools/Makefile b/dns/domtools/Makefile index 99d85c386b1f..3919113d68b2 100644 --- a/dns/domtools/Makefile +++ b/dns/domtools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= domtools -PORTVERSION= 1.4.0 +PORTVERSION= 1.5.0 CATEGORIES= net MASTER_SITES= http://www.domtools.com/pub/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -18,13 +18,15 @@ USE_PERL5= YES NO_BUILD= YES WRKSRC= ${WRKDIR}/domtools${PORTVERSION}/ +MAKE_ENV+= PDEST=${PREFIX} + # XXX - patches/patch-aa modifies Makefile # and so does the post-patch target post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.old - ${SED} -e 's#/usr/bin/perl#${PERL5}#' \ + ${SED} -e 's#/usr/bin/perl#${PERL5}#' -e '/^PDEST=/d' \ < ${WRKSRC}/Makefile.old > ${WRKSRC}/Makefile post-install: diff --git a/dns/domtools/distinfo b/dns/domtools/distinfo index 5f351c0af4a7..6f13ee395158 100644 --- a/dns/domtools/distinfo +++ b/dns/domtools/distinfo @@ -1 +1 @@ -MD5 (domtools1.4.0.tar.gz) = 4075410e4556d24dc19854afedecc635 +MD5 (domtools1.5.0.tar.gz) = 839442a8302279ed9ced5f7241a70e10 diff --git a/dns/domtools/files/patch-aa b/dns/domtools/files/patch-aa index 65b15ed2ec9d..0b32844d72e4 100644 --- a/dns/domtools/files/patch-aa +++ b/dns/domtools/files/patch-aa @@ -1,5 +1,5 @@ ---- ../domtools.orig/Makefile Thu Mar 18 11:48:08 1999 -+++ Makefile Sat Jun 12 22:31:17 1999 +--- Makefile.old Wed Aug 16 23:22:00 2000 ++++ Makefile Wed Aug 16 23:23:05 2000 @@ -35,12 +35,12 @@ # This directory is created, below, if it doesn't exist. # "bin" will put it in $LDEST/bin. @@ -33,14 +33,21 @@ #INSTALL=/usr/ucb/install #INSTALL=/usr/local/gnu/bin/install #INSTALL=/stor/gnu/aix/bin/install -@@ -148,8 +148,8 @@ +@@ -148,7 +148,7 @@ # Regardless of the name, it _must_ be a gnu-based awk. # If you don't have gawk, get it and install it; or hosttbl,networktbl,netmasktbl # tools won't work right. Gawk is much better than awk or nawk anyway. -GAWKPROG=gawk # many systems --#GAWKPROG=awk # BSDI, Linux -+#GAWKPROG=gawk # many systems -+GAWKPROG=/usr/bin/awk # BSDI, Linux ++GAWKPROG=/usr/bin/awk # many systems + #GAWKPROG=awk # BSDI, Linux #GAWKPROG=/usr/local/bin/awk - #--------------------------------------------------------------------------------------- +@@ -233,7 +233,7 @@ + # (Very important for BIND 8 users, because zone file format changed) + # No, we don't want the sticky (text) bit set on this directory. + -if test $(ZONECACHEWANTED) -eq 1; then \ +- $(INSTALL) -m 777 $(CHOWNOPT) -g $(GROUP) -d $(PDEST)/$(ZONEDIR); \ ++ $(INSTALL) -m 1777 $(CHOWNOPT) -g $(GROUP) -d $(PDEST)/$(ZONEDIR); \ + rm -f $(PDEST)/$(ZONEDIR)/* > /dev/null 2>&1; \ + fi + for i in $(LIBS); do \ diff --git a/dns/domtools/pkg-plist b/dns/domtools/pkg-plist index 11db14e761c7..01e8d3f2a4b1 100644 --- a/dns/domtools/pkg-plist +++ b/dns/domtools/pkg-plist @@ -3,9 +3,11 @@ domtools/bin/addr2net domtools/bin/addr2mask domtools/bin/axfr domtools/bin/basedomain +domtools/bin/bits2mask domtools/bin/check1101 domtools/bin/domsort domtools/bin/f2iaddr +domtools/bin/geniplist domtools/bin/gw domtools/bin/hinfo domtools/bin/hosts @@ -15,6 +17,7 @@ domtools/bin/ipsort domtools/bin/isequal domtools/bin/issubdom domtools/bin/makestatic +domtools/bin/mask2bits domtools/bin/netkillzeros domtools/bin/netmask domtools/bin/network diff --git a/net/domtools/Makefile b/net/domtools/Makefile index 99d85c386b1f..3919113d68b2 100644 --- a/net/domtools/Makefile +++ b/net/domtools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= domtools -PORTVERSION= 1.4.0 +PORTVERSION= 1.5.0 CATEGORIES= net MASTER_SITES= http://www.domtools.com/pub/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -18,13 +18,15 @@ USE_PERL5= YES NO_BUILD= YES WRKSRC= ${WRKDIR}/domtools${PORTVERSION}/ +MAKE_ENV+= PDEST=${PREFIX} + # XXX - patches/patch-aa modifies Makefile # and so does the post-patch target post-patch: ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.old - ${SED} -e 's#/usr/bin/perl#${PERL5}#' \ + ${SED} -e 's#/usr/bin/perl#${PERL5}#' -e '/^PDEST=/d' \ < ${WRKSRC}/Makefile.old > ${WRKSRC}/Makefile post-install: diff --git a/net/domtools/distinfo b/net/domtools/distinfo index 5f351c0af4a7..6f13ee395158 100644 --- a/net/domtools/distinfo +++ b/net/domtools/distinfo @@ -1 +1 @@ -MD5 (domtools1.4.0.tar.gz) = 4075410e4556d24dc19854afedecc635 +MD5 (domtools1.5.0.tar.gz) = 839442a8302279ed9ced5f7241a70e10 diff --git a/net/domtools/files/patch-aa b/net/domtools/files/patch-aa index 65b15ed2ec9d..0b32844d72e4 100644 --- a/net/domtools/files/patch-aa +++ b/net/domtools/files/patch-aa @@ -1,5 +1,5 @@ ---- ../domtools.orig/Makefile Thu Mar 18 11:48:08 1999 -+++ Makefile Sat Jun 12 22:31:17 1999 +--- Makefile.old Wed Aug 16 23:22:00 2000 ++++ Makefile Wed Aug 16 23:23:05 2000 @@ -35,12 +35,12 @@ # This directory is created, below, if it doesn't exist. # "bin" will put it in $LDEST/bin. @@ -33,14 +33,21 @@ #INSTALL=/usr/ucb/install #INSTALL=/usr/local/gnu/bin/install #INSTALL=/stor/gnu/aix/bin/install -@@ -148,8 +148,8 @@ +@@ -148,7 +148,7 @@ # Regardless of the name, it _must_ be a gnu-based awk. # If you don't have gawk, get it and install it; or hosttbl,networktbl,netmasktbl # tools won't work right. Gawk is much better than awk or nawk anyway. -GAWKPROG=gawk # many systems --#GAWKPROG=awk # BSDI, Linux -+#GAWKPROG=gawk # many systems -+GAWKPROG=/usr/bin/awk # BSDI, Linux ++GAWKPROG=/usr/bin/awk # many systems + #GAWKPROG=awk # BSDI, Linux #GAWKPROG=/usr/local/bin/awk - #--------------------------------------------------------------------------------------- +@@ -233,7 +233,7 @@ + # (Very important for BIND 8 users, because zone file format changed) + # No, we don't want the sticky (text) bit set on this directory. + -if test $(ZONECACHEWANTED) -eq 1; then \ +- $(INSTALL) -m 777 $(CHOWNOPT) -g $(GROUP) -d $(PDEST)/$(ZONEDIR); \ ++ $(INSTALL) -m 1777 $(CHOWNOPT) -g $(GROUP) -d $(PDEST)/$(ZONEDIR); \ + rm -f $(PDEST)/$(ZONEDIR)/* > /dev/null 2>&1; \ + fi + for i in $(LIBS); do \ diff --git a/net/domtools/pkg-plist b/net/domtools/pkg-plist index 11db14e761c7..01e8d3f2a4b1 100644 --- a/net/domtools/pkg-plist +++ b/net/domtools/pkg-plist @@ -3,9 +3,11 @@ domtools/bin/addr2net domtools/bin/addr2mask domtools/bin/axfr domtools/bin/basedomain +domtools/bin/bits2mask domtools/bin/check1101 domtools/bin/domsort domtools/bin/f2iaddr +domtools/bin/geniplist domtools/bin/gw domtools/bin/hinfo domtools/bin/hosts @@ -15,6 +17,7 @@ domtools/bin/ipsort domtools/bin/isequal domtools/bin/issubdom domtools/bin/makestatic +domtools/bin/mask2bits domtools/bin/netkillzeros domtools/bin/netmask domtools/bin/network |