- Update to 4.60

PR:		ports/84016
Submitted by:	maintainer

4 files changed, 34 insertions, 35 deletions

diff --git a/lang/munger/Makefile b/lang/munger/Makefile
index cd33a1e4f66a..a8d131c25259 100644
--- a/lang/munger/Makefile
+++ b/lang/munger/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	munger
-PORTVERSION=	4.57
+PORTVERSION=	4.60
 CATEGORIES=	lang
 MASTER_SITES=	http://www.jamesbailie.com/
 
@@ -14,11 +14,11 @@ MAINTAINER=	jimmy@jamesbailie.com
 COMMENT=	Static lisp interpreter with text processing abilities
 
 RUN_DEPENDS=	nc:${PORTSDIR}/net/netcat
+DATADIR=	${PREFIX}/share/${PORTNAME}-${PORTVERSION}
 
 USE_REINPLACE=	yes
 MAN1=		munger.1
 MANCOMPRESSED=	yes
-PLIST_SUB=	MUNGER_VERSION=${PORTVERSION}
 
 OPTIONS=	FCGI "include FastCGI interface" on \
 		SQL  "include SQLite interface"  on \
diff --git a/lang/munger/distinfo b/lang/munger/distinfo
index c15673ba81c8..a9d7c0d94a7a 100644
--- a/lang/munger/distinfo
+++ b/lang/munger/distinfo
@@ -1,2 +1,2 @@
-MD5 (munger-4.57.tar.gz) = 408db3395ca496daa7cad6f01b2b5e71
-SIZE (munger-4.57.tar.gz) = 165092
+MD5 (munger-4.60.tar.gz) = 014692cd655c5b9a6902f876f181af72
+SIZE (munger-4.60.tar.gz) = 164856
diff --git a/lang/munger/pkg-descr b/lang/munger/pkg-descr
index 556b5ad56c3b..652e89984cc7 100644
--- a/lang/munger/pkg-descr
+++ b/lang/munger/pkg-descr
@@ -1,15 +1,14 @@
-Munger is a simple, statically-scoped, interpreted lisp that has
-line-editor-like access to multiple text buffers.  Lines can be inserted,
-removed, overwritten, retrieved in whole or in part, with or without tabs
-expanded, searched for matches on regular expressions, read from and written
-to files, and piped to and from, or filtered through external processes.
+Munger is a simplified, statically-scoped, interpreted lisp specialized
+for writing text processors for 8-bit text.  With Munger the programmer may
+write text-processing filters if serial access to the text is sufficient,
+or the programmer may load text into buffers and have line-oriented random
+access to those lines, if that is more convenient.  Buffer lines can be
+inserted, removed, overwritten, retrieved in whole or in part, with or
+without tabs expanded, searched for matches on regular expressions, read
+from and written to files, and piped to and from, or filtered through
+external processes.
 
-Using regular expressions to search through or transform strings is easy in
-Munger.  Basic facilities for doing line-oriented I/O and cursor-addressing
-are provided.  Munger also has interfaces to the FastCGI devkit
-(http://www.fastcgi.com), and the SQLite library (http://www.sqlite.org).
-
-WWW: http://jamesbailie.com/munger.html
+WWW: http://www.jamesbailie.com/munger.html
 
 --
 James Bailie <jimmy@jamesbailie.com>
diff --git a/lang/munger/pkg-plist b/lang/munger/pkg-plist
index bf490f37533b..140a120a1efd 100644
--- a/lang/munger/pkg-plist
+++ b/lang/munger/pkg-plist
@@ -1,21 +1,21 @@
 bin/munger
-share/munger-%%MUNGER_VERSION%%/mbox2munger.munger
-share/munger-%%MUNGER_VERSION%%/xml2alist.munger
-share/munger-%%MUNGER_VERSION%%/mime2munger.munger
-share/munger-%%MUNGER_VERSION%%/google.munger
-share/munger-%%MUNGER_VERSION%%/google.template
-share/munger-%%MUNGER_VERSION%%/ed.munger
-share/munger-%%MUNGER_VERSION%%/xmlquery.munger
-share/munger-%%MUNGER_VERSION%%/filter.munger
-share/munger-%%MUNGER_VERSION%%/tags.munger
-share/munger-%%MUNGER_VERSION%%/fcgi.munger
-share/munger-%%MUNGER_VERSION%%/client.fcgi
-share/munger-%%MUNGER_VERSION%%/err.munger
-share/munger-%%MUNGER_VERSION%%/options.munger
-share/munger-%%MUNGER_VERSION%%/fmt.munger
-share/munger-%%MUNGER_VERSION%%/cat.munger
-share/munger-%%MUNGER_VERSION%%/grep.munger
-share/munger-%%MUNGER_VERSION%%/library.munger
-share/munger-%%MUNGER_VERSION%%/transform.munger
-share/munger-%%MUNGER_VERSION%%/view.munger
-@dirrm share/munger-%%MUNGER_VERSION%%
+%%DATADIR%%/mbox2munger.munger
+%%DATADIR%%/xml2alist.munger
+%%DATADIR%%/mime2munger.munger
+%%DATADIR%%/google.munger
+%%DATADIR%%/google.template
+%%DATADIR%%/ed.munger
+%%DATADIR%%/xmlquery.munger
+%%DATADIR%%/filter.munger
+%%DATADIR%%/tags.munger
+%%DATADIR%%/fcgi.munger
+%%DATADIR%%/client.fcgi
+%%DATADIR%%/err.munger
+%%DATADIR%%/options.munger
+%%DATADIR%%/fmt.munger
+%%DATADIR%%/cat.munger
+%%DATADIR%%/grep.munger
+%%DATADIR%%/library.munger
+%%DATADIR%%/transform.munger
+%%DATADIR%%/view.munger
+@dirrm %%DATADIR%%/