Use SPECIAL_PERMS and don't set USERGROUP_PHASE. PKGREVISION -> 7

3 files changed, 23 insertions, 10 deletions

diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 4ac90472d24..945feaac670 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2013/07/12 10:44:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.68 2013/11/24 04:01:07 dholland Exp $
 #
 
 DISTNAME=	fidogate-4.4.10
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fidogate/}
 
@@ -22,7 +22,6 @@ RCD_SCRIPTS=	fidogate
 RCD_SCRIPT_SRC.fidogate=	${WRKSRC}/scripts/maintenance/rc.fidogate
 INFO_FILES=	yes # PLIST
 
-USERGROUP_PHASE=	pre-install
 PKG_GROUPS=	news
 PKG_USERS=	news:news
 PKG_GECOS.news=	Network News
@@ -41,8 +40,6 @@ SUBST_STAGE.paths=	pre-build
 # Too many schar/uchar issues.
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
-PKG_DESTDIR_SUPPORT=	destdir
-
 OWN_DIRS=		${PKG_SYSCONFDIR}/fidogate
 INSTALLATION_DIRS+=	${EGDIR}		lib/fidogate		\
 			lib/fidogate/bin	share/doc/fidogate	\
@@ -50,6 +47,11 @@ INSTALLATION_DIRS+=	${EGDIR}		lib/fidogate		\
 			${PKGINFODIR} \
 			share/fidogate/sendmail/mailer share/examples/rc.d
 
+FIDOGATE_SUID_PERMS=	news news 4111
+SPECIAL_PERMS+=		${PREFIX}/lib/fidogate/ffx ${FIDOGATE_SUID_PERMS} \
+			${PREFIX}/lib/fidogate/ftnmail ${FIDOGATE_SUID_PERMS} \
+			${PREFIX}/lib/fidogate/ftnafmail ${FIDOGATE_SUID_PERMS}
+
 post-extract:
 	${CP} ${WRKSRC}/examples/orodruin/fidogate.conf \
 		${WRKSRC}/fidogate.conf.dist
diff --git a/comms/fidogate/distinfo b/comms/fidogate/distinfo
index a6b9d5ef7b5..15f4c8ec3e2 100644
--- a/comms/fidogate/distinfo
+++ b/comms/fidogate/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2012/02/28 11:21:50 hans Exp $
+$NetBSD: distinfo,v 1.18 2013/11/24 04:01:07 dholland Exp $
 
 SHA1 (fidogate-4.4.10.tar.gz) = 531305ac82963d5bd6398d2e8e350676bbc9c5eb
 RMD160 (fidogate-4.4.10.tar.gz) = 09b8dfa7304089ff27c7c39c1b6004aef00edadf
 Size (fidogate-4.4.10.tar.gz) = 1191524 bytes
-SHA1 (patch-aa) = 39b7d08fbebbc08b97f02591ee752939b1b7ce7d
+SHA1 (patch-aa) = d476125a072e1691258321dfd1fed50843f0cedc
 SHA1 (patch-ab) = 4ae99842832c406d94b9c40736f22e9abdb28426
 SHA1 (patch-ac) = 220f4d95a4ef28fba3ac603957a2f084df5a95e4
 SHA1 (patch-ad) = f2b9504700d7817ccfbe0181249737c037da2a9b
diff --git a/comms/fidogate/patches/patch-aa b/comms/fidogate/patches/patch-aa
index dacae405b47..5fb0f748b72 100644
--- a/comms/fidogate/patches/patch-aa
+++ b/comms/fidogate/patches/patch-aa
@@ -1,6 +1,17 @@
-$NetBSD: patch-aa,v 1.8 2012/02/28 11:21:50 hans Exp $
+$NetBSD: patch-aa,v 1.9 2013/11/24 04:01:07 dholland Exp $
 
---- config.make.orig	2003-04-15 14:45:20.000000000 -0400
+- honor PREFIX, PKG_SYSCONFDIR, PKGINFODIR
+- XXX: should but does not honor VARBASE
+- use /var/spool/fido rather than /var/spool/fidogate (why?)
+- use /var/news rather than /var/lib/news and/or /var/spool/news
+- use pkgsrc perl
+- set SENDMAIL_CF_DIR (XXX: it is no longer correct)
+- use pkgsrc compiler and yacc
+- don't build with -g by default
+- use pkgsrc install tools
+- handle setuid perms with SPECIAL_PERMS rather than requiring root to build
+
+--- config.make.orig	2003-04-15 18:45:20.000000000 +0000
 +++ config.make
 @@ -56,13 +56,13 @@
  #
@@ -106,7 +117,7 @@ $NetBSD: patch-aa,v 1.8 2012/02/28 11:21:50 hans Exp $
 -INSTALL_DIR	= $(INSTALL) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
 +INSTALL_PROG	= $(BSD_INSTALL_SCRIPT)
 +INSTALL_DATA	= $(BSD_INSTALL_DATA)
-+INSTALL_SETUID	= $(BSD_INSTALL_PROGRAM) -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
++INSTALL_SETUID	= $(BSD_INSTALL_PROGRAM)
 +INSTALL_DIR	= $(BSD_INSTALL_DATA_DIR) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
  # extra prefix for installation
  PREFIX		=