Add ps-print-nomule-1.03-pkg.tar.gz because the default "File" menu

in xemacs uses it, so without it the "Pretty Print Buffer" option is
always greyed out.

Put each package on its own line in the Makefile and sort them - this
makes it easier to check whether a package has changed. This also
affects md5.

Add a line to PLIST to remove lib/xemacs if it's empty - noticed by
bento.

Bump version number to 1.3.

Requested by:	wolman@cs.washington.edu

3 files changed, 59 insertions, 31 deletions

diff --git a/editors/xemacs-libs-packages/Makefile b/editors/xemacs-libs-packages/Makefile
index 631d7302e4c..1df119b310a 100644
--- a/editors/xemacs-libs-packages/Makefile
+++ b/editors/xemacs-libs-packages/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xemacs-packages
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	editors elisp
 MASTER_SITES=	\
 		ftp://ftp.xemacs.org/pub/xemacs/packages/ \
@@ -15,20 +15,34 @@ MASTER_SITES=	\
 		ftp://ftp.lab.kdd.co.jp/xemacs/packages/ \
 		ftp://ftp.th-darmstadt.de/pub/editors/xemacs/packages/
 DISTFILES=	\
-		xemacs-base-1.37-pkg.tar.gz xemacs-devel-1.25-pkg.tar.gz \
-		c-support-1.14-pkg.tar.gz   os-utils-1.19-pkg.tar.gz \
-		cc-mode-1.17-pkg.tar.gz     prog-modes-1.23-pkg.tar.gz \
-		debug-1.11-pkg.tar.gz       psgml-1.15-pkg.tar.gz \
-		dired-1.07-pkg.tar.gz       sgml-1.06-pkg.tar.gz \
-		edit-utils-1.45-pkg.tar.gz  text-modes-1.22-pkg.tar.gz \
-		efs-1.16-pkg.tar.gz         time-1.09-pkg.tar.gz \
-		fsf-compat-1.07-pkg.tar.gz  viper-1.18-pkg.tar.gz \
-		mail-lib-1.28-pkg.tar.gz    net-utils-1.13-pkg.tar.gz \
-		mailcrypt-2.04-pkg.tar.gz   vc-1.22-pkg.tar.gz \
-		sh-script-1.11-pkg.tar.gz   auctex-1.19-pkg.tar.gz \
-		ispell-1.18-pkg.tar.gz      pcl-cvs-1.41-pkg.tar.gz \
-		w3-1.15-pkg.tar.gz          texinfo-1.18-pkg.tar.gz \
-		hm--html-menus-1.14-pkg.tar.gz
+		auctex-1.19-pkg.tar.gz \
+		c-support-1.14-pkg.tar.gz \
+		cc-mode-1.17-pkg.tar.gz  \
+		debug-1.11-pkg.tar.gz  \
+		dired-1.07-pkg.tar.gz  \
+		edit-utils-1.45-pkg.tar.gz  \
+		efs-1.16-pkg.tar.gz   \
+		fsf-compat-1.07-pkg.tar.gz \
+		hm--html-menus-1.14-pkg.tar.gz \
+		ispell-1.18-pkg.tar.gz \
+		mail-lib-1.28-pkg.tar.gz \
+		mailcrypt-2.04-pkg.tar.gz \
+		net-utils-1.13-pkg.tar.gz \
+		os-utils-1.19-pkg.tar.gz \
+		pcl-cvs-1.41-pkg.tar.gz \
+		prog-modes-1.23-pkg.tar.gz \
+		ps-print-nomule-1.03-pkg.tar.gz \
+		psgml-1.15-pkg.tar.gz \
+		sgml-1.06-pkg.tar.gz \
+		sh-script-1.11-pkg.tar.gz \
+		texinfo-1.18-pkg.tar.gz \
+		text-modes-1.22-pkg.tar.gz \
+		time-1.09-pkg.tar.gz \
+		vc-1.22-pkg.tar.gz \
+		viper-1.18-pkg.tar.gz \
+		w3-1.15-pkg.tar.gz \
+		xemacs-base-1.37-pkg.tar.gz \
+		xemacs-devel-1.25-pkg.tar.gz
 
 MAINTAINER=	gj@FreeBSD.org
 
diff --git a/editors/xemacs-libs-packages/distinfo b/editors/xemacs-libs-packages/distinfo
index a0a7107bfe2..61539135c26 100644
--- a/editors/xemacs-libs-packages/distinfo
+++ b/editors/xemacs-libs-packages/distinfo
@@ -1,27 +1,28 @@
-MD5 (xemacs/xemacs-base-1.37-pkg.tar.gz) = 08ae3bd521b19cfa59cd80a9892f2656
-MD5 (xemacs/xemacs-devel-1.25-pkg.tar.gz) = 521f5b549326278261ec1d2dd293dd65
+MD5 (xemacs/auctex-1.19-pkg.tar.gz) = 278f92451968e75df51d70cbe0f9a3bc
 MD5 (xemacs/c-support-1.14-pkg.tar.gz) = c804b3eb5a395bbe39020a5115c3d5e5
-MD5 (xemacs/os-utils-1.19-pkg.tar.gz) = 9202c67fdd110d546c2d6ae96a16ee4e
 MD5 (xemacs/cc-mode-1.17-pkg.tar.gz) = ac9ed86d107513eb22173e8893e8ae78
-MD5 (xemacs/prog-modes-1.23-pkg.tar.gz) = 108b0bdbecc0b648e27a5760572e283e
 MD5 (xemacs/debug-1.11-pkg.tar.gz) = 034e56577b306bb9f4cb822c2adc89b0
-MD5 (xemacs/psgml-1.15-pkg.tar.gz) = 3f7835cf7f2e891a731179a698473a16
 MD5 (xemacs/dired-1.07-pkg.tar.gz) = f7ecf6faf11794e18299c2aa139e6b1e
-MD5 (xemacs/sgml-1.06-pkg.tar.gz) = 4761323697a995beb53896f350c3f3d6
 MD5 (xemacs/edit-utils-1.45-pkg.tar.gz) = b541b5c1f63f69a32864d609fbb4ead9
-MD5 (xemacs/text-modes-1.22-pkg.tar.gz) = 969a6a4b259153b17365c68dda516ce0
 MD5 (xemacs/efs-1.16-pkg.tar.gz) = c04ecaf45f6e090b8f0bdcb6ce7a04ab
-MD5 (xemacs/time-1.09-pkg.tar.gz) = fe670ec58c71b6720e97af24f2fb9893
 MD5 (xemacs/fsf-compat-1.07-pkg.tar.gz) = c6c353c516ce02153e93348768589b47
-MD5 (xemacs/viper-1.18-pkg.tar.gz) = 66c988d8f43927d2998ba4bad4ce36b1
+MD5 (xemacs/hm--html-menus-1.14-pkg.tar.gz) = 92bcfc9112da3c16f3b922576c79facc
+MD5 (xemacs/ispell-1.18-pkg.tar.gz) = 11ae38e4e89498a44502fe596a9cd563
 MD5 (xemacs/mail-lib-1.28-pkg.tar.gz) = bef2f5542871e820f0f0bcd918fd3676
-MD5 (xemacs/net-utils-1.13-pkg.tar.gz) = 9ee77d48ee7e97cb148dc4f9a04c3bf4
 MD5 (xemacs/mailcrypt-2.04-pkg.tar.gz) = 69807743b44a35a99eb03054642d8a25
-MD5 (xemacs/vc-1.22-pkg.tar.gz) = 203309aa4378cc3fce8eff5f7b8ac622
-MD5 (xemacs/sh-script-1.11-pkg.tar.gz) = 49f389b0bf5107848a4b342e70bb9472
-MD5 (xemacs/auctex-1.19-pkg.tar.gz) = 278f92451968e75df51d70cbe0f9a3bc
-MD5 (xemacs/ispell-1.18-pkg.tar.gz) = 11ae38e4e89498a44502fe596a9cd563
+MD5 (xemacs/net-utils-1.13-pkg.tar.gz) = 9ee77d48ee7e97cb148dc4f9a04c3bf4
+MD5 (xemacs/os-utils-1.19-pkg.tar.gz) = 9202c67fdd110d546c2d6ae96a16ee4e
 MD5 (xemacs/pcl-cvs-1.41-pkg.tar.gz) = 86e3b1e6bbb60931c31ba0d98162da26
-MD5 (xemacs/w3-1.15-pkg.tar.gz) = a160290f8b3df941f3f0985522bc271b
+MD5 (xemacs/prog-modes-1.23-pkg.tar.gz) = 108b0bdbecc0b648e27a5760572e283e
+MD5 (xemacs/ps-print-nomule-1.03-pkg.tar.gz) = 4656fbaccd48ab097d791b03e9f40f76
+MD5 (xemacs/psgml-1.15-pkg.tar.gz) = 3f7835cf7f2e891a731179a698473a16
+MD5 (xemacs/sgml-1.06-pkg.tar.gz) = 4761323697a995beb53896f350c3f3d6
+MD5 (xemacs/sh-script-1.11-pkg.tar.gz) = 49f389b0bf5107848a4b342e70bb9472
 MD5 (xemacs/texinfo-1.18-pkg.tar.gz) = ddfced14a51de83ce4db4d5036538124
-MD5 (xemacs/hm--html-menus-1.14-pkg.tar.gz) = 92bcfc9112da3c16f3b922576c79facc
+MD5 (xemacs/text-modes-1.22-pkg.tar.gz) = 969a6a4b259153b17365c68dda516ce0
+MD5 (xemacs/time-1.09-pkg.tar.gz) = fe670ec58c71b6720e97af24f2fb9893
+MD5 (xemacs/vc-1.22-pkg.tar.gz) = 203309aa4378cc3fce8eff5f7b8ac622
+MD5 (xemacs/viper-1.18-pkg.tar.gz) = 66c988d8f43927d2998ba4bad4ce36b1
+MD5 (xemacs/w3-1.15-pkg.tar.gz) = a160290f8b3df941f3f0985522bc271b
+MD5 (xemacs/xemacs-base-1.37-pkg.tar.gz) = 08ae3bd521b19cfa59cd80a9892f2656
+MD5 (xemacs/xemacs-devel-1.25-pkg.tar.gz) = 521f5b549326278261ec1d2dd293dd65
diff --git a/editors/xemacs-libs-packages/pkg-plist b/editors/xemacs-libs-packages/pkg-plist
index e602b2c0b0a..20a03de8912 100644
--- a/editors/xemacs-libs-packages/pkg-plist
+++ b/editors/xemacs-libs-packages/pkg-plist
@@ -966,6 +966,16 @@ lib/xemacs/xemacs-packages/lisp/psgml/custom-load.el
 lib/xemacs/xemacs-packages/lisp/psgml/custom-load.elc
 lib/xemacs/xemacs-packages/lisp/psgml/iso-sgml.el
 lib/xemacs/xemacs-packages/lisp/psgml/iso-sgml.elc
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/ChangeLog
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/_pkg.el
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/auto-autoloads.el
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/auto-autoloads.elc
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/custom-load.el
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/custom-load.elc
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/ps-print.el
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/ps-print.elc
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/ps-swapper.el
+lib/xemacs/xemacs-packages/lisp/ps-print-nomule/ps-swapper.elc
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-api.el
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-api.elc
 lib/xemacs/xemacs-packages/lisp/psgml/psgml-charent.el
@@ -1403,6 +1413,7 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.net-utils
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.os-utils
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.pcl-cvs
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.prog-modes
+lib/xemacs/xemacs-packages/pkginfo/MANIFEST.ps-print-nomule
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.psgml
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.sgml
 lib/xemacs/xemacs-packages/pkginfo/MANIFEST.sh-script
@@ -1436,6 +1447,7 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/lisp/texinfo
 @dirrm lib/xemacs/xemacs-packages/lisp/sh-script
 @dirrm lib/xemacs/xemacs-packages/lisp/sgml
+@dirrm lib/xemacs/xemacs-packages/lisp/ps-print-nomule
 @dirrm lib/xemacs/xemacs-packages/lisp/psgml
 @dirrm lib/xemacs/xemacs-packages/lisp/prog-modes
 @dirrm lib/xemacs/xemacs-packages/lisp/pcl-cvs
@@ -1468,3 +1480,4 @@ lib/xemacs/xemacs-packages/pkginfo/MANIFEST.xemacs-devel
 @dirrm lib/xemacs/xemacs-packages/etc/auctex
 @unexec rmdir %D/lib/xemacs/xemacs-packages/etc 2>/dev/null || true
 @unexec rmdir %D/lib/xemacs/xemacs-packages 2>/dev/null || true
+@unexec rmdir %D/lib/xemacs 2>/dev/null || true