CVS commit: pkgsrc/net/gofish

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Dec 18 16:36:18 UTC 2016

Modified Files:
        pkgsrc/net/gofish: Makefile

Log Message:
Fixed pkglint warnings. Bumped PKGREVISION.

The user name is configurable now.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/gofish/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/gofish/Makefile
diff -u pkgsrc/net/gofish/Makefile:1.16 pkgsrc/net/gofish/Makefile:1.17
--- pkgsrc/net/gofish/Makefile:1.16     Fri Jul 12 10:44:59 2013
+++ pkgsrc/net/gofish/Makefile  Sun Dec 18 16:36:18 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2013/07/12 10:44:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2016/12/18 16:36:18 rillig Exp $
 
 DISTNAME=              gofish-1.2
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=gofish/}
 
@@ -14,13 +14,16 @@ WRKSRC=                     ${WRKDIR}/gofish
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
-CONFIGURE_ARGS+=       --with-gopheruser=${GOPHER_USER:Q}
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=       --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=       --with-gopheruser=${GOPHER_USER}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+BUILD_DEFS+=           VARBASE
 
 EGDIR=                 ${PREFIX}/share/examples/gofish
 RUNTIMEDIR=            ${VARBASE}/gopher
 
+.include "../../mk/bsd.prefs.mk"
+
 GOPHER_USER?=          gopher
 GOPHER_GROUP?=         gopher
 PKG_GROUPS=            ${GOPHER_GROUP}
@@ -36,10 +39,11 @@ OWN_DIRS_PERMS=             ${RUNTIMEDIR} ${GOPHER_
 CONF_FILES+=           ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
 .endfor
 
-FILES_SUBST+=          RUNTIMEDIR=${RUNTIMEDIR:Q}
+FILES_SUBST+=          RUNTIMEDIR=${RUNTIMEDIR}
 FILES_SUBST+=          PKG_USERS=${PKG_USERS:Q}
 
 SUBST_CLASSES+=                user
+SUBST_STAGE.user=      pre-configure
 SUBST_MESSAGE.user=    Fixing name of gopher user in files.
 SUBST_FILES.user=      gofish.conf
 SUBST_SED.user=                -e "s/;user = gopher/user = ${GOPHER_USER}/g"