From addfe5c8ff6b6963fa703148edcb47b3184dd810 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Tue, 27 Aug 2002 15:27:03 +0000
Subject: @@PREFIX@@ -> @PREFIX@, as this is more consistent with other
 packages.

---
 news/inn/Makefile      |  8 ++++----
 news/inn/files/innd.sh | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'news/inn')

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 7abc273bdf5..034dbdc5b97 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/07/06 15:04:57 tron Exp $
+# $NetBSD: Makefile,v 1.36 2002/08/27 15:27:46 grant Exp $
 
 DISTNAME=		inn-2.3.3
 CATEGORIES=		news
@@ -60,11 +60,11 @@ INSTALL_FILE=		${WRKDIR}/INSTALL
 BUILD_DEFS+=		INN_DATA_DIR
 
 post-build:
-	${SED} -e 's#@@INN_DATA_DIR@@#${INN_DATA_DIR}#g' \
-	       -e 's#@@PREFIX@@#${PREFIX}#g' \
+	${SED} -e 's#@INN_DATA_DIR@#${INN_DATA_DIR}#g' \
+	       -e 's#@PREFIX@#${PREFIX}#g' \
 	        ${FILESDIR}/innd.sh >${WRKDIR}/innd.sh
 .for FILE in DEINSTALL INSTALL
-	${SED} -e 's#@@INN_DATA_DIR@@#${INN_DATA_DIR}#g' \
+	${SED} -e 's#@INN_DATA_DIR@#${INN_DATA_DIR}#g' \
 	        ${PKGDIR}/${FILE} >${WRKDIR}/${FILE}
 .endfor
 	for DIR in backends expire frontends innd innfeed lib nnrpd	\
diff --git a/news/inn/files/innd.sh b/news/inn/files/innd.sh
index 833fe3302cb..7bf8f9eb15c 100644
--- a/news/inn/files/innd.sh
+++ b/news/inn/files/innd.sh
@@ -1,42 +1,42 @@
 #!/bin/sh
 #
-# $NetBSD: innd.sh,v 1.11 2001/07/29 05:11:26 tron Exp $
+# $NetBSD: innd.sh,v 1.12 2002/08/27 15:27:03 grant Exp $
 #
 # PROVIDE: inn
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
-if [ -x @@PREFIX@@/inn/bin/rc.news -a -s @@INN_DATA_DIR@@/db/active ]
+if [ -x @PREFIX@/inn/bin/rc.news -a -s @INN_DATA_DIR@/db/active ]
 then
-	if [ ! -f @@PREFIX@@/etc/nntp/server ]
+	if [ ! -f @PREFIX@/etc/nntp/server ]
 	then
-		hostname >@@PREFIX@@/etc/nntp/server
+		hostname >@PREFIX@/etc/nntp/server
 	fi
 
-	if [ ! -f @@PREFIX@@/etc/nntp/domainname ]
+	if [ ! -f @PREFIX@/etc/nntp/domainname ]
 	then
-		(set - X `grep ^fromhost: @@INN_DATA_DIR@@/etc/inn.conf`
+		(set - X `grep ^fromhost: @INN_DATA_DIR@/etc/inn.conf`
 		if [ $# -eq 3 ]
 		then
-			echo $3 >@@PREFIX@@/etc/nntp/domainname
+			echo $3 >@PREFIX@/etc/nntp/domainname
 		fi)
 	fi
 
 	if [ $# -eq 0 ]
 	then
 		echo -n ' innd'
-		su news -c "@@PREFIX@@/inn/bin/rc.news start" >/dev/null
+		su news -c "@PREFIX@/inn/bin/rc.news start" >/dev/null
 		exit 0
 	fi
 
 	case "$1" in
 	start )
 		echo "Starting INN."
-		su news -c "@@PREFIX@@/inn/bin/rc.news $1" >/dev/null
+		su news -c "@PREFIX@/inn/bin/rc.news $1" >/dev/null
 		exit 0
 		;;
 	stop )
-		su news -c "@@PREFIX@@/inn/bin/rc.news $1"
+		su news -c "@PREFIX@/inn/bin/rc.news $1"
 		exit 0
 		;;
 	restart )
-- 
cgit v1.2.3