Sun Nov 24 04:01:07 2013 UTC ()
Use SPECIAL_PERMS and don't set USERGROUP_PHASE. PKGREVISION -> 7


(dholland)
diff -r1.67 -r1.68 pkgsrc/comms/fidogate/Makefile
diff -r1.17 -r1.18 pkgsrc/comms/fidogate/distinfo
diff -r1.8 -r1.9 pkgsrc/comms/fidogate/patches/patch-aa
cvs diff -r1.67 -r1.68 pkgsrc/comms/fidogate/Makefile (expand / switch to unified diff)

--- pkgsrc/comms/fidogate/Makefile 2013/07/12 10:44:53 1.67
+++ pkgsrc/comms/fidogate/Makefile 2013/11/24 04:01:07 1.68
@@ -1,65 +1,67 @@ @@ -1,65 +1,67 @@
1# $NetBSD: Makefile,v 1.67 2013/07/12 10:44:53 jperkin Exp $ 1# $NetBSD: Makefile,v 1.68 2013/11/24 04:01:07 dholland Exp $
2# 2#
3 3
4DISTNAME= fidogate-4.4.10 4DISTNAME= fidogate-4.4.10
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= comms 6CATEGORIES= comms
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fidogate/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fidogate/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.fidogate.org/ 10HOMEPAGE= http://www.fidogate.org/
11COMMENT= FidoNet (FTN) <-> Internet mail and news gateway 11COMMENT= FidoNet (FTN) <-> Internet mail and news gateway
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15USE_TOOLS+= gmake makeinfo perl:run yacc 15USE_TOOLS+= gmake makeinfo perl:run yacc
16MAKE_ENV+= DEBUG="${CFLAGS} -Werror" 16MAKE_ENV+= DEBUG="${CFLAGS} -Werror"
17BUILDLINK_SETENV.CC= CC="cc ${_STRIPFLAG_CC}" 17BUILDLINK_SETENV.CC= CC="cc ${_STRIPFLAG_CC}"
18 18
19EGDIR= ${PREFIX}/share/examples/fidogate 19EGDIR= ${PREFIX}/share/examples/fidogate
20CONF_FILES= ${EGDIR}/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf 20CONF_FILES= ${EGDIR}/fidogate.conf ${PKG_SYSCONFDIR}/fidogate/fidogate.conf
21RCD_SCRIPTS= fidogate 21RCD_SCRIPTS= fidogate
22RCD_SCRIPT_SRC.fidogate= ${WRKSRC}/scripts/maintenance/rc.fidogate 22RCD_SCRIPT_SRC.fidogate= ${WRKSRC}/scripts/maintenance/rc.fidogate
23INFO_FILES= yes # PLIST 23INFO_FILES= yes # PLIST
24 24
25USERGROUP_PHASE= pre-install 
26PKG_GROUPS= news 25PKG_GROUPS= news
27PKG_USERS= news:news 26PKG_USERS= news:news
28PKG_GECOS.news= Network News 27PKG_GECOS.news= Network News
29PKG_HOME.news= /var/spool/news 28PKG_HOME.news= /var/spool/news
30 29
31NO_CONFIGURE= yes 30NO_CONFIGURE= yes
32 31
33SUBST_CLASSES+= paths 32SUBST_CLASSES+= paths
34SUBST_FILES.paths= config.make 33SUBST_FILES.paths= config.make
35SUBST_SED.paths= -e "s,@PREFIX@,"${PREFIX:Q}",g" 34SUBST_SED.paths= -e "s,@PREFIX@,"${PREFIX:Q}",g"
36SUBST_SED.paths+= -e "s,@PKG_SYSCONFDIR@,"${PKG_SYSCONFDIR:Q}",g" 35SUBST_SED.paths+= -e "s,@PKG_SYSCONFDIR@,"${PKG_SYSCONFDIR:Q}",g"
37SUBST_SED.paths+= -e "s,@PKGINFODIR@,"${PKGINFODIR:Q}",g" 36SUBST_SED.paths+= -e "s,@PKGINFODIR@,"${PKGINFODIR:Q}",g"
38SUBST_SED.paths+= -e "s,@PERL@,"${TOOLS_PATH.perl:Q}",g" 37SUBST_SED.paths+= -e "s,@PERL@,"${TOOLS_PATH.perl:Q}",g"
39SUBST_STAGE.paths= pre-build 38SUBST_STAGE.paths= pre-build
40 39
41# Too many schar/uchar issues. 40# Too many schar/uchar issues.
42BUILDLINK_TRANSFORM+= rm:-Werror 41BUILDLINK_TRANSFORM+= rm:-Werror
43 42
44PKG_DESTDIR_SUPPORT= destdir 
45 
46OWN_DIRS= ${PKG_SYSCONFDIR}/fidogate 43OWN_DIRS= ${PKG_SYSCONFDIR}/fidogate
47INSTALLATION_DIRS+= ${EGDIR} lib/fidogate \ 44INSTALLATION_DIRS+= ${EGDIR} lib/fidogate \
48 lib/fidogate/bin share/doc/fidogate \ 45 lib/fidogate/bin share/doc/fidogate \
49 share/fidogate share/fidogate/sendmail \ 46 share/fidogate share/fidogate/sendmail \
50 ${PKGINFODIR} \ 47 ${PKGINFODIR} \
51 share/fidogate/sendmail/mailer share/examples/rc.d 48 share/fidogate/sendmail/mailer share/examples/rc.d
52 49
 50FIDOGATE_SUID_PERMS= news news 4111
 51SPECIAL_PERMS+= ${PREFIX}/lib/fidogate/ffx ${FIDOGATE_SUID_PERMS} \
 52 ${PREFIX}/lib/fidogate/ftnmail ${FIDOGATE_SUID_PERMS} \
 53 ${PREFIX}/lib/fidogate/ftnafmail ${FIDOGATE_SUID_PERMS}
 54
53post-extract: 55post-extract:
54 ${CP} ${WRKSRC}/examples/orodruin/fidogate.conf \ 56 ${CP} ${WRKSRC}/examples/orodruin/fidogate.conf \
55 ${WRKSRC}/fidogate.conf.dist 57 ${WRKSRC}/fidogate.conf.dist
56 58
57pre-build: 59pre-build:
58 ${RM} -f ${WRKSRC}/doc/fidogate.info* 60 ${RM} -f ${WRKSRC}/doc/fidogate.info*
59 cd ${WRKSRC}/doc && makeinfo fidogate.texi && \ 61 cd ${WRKSRC}/doc && makeinfo fidogate.texi && \
60 ${TOUCH} fidogate.txt html/fidogate_toc.html 62 ${TOUCH} fidogate.txt html/fidogate_toc.html
61 ${PERL5} ${WRKSRC}/subst.pl -t${WRKSRC} ${WRKSRC}/fidogate.conf.dist \ 63 ${PERL5} ${WRKSRC}/subst.pl -t${WRKSRC} ${WRKSRC}/fidogate.conf.dist \
62 >${WRKSRC}/fidogate.conf 64 >${WRKSRC}/fidogate.conf
63 65
64post-install: 66post-install:
65 cd ${WRKSRC}/examples && for f in `${FIND} [m-p]* -type d -print`; do \ 67 cd ${WRKSRC}/examples && for f in `${FIND} [m-p]* -type d -print`; do \
cvs diff -r1.17 -r1.18 pkgsrc/comms/fidogate/distinfo (expand / switch to unified diff)

--- pkgsrc/comms/fidogate/distinfo 2012/02/28 11:21:50 1.17
+++ pkgsrc/comms/fidogate/distinfo 2013/11/24 04:01:07 1.18
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: distinfo,v 1.17 2012/02/28 11:21:50 hans Exp $ 1$NetBSD: distinfo,v 1.18 2013/11/24 04:01:07 dholland Exp $
2 2
3SHA1 (fidogate-4.4.10.tar.gz) = 531305ac82963d5bd6398d2e8e350676bbc9c5eb 3SHA1 (fidogate-4.4.10.tar.gz) = 531305ac82963d5bd6398d2e8e350676bbc9c5eb
4RMD160 (fidogate-4.4.10.tar.gz) = 09b8dfa7304089ff27c7c39c1b6004aef00edadf 4RMD160 (fidogate-4.4.10.tar.gz) = 09b8dfa7304089ff27c7c39c1b6004aef00edadf
5Size (fidogate-4.4.10.tar.gz) = 1191524 bytes 5Size (fidogate-4.4.10.tar.gz) = 1191524 bytes
6SHA1 (patch-aa) = 39b7d08fbebbc08b97f02591ee752939b1b7ce7d 6SHA1 (patch-aa) = d476125a072e1691258321dfd1fed50843f0cedc
7SHA1 (patch-ab) = 4ae99842832c406d94b9c40736f22e9abdb28426 7SHA1 (patch-ab) = 4ae99842832c406d94b9c40736f22e9abdb28426
8SHA1 (patch-ac) = 220f4d95a4ef28fba3ac603957a2f084df5a95e4 8SHA1 (patch-ac) = 220f4d95a4ef28fba3ac603957a2f084df5a95e4
9SHA1 (patch-ad) = f2b9504700d7817ccfbe0181249737c037da2a9b 9SHA1 (patch-ad) = f2b9504700d7817ccfbe0181249737c037da2a9b
10SHA1 (patch-ae) = b3eeba024fc0381f563e895554e0247ffc92ddd0 10SHA1 (patch-ae) = b3eeba024fc0381f563e895554e0247ffc92ddd0
11SHA1 (patch-af) = 1402d0e353352b43b787d10b2031252795c791aa 11SHA1 (patch-af) = 1402d0e353352b43b787d10b2031252795c791aa
12SHA1 (patch-ag) = 0f6262494ee838ddb900d31e329590803b97a244 12SHA1 (patch-ag) = 0f6262494ee838ddb900d31e329590803b97a244
13SHA1 (patch-ah) = 535c660bf2d82dba174c5243662b89118c0fdaf8 13SHA1 (patch-ah) = 535c660bf2d82dba174c5243662b89118c0fdaf8
14SHA1 (patch-ai) = 88fb589f14d4e2cbf7ccf37913d575f22b37b235 14SHA1 (patch-ai) = 88fb589f14d4e2cbf7ccf37913d575f22b37b235
15SHA1 (patch-aj) = ed49394f525a4040ee80777268b3c784ee9bc501 15SHA1 (patch-aj) = ed49394f525a4040ee80777268b3c784ee9bc501
16SHA1 (patch-ak) = 549b69145e6c9168107ed539311e3be30663d25c 16SHA1 (patch-ak) = 549b69145e6c9168107ed539311e3be30663d25c
17SHA1 (patch-al) = 1cb04670948988c1eda0d78667ffd529dbca0c6c 17SHA1 (patch-al) = 1cb04670948988c1eda0d78667ffd529dbca0c6c
18SHA1 (patch-am) = 67a56ba8d63ca0bf6514ffc108f2cc0732928969 18SHA1 (patch-am) = 67a56ba8d63ca0bf6514ffc108f2cc0732928969
19SHA1 (patch-an) = fce7572619f5f451c92cdd70bf664e682825b372 19SHA1 (patch-an) = fce7572619f5f451c92cdd70bf664e682825b372
cvs diff -r1.8 -r1.9 pkgsrc/comms/fidogate/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/comms/fidogate/patches/patch-aa 2012/02/28 11:21:50 1.8
+++ pkgsrc/comms/fidogate/patches/patch-aa 2013/11/24 04:01:07 1.9
@@ -1,16 +1,27 @@ @@ -1,16 +1,27 @@
1$NetBSD: patch-aa,v 1.8 2012/02/28 11:21:50 hans Exp $ 1$NetBSD: patch-aa,v 1.9 2013/11/24 04:01:07 dholland Exp $
2 2
3--- config.make.orig 2003-04-15 14:45:20.000000000 -0400 3- honor PREFIX, PKG_SYSCONFDIR, PKGINFODIR
 4- XXX: should but does not honor VARBASE
 5- use /var/spool/fido rather than /var/spool/fidogate (why?)
 6- use /var/news rather than /var/lib/news and/or /var/spool/news
 7- use pkgsrc perl
 8- set SENDMAIL_CF_DIR (XXX: it is no longer correct)
 9- use pkgsrc compiler and yacc
 10- don't build with -g by default
 11- use pkgsrc install tools
 12- handle setuid perms with SPECIAL_PERMS rather than requiring root to build
 13
 14--- config.make.orig 2003-04-15 18:45:20.000000000 +0000
4+++ config.make 15+++ config.make
5@@ -56,13 +56,13 @@ 16@@ -56,13 +56,13 @@
6 # 17 #
7  18
8 # variable parameters, can be changed at run-time, DO NOT DELETE ANYTHING!!! 19 # variable parameters, can be changed at run-time, DO NOT DELETE ANYTHING!!!
9-DEFAULT_V_CONFIGDIR = /etc/fidogate 20-DEFAULT_V_CONFIGDIR = /etc/fidogate
10-DEFAULT_V_LIBDIR = /usr/lib/fidogate 21-DEFAULT_V_LIBDIR = /usr/lib/fidogate
11-DEFAULT_V_BINDIR = $(DEFAULT_V_LIBDIR)/bin 22-DEFAULT_V_BINDIR = $(DEFAULT_V_LIBDIR)/bin
12-DEFAULT_V_LOGDIR = /var/log/fidogate 23-DEFAULT_V_LOGDIR = /var/log/fidogate
13-DEFAULT_V_VARDIR = /var/lib/fidogate 24-DEFAULT_V_VARDIR = /var/lib/fidogate
14-DEFAULT_V_LOCKDIR = /var/lock/fidogate 25-DEFAULT_V_LOCKDIR = /var/lock/fidogate
15-DEFAULT_V_SPOOLDIR = /var/spool/fidogate 26-DEFAULT_V_SPOOLDIR = /var/spool/fidogate
16+DEFAULT_V_CONFIGDIR = @PKG_SYSCONFDIR@/fidogate 27+DEFAULT_V_CONFIGDIR = @PKG_SYSCONFDIR@/fidogate
@@ -96,18 +107,18 @@ $NetBSD: patch-aa,v 1.8 2012/02/28 11:21 @@ -96,18 +107,18 @@ $NetBSD: patch-aa,v 1.8 2012/02/28 11:21
96  107
97 INCLUDE = -I$(TOPDIR) -I$(TOPDIR)/src/include 108 INCLUDE = -I$(TOPDIR) -I$(TOPDIR)/src/include
98  109
99@@ -242,10 +236,10 @@ INSTALL = install 110@@ -242,10 +236,10 @@ INSTALL = install
100 # MSDOS, OS2, WIN32 111 # MSDOS, OS2, WIN32
101 # EXE = .exe 112 # EXE = .exe
102 EXE = 113 EXE =
103-INSTALL_PROG = $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_PROG) 114-INSTALL_PROG = $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_PROG)
104-INSTALL_DATA = $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_DATA) 115-INSTALL_DATA = $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_DATA)
105-INSTALL_SETUID = $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID) 116-INSTALL_SETUID = $(INSTALL) -c -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
106-INSTALL_DIR = $(INSTALL) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d 117-INSTALL_DIR = $(INSTALL) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
107+INSTALL_PROG = $(BSD_INSTALL_SCRIPT) 118+INSTALL_PROG = $(BSD_INSTALL_SCRIPT)
108+INSTALL_DATA = $(BSD_INSTALL_DATA) 119+INSTALL_DATA = $(BSD_INSTALL_DATA)
109+INSTALL_SETUID = $(BSD_INSTALL_PROGRAM) -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID) 120+INSTALL_SETUID = $(BSD_INSTALL_PROGRAM)
110+INSTALL_DIR = $(BSD_INSTALL_DATA_DIR) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d 121+INSTALL_DIR = $(BSD_INSTALL_DATA_DIR) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
111 # extra prefix for installation 122 # extra prefix for installation
112 PREFIX = 123 PREFIX =
113  124