Update to 4.11. General Makefile cleanups.

PR:		18984
Submitted by:	Trevor Johnson <trevor@jpj.net>

3 files changed, 22 insertions, 26 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index 2f5a16ed08a1..99399b753b1c 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for: analog
-# http://www.analog.cx/
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
@@ -7,7 +6,7 @@
 #
 
 PORTNAME=	analog
-PORTVERSION=    4.1
+PORTVERSION=    4.11
 CATEGORIES=	www
 MASTER_SITES=   http://www.analog.cx/ \
 		http://brendanr.simplenet.com/analog/ \
@@ -27,28 +26,18 @@ MAKE_FLAGS=     -DPREFIX=${PREFIX} -f
 ALL_TARGET=     analog
 
 do-install:
-	install -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
-		${PREFIX}/share/doc/analog
-	install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
-		${PREFIX}/lib/analog/lang
-	install -d -o nobody -g nogroup -m 755 \
-		${PREFIX}/www/data/images
-	cd ${WRKSRC}/images && \
-		${INSTALL_DATA} * ${PREFIX}/www/data/images
-	cd ${WRKSRC}/lang && \
-		${INSTALL_DATA} * ${PREFIX}/lib/analog/lang
-	cd ${WRKSRC} && \
-		${INSTALL_PROGRAM} analog ${PREFIX}/bin
-	cd ${WRKSRC} && \
-	for file in analog.cfg ; do \
-	    if [ ! -f ${PREFIX}/etc/$$file ] ; then \
-		${INSTALL_DATA} -m 644 $$file ${PREFIX}/etc/$$file ; \
-	    fi ; \
-	${INSTALL_DATA} -m 644 $$file ${PREFIX}/etc/$$file-dist ; \
-	done
+	${MKDIR} ${PREFIX}/share/doc/analog
+	${MKDIR} ${PREFIX}/lib/analog/lang
+	${MKDIR} ${PREFIX}/www/data/images
+	${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/www/data/images
+	${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/lib/analog/lang
+	${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin
+.if !exists(${PREFIX}/etc/analog.cfg)
+	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${PREFIX}/etc
+.endif
+	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg.dist
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/docs && \
-		${INSTALL_DATA} * ${PREFIX}/share/doc/analog
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/analog
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/analog/distinfo b/www/analog/distinfo
index 3690884e7064..40c16621aab1 100644
--- a/www/analog/distinfo
+++ b/www/analog/distinfo
@@ -1 +1 @@
-MD5 (analog-4.1.tar.gz) = d417106fa657f23c40bfff3679d1eab5
+MD5 (analog-4.11.tar.gz) = 1eb98a1c2f44f3a846b27e257a458e4a
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 1d187610b83c..a859aff06459 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -2,6 +2,7 @@ bin/analog
 @unexec [ -f %D/etc/analog.cfg ] && cmp -s %D/etc/analog.cfg %D/etc/analog.cfg-dist && rm -f %D/etc/analog.cfg
 etc/analog.cfg-dist
 @exec if [ ! -f %D/etc/analog.cfg ] ; then cp -p %D/%F %B/analog.cfg; fi
+lib/analog/lang/README.txt
 lib/analog/lang/am.lng
 lib/analog/lang/amdom.tab
 lib/analog/lang/ba.lng
@@ -30,6 +31,7 @@ lib/analog/lang/es.lng
 lib/analog/lang/esa.lng
 lib/analog/lang/esadom.tab
 lib/analog/lang/esdom.tab
+lib/analog/lang/esform.html
 lib/analog/lang/esh.lng
 lib/analog/lang/eshdom.tab
 lib/analog/lang/fi.lng
@@ -44,8 +46,12 @@ lib/analog/lang/frh.lng
 lib/analog/lang/frhdom.tab
 lib/analog/lang/gr.lng
 lib/analog/lang/gra.lng
+lib/analog/lang/hu.cfg
+lib/analog/lang/hu.lng
 lib/analog/lang/hua.lng
-lib/analog/lang/huh.lng
+lib/analog/lang/huadom.tab
+lib/analog/lang/hudom.tab
+lib/analog/lang/itform.html
 lib/analog/lang/is.lng
 lib/analog/lang/isa.lng
 lib/analog/lang/ish.lng
@@ -77,6 +83,7 @@ lib/analog/lang/pt.lng
 lib/analog/lang/pta.lng
 lib/analog/lang/pth.lng
 lib/analog/lang/ro.lng
+lib/analog/lang/rodom.tab
 lib/analog/lang/ru.lng
 lib/analog/lang/rua.lng
 lib/analog/lang/rudom.tab
@@ -211,6 +218,6 @@ www/data/images/html2.gif
 @dirrm lib/analog/lang
 @dirrm lib/analog
 @dirrm share/doc/analog
-@dirrm www/data/images
+@unexec rmdir %D/www/data/images 2>/dev/null || true
 @unexec rmdir %D/www/data 2>/dev/null || true
 @unexec rmdir %D/www 2>/dev/null || true