 @@ -1,32 +1,32 @@
-# $NetBSD: Makefile,v 1.12 2012/09/11 20:32:12 asau Exp $
+# $NetBSD: Makefile,v 1.13 2013/04/06 13:24:18 rodent Exp $
+#
 DISTNAME=		GeneSplicer
 PKGNAME=		genesplicer-20030403
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.tigr.org/pub/software/GeneSplicer/
 MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		ftp://ftp.tigr.org/pub/software/GeneSplicer/
 COMMENT=		Computational Method for Splice Site Prediction
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		pax
 EXDIR=			${PREFIX}/share/examples/genesplicer
 EXAMPLES=		arabidopsis drosophila malaria pyoelii human rice \
 			training_data_sets/Arabidopsis			  \
 			training_data_sets/Human
 MAKE_FILE=		makefile
 BUILD_DIRS=		sources
 INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sources/genesplicer ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${DESTDIR}${EXDIR}
-.for DOC in readme fasta.example fasta.results
+.for doc in readme fasta.example fasta.results
-	${INSTALL_DATA} ${WRKSRC}/sources/${DOC} ${DESTDIR}${EXDIR}
+	${INSTALL_DATA} ${WRKSRC}/sources/${doc} ${DESTDIR}${EXDIR}
 .endfor
 	cd ${WRKSRC} && pax -rw ${EXAMPLES} ${DESTDIR}${EXDIR}
 .include "../../mk/bsd.pkg.mk"

 @@ -1,36 +1,36 @@
-# $NetBSD: Makefile,v 1.12 2012/09/16 17:20:17 cheusov Exp $
+# $NetBSD: Makefile,v 1.13 2013/04/06 13:24:18 rodent Exp $
+#
 DISTNAME=		glimmer213
 PKGREVISION=		1
 PKGNAME=		glimmer-2.13
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.tigr.org/pub/software/Glimmer/
 MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		ftp://ftp.tigr.org/pub/software/Glimmer/
 COMMENT=		System for finding genes in microbial DNA
 CONFLICTS+=		generate-[0-9]*
 USE_LANGUAGES=		c c++
 WRKSRC=			${WRKDIR}/glimmer2.13
 INSTALLATION_DIRS=	bin
 do-install:
-.for PROGRAM in adjust anomaly build-icm check codon-usage compare-lists \
+.for program in adjust anomaly build-icm check codon-usage compare-lists \
 	generate get-len get-putative glimmer2 long-orfs
-	${INSTALL_PROGRAM} ${WRKSRC}/${PROGRAM} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${program} ${DESTDIR}${PREFIX}/bin
 .endfor
 	# ``extract'' is also in the csound package, so rename to avoid conflict
 	${INSTALL_PROGRAM} ${WRKSRC}/extract ${DESTDIR}${PREFIX}/bin/glextract
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/glimmer
 	${CP} ${WRKSRC}/README ${WRKSRC}/run-glimmer2.readme
-.for DOC in run-glimmer2.readme build-icm.readme extract.readme glimmer2.readme long-orfs.readme
+.for doc in run-glimmer2.readme build-icm.readme extract.readme glimmer2.readme long-orfs.readme
-	${INSTALL_DATA} ${WRKSRC}/${DOC} ${DESTDIR}${PREFIX}/share/doc/glimmer
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DESTDIR}${PREFIX}/share/doc/glimmer
 .endfor
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/glimmer
 	${INSTALL_SCRIPT} ${WRKSRC}/run-glimmer2 ${DESTDIR}${PREFIX}/share/glimmer
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2012/09/11 20:32:14 asau Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/06 13:24:18 rodent Exp $
+#
 DISTNAME=		xylem.1.8.7
 PKGNAME=		xylem-1.8.7
 CATEGORIES=		biology
 MASTER_SITES=		ftp://ftp.cc.umanitoba.ca/psgendb/
 EXTRACT_SUFX=		.tar.Z
 MAINTAINER=		hdp@cs.nmsu.edu
 HOMEPAGE=		http://home.cc.umanitoba.ca/~psgendb/XYLEM.html
 COMMENT=		Tools for manipulation of genetic databases
 MAKE_JOBS_SAFE=		no
 @@ -17,26 +17,26 @@ WRKSRC=			${WRKDIR}/xylem
 BUILD_DIRS=		src.c # yes, it's a directory
 INSTALLATION_DIRS=	bin
 do-configure:
 	${CP} ${WRKSRC}/src.c/p2c.h.standard ${WRKSRC}/src.c/p2c.h
 # Rename some binaries to avoid confusion with base system or conflicts
 post-build:
 	${RM} -f ${WRKSRC}/test/testxylem.csh.orig
 	${MV} ${WRKSRC}/src.c/identify ${WRKSRC}/src.c/xyl-identify
 	${MV} ${WRKSRC}/src.c/shuffle ${WRKSRC}/src.c/xyl-shuffle
 do-install:
-.for PROGRAM in dbstat getloc getob xyl-identify prot2nuc reform ribosome \
+.for program in dbstat getloc getob xyl-identify prot2nuc reform ribosome \
 	splitdb xyl-shuffle flat2phyl phyl2flat
-	${INSTALL_PROGRAM} ${WRKSRC}/src.c/${PROGRAM} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src.c/${program} ${DESTDIR}${PREFIX}/bin
 .endfor
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xylem
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/xylem/
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/xylem
 	${INSTALL_DATA} ${WRKSRC}/test/sample.* \
 		${DESTDIR}${PREFIX}/share/examples/xylem
 	${INSTALL_SCRIPT} ${WRKSRC}/test/testxylem.csh \
 		${DESTDIR}${PREFIX}/share/examples/xylem
 .include "../../mk/bsd.pkg.mk"

 @@ -1,36 +1,36 @@
-# $NetBSD: Makefile,v 1.20 2012/10/03 21:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2013/04/06 13:24:18 rodent Exp $
+#
 DISTNAME=	doc2html
 PKGNAME=	doc2html-3.0
 PKGREVISION=	4
 CATEGORIES=	converters
 MASTER_SITES=	http://www.htdig.org/files/contrib/parsers/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.htdig.org/
 COMMENT=	PERL external filter for htdig to convert numerous doc formats to HTML
 DEPENDS+=	xlhtml-[0-9]*:../../converters/xlhtml
 DEPENDS+=	rtf2html-[0-9]*:../../converters/rtf2html
 DEPENDS+=	xpdf-[0-9]*:../../print/xpdf
 DEPENDS+=	catdoc-[0-9]*:../../textproc/catdoc
 USE_TOOLS+=	gs:run perl:run
 INSTALLATION_DIRS=	bin
 do-build:
-.for CVTR in doc2html pdf2html
+.for cvtr in doc2html pdf2html
 	${SED} -e "s%@@LOCALBASE@@%${LOCALBASE}%g" \
 		-e "s%/usr/bin/perl%${PERL5}%g" \
 		-e "s%/bin/sed%${SED}%g" \
-		-e "s%@@X11BASE@@%${X11BASE}%g" < ${WRKSRC}/${CVTR}.pl \
+		-e "s%@@X11BASE@@%${X11BASE}%g" < ${WRKSRC}/${cvtr}.pl \
-		> ${WRKSRC}/${CVTR}
+		> ${WRKSRC}/${cvtr}
 .endfor
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/doc2html ${DESTDIR}${PREFIX}/bin/doc2html
 	${INSTALL_SCRIPT} ${WRKSRC}/pdf2html ${DESTDIR}${PREFIX}/bin/pdf2html
 .include "../../mk/bsd.pkg.mk"

 @@ -1,37 +1,37 @@
-# $NetBSD: Makefile,v 1.18 2012/10/03 11:43:47 asau Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/06 13:24:18 rodent Exp $
 DISTNAME=		xcoral-3.2
 PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		${MASTER_SITE_XCONTRIB:=editors/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Multiwindow mouse-based text editor for X
 MAKE_JOBS_SAFE=		no
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 LIBFILES=	DEPEND README cmd.sc color.sc comments.sc compare-win.sc \
 		complete-word.sc describe.sc edir.sc edt.sc example.sc \
 		french.sc hack-filename.sc hanoi.sc head.sc html.sc \
 		java.sc keydef-ext.sc latex-macros.sc latex.sc \
 		man.dtex misc-commands.sc mode-ext.sc mode.sc mouse.sc \
 		rcs.sc save.sc sun-keydef.sc title.sc top-ten.sc \
 		utilities.sc version.sc window-utilities.sc xcoralrc.lf
 INSTALLATION_DIRS=	bin lib/xcoral share/doc/xcoral/HTML/icons
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${DESTDIR}${PREFIX}/bin
-.for FILE in ${LIBFILES}
+.for file in ${LIBFILES}
-	${INSTALL_DATA} ${WRKSRC}/SmacLib/${FILE} ${DESTDIR}${PREFIX}/lib/xcoral
+	${INSTALL_DATA} ${WRKSRC}/SmacLib/${file} ${DESTDIR}${PREFIX}/lib/xcoral
 .endfor
 	${CP} -r ${WRKSRC}/Doc/* ${DESTDIR}${PREFIX}/share/doc/xcoral
 BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.58 2012/10/03 21:56:00 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2013/04/06 13:24:19 rodent Exp $
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.16
 PKGREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=packages/}
 DISTFILES=	\
 		Sun-1.15-pkg.tar.gz \
 		ada-1.14-pkg.tar.gz \
 		apel-1.32-pkg.tar.gz \
 		auctex-1.36-pkg.tar.gz \
 		bbdb-1.24-pkg.tar.gz \
 @@ -202,44 +202,44 @@ xemacs-merge-package-list:
 		${SED} -n '/^### DISTFILES/,$$p' ${PKGDIR}/Makefile; \
 	} >${PKGDIR}/Makefile.work
 	{ \
 		${PRINTF} '/^DISTFILES\n+1\nka\n/^### DISTFILES\n-2\nkb\n'; \
 		${PRINTF} "'a,'b"'s/$$/ \\\\/\nw\nq\n'; \
 	} | ${ED} - ${PKGDIR}/Makefile.work
 .PHONY: xemacs-update-package
 xemacs-update-package: xemacs-fetch-package-list xemacs-merge-package-list
 .endif	# PKG_DEVELOPER && OPSYS == "NetBSD"
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
-.for DISTFILE in ${DISTFILES}
+.for distfile in ${DISTFILES}
-	@${ECHO_MSG} -n "Extracting ${DISTFILE} ... "
+	@${ECHO_MSG} -n "Extracting ${distfile} ... "
 	${GTAR} xCzf ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages \
-		${DISTDIR}/${DIST_SUBDIR}/${DISTFILE}
+		${DISTDIR}/${DIST_SUBDIR}/${distfile}
 	@${ECHO_MSG} "done"
 .endfor
 	@${ECHO_MSG} -n "Fixing file ownerships ... "
 	${CHOWN} -R ${BINOWN}:${BINGRP} \
 		${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
 	@${ECHO_MSG} "done"
 	@${ECHO_MSG} -n "Fixing file permissions ... "
 	${CHMOD} -R g-w,o-w ${DESTDIR}${PREFIX}/lib/xemacs/xemacs-packages
 	@${ECHO_MSG} "done"
-.for PROG in ${REPLACEMENT_PROGS}
+.for prog in ${REPLACEMENT_PROGS}
-	@${ECHO_MSG} "Fixing ${PROG} paths"
+	@${ECHO_MSG} "Fixing ${prog} paths"
-	for f in ${REPLACEMENTS.${PROG}}; do 			\
+	for f in ${REPLACEMENTS.${prog}}; do 			\
 		cp ${DESTDIR}$$f ${DESTDIR}$$f.pre;		\
-		${SED} -e 's|#!.*${PROG}|${PREFIX}/bin/${PROG}|'	\
+		${SED} -e 's|#!.*${prog}|${PREFIX}/bin/${prog}|'	\
 			${DESTDIR}$$f.pre > ${DESTDIR}$$f;	\
 		rm ${DESTDIR}$$f.pre;				\
 	done
 .endfor
 .if defined(MANZ)
 	@${ECHO_MSG} -n "Compressing \".el\" files ... "
 	cd ${DESTDIR}${PREFIX} && \
 		${GREP} '\$${ELSUFX}$$' ${PLIST_SRC} | \
 		${SED} -e 's#\$${ELSUFX}$$##' | \
 		${XARGS} ${GZIP_CMD}
 	@${ECHO_MSG} "done"
 .endif

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.31 2013/04/06 13:01:26 rodent Exp $
+# $NetBSD: Makefile,v 1.32 2013/04/06 13:24:19 rodent Exp $
 DISTNAME=	intlfonts-1.2.1
 PKGREVISION=	5
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_GNU:=intlfonts/intlfonts-1.2.1-split/}
 DISTFILES=	${FONT_SETS:=${EXTRACT_SUFX}} ${MISC_FILES}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Free X11 fonts (BDF format) for all characters that Emacs can handle
 FONT_SETS=	Asian		\
 		Chinese		\
 		Ethiopic	\
 @@ -55,18 +55,18 @@ FONTS_DIRS.ttf+=	${FONTS_DIR}/TrueType
 REQD_DIRS+=		${FONTS_DIR}
 REQD_DIRS+=		${FONTS_DIR}/bdf
 REQD_DIRS+=		${FONTS_DIR}/Type1
 REQD_DIRS+=		${FONTS_DIR}/TrueType
 .include "../../mk/bsd.prefs.mk"
 .if !defined(NO_EXTRA_FONTS)
 FONT_SETS+=	${EXTRA_FONTS}
 PLIST_SRC=	PLIST PLIST.extrafonts
 .endif
 post-extract:
-.for FILE in ${MISC_FILES}
+.for file in ${MISC_FILES}
-	${CP} ${_DISTDIR}/${FILE} ${WRKSRC}
+	${CP} ${_DISTDIR}/${file} ${WRKSRC}
 .endfor
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.44 2013/04/06 11:39:26 rodent Exp $
+# $NetBSD: Makefile,v 1.45 2013/04/06 13:24:19 rodent Exp $
 DISTNAME=	openjdk-7-fcs-src-b147-27_jun_2011
 PKGNAME=	openjdk7-1.7.0.147.20110811
 PKGREVISION=	9
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openjdk.java.net/
 COMMENT=	Open-source implementation of the Java Platform, Standard Edition
 LICENSE=	gnu-gpl-v2
 @@ -118,31 +118,31 @@ PLIST.i386=	yes
 .endif
 post-extract:
 	chmod +x ${ANT_BIN}/ant
 	cd ${WRKDIR}/${ICEDTEA_WEB}/plugin/icedteanp/java && pax -rw . \
 	  ${WRKSRC}/jdk/src/share/classes
 	cd ${WRKDIR}/${ICEDTEA_WEB}/netx && pax -rw . \
 	  ${WRKSRC}/jdk/src/share/classes
 	cd ${WRKSRC} && patch -s -p1 < ${WRKDIR}/${ICEDTEA}/patches/rhino.patch
 	mv ${WRKDIR}/bootstrap/bin/java ${WRKDIR}/bootstrap/bin/java-real
 	printf '#!/bin/sh\nexec %s/bootstrap/bin/java-real -mx256m "$$@"\n' \
 	    ${WRKDIR} > ${WRKDIR}/bootstrap/bin/java
 	chmod a+x ${WRKDIR}/bootstrap/bin/java
-.for T in idlj jar javac javah javap native2ascii rmic
+.for t in idlj jar javac javah javap native2ascii rmic
-	mv ${WRKDIR}/bootstrap/bin/${T} ${WRKDIR}/bootstrap/bin/${T}-real
+	mv ${WRKDIR}/bootstrap/bin/${t} ${WRKDIR}/bootstrap/bin/${t}-real
-	printf '#!/bin/sh\n\nexec %s/bootstrap/bin/${T}-real -J-mx256m "$$@"\n' \
+	printf '#!/bin/sh\n\nexec %s/bootstrap/bin/${t}-real -J-mx256m "$$@"\n' \
-	    ${WRKDIR} > ${WRKDIR}/bootstrap/bin/${T}
+	    ${WRKDIR} > ${WRKDIR}/bootstrap/bin/${t}
-	chmod a+x ${WRKDIR}/bootstrap/bin/${T}
+	chmod a+x ${WRKDIR}/bootstrap/bin/${t}
 .endfor
 do-build: ${WRKDIR}/stage3-done
 # stage 1 builds a native JDK using the bootstrap binaries
 ${WRKDIR}/stage1-done:
 	${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
 	rm -rf ${WRKDIR}/bootstrap
 	cd ${BUILDDIR} && mv j2sdk-image ${WRKDIR}/bootstrap
 	rm -rf ${BUILDDIR}
 	touch ${WRKDIR}/stage1-done
 # stage 2 rebuilds the JDK using native tools

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2012/10/23 17:18:24 asau Exp $
+# $NetBSD: Makefile,v 1.15 2013/04/06 13:24:19 rodent Exp $
 DISTNAME=		gofish-1.2
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gofish/}
 MAINTAINER=		esg@sdf.lonestar.org
 HOMEPAGE=		http://gofish.sourceforge.net/
 COMMENT=		Gopher server
 LICENSE=		gnu-gpl-v2
 WRKSRC=			${WRKDIR}/gofish
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 @@ -21,28 +21,28 @@ EGDIR=			${PREFIX}/share/examples/gofish
 RUNTIMEDIR=		${VARBASE}/gopher
 GOPHER_USER?=		gopher
 GOPHER_GROUP?=		gopher
 PKG_GROUPS=		${GOPHER_GROUP}
 PKG_USERS=		${GOPHER_USER}:${GOPHER_GROUP}
 PKG_GROUPS_VARS+=	GOPHER_GROUP
 PKG_USERS_VARS+=	GOPHER_USER
 RCD_SCRIPTS=		gopherd
 OWN_DIRS_PERMS=		${RUNTIMEDIR} ${GOPHER_USER} ${GOPHER_GROUP} 0750
-.for FILE in gofish.conf gofish-www.conf
+.for file in gofish.conf gofish-www.conf
-CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+CONF_FILES+=		${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
 .endfor
 FILES_SUBST+=		RUNTIMEDIR=${RUNTIMEDIR:Q}
 FILES_SUBST+=		PKG_USERS=${PKG_USERS:Q}
 SUBST_CLASSES+=		user
 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"
 INSTALLATION_DIRS=	share/examples/gofish share/doc/gofish
 post-install:

 @@ -1,42 +1,42 @@
-# $NetBSD: Makefile,v 1.41 2013/02/14 16:51:32 drochner Exp $
+# $NetBSD: Makefile,v 1.42 2013/04/06 13:24:19 rodent Exp $
 DISTNAME=	openslp-1.2.1
 PKGREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=openslp/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.openslp.org/
 COMMENT=	Open-source implementation of the Service Location Protocol
 # Needs pkgviews-enabled automake
 # PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_TOOLS+=		automake bison lex pax
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
 CONFIGURE_ARGS+=	--enable-slpv2-security
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR} DOC_DIR=${DOCDIR}
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 CONFS=			slp.conf slp.reg slp.spi
 CONF_FILES=		# empty
-.for FILE in ${CONFS}
+.for file in ${CONFS}
-CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+CONF_FILES+=		${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
 .endfor
 RCD_SCRIPTS=		slpd
 INSTALLATION_DIRS=	share/doc/openslp
 .include "../../security/openssl/buildlink3.mk"
 post-extract:
 	@${FIND} ${WRKSRC} -name "CVS" -print | ${XARGS} ${RM} -rf
 	@${RM} -fr ${WRKSRC}/doc/html/UsersGuide/.xvpics
 pre-configure:
 	@cd ${WRKSRC} && aclocal && autoheader && autoconf &&		\

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2012/10/03 21:57:15 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/04/06 13:24:19 rodent Exp $
+#
 DISTNAME=	pkgdepgraph-2.8
 PKGREVISION=	1
 CATEGORIES=	pkgtools devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=	Visual representation of installed NetBSD packages
 # removed so that pkgdepgraph can be used on "client" machines -- @@@
 @@ -21,39 +21,39 @@ NO_CONFIGURE=	yes
 DISTVER=	${DISTNAME:S/pkgdepgraph-//}
 .include "../../mk/bsd.prefs.mk"
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 do-extract:
 	${CP} ${FILESDIR}/pkgdepgraph.pl ${WRKSRC}/pkgdepgraph.pl
 	${CP} ${FILESDIR}/pkgdepgraph.1 ${WRKSRC}/pkgdepgraph.1.in
 	${CP} ${FILESDIR}/pkgdepgraph.0 ${WRKSRC}/pkgdepgraph.0.in
 do-build:
-.for FILE in pkgdepgraph
+.for file in pkgdepgraph
 	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
 		-e 's|@PKG_DBDIR@|${PKG_DBDIR}|g'	\
 		-e 's|@PKGSRCDIR@|${PKGSRCDIR}|g'	\
 		-e 's|@DISTVER@|${DISTVER}|g'		\
-		< ${WRKSRC}/${FILE}.pl 		\
+		< ${WRKSRC}/${file}.pl 		\
-		> ${WRKSRC}/${FILE}
+		> ${WRKSRC}/${file}
 .endfor
-.for FILE in pkgdepgraph.1 pkgdepgraph.0
+.for file in pkgdepgraph.1 pkgdepgraph.0
 	${SED} -e 's|@PKG_DBDIR@|${PKG_DBDIR}|g'	\
 		-e 's|@PKGSRCDIR@|${PKGSRCDIR}|g'	\
-		< ${WRKSRC}/${FILE}.in		\
+		< ${WRKSRC}/${file}.in		\
-		> ${WRKSRC}/${FILE}
+		> ${WRKSRC}/${file}
 .endfor
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "AIX"
 	# the pre-generated man-pages are 'mandoc';  these OS need 'man'
 	nroff -man ${WRKSRC}/pkgdepgraph.1 > ${WRKSRC}/pkgdepgraph.0
 .endif
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pkgdepgraph ${DESTDIR}${PREFIX}/bin/pkgdepgraph
 .if !empty(MANINSTALL:Mcatinstall)
 	${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
 .endif
 .if !empty(MANINSTALL:Mmaninstall)
 	${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1

 @@ -1,34 +1,34 @@
-# $NetBSD: Makefile,v 1.11 2011/05/28 09:07:38 obache Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/06 13:24:19 rodent Exp $
 .include "Makefile.common"
 PKGNAME=	ja-vflib-lib-${VFLIB_VERSION}
 PKGREVISION=	3
 COMMENT=	Japanese Vector font library
 BUILD_TARGET=		build-src
 INSTALL_TARGET=		install-src
 USE_TOOLS+=	pax
 post-build:
-.for FILE in vfontcap vfontcap.bdf
+.for file in vfontcap vfontcap.bdf
 	cd ${WRKSRC};							\
-	${MV} ${FILE} ${FILE}.orig;					\
+	${MV} ${file} ${file}.orig;					\
 	${SED} -e "s|/usr/local/share/fonts|${PREFIX}/share/fonts|g"	\
-		${FILE}.orig > ${FILE};					\
+		${file}.orig > ${file};					\
-	${RM} ${FILE}.orig
+	${RM} ${file}.orig
 .endfor
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${DESTDIR}${PREFIX}/include
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION}
 	cd ${WRKSRC} && ${INSTALL_DATA} COPYING COPYING.LIB README.txt.JP_EUC \
 		${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION}
 	cd ${WRKSRC} && pax -rw jTeX ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION}
 	${FIND} ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION} -type d -print \
 		-exec ${CHMOD} ${PKGDIRMODE} {} \;
 	${FIND} ${DESTDIR}${PREFIX}/share/VFlib/${VFLIB_VERSION} -type f -print \
 		-exec ${CHMOD} ${SHAREMODE} {} \;

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.48 2012/10/23 18:16:20 asau Exp $
+# $NetBSD: Makefile,v 1.49 2013/04/06 13:24:19 rodent Exp $
 DISTNAME=	Linux-PAM-0.77
 PKGNAME=	${DISTNAME:S/Linux-//}
 PKGREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	http://www.kernel.org/pub/linux/libs/pam/pre/library/ \
 		ftp://ftp.kernel.org/pub/linux/libs/pam/pre/library/ \
 		http://www.de.kernel.org/pub/linux/libs/pam/pre/library/ \
 		ftp://ftp.jp.kernel.org/pub/linux/libs/pam/pre/library/
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.kernel.org/pub/linux/libs/pam/
 COMMENT=	Pluggable Authentication Modules (PAM)
 @@ -70,28 +70,28 @@ CPPFLAGS+=		-DUSE_GETLOGIN=1
 PKG_SYSCONFSUBDIR?=	pam
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 CFILES=			access.conf pam_env.conf group.conf time.conf
 PLIST_VARS+=		limits
 .if ${OPSYS} == "Linux"
 CFILES+=		limits.conf
 PLIST.limits=		yes
 .endif
 CONF_FILES=		${EGDIR}/pam.conf ${PKG_SYSCONFBASEDIR}/pam.conf
-.for FILE in ${CFILES}
+.for file in ${CFILES}
-CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+CONF_FILES+=		${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
 .endfor
 SPECIAL_PERMS=		${PREFIX}/sbin/unix_chkpwd ${SETUID_ROOT_PERMS}
 post-configure:
 	cd ${WRKSRC}; for file in Make.Rules; do			\
 		${SED}	-e "s|@LIBTOOL@|${LIBTOOL}|g"			\
 			-e "s|@SHLIBTOOL@|${SHLIBTOOL}|g"		\
 			$$file > $$file.new;				\
 		${MV} -f $$file.new $$file;				\
 	done
 	cd ${WRKSRC}; for file in libpam/pam_private.h; do		\
 		${SED}	-e "s|/etc/|${PKG_SYSCONFBASEDIR}/|g"		\
 			$$file > $$file.new;				\

 @@ -1,31 +1,31 @@
-# $NetBSD: Makefile,v 1.23 2013/02/06 23:23:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2013/04/06 13:24:20 rodent Exp $
 DISTNAME=	fragroute-1.2
 PKGREVISION=	14
 CATEGORIES=	security net
 MASTER_SITES=	http://monkey.org/~dugsong/fragroute/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.monkey.org/~dugsong/fragroute/
 COMMENT=	Tool for intercepting, modifying and rewriting egress traffic
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-libdnet=${BUILDLINK_PREFIX.libdnet}
 CONFIGURE_ARGS+=	--with-libevent=${BUILDLINK_PREFIX.libevent}
 CONFIGURE_ARGS+=	--with-pcap=${BUILDLINK_PREFIX.libpcap}
 SCRIPTS=	README.snort base-1 frag-1 frag-2 frag-3 frag-4 frag-5 \
 	frag-6 frag-7-unix frag-7-win32 ins-2 ins-3 tcbc-2 tcp-3 tcp-5 \
 	tcp-7 tcp-9
 INSTALLATION_DIRS+=	share/fragroute
 pre-install:
-.for FILE in ${SCRIPTS}
+.for file in ${SCRIPTS}
-	${INSTALL_DATA} ${WRKSRC}/scripts/${FILE} ${DESTDIR}${PREFIX}/share/fragroute
+	${INSTALL_DATA} ${WRKSRC}/scripts/${file} ${DESTDIR}${PREFIX}/share/fragroute
 .endfor
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../net/libdnet/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2012/10/23 18:16:29 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/04/06 13:24:20 rodent Exp $
+#
 DISTNAME=	gpg2dot-1.5
 PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=	Converts your GnuPG keyring to a graph of associations
 USE_LANGUAGES=	# empty
 @@ -16,30 +16,30 @@ USE_TOOLS+=	perl:run
 NO_CONFIGURE=	yes
 DISTVER=	${DISTNAME:S/gpg2dot-//}
 WRKSRC=		${WRKDIR}
 INSTALLATION_DIRS=	bin
 do-extract:
 	${CP} ${FILESDIR}/gpg2dot.pl ${WRKSRC}/gpg2dot.pl
 #	${CP} ${FILESDIR}/gpg2dot.1 ${WRKSRC}/gpg2dot.1.in
 do-build:
-.for FILE in gpg2dot
+.for file in gpg2dot
 	${SED} -e 's|@PREFIX@|${PREFIX}|g'		\
 		-e 's|@DISTVER@|${DISTVER}|g'		\
-		< ${WRKSRC}/${FILE}.pl 			\
+		< ${WRKSRC}/${file}.pl 			\
-		> ${WRKSRC}/${FILE}
+		> ${WRKSRC}/${file}
 .endfor
-#.for FILE in gpg2dot
+#.for file in gpg2dot
 #	${SED} -e ''					\
-#		< ${WRKSRC}/${FILE}.1.in		\
+#		< ${WRKSRC}/${file}.1.in		\
-#		> ${WRKSRC}/${FILE}.1
+#		> ${WRKSRC}/${file}.1
 #.endfor
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gpg2dot ${DESTDIR}${PREFIX}/bin/gpg2dot
 #	${INSTALL_MAN} ${WRKSRC}/gpg2dot.1 ${PREFIX}/${PKGMANDIR}/man1
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.32 2012/10/23 10:24:11 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2013/04/06 13:24:20 rodent Exp $
 DISTNAME=	asclock-classic-1.0
 PKGNAME=	asclock-1.0
 PKGREVISION=	2
 CATEGORIES=	x11 time
 MASTER_SITES=	${MASTER_SITE_LOCAL}	# www.asclock.org is no more
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	NeXTstep-like clock and calendar
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL
 WRKSRC=		${WRKDIR}/asclock1.0
 @@ -47,24 +47,24 @@ pre-configure:
 	${RM} -f ${WRKSRC}/month.xpm ${WRKSRC}/weekday.xpm ${WRKSRC}/clk.xpm
 	${LN} -s ./en/month.xpm ${WRKSRC}/month.xpm
 	${LN} -s ./en/weekday.xpm ${WRKSRC}/weekday.xpm
 	${LN} -s ./xpm/color.xpm ${WRKSRC}/clk.xpm
 do-install:
 	${SED} -e "s,@PREFIX@,${PREFIX},g" \
 		${FILESDIR}/asclock.sh > ${WRKDIR}/asclock.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/asclock.sh ${DESTDIR}${PREFIX}/bin/asclock
 	${INSTALL_PROGRAM} ${WRKSRC}/asclock ${DESTDIR}${PREFIX}/libexec/asclock-classic
 	${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC}
 	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_MAN} ${WRKSRC}/asclock.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/asclock.1
-.for LANGUAGE in ${LANGUAGES}
+.for language in ${LANGUAGES}
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/asclock-classic/${LANGUAGE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/asclock-classic/${language}
-	cd ${WRKSRC}/${LANGUAGE}; ${INSTALL_DATA} month.xpm weekday.xpm \
+	cd ${WRKSRC}/${language}; ${INSTALL_DATA} month.xpm weekday.xpm \
-		${DESTDIR}${PREFIX}/share/asclock-classic/${LANGUAGE}
+		${DESTDIR}${PREFIX}/share/asclock-classic/${language}
-	@${ECHO} share/asclock-classic/${LANGUAGE}/month.xpm >> ${PLIST_SRC}
+	@${ECHO} share/asclock-classic/${language}/month.xpm >> ${PLIST_SRC}
-	@${ECHO} share/asclock-classic/${LANGUAGE}/weekday.xpm >> ${PLIST_SRC}
+	@${ECHO} share/asclock-classic/${language}/weekday.xpm >> ${PLIST_SRC}
 .endfor
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,34 +1,34 @@
-# $NetBSD: Makefile,v 1.30 2012/10/08 13:04:17 asau Exp $
+# $NetBSD: Makefile,v 1.31 2013/04/06 13:24:20 rodent Exp $
 DISTNAME=	devtodo-0.1.20
 PKGREVISION=	3
 CATEGORIES=	time
 MASTER_SITES=	http://swapoff.org/files/devtodo/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://swapoff.org/DevTodo
 COMMENT=	Display and manage a list of items that are outstanding
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_GNU_READLINE=	# uses rl_startup_hook()
 GNU_CONFIGURE=		yes
 EGDIR=			${PREFIX}/share/examples/devtodo
 INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 post-install:
-.for CFILE in	changelog2html						\
+.for cfile in	changelog2html						\
 		changelog2todo						\
 		tdrec							\
 		todo-nodone-html.xslt					\
 		todo2html-2.xslt					\
 		todo2html.xslt						\
 		todo2pdf.README						\
 		todo2pdf.sh						\
 		todo2pdf.xslt
-	${INSTALL_DATA} ${WRKSRC}/contrib/${CFILE} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/contrib/${cfile} ${DESTDIR}${EGDIR}
 .endfor
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2012/10/08 12:42:19 asau Exp $
+# $NetBSD: Makefile,v 1.21 2013/04/06 13:24:20 rodent Exp $
 DISTNAME=	ethemes-0.1
 PKGREVISION=	3
 CATEGORIES=	x11 wm
 MASTER_SITES=	ftp://themes.org/pub/themes/e/
 DISTFILES=	${E_THEMES}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://e.themes.org/
 COMMENT=	Themes for the window manager Enlightenment
 DEPENDS+=	enlightenment>=0.16.2:../../wm/enlightenment
 @@ -28,26 +28,26 @@ E_THEMES?=	Absolute_E-DR16-199911060830.
 	BevelFree-DR16-199908221339.etheme Black-DR16-199911201455.etheme \
 	E-Tech_Hydro-DR16-199912241355.etheme Ebench-DR16-199911181110.etheme \
 	Evisio-Green-DR16-199908220707.etheme \
 	FinalE-DR16-200003121555.etheme \
 	GTK+-DR16-200004271913.etheme \
 	HackerPurple138-DR16-199908131917.etheme \
 	IReX-DR16-199912221118.etheme Industrial-DR16-199910202053.etheme \
 	Sensible-DR16-199908211837.etheme Sunset-DR16-200001061225.etheme \
 	X11-DR16-199910131422.etheme \
 	arctic-DR16-200006050720.etheme \
 	eMac-DR16-199912101635.etheme small-e-DR16-199908230041.etheme
 do-install:
-.for FILE in ${E_THEMES}
+.for file in ${E_THEMES}
-	NAME=`echo ${FILE} | ${SED} -e s/-DR16.*//` ; \
+	NAME=`echo ${file} | ${SED} -e s/-DR16.*//` ; \
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${E_DATADIR}/$$NAME ; \
 	${GTAR} -C ${DESTDIR}${PREFIX}/${E_DATADIR}/$$NAME \
-		-xzf ${DISTDIR}/${DIST_SUBDIR}/${FILE}
+		-xzf ${DISTDIR}/${DIST_SUBDIR}/${file}
 .endfor
-.for DIR in Absolute_E ApplePlatinum FinalE
+.for dir in Absolute_E ApplePlatinum FinalE
-	cd ${DESTDIR}${PREFIX}/${E_DATADIR}/${DIR} \
+	cd ${DESTDIR}${PREFIX}/${E_DATADIR}/${dir} \
 		&& ${CHMOD} go+rx `${FIND} . -type d -print` \
 		&& ${CHMOD} go+r `${FIND} . -type f -print`
 .endfor
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.29 2012/10/08 12:42:25 asau Exp $
+# $NetBSD: Makefile,v 1.30 2013/04/06 13:24:20 rodent Exp $
+#
 # There is no distinfo file because users can specify alternate themes
 # via the "WINDOWMAKER_THEMES" variable.
+#
 DISTNAME=	wmthemes-0.80.0
 PKGREVISION=	2
 CATEGORIES=	x11 wm windowmaker
 MASTER_SITES=	http://download.themes.org/wm/
 DISTFILES=	${THEME_FILES}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 @@ -31,39 +31,39 @@ WM_DATADIR=	share/WindowMaker
 .include "../../mk/bsd.prefs.mk"
 BUILD_DEFS+=	WINDOWMAKER_THEMES
 THEME_FILES=
 .for theme in ${WINDOWMAKER_THEMES}
 THEME_FILES+=	${theme}.tar.gz
 SITES.${theme}.tar.gz=	http://download.freshmeat.net/themes/${theme:C/-[^-]*$//}/
 .endfor
 do-install:
 	@${RM} -f ${PLIST_SRC}
 	@${TOUCH} ${PLIST_SRC}
-.for DIR in ${THEME_SUBDIRS}
+.for dir in ${THEME_SUBDIRS}
-	@if [ -d ${WRKSRC}/${DIR} ] && [ -n "`ls ${WRKSRC}/${DIR}`" ]; then \
+	@if [ -d ${WRKSRC}/${dir} ] && [ -n "`ls ${WRKSRC}/${dir}`" ]; then \
-	  ${ECHO} "Installing files in directory ${DIR}."; \
+	  ${ECHO} "Installing files in directory ${dir}."; \
-	  cd ${WRKSRC}/${DIR}; \
+	  cd ${WRKSRC}/${dir}; \
-	  for FILE in *; do \
+	  for file in *; do \
-	    ${MKDIR} ${DESTDIR}${PREFIX}/${WM_DATADIR}/${DIR}; \
+	    ${MKDIR} ${DESTDIR}${PREFIX}/${WM_DATADIR}/${dir}; \
-	    ${INSTALL_DATA} "$$FILE" ${DESTDIR}${PREFIX}/${WM_DATADIR}/${DIR}; \
+	    ${INSTALL_DATA} "$$file" ${DESTDIR}${PREFIX}/${WM_DATADIR}/${dir}; \
-	    ${ECHO} "${WM_DATADIR}/${DIR}/$$FILE" >>${PLIST_SRC}; \
+	    ${ECHO} "${WM_DATADIR}/${dir}/$$file" >>${PLIST_SRC}; \
 	  done; \
 	fi
 .endfor
 	@cd ${WRKSRC}; \
-	for DIR in *.themed; do \
+	for dir in *.themed; do \
-	  if [ -d "$$DIR" ] && [ -n "`${LS} "$$DIR"`" ]; then \
+	  if [ -d "$$dir" ] && [ -n "`${LS} "$$dir"`" ]; then \
-	    ${ECHO} "Installing \"`${BASENAME} "$$DIR" .themed`\" theme."; \
+	    ${ECHO} "Installing \"`${BASENAME} "$$dir" .themed`\" theme."; \
-	    ${INSTALL_DATA_DIR} "${DESTDIR}${PREFIX}/${WM_DATADIR}/Themes/$$DIR"; \
+	    ${INSTALL_DATA_DIR} "${DESTDIR}${PREFIX}/${WM_DATADIR}/Themes/$$dir"; \
-	    cd "${WRKSRC}/$$DIR"; \
+	    cd "${WRKSRC}/$$dir"; \
-	    for FILE in *; do \
+	    for file in *; do \
-	      ${INSTALL_DATA} "$$FILE" "${DESTDIR}${PREFIX}/${WM_DATADIR}/Themes/$$DIR"; \
+	      ${INSTALL_DATA} "$$file" "${DESTDIR}${PREFIX}/${WM_DATADIR}/Themes/$$dir"; \
-	      ${ECHO} "${WM_DATADIR}/Themes/$$DIR/$$FILE" >>${PLIST_SRC}; \
+	      ${ECHO} "${WM_DATADIR}/Themes/$$dir/$$file" >>${PLIST_SRC}; \
 	    done; \
 	    cd ..; \
 	  fi; \
 	done
 .include "../../mk/bsd.pkg.mk"

 @@ -1,55 +1,55 @@
-# $NetBSD: Makefile,v 1.65 2012/10/28 06:30:01 asau Exp $
+# $NetBSD: Makefile,v 1.66 2013/04/06 13:24:20 rodent Exp $
+#
 DISTNAME=	adzap-20080508
 PKGREVISION=	1
 CATEGORIES=	www perl5
 # XXX: should use the following one day:
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=adzapper/}
 MASTER_SITES=	http://adzapper.sourceforge.net/
 MAINTAINER=	simonb@NetBSD.org
 HOMEPAGE=	http://adzapper.sourceforge.net/
 COMMENT=	Filter out animated ad banners from web pages
 WRKSRC=		${WRKDIR}/adzap
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
 CHECK_PORTABILITY_SKIP=	scripts/update-zapper.damien
 INSTALLATION_DIRS=	libexec share/examples/adzap
 do-configure:
-.for FILE in scripts/squid_redirect scripts/wrapzap
+.for file in scripts/squid_redirect scripts/wrapzap
-	${CP} ${WRKSRC}/${FILE} ${WRKSRC}/${FILE}.ORIG
+	${CP} ${WRKSRC}/${file} ${WRKSRC}/${file}.ORIG
 	${SED} -e "s:/usr/bin/perl:${PERL5}:g" \
 	       -e "s:@@PREFIX@@:${PREFIX}:g" \
-		<${WRKSRC}/${FILE}.ORIG >${WRKSRC}/${FILE}
+		<${WRKSRC}/${file}.ORIG >${WRKSRC}/${file}
 .endfor
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect ${DESTDIR}${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/wrapzap ${DESTDIR}${PREFIX}/libexec/adzap
-.for FILE in ad-clear.gif ad-clear.mp3 ad-clear.swf \
+.for file in ad-clear.gif ad-clear.mp3 ad-clear.swf \
     ad-grey.gif ad-old.gif \
     ad.gif ad.mp3 ad.swf \
     adbg-clear.gif adbg.gif \
     closepopup-clear.html closepopup.html \
     counter-clear.gif counter-clear.js \
     counter.gif counter.js \
     no-op-clear.html no-op-clear.js \
     no-op-counter-clear.html no-op-counter-clear.js \
     no-op-counter.html no-op-counter.js \
     no-op.html no-op.js \
     webbug-clear.gif webbug-clear.html webbug-clear.js \
     webbug.gif webbug.html webbug.js
-	${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${DESTDIR}${PREFIX}/share/examples/adzap
+	${INSTALL_DATA} ${WRKSRC}/zaps/${file} ${DESTDIR}${PREFIX}/share/examples/adzap
 .endfor
-.for FILE in proxy-home.pac proxy-zip.pac
+.for file in proxy-home.pac proxy-zip.pac
-	${INSTALL_DATA} ${WRKSRC}/rc/${FILE} ${DESTDIR}${PREFIX}/share/examples/adzap
+	${INSTALL_DATA} ${WRKSRC}/rc/${file} ${DESTDIR}${PREFIX}/share/examples/adzap
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/scripts/adzap.conf \
 	    ${DESTDIR}${PREFIX}/share/examples/adzap
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.113 2013/02/06 23:23:57 jperkin Exp $
+# $NetBSD: Makefile,v 1.114 2013/04/06 13:24:21 rodent Exp $
 DISTNAME=		mod_ssl-2.8.31-1.3.41
 PKGNAME=		ap13-ssl-2.8.31
 PKGREVISION=		4
 CATEGORIES=		www security
 MASTER_SITES=		http://www.modssl.org/source/ \
 			ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.modssl.org/
 COMMENT=		SSL/TLS protocols module for Apache
 CONFLICTS=		apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]*
 @@ -35,28 +35,28 @@ PKG_SYSCONFSUBDIR?=	httpd
 EGDIR=			${PREFIX}/share/examples/mod_ssl
 OWN_DIRS=		${PKG_SYSCONFDIR}/ssl.crl
 OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.crt
 OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.csr
 OWN_DIRS+=		${PKG_SYSCONFDIR}/ssl.prm
 OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/ssl.key			\
 			${ROOT_USER} ${ROOT_GROUP} 0700
 CONF_FILES=		# empty
 CONFS=			ssl.crl/Makefile.crl ssl.crl/README.CRL		\
 			ssl.crt/Makefile.crt ssl.crt/README.CRT		\
 			ssl.csr/README.CSR ssl.csr/README.CSR		\
 			ssl.key/README.KEY ssl.prm/README.PRM
-.for FILE in ${CONFS}
+.for file in ${CONFS}
-CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+CONF_FILES+=		${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file}
 .endfor
 .include "../../security/openssl/buildlink3.mk"
 SUBST_CLASSES+=		paths perl
 SUBST_FILES.paths=	README.mkcert pkg.sslsup/mkcert.sh
 SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.perl=	pkg.contrib/loadcacert.cgi
 SUBST_SED.perl=		-e 's,^\#!/.*,\#!${PERL5},g'
 SUBST_STAGE.perl=	post-patch