diff options
author | marino <marino@FreeBSD.org> | 2014-07-27 20:38:41 +0800 |
---|---|---|
committer | marino <marino@FreeBSD.org> | 2014-07-27 20:38:41 +0800 |
commit | 52bbfac62822131244b6de3298f9b0ea87ac209b (patch) | |
tree | 30b015ab2fe586e7e93a2103dbf63dda19522979 /comms | |
parent | 6ea31edb9f2a4dea4d9ed77fa869e04a4d12fc96 (diff) | |
download | freebsd-ports-graphics-52bbfac62822131244b6de3298f9b0ea87ac209b.tar.gz freebsd-ports-graphics-52bbfac62822131244b6de3298f9b0ea87ac209b.tar.zst freebsd-ports-graphics-52bbfac62822131244b6de3298f9b0ea87ac209b.zip |
Stage comms/qpage
The PR wasn't quite right with regards to stage support, so I had to modify
it further. The post-install configure file handling was focused on the
wrong file. I updated the default name of the qpage configure file in
order to use the @sample keyword. I added an entry in UPDATING to let
users know they may need to move an existing configure file accordingly.
PR: 192120
Submitted by: maintainer (Jeff Blank)
Changes by: marino
Diffstat (limited to 'comms')
-rw-r--r-- | comms/qpage/Makefile | 20 | ||||
-rw-r--r-- | comms/qpage/files/patch-config.h.in | 2 | ||||
-rw-r--r-- | comms/qpage/files/patch-config.input | 2 | ||||
-rw-r--r-- | comms/qpage/files/patch-qpage.man | 2 | ||||
-rw-r--r-- | comms/qpage/pkg-plist | 3 |
5 files changed, 12 insertions, 17 deletions
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile index b650af8d4a5..01ad72a2c0f 100644 --- a/comms/qpage/Makefile +++ b/comms/qpage/Makefile @@ -3,7 +3,7 @@ PORTNAME= qpage PORTVERSION= 3.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= comms MASTER_SITES= http://www.qpage.org/download/ EXTRACT_SUFX= .tar.Z @@ -17,9 +17,6 @@ GNU_CONFIGURE= yes OPTIONS_DEFINE= IDENT_PATCH IDENT_PATCH_DESC= Disable libwrap ident lookups -MAN1= qpage.1 - -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MIDENT_PATCH} @@ -69,14 +66,11 @@ post-patch: -e 's,%%WITH_QPAGE_USER%%,${WITH_QPAGE_USER},' \ ${WRKSRC}/config.input -post-install: - @if [ ! -f ${PREFIX}/etc/qpage-example.cf ]; then \ - ${ECHO_MSG} "Install ${PREFIX}/etc/qpage-example.cf file."; \ - ${INSTALL_DATA} -m 640 ${WRKDIR}/${PORTNAME}-${PORTVERSION}/example.cf \ - ${PREFIX}/etc/qpage-example.cf; \ - fi - ${MKDIR} /var/spool/${PORTNAME} - ${CHOWN} ${WITH_QPAGE_USER}:dialer /var/spool/${PORTNAME} - ${CHMOD} 0775 /var/spool/${PORTNAME} +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/qpage ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/qpage.man \ + ${STAGEDIR}${MAN1PREFIX}/man/man1/qpage.1 + ${INSTALL_DATA} ${WRKSRC}/example.cf \ + ${STAGEDIR}${PREFIX}/etc/qpage.conf.sample .include <bsd.port.mk> diff --git a/comms/qpage/files/patch-config.h.in b/comms/qpage/files/patch-config.h.in index 0ef2db19f85..8bed5105b2a 100644 --- a/comms/qpage/files/patch-config.h.in +++ b/comms/qpage/files/patch-config.h.in @@ -5,7 +5,7 @@ /* Define as the location of the qpage configuration file. */ -#define QPAGE_CONFIG "/etc/qpage.cf" -+#define QPAGE_CONFIG "%%PREFIX%%/etc/qpage.cf" ++#define QPAGE_CONFIG "%%PREFIX%%/etc/qpage.conf" /* Define as the location of the lock directory. */ #undef DEFAULT_LOCKDIR diff --git a/comms/qpage/files/patch-config.input b/comms/qpage/files/patch-config.input index ff8439da6b8..706b32f16a5 100644 --- a/comms/qpage/files/patch-config.input +++ b/comms/qpage/files/patch-config.input @@ -5,7 +5,7 @@ # the syntax of the configuration file. # -QPAGE_CONFIG="/etc/qpage.cf" -+QPAGE_CONFIG="%%PREFIX%%/etc/qpage.cf" ++QPAGE_CONFIG="%%PREFIX%%/etc/qpage.conf" # diff --git a/comms/qpage/files/patch-qpage.man b/comms/qpage/files/patch-qpage.man index 19e11ba81a5..31066fb9dcb 100644 --- a/comms/qpage/files/patch-qpage.man +++ b/comms/qpage/files/patch-qpage.man @@ -5,7 +5,7 @@ .LP .SH FILES -/etc/qpage.cf -+%%PREFIX%%/etc/qpage.cf ++%%PREFIX%%/etc/qpage.conf .SH SEE ALSO .B RFC-1861 .SH KNOWN BUGS diff --git a/comms/qpage/pkg-plist b/comms/qpage/pkg-plist index 7a1218d2315..891a79b6568 100644 --- a/comms/qpage/pkg-plist +++ b/comms/qpage/pkg-plist @@ -1,4 +1,5 @@ bin/qpage -etc/qpage-example.cf +@sample etc/qpage.conf.sample +man/man1/qpage.1.gz @exec if [ ! -d /var/spool/qpage ]; then mkdir /var/spool/qpage; chown uucp:dialer /var/spool/qpage; chmod 0775 /var/spool/qpage; fi @unexec if [ -d /var/spool/qpage ]; then rm -rf /var/spool/qpage; fi |