aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING9
-rw-r--r--comms/qpage/Makefile20
-rw-r--r--comms/qpage/files/patch-config.h.in2
-rw-r--r--comms/qpage/files/patch-config.input2
-rw-r--r--comms/qpage/files/patch-qpage.man2
-rw-r--r--comms/qpage/pkg-plist3
6 files changed, 21 insertions, 17 deletions
diff --git a/UPDATING b/UPDATING
index 8eca28ab3e69..6f9f8b10fc3a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index b650af8d4a58..01ad72a2c0f2 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 0ef2db19f858..8bed5105b2ae 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 ff8439da6b85..706b32f16a5a 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 19e11ba81a58..31066fb9dcb2 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 7a1218d2315b..891a79b65680 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