- Fix MASTER_SITES

- Add MAINTAINER line
- Add (probably missing) USE_XLIB line
- Move install path of utility data files from lib/ to libdata/
- Shorten pkg/DESCR and move original file to files/README.FreeBSD
- Sort pkg/PLIST

PR:		16039
Submitted by:	tkato@prontomail.ne.jp

6 files changed, 96 insertions, 57 deletions

diff --git a/emulators/xgs/Makefile b/emulators/xgs/Makefile
index b37d67a5a050..8bd20c995594 100644
--- a/emulators/xgs/Makefile
+++ b/emulators/xgs/Makefile
@@ -1,8 +1,7 @@
-# New ports collection makefile for:   xgs-0.50
+# New ports collection makefile for:	xgs
 # Version required:	0.50
 # Date created:		2nd May, 1997
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
-# FreeBSD Version:	2.1.5-RELEASE
 #
 # $FreeBSD$
 #
@@ -11,44 +10,44 @@
 # currently broken.
 
 # Distfile collection and extraction stuff
-#      
-DISTNAME=	xgs-0.50-src
-PKGNAME=	xgs-0.50
+#
+DISTNAME=	xgs-0.50
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.optera.com/pub/xgs/ \
+MASTER_SITES=	http://www.inwards.com/xgs/ \
 		ftp://ftp.apple.asimov.net/pub/apple_II/emulators/rom_images/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xgs.rom
+DISTFILES=	xgs050.tgz xgs.rom
 
-BROKEN='fetch'
+MAINTAINER=	ports@FreeBSD.org
 
 DIST_SUBDIR=	xgs
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	xgs050.tgz
 RESTRICTED=	"xgs.rom copyright is owned by Apple and cannot be distributed"
 NO_PACKAGE=	${RESTRICTED}
 
 # Source building
 #
 WRKSRC=		${WRKDIR}/xgs
+USE_XLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-x --datadir="${PREFIX}/lib"
+CONFIGURE_ARGS=	--with-x --datadir='${PREFIX}/libdata'
 
 # Directories etc...
 #
 XGS_DOC=	${PREFIX}/share/doc/xgs
-XGS_LIB=	${PREFIX}/lib/xgs
+XGS_LIB=	${PREFIX}/libdata/xgs
 DOC_FILES= 	CHANGES.TXT COMPAT.TXT INSTALL.TXT TODO.TXT \
 		IWM-DOC.TXT XGS-FAQ.TXT
 
 post-install:
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/xgs.rom ${XGS_LIB}
+	${INSTALL_DATA} -m 666 /dev/null ${XGS_LIB}/xgs.ram
 .if !defined(NOPORTDOCS)
-	-${MKDIR} ${XGS_DOC}
-	for file in ${DOC_FILES} ; do \
-		${INSTALL_DATA} ${WRKSRC}/docs/$$file ${XGS_DOC}/ ;\
-	done
-	${INSTALL_DATA} ${PKGDIR}/DESCR ${XGS_DOC}/README.FreeBSD
+	@${MKDIR} ${XGS_DOC}
+.for file in ${DOC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${XGS_DOC}
+.endfor
+	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${XGS_DOC}
 .endif
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/xgs.rom ${XGS_LIB}/
-	${INSTALL_DATA} -m 666 /dev/null ${XGS_LIB}/xgs.ram
 
 .include <bsd.port.mk>
diff --git a/emulators/xgs/distinfo b/emulators/xgs/distinfo
index b896572ca974..51c5876642c4 100644
--- a/emulators/xgs/distinfo
+++ b/emulators/xgs/distinfo
@@ -1,2 +1,2 @@
-MD5 (xgs/xgs-0.50-src.tar.gz) = a22f2974fd87253ba39c21a32451a4fb
+MD5 (xgs/xgs050.tgz) = a22f2974fd87253ba39c21a32451a4fb
 MD5 (xgs/xgs.rom) = 20a0334c447cb069a040ae5be1d938df
diff --git a/emulators/xgs/files/README.FreeBSD b/emulators/xgs/files/README.FreeBSD
new file mode 100644
index 000000000000..fe3666892f3d
--- /dev/null
+++ b/emulators/xgs/files/README.FreeBSD
@@ -0,0 +1,49 @@
+General Notes
+=============
+
+This emulator does a great job of emulating an Apple IIGS. Various
+IIGS hardware devices are also emulated but this version is still an
+alpha quality release so you might find a few things missing.
+
+XGS requires a copy of the IIGS ROM to boot up and this port should
+attempt to FTP a copy of it from the Asimov archives (if it is still
+available). If you have to obtain a copy of it manually then all you
+should need to do is drop it in the xgs subdirectory of the distfiles
+directory to allow the port to build. This ROM cannot be distributed
+due to copyright reasons.
+
+Version Specific Notes
+======================
+
+Disk emulation has improved considerably. Many images available on the
+net will now load. 
+
+A new disk image format has been adopted and further support for other
+image types have been added. Also most of the utilities have been
+consolidated into one program. Be sure to check the docs on this one. 
+
+Sound emulation is currently broken and I'm looking for help in this
+area as I lack experience with sound programming. If you are able to
+assist, or even better, have some patches you can send me please
+contact me on the email address below.
+
+Finally
+=======
+
+Please check out the files in /usr/local/share/doc/xgs (or equivalent
+on your system). As this package has no man pages you will need to
+pick up the basics from there. All author credits can be found in
+these files also.
+
+Check out the following for all sorts of Apple II goodies:
+
+	ftp://ftp.apple.asimov.net/pub/apple_II/
+	http://www.inwards.com/xgs/
+	comp.emulators.apple2
+
+Share and enjoy,
+
+Joel...
+:->
+sutton@aardvark.apana.org.au
+
diff --git a/emulators/xgs/files/patch-aa b/emulators/xgs/files/patch-aa
new file mode 100644
index 000000000000..9a16b82c7f83
--- /dev/null
+++ b/emulators/xgs/files/patch-aa
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	Sat Jan 22 04:57:59 2000
++++ Makefile.in	Sat Jan 22 04:58:07 2000
+@@ -52,10 +52,10 @@
+ all: $(XGS_TARGET) $(UTIL_TARGET)
+ 
+ install: all
+-	-/bin/mkdir $(bindir)
++	-/bin/mkdir -p $(bindir)
+ 	rm -f $(bindir)/$(XGS_TARGET)
+ 	$(INSTALL_PROGRAM) $(XGS_TARGET) $(bindir)/$(XGS_TARGET)
+-	-/bin/mkdir $(XGS_DIR)
++	-/bin/mkdir -p $(XGS_DIR)
+ 	$(INSTALL_DATA) $(srcdir)/xgs40.fnt $(XGS_DIR)/xgs40.fnt
+ 	$(INSTALL_DATA) $(srcdir)/xgs80.fnt $(XGS_DIR)/xgs80.fnt
+ 	for f in $(UTIL_TARGET) ; do \
diff --git a/emulators/xgs/pkg-descr b/emulators/xgs/pkg-descr
index ca97d557afd0..e9c99d56dd6c 100644
--- a/emulators/xgs/pkg-descr
+++ b/emulators/xgs/pkg-descr
@@ -1,6 +1,3 @@
-General Notes
-=============
-
 This emulator does a great job of emulating an Apple IIGS. Various
 IIGS hardware devices are also emulated but this version is still an
 alpha quality release so you might find a few things missing.
@@ -12,38 +9,15 @@ should need to do is drop it in the xgs subdirectory of the distfiles
 directory to allow the port to build. This ROM cannot be distributed
 due to copyright reasons.
 
-Version Specific Notes
-======================
-
-Disk emulation has improved considerably. Many images available on the
-net will now load. 
-
-A new disk image format has been adopted and further support for other
-image types have been added. Also most of the utilities have been
-consolidated into one program. Be sure to check the docs on this one. 
-
-Sound emulation is currently broken and I'm looking for help in this
-area as I lack experience with sound programming. If you are able to
-assist, or even better, have some patches you can send me please
-contact me on the email address below.
-
-Finally
-=======
-
 Please check out the files in /usr/local/share/doc/xgs (or equivalent
 on your system). As this package has no man pages you will need to
 pick up the basics from there. All author credits can be found in
 these files also.
 
-Check out the following for all sorts of Apple II goodies:
-
-	ftp://ftp.apple.asimov.net/pub/apple_II/
-	http://www.optera.com/~invid/emulators/XGS/
-	comp.emulators.apple2
-
 Share and enjoy,
 
 Joel...
 :->
 sutton@aardvark.apana.org.au
 
+WWW: http://www.inwards.com/xgs/
diff --git a/emulators/xgs/pkg-plist b/emulators/xgs/pkg-plist
index dd110cfed411..3c629285e341 100644
--- a/emulators/xgs/pkg-plist
+++ b/emulators/xgs/pkg-plist
@@ -1,14 +1,16 @@
-bin/xgs
+bin/imgconv
 bin/imgutil
-share/doc/xgs/CHANGES.TXT 
-share/doc/xgs/COMPAT.TXT 
-share/doc/xgs/INSTALL.TXT 
-share/doc/xgs/TODO.TXT
+bin/xgs
+libdata/xgs/xgs.ram
+libdata/xgs/xgs.rom
+libdata/xgs/xgs40.fnt
+libdata/xgs/xgs80.fnt
+share/doc/xgs/CHANGES.TXT
+share/doc/xgs/COMPAT.TXT
+share/doc/xgs/INSTALL.TXT
 share/doc/xgs/IWM-DOC.TXT
-share/doc/xgs/XGS-FAQ.TXT
 share/doc/xgs/README.FreeBSD
-lib/xgs/xgs40.fnt
-lib/xgs/xgs80.fnt
-lib/xgs/xgs.rom
-lib/xgs/xgs.ram
-
+share/doc/xgs/TODO.TXT
+share/doc/xgs/XGS-FAQ.TXT
+@dirrm share/doc/xgs
+@dirrm libdata/xgs