From owner-freebsd-ports  Fri Aug 25  5:20:13 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 514C037B422
	for <freebsd-ports@FreeBSD.org>; Fri, 25 Aug 2000 05:20:04 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id FAA73635;
	Fri, 25 Aug 2000 05:20:04 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F41A837B42C; Fri, 25 Aug 2000 05:18:46 -0700 (PDT)
Message-Id: <20000825121846.F41A837B42C@hub.freebsd.org>
Date: Fri, 25 Aug 2000 05:18:46 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20839: Update port: emulators/xgs (fix ports/20753)
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20839
>Category:       ports
>Synopsis:       Update port: emulators/xgs (fix ports/20753)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 25 05:20:03 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix MASTER_SITES
- Change location of data files from libdata/ to share/

This PR supersedes ports/20753.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/emulators/xgs/Makefile emulators/xgs/Makefile
--- /usr/ports/emulators/xgs/Makefile	Wed Apr 12 21:21:20 2000
+++ emulators/xgs/Makefile	Fri Aug 25 19:04:59 2000
@@ -11,37 +11,42 @@
 PORTVERSION=	0.50
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.inwards.com/xgs/ \
-		ftp://ftp.apple.asimov.net/pub/apple_II/emulators/rom_images/
-DISTFILES=	xgs050.tgz xgs.rom
+		http://www.inwards.com/xgs/2mg/
+DISTFILES=	xgs050.tgz ROM01.ZIP
+EXTRACT_ONLY=	xgs050.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+
 DIST_SUBDIR=	xgs
-EXTRACT_ONLY=	xgs050.tgz
 RESTRICTED=	"xgs.rom copyright is owned by Apple and cannot be distributed"
 NO_PACKAGE=	${RESTRICTED}
 
 # Source building
 #
-WRKSRC=		${WRKDIR}/xgs
+WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_XLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-x --datadir='${PREFIX}/libdata'
+CONFIGURE_ARGS=	--with-x
 
 # Directories etc...
 #
+XGS_DIR=	${PREFIX}/share/xgs
 XGS_DOC=	${PREFIX}/share/doc/xgs
-XGS_LIB=	${PREFIX}/libdata/xgs
-DOC_FILES= 	CHANGES.TXT COMPAT.TXT INSTALL.TXT TODO.TXT \
-		IWM-DOC.TXT XGS-FAQ.TXT
+PORTDOCS= 	CHANGES.TXT COMPAT.TXT INSTALL.TXT IWM-DOC.TXT TODO.TXT \
+		XGS-FAQ.TXT
+
+post-extract:
+	unzip -L -qq ${_DISTDIR}/ROM01.ZIP -d ${WRKSRC}
 
 post-install:
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/xgs.rom ${XGS_LIB}
-	${INSTALL_DATA} -m 666 /dev/null ${XGS_LIB}/xgs.ram
+	${INSTALL_DATA} ${WRKSRC}/xgs.rom ${XGS_DIR}
+	${INSTALL_DATA} -m 666 /dev/null ${XGS_DIR}/xgs.ram
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${XGS_DOC}
-.for file in ${DOC_FILES}
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/docs/${file} ${XGS_DOC}
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/README.FreeBSD ${XGS_DOC}
diff -urN /usr/ports/emulators/xgs/files/md5 emulators/xgs/files/md5
--- /usr/ports/emulators/xgs/files/md5	Sat Jan 22 22:03:14 2000
+++ emulators/xgs/files/md5	Tue Aug 15 20:12:01 2000
@@ -1,2 +1,2 @@
 MD5 (xgs/xgs050.tgz) = a22f2974fd87253ba39c21a32451a4fb
-MD5 (xgs/xgs.rom) = 20a0334c447cb069a040ae5be1d938df
+MD5 (xgs/ROM01.ZIP) = 62a2309196e70e06fa895a9eee3750e9
diff -urN /usr/ports/emulators/xgs/pkg/PLIST emulators/xgs/pkg/PLIST
--- /usr/ports/emulators/xgs/pkg/PLIST	Sat Jan 22 22:03:16 2000
+++ emulators/xgs/pkg/PLIST	Tue Aug 15 20:18:18 2000
@@ -1,10 +1,6 @@
 bin/imgconv
 bin/imgutil
 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
@@ -12,5 +8,9 @@
 share/doc/xgs/README.FreeBSD
 share/doc/xgs/TODO.TXT
 share/doc/xgs/XGS-FAQ.TXT
+share/xgs/xgs.ram
+share/xgs/xgs.rom
+share/xgs/xgs40.fnt
+share/xgs/xgs80.fnt
+@dirrm share/xgs
 @dirrm share/doc/xgs
-@dirrm libdata/xgs


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message