- Update to version 1.1.1

- Better ${PREFIX} handling

PR: 24626
Submitted by: MAINTAINER

10 files changed, 22 insertions, 20 deletions

diff --git a/dns/pdnsd/Makefile b/dns/pdnsd/Makefile
index f00e99d37218..00762d690fb0 100644
--- a/dns/pdnsd/Makefile
+++ b/dns/pdnsd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pdnsd
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	net
 MASTER_SITES=	http://home.t-online.de/home/Moestl/
 
@@ -19,7 +19,8 @@ PDNSDB=		/var/db/pdnsd
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/rc.d
-	@${INSTALL} ${COPY} -m 744 -o root ${FILESDIR}/pdnsd.sh ${PREFIX}/etc/rc.d/pdnsd.sh
+	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pdnsd.sh > ${PREFIX}/etc/rc.d/pdnsd.sh
+	@${CHMOD} 750 ${PREFIX}/etc/rc.d/pdnsd.sh
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/dns/pdnsd/distinfo b/dns/pdnsd/distinfo
index 24446fb61d48..b1b8e03c81fa 100644
--- a/dns/pdnsd/distinfo
+++ b/dns/pdnsd/distinfo
@@ -1 +1 @@
-MD5 (pdnsd-1.1.0.tar.gz) = 829bd8ff5806516d866735c3574c717e
+MD5 (pdnsd-1.1.1.tar.gz) = e7468ab4f49a81f279e0132ae064aaa3
diff --git a/dns/pdnsd/files/pdnsd.sh b/dns/pdnsd/files/pdnsd.sh
index 4795f23879ac..b5d6453eafd0 100644
--- a/dns/pdnsd/files/pdnsd.sh
+++ b/dns/pdnsd/files/pdnsd.sh
@@ -2,9 +2,9 @@
 
 case $1 in
 start)
-	if [ -x /usr/local/sbin/pdnsd -a -f /usr/local/etc/pdnsd.conf ]; then
-		/usr/local/sbin/pdnsd -d
-		echo ' pdnsd'
+	if [ -x %%PREFIX%%/sbin/pdnsd -a -f %%PREFIX%%/etc/pdnsd.conf ]; then
+		%%PREFIX%%/sbin/pdnsd -d
+		echo -n ' pdnsd'
 	fi
 	;;
 stop)
diff --git a/dns/pdnsd/pkg-comment b/dns/pdnsd/pkg-comment
index 4ef8af4a13e2..98cad6162dbb 100644
--- a/dns/pdnsd/pkg-comment
+++ b/dns/pdnsd/pkg-comment
@@ -1 +1 @@
-Cacheing (permanently, writes to disk on exit) DNS proxy-server
+Caching (permanently, writes to disk on exit) DNS proxy-server
diff --git a/dns/pdnsd/pkg-descr b/dns/pdnsd/pkg-descr
index b21dd3bc6945..610db2a00fdb 100644
--- a/dns/pdnsd/pkg-descr
+++ b/dns/pdnsd/pkg-descr
@@ -1,10 +1,10 @@
 pdnsd is a proxy dns server with permanent caching (the cache contents are
-written to hard disk on exit) that is designed to cope with unreacheable or
+written to hard disk on exit) that is designed to cope with unreachable or
 down dns servers (for example in dial-in networking).
 pdnsd can be used with applications that do dns lookups, eg on startup, and
-can't be configured to change that behaviour, to prevent the often minute-long
+can't be configured to change that behavior, to prevent the often minute-long
 hangs (or even crashes) that result from stalled dns queries. Some Netscape
-Navigator versions for Unix, for example, expose this behaviour.
+Navigator versions for Unix, for example, expose this behavior.
 pdnsd is configurable via a file and supports run-time configuration using the
 program pdnsd-ctl that comes with pdnsd. This allows you to set the status
 flags of servers that pdnsd knows (to influence which servers pdnsd will
diff --git a/net/pdnsd/Makefile b/net/pdnsd/Makefile
index f00e99d37218..00762d690fb0 100644
--- a/net/pdnsd/Makefile
+++ b/net/pdnsd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pdnsd
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	net
 MASTER_SITES=	http://home.t-online.de/home/Moestl/
 
@@ -19,7 +19,8 @@ PDNSDB=		/var/db/pdnsd
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/rc.d
-	@${INSTALL} ${COPY} -m 744 -o root ${FILESDIR}/pdnsd.sh ${PREFIX}/etc/rc.d/pdnsd.sh
+	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/pdnsd.sh > ${PREFIX}/etc/rc.d/pdnsd.sh
+	@${CHMOD} 750 ${PREFIX}/etc/rc.d/pdnsd.sh
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/pdnsd/distinfo b/net/pdnsd/distinfo
index 24446fb61d48..b1b8e03c81fa 100644
--- a/net/pdnsd/distinfo
+++ b/net/pdnsd/distinfo
@@ -1 +1 @@
-MD5 (pdnsd-1.1.0.tar.gz) = 829bd8ff5806516d866735c3574c717e
+MD5 (pdnsd-1.1.1.tar.gz) = e7468ab4f49a81f279e0132ae064aaa3
diff --git a/net/pdnsd/files/pdnsd.sh b/net/pdnsd/files/pdnsd.sh
index 4795f23879ac..b5d6453eafd0 100644
--- a/net/pdnsd/files/pdnsd.sh
+++ b/net/pdnsd/files/pdnsd.sh
@@ -2,9 +2,9 @@
 
 case $1 in
 start)
-	if [ -x /usr/local/sbin/pdnsd -a -f /usr/local/etc/pdnsd.conf ]; then
-		/usr/local/sbin/pdnsd -d
-		echo ' pdnsd'
+	if [ -x %%PREFIX%%/sbin/pdnsd -a -f %%PREFIX%%/etc/pdnsd.conf ]; then
+		%%PREFIX%%/sbin/pdnsd -d
+		echo -n ' pdnsd'
 	fi
 	;;
 stop)
diff --git a/net/pdnsd/pkg-comment b/net/pdnsd/pkg-comment
index 4ef8af4a13e2..98cad6162dbb 100644
--- a/net/pdnsd/pkg-comment
+++ b/net/pdnsd/pkg-comment
@@ -1 +1 @@
-Cacheing (permanently, writes to disk on exit) DNS proxy-server
+Caching (permanently, writes to disk on exit) DNS proxy-server
diff --git a/net/pdnsd/pkg-descr b/net/pdnsd/pkg-descr
index b21dd3bc6945..610db2a00fdb 100644
--- a/net/pdnsd/pkg-descr
+++ b/net/pdnsd/pkg-descr
@@ -1,10 +1,10 @@
 pdnsd is a proxy dns server with permanent caching (the cache contents are
-written to hard disk on exit) that is designed to cope with unreacheable or
+written to hard disk on exit) that is designed to cope with unreachable or
 down dns servers (for example in dial-in networking).
 pdnsd can be used with applications that do dns lookups, eg on startup, and
-can't be configured to change that behaviour, to prevent the often minute-long
+can't be configured to change that behavior, to prevent the often minute-long
 hangs (or even crashes) that result from stalled dns queries. Some Netscape
-Navigator versions for Unix, for example, expose this behaviour.
+Navigator versions for Unix, for example, expose this behavior.
 pdnsd is configurable via a file and supports run-time configuration using the
 program pdnsd-ctl that comes with pdnsd. This allows you to set the status
 flags of servers that pdnsd knows (to influence which servers pdnsd will