Update to 1.2pre2, which lets environment variables and a per-user

configuration file override the settings in the global config file.
The command-line options still take precedence, though.

3 files changed, 20 insertions, 15 deletions

diff --git a/sysutils/penv/Makefile b/sysutils/penv/Makefile
index db9d6f2b006..bb2147d0de4 100644
--- a/sysutils/penv/Makefile
+++ b/sysutils/penv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	penv
-PORTVERSION=	1.2.b1
+PORTVERSION=	1.2.b2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://devel.ringlet.net/sysutils/penv/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/pre/}
@@ -29,10 +29,7 @@ DBDIR?=		/var/db/${PORTNAME}
 
 PLIST_SUB+=	DBDIR=${DBDIR}
 
-HTMLDOCS=	docbook.css index.html penv-compat.html penv-history.html \
-		penv-install.html penv-src.html penv-usage.html penv.html
-HTMLCDOCS=	changes.html changes.txt
-TXTDOCS=	penv.txt
+DOCS=		html txt
 
 post-install:
 		${MKDIR} ${PREFIX}/etc
@@ -43,12 +40,8 @@ post-install:
 				${PREFIX}/etc/penv.conf; \
 		fi
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${DOCSDIR}/html
-		${INSTALL_DATA} ${HTMLDOCS:S,^,${WRKSRC}/doc/html/,} ${DOCSDIR}/html
-		${MKDIR} ${DOCSDIR}/html/changes
-		${INSTALL_DATA} ${HTMLCDOCS:S,^,${WRKSRC}/doc/html/changes/,} ${DOCSDIR}/html/changes
-		${MKDIR} ${DOCSDIR}/txt
-		${INSTALL_DATA} ${TXTDOCS:S,^,${WRKSRC}/doc/txt/,} ${DOCSDIR}/txt
+		${MKDIR} ${DOCSDIR}
+		cd ${WRKSRC}/doc && ${TAR} -cpf - ${DOCS} | ${TAR} -xpf - -C ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/penv/distinfo b/sysutils/penv/distinfo
index 82ad498d63f..cd2512d5c36 100644
--- a/sysutils/penv/distinfo
+++ b/sysutils/penv/distinfo
@@ -1 +1 @@
-MD5 (penv-1.2pre1.tar.gz) = 5f14448c25f3a0d1456af1307a3d10c7
+MD5 (penv-1.2pre2.tar.gz) = db04c7fa8759f286537f09f58ddcf2d1
diff --git a/sysutils/penv/pkg-plist b/sysutils/penv/pkg-plist
index bed2431ebc4..2ead1e047c7 100644
--- a/sysutils/penv/pkg-plist
+++ b/sysutils/penv/pkg-plist
@@ -2,7 +2,18 @@ bin/penv
 @unexec if cmp -s %D/etc/penv.conf %D/etc/penv.conf.default; then rm -f %D/etc/penv.conf; fi
 etc/penv.conf.default
 @exec [ -f %B/penv.conf ] || cp %B/%f %B/penv.conf
+%%PORTDOCS%%share/doc/penv/html/changes
 %%PORTDOCS%%share/doc/penv/html/docbook.css
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/changes/changes.html
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/changes/changes.txt
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/docbook.css
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/index.html
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/penv-compat.html
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/penv-history.html
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/penv-install.html
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/penv-src.html
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/penv-usage.html
+%%PORTDOCS%%share/doc/penv/html/en_US.ISO8859-1/penv.html
 %%PORTDOCS%%share/doc/penv/html/index.html
 %%PORTDOCS%%share/doc/penv/html/penv-compat.html
 %%PORTDOCS%%share/doc/penv/html/penv-history.html
@@ -10,11 +21,12 @@ etc/penv.conf.default
 %%PORTDOCS%%share/doc/penv/html/penv-src.html
 %%PORTDOCS%%share/doc/penv/html/penv-usage.html
 %%PORTDOCS%%share/doc/penv/html/penv.html
-%%PORTDOCS%%share/doc/penv/html/changes/changes.html
-%%PORTDOCS%%share/doc/penv/html/changes/changes.txt
+%%PORTDOCS%%share/doc/penv/txt/en_US.ISO8859-1/penv.txt
 %%PORTDOCS%%share/doc/penv/txt/penv.txt
-%%PORTDOCS%%@dirrm share/doc/penv/html/changes
+%%PORTDOCS%%@dirrm share/doc/penv/html/en_US.ISO8859-1/changes
+%%PORTDOCS%%@dirrm share/doc/penv/html/en_US.ISO8859-1
 %%PORTDOCS%%@dirrm share/doc/penv/html
+%%PORTDOCS%%@dirrm share/doc/penv/txt/en_US.ISO8859-1
 %%PORTDOCS%%@dirrm share/doc/penv/txt
 %%PORTDOCS%%@dirrm share/doc/penv
 @exec mkdir -p %%DBDIR%%