diff options
| author | pav <pav@FreeBSD.org> | 2004-03-03 03:27:59 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2004-03-03 03:27:59 +0800 |
| commit | 424ac94ed3cc9d22d175e724333b1ee69ca03720 (patch) | |
| tree | c65acc9129a34c7dc346527258afd2c225a357c3 | |
| parent | 2c7cd3a7fef967711369e79294f33bf00caf7e9d (diff) | |
| download | freebsd-ports-gnome-424ac94ed3cc9d22d175e724333b1ee69ca03720.tar.gz freebsd-ports-gnome-424ac94ed3cc9d22d175e724333b1ee69ca03720.tar.zst freebsd-ports-gnome-424ac94ed3cc9d22d175e724333b1ee69ca03720.zip | |
- Some small fixes to startup-script (fixed by Dirk Meyer and Ralf vd Enden).
- $PREFIX no longer hardcoded (fixed by Dirk Meyer).
- Pet portlint a bit
PR: ports/63530
Submitted by: maintainer
| -rw-r--r-- | dns/powerdns-devel/Makefile | 7 | ||||
| -rw-r--r-- | dns/powerdns-devel/files/pdns.sh.sample | 7 | ||||
| -rw-r--r-- | dns/powerdns/Makefile | 7 | ||||
| -rw-r--r-- | dns/powerdns/files/pdns.sh.sample | 7 |
4 files changed, 16 insertions, 12 deletions
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile index 606b9642e264..64333597c989 100644 --- a/dns/powerdns-devel/Makefile +++ b/dns/powerdns-devel/Makefile @@ -1,3 +1,4 @@ +# New ports collection makefile for: powerdns # Date Created: 14.Jan 2003 # Whom: dirk.meyer@dinoex.sub.org # @@ -6,6 +7,7 @@ PORTNAME= powerdns PORTVERSION= 2.9.16 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} @@ -127,7 +129,10 @@ post-install: .endif .if !exists(${STARTUP_SCRIPT}) ${ECHO_MSG} "Installing ${STARTUP_SCRIPT} startup file." - ${INSTALL_SCRIPT} ${FILESDIR}/pdns.sh.sample ${STARTUP_SCRIPT} + ${SED} -e "s=%%PREFIX%%=${PREFIX}=" \ + ${FILESDIR}/pdns.sh.sample \ + > ${WRKSRC}/pdns.sh.sample + ${INSTALL_SCRIPT} ${WRKSRC}/pdns.sh.sample ${STARTUP_SCRIPT} .endif .include <bsd.port.post.mk> diff --git a/dns/powerdns-devel/files/pdns.sh.sample b/dns/powerdns-devel/files/pdns.sh.sample index d19be1bfd061..b5899e363ee1 100644 --- a/dns/powerdns-devel/files/pdns.sh.sample +++ b/dns/powerdns-devel/files/pdns.sh.sample @@ -2,11 +2,7 @@ rc_file=${0##*/} -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${rc_file}\$"); then - echo "${rc_file}: Cannot determine PREFIX." >&2 - echo "Please use the complete pathname." >&2 - exit 64 -fi +PREFIX=%%PREFIX%% pdns=${PREFIX}/sbin/pdns_server pdnscontrol=${PREFIX}/bin/pdns_control @@ -18,6 +14,7 @@ if [ "x$1" = "x" -o "x$1" = "xstart" ]; then if [ -f $pdns ]; then echo -n ' PowerDNS' if [ -f $pdnsrecursor ]; then + rm $recursorpid >/dev/null 2>&1 $pdnsrecursor >/dev/null 2>&1 fi $pdns diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 606b9642e264..64333597c989 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -1,3 +1,4 @@ +# New ports collection makefile for: powerdns # Date Created: 14.Jan 2003 # Whom: dirk.meyer@dinoex.sub.org # @@ -6,6 +7,7 @@ PORTNAME= powerdns PORTVERSION= 2.9.16 +PORTREVISION= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ DISTNAME= pdns-${PORTVERSION} @@ -127,7 +129,10 @@ post-install: .endif .if !exists(${STARTUP_SCRIPT}) ${ECHO_MSG} "Installing ${STARTUP_SCRIPT} startup file." - ${INSTALL_SCRIPT} ${FILESDIR}/pdns.sh.sample ${STARTUP_SCRIPT} + ${SED} -e "s=%%PREFIX%%=${PREFIX}=" \ + ${FILESDIR}/pdns.sh.sample \ + > ${WRKSRC}/pdns.sh.sample + ${INSTALL_SCRIPT} ${WRKSRC}/pdns.sh.sample ${STARTUP_SCRIPT} .endif .include <bsd.port.post.mk> diff --git a/dns/powerdns/files/pdns.sh.sample b/dns/powerdns/files/pdns.sh.sample index d19be1bfd061..b5899e363ee1 100644 --- a/dns/powerdns/files/pdns.sh.sample +++ b/dns/powerdns/files/pdns.sh.sample @@ -2,11 +2,7 @@ rc_file=${0##*/} -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/${rc_file}\$"); then - echo "${rc_file}: Cannot determine PREFIX." >&2 - echo "Please use the complete pathname." >&2 - exit 64 -fi +PREFIX=%%PREFIX%% pdns=${PREFIX}/sbin/pdns_server pdnscontrol=${PREFIX}/bin/pdns_control @@ -18,6 +14,7 @@ if [ "x$1" = "x" -o "x$1" = "xstart" ]; then if [ -f $pdns ]; then echo -n ' PowerDNS' if [ -f $pdnsrecursor ]; then + rm $recursorpid >/dev/null 2>&1 $pdnsrecursor >/dev/null 2>&1 fi $pdns |