Date: Thu, 7 Jan 2010 22:55:38 GMT From: Sevan Janiyan <venture37@geeklan.co.uk> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/142441: [patch] comms/aprsd use $SUB_FILES to dynamically adjust pkg-message Message-ID: <201001072255.o07MtcWb069154@www.freebsd.org> Resent-Message-ID: <201001072300.o07N0BXN080377@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 142441
>Category: ports
>Synopsis: [patch] comms/aprsd use $SUB_FILES to dynamically adjust pkg-message
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 07 23:00:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sevan Janiyan
>Release:
>Organization:
>Environment:
>Description:
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/comms/aprsd/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 22 Aug 2009 00:15:08 -0000 1.2
+++ Makefile 7 Jan 2010 22:47:33 -0000
@@ -15,8 +15,7 @@
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 @@
${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 @@
@${ECHO} docs are in ${PREFIX}/share/doc/aprsd
@${ECHO}
.endif
- @${CAT} ${WRK_PKGMESSAGE}
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/pkg-message.in 7 Jan 2010 22:47:33 -0000
@@ -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
Index: files/pkg_message.in
===================================================================
RCS file: files/pkg_message.in
diff -N files/pkg_message.in
--- files/pkg_message.in 24 Jan 2008 18:23:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001072255.o07MtcWb069154>