Date: Sun, 27 Jul 2014 12:38:42 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363056 - in head: . comms/qpage comms/qpage/files Message-ID: <201407271238.s6RCcgOf083497@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sun Jul 27 12:38:41 2014 New Revision: 363056 URL: http://svnweb.freebsd.org/changeset/ports/363056 QAT: https://qat.redports.org/buildarchive/r363056/ Log: 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 Modified: head/UPDATING head/comms/qpage/Makefile head/comms/qpage/files/patch-config.h.in head/comms/qpage/files/patch-config.input head/comms/qpage/files/patch-qpage.man head/comms/qpage/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Jul 27 12:16:47 2014 (r363055) +++ head/UPDATING Sun Jul 27 12:38:41 2014 (r363056) @@ -5,6 +5,15 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140727: + AFFECTS: users of comms/qpage + AUTHOR: marino@FreeBSD.org + + The default configure file location has changed from + ${LOCALBASE}/etc/qpage.cf to ${LOCALBASE}/etc/qpage.conf + You will likely want to move the old configure file to the new location + after updating if it contains custom settings. + 20140725: AFFECTS: users of cad/netgen AUTHOR: stephen@FreeBSD.org Modified: head/comms/qpage/Makefile ============================================================================== --- head/comms/qpage/Makefile Sun Jul 27 12:16:47 2014 (r363055) +++ head/comms/qpage/Makefile Sun Jul 27 12:38:41 2014 (r363056) @@ -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> Modified: head/comms/qpage/files/patch-config.h.in ============================================================================== --- head/comms/qpage/files/patch-config.h.in Sun Jul 27 12:16:47 2014 (r363055) +++ head/comms/qpage/files/patch-config.h.in Sun Jul 27 12:38:41 2014 (r363056) @@ -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 Modified: head/comms/qpage/files/patch-config.input ============================================================================== --- head/comms/qpage/files/patch-config.input Sun Jul 27 12:16:47 2014 (r363055) +++ head/comms/qpage/files/patch-config.input Sun Jul 27 12:38:41 2014 (r363056) @@ -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" # Modified: head/comms/qpage/files/patch-qpage.man ============================================================================== --- head/comms/qpage/files/patch-qpage.man Sun Jul 27 12:16:47 2014 (r363055) +++ head/comms/qpage/files/patch-qpage.man Sun Jul 27 12:38:41 2014 (r363056) @@ -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 Modified: head/comms/qpage/pkg-plist ============================================================================== --- head/comms/qpage/pkg-plist Sun Jul 27 12:16:47 2014 (r363055) +++ head/comms/qpage/pkg-plist Sun Jul 27 12:38:41 2014 (r363056) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407271238.s6RCcgOf083497>