From 04df566144768e4b5e59147ebeae21297d367810 Mon Sep 17 00:00:00 2001
From: Diane Bruce <db@FreeBSD.org>
Date: Sat, 16 Jan 2010 02:17:02 +0000
Subject: - use $SUB_FILES to dynamically adjust pkg-message

PR:		ports/142441
Submitted by:	Sevan Janiyan <venture37@geeklan.co.uk>
---
 comms/aprsd/Makefile             | 11 +++++------
 comms/aprsd/files/pkg-message.in |  9 +++++++++
 comms/aprsd/files/pkg_message.in |  9 ---------
 3 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 comms/aprsd/files/pkg-message.in
 delete mode 100644 comms/aprsd/files/pkg_message.in

(limited to 'comms')

diff --git a/comms/aprsd/Makefile b/comms/aprsd/Makefile
index ab4ebb07f2e8..f306b9bfdc73 100644
--- a/comms/aprsd/Makefile
+++ b/comms/aprsd/Makefile
@@ -15,8 +15,7 @@ MAINTAINER=	db@FreeBSD.org
 COMMENT=	Server daemon providing Internet access to APRS packet data
 
 GNU_CONFIGURE=	yes
-PKGMESSAGE=	${FILESDIR}/pkg_message.in
-WRK_PKGMESSAGE=	${WRKDIR}/pkg_message
+SUB_FILES=	pkg-message
 
 .include <bsd.port.pre.mk>
 
@@ -26,16 +25,16 @@ post-patch:
 		    ${WRKSRC}/src/aprsd.cpp
 	@${REINPLACE_CMD} -e 's|%%LOGPATH%%|/var/log/aprsd/|' \
 	    ${WRKSRC}/src/utils.cpp
+
 post-configure:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
 	    ${WRKSRC}/Makefile
+
 pre-install:
 	@${MKDIR} ${PREFIX}/etc/aprsd
 	@${MKDIR} "/var/log/aprsd"
-	@${CP} ${PKGMESSAGE} ${WRK_PKGMESSAGE}
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
-	    ${WRK_PKGMESSAGE}
 	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 post-install:
 	@cd ${WRKSRC}/admin
 .for	f in INIT.TNC RESTORE.TNC aprsd.conf welcome.txt user.deny
@@ -53,6 +52,6 @@ post-install:
 	@${ECHO} docs are in ${PREFIX}/share/doc/aprsd
 	@${ECHO}
 .endif
-	@${CAT} ${WRK_PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/comms/aprsd/files/pkg-message.in b/comms/aprsd/files/pkg-message.in
new file mode 100644
index 000000000000..2ed67ce89297
--- /dev/null
+++ b/comms/aprsd/files/pkg-message.in
@@ -0,0 +1,9 @@
+aprsd is now installed
+
+aprsd has various config files to set up in %%PREFIX%%/etc/aprsd
+logs are kept in /var/log/aprsd
+
+To enable aprsd you need to add: aprsd_enable="YES" to /etc/rc.conf
+to run aprsd as UID aprsd   add: aprsd_root="NO" to /etc/rc.conf
+
+- 73 Diane VA3DB
diff --git a/comms/aprsd/files/pkg_message.in b/comms/aprsd/files/pkg_message.in
deleted file mode 100644
index 2ed67ce89297..000000000000
--- a/comms/aprsd/files/pkg_message.in
+++ /dev/null
@@ -1,9 +0,0 @@
-aprsd is now installed
-
-aprsd has various config files to set up in %%PREFIX%%/etc/aprsd
-logs are kept in /var/log/aprsd
-
-To enable aprsd you need to add: aprsd_enable="YES" to /etc/rc.conf
-to run aprsd as UID aprsd   add: aprsd_root="NO" to /etc/rc.conf
-
-- 73 Diane VA3DB
-- 
cgit