6 files changed, 13 insertions, 57 deletions

diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index f07657b06615..cda6c1f24b84 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	qpage
-PORTVERSION=	3.2
+PORTVERSION=	3.3
 CATEGORIES=	comms
-#MASTER_SITES=	http://www.qpage.org/download/
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	fenner
+MASTER_SITES=	http://www.qpage.org/download/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	joes@seaport.net
 
+GNU_CONFIGURE=	yes
+
 MAN1=		qpage.1
 
 post-install:
@@ -23,5 +23,10 @@ post-install:
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/qpage.sh \
 			${PREFIX}/etc/rc.d/qpage.sh; \
 	fi
+	@if [ ! -f ${PREFIX}/etc/qpage-example.cf ]; then \
+		${ECHO} "Install ${PREFIX}/etc/qpage-example.cf file."; \
+		${INSTALL_SCRIPT} -m 660 ${WRKDIR}/${PORTNAME}-${PORTVERSION}/example.cf \
+			${PREFIX}/etc/qpage-example.cf; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/comms/qpage/distinfo b/comms/qpage/distinfo
index f51b6e825e7f..b3a5c22eb6d4 100644
--- a/comms/qpage/distinfo
+++ b/comms/qpage/distinfo
@@ -1 +1 @@
-MD5 (qpage-3.2.tar.Z) = 9716c9d07a504b301788a22eaaf2aa80
+MD5 (qpage-3.3.tar.Z) = 11aa64fa71d3a356bbcc0b85754680bc
diff --git a/comms/qpage/files/patch-aa b/comms/qpage/files/patch-aa
deleted file mode 100644
index 971a5b9dd7a4..000000000000
--- a/comms/qpage/files/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile.orig	Thu Jun 26 23:43:10 1997
-+++ Makefile	Thu Aug 22 20:07:53 2002
-@@ -16,11 +16,13 @@
- #	NEED_STRERROR		- your system does NOT support strerror()
- #
- 
--CCENV=		-DSOLARIS -DFACILITY=LOG_LOCAL1 # -DSNPP_SERVER=\"short\"
-+#CCENV=		-DSOLARIS -DFACILITY=LOG_LOCAL1 # -DSNPP_SERVER=\"short\"
-+CCENV=		-DFACILITY=LOG_DAEMON -DLOCKDIR=\"/var/spool/lock\" -DDAEMONUSER=1 -DDAEMONGROUP=68 -DSYSTEM_CONFIG=\"${PREFIX}/etc/qpage.cf\" -D_PATH_SENDMAIL=\"/usr/sbin/sendmail\"
- #DEBUG=		-g -DDEBUG
- 
--CFLAGS=		-mr $(DEBUG) $(CCENV)
--LDLIBS=		-lsocket -lnsl
-+#CFLAGS=		-mr $(DEBUG) $(CCENV)
-+CFLAGS+=		$(CCENV)
-+#LDLIBS=		-lsocket -lnsl
- 
- #CC=cc
- #CC=gcc
-@@ -54,9 +56,19 @@
- 
- $(OBJS):	$(INCL)
- 
-+install:	all
-+		${BSD_INSTALL_PROGRAM} qpage ${PREFIX}/bin
-+		${BSD_INSTALL_MAN} qpage.man ${PREFIX}/man/man1/qpage.1
-+		${BSD_INSTALL_DATA} example-qpage.cf ${PREFIX}/etc
-+		if [ ! -d /var/spool/qpage ]; then \
-+			mkdir /var/spool/qpage; \
-+			chown root:dialer /var/spool/qpage; \
-+			chmod 0775 /var/spool/qpage; \
-+		fi
-+
- $(PROG):	$(OBJS)
- 		$(RM) $(PROG)
--		$(CC) -o $(PROG) $(OBJS) $(LDFLAGS) $(LDLIBS)
-+		$(CC) -o $(PROG) $(OBJS) $(LDFLAGS)
- 
- client:
- 		@$(MAKE) CCENV='-DCLIENT_ONLY $(CCENV)' OBJS="$(CLNTOBJS)"
diff --git a/comms/qpage/files/patch-ab b/comms/qpage/files/patch-ab
deleted file mode 100644
index 5c0cd4007fb6..000000000000
--- a/comms/qpage/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- qpage.doc.orig	Wed Jun  3 23:40:13 1998
-+++ qpage.doc	Wed Jun  3 23:40:35 1998
-@@ -608,7 +608,7 @@
-      when it's safe to send dial commands to the modem.
- 
- FILES
--     /etc/qpage.cf
-+     /usr/local/etc/qpage.cf
- 
- SEE ALSO
-      RFC-1861
diff --git a/comms/qpage/pkg-descr b/comms/qpage/pkg-descr
index 2aa106930d4b..e35ddc6bd6d5 100644
--- a/comms/qpage/pkg-descr
+++ b/comms/qpage/pkg-descr
@@ -8,5 +8,7 @@ Page groups and duty schedules are supported.  Status notification
 messages indicating the success or failure of a page are sent via
 e-mail to submitters of high-priority (level 0) pages.
 
+WWW: http://www.qpage.org/
+
 Joe Stein
 joes@seaport.net
diff --git a/comms/qpage/pkg-plist b/comms/qpage/pkg-plist
index 943f34044877..bcb7424270c5 100644
--- a/comms/qpage/pkg-plist
+++ b/comms/qpage/pkg-plist
@@ -1,5 +1,5 @@
 bin/qpage
-etc/example-qpage.cf
+etc/qpage-example.cf
 etc/rc.d/qpage.sh
 @exec if [ ! -d /var/spool/qpage ]; then mkdir /var/spool/qpage; chown root:dialer /var/spool/qpage; chmod 0775 /var/spool/qpage; fi
 @unexec if [ -d /var/spool/qpage ]; then rm -rf /var/spool/qpage; fi