Sun Dec 18 16:36:18 2016 UTC ()
Fixed pkglint warnings. Bumped PKGREVISION.

The user name is configurable now.


(rillig)
diff -r1.16 -r1.17 pkgsrc/net/gofish/Makefile
cvs diff -r1.16 -r1.17 pkgsrc/net/gofish/Makefile (expand / switch to unified diff)

--- pkgsrc/net/gofish/Makefile 2013/07/12 10:44:59 1.16
+++ pkgsrc/net/gofish/Makefile 2016/12/18 16:36:18 1.17
@@ -1,54 +1,58 @@ @@ -1,54 +1,58 @@
1# $NetBSD: Makefile,v 1.16 2013/07/12 10:44:59 jperkin Exp $ 1# $NetBSD: Makefile,v 1.17 2016/12/18 16:36:18 rillig Exp $
2 2
3DISTNAME= gofish-1.2 3DISTNAME= gofish-1.2
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gofish/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gofish/}
7 7
8MAINTAINER= esg@sdf.lonestar.org 8MAINTAINER= esg@sdf.lonestar.org
9HOMEPAGE= http://gofish.sourceforge.net/ 9HOMEPAGE= http://gofish.sourceforge.net/
10COMMENT= Gopher server 10COMMENT= Gopher server
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13WRKSRC= ${WRKDIR}/gofish 13WRKSRC= ${WRKDIR}/gofish
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16 16
17CONFIGURE_ARGS+= --with-gopheruser=${GOPHER_USER:Q} 17CONFIGURE_ARGS+= --with-gopheruser=${GOPHER_USER}
18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
19CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} 19CONFIGURE_ARGS+= --localstatedir=${VARBASE}
 20BUILD_DEFS+= VARBASE
20 21
21EGDIR= ${PREFIX}/share/examples/gofish 22EGDIR= ${PREFIX}/share/examples/gofish
22RUNTIMEDIR= ${VARBASE}/gopher 23RUNTIMEDIR= ${VARBASE}/gopher
23 24
 25.include "../../mk/bsd.prefs.mk"
 26
24GOPHER_USER?= gopher 27GOPHER_USER?= gopher
25GOPHER_GROUP?= gopher 28GOPHER_GROUP?= gopher
26PKG_GROUPS= ${GOPHER_GROUP} 29PKG_GROUPS= ${GOPHER_GROUP}
27PKG_USERS= ${GOPHER_USER}:${GOPHER_GROUP} 30PKG_USERS= ${GOPHER_USER}:${GOPHER_GROUP}
28PKG_GROUPS_VARS+= GOPHER_GROUP 31PKG_GROUPS_VARS+= GOPHER_GROUP
29PKG_USERS_VARS+= GOPHER_USER 32PKG_USERS_VARS+= GOPHER_USER
30 33
31RCD_SCRIPTS= gopherd 34RCD_SCRIPTS= gopherd
32 35
33OWN_DIRS_PERMS= ${RUNTIMEDIR} ${GOPHER_USER} ${GOPHER_GROUP} 0750 36OWN_DIRS_PERMS= ${RUNTIMEDIR} ${GOPHER_USER} ${GOPHER_GROUP} 0750
34 37
35.for file in gofish.conf gofish-www.conf 38.for file in gofish.conf gofish-www.conf
36CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} 39CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
37.endfor 40.endfor
38 41
39FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q} 42FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR}
40FILES_SUBST+= PKG_USERS=${PKG_USERS:Q} 43FILES_SUBST+= PKG_USERS=${PKG_USERS:Q}
41 44
42SUBST_CLASSES+= user 45SUBST_CLASSES+= user
 46SUBST_STAGE.user= pre-configure
43SUBST_MESSAGE.user= Fixing name of gopher user in files. 47SUBST_MESSAGE.user= Fixing name of gopher user in files.
44SUBST_FILES.user= gofish.conf 48SUBST_FILES.user= gofish.conf
45SUBST_SED.user= -e "s/;user = gopher/user = ${GOPHER_USER}/g" 49SUBST_SED.user= -e "s/;user = gopher/user = ${GOPHER_USER}/g"
46 50
47INSTALLATION_DIRS= share/examples/gofish share/doc/gofish 51INSTALLATION_DIRS= share/examples/gofish share/doc/gofish
48 52
49post-install: 53post-install:
50 ${INSTALL_DATA} ${WRKSRC}/gofish.conf ${DESTDIR}${EGDIR} 54 ${INSTALL_DATA} ${WRKSRC}/gofish.conf ${DESTDIR}${EGDIR}
51 ${INSTALL_DATA} ${WRKSRC}/gofish-www.conf ${DESTDIR}${EGDIR} 55 ${INSTALL_DATA} ${WRKSRC}/gofish-www.conf ${DESTDIR}${EGDIR}
52 ${INSTALL_DATA} ${WRKSRC}/Configure_GoFish ${DESTDIR}${PREFIX}/share/doc/gofish 56 ${INSTALL_DATA} ${WRKSRC}/Configure_GoFish ${DESTDIR}${PREFIX}/share/doc/gofish
53 57
54.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"