Skip site navigation (1)Skip section navigation (2)
Date:      8 Dec 2001 22:32:42 +0900
From:      Akio Morita <amorita@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/32602: Update port: emulators/xsystem35 to 1.4.2
Message-ID:  <20011208133242.51579.qmail@misao.kuicr.kyoto-u.ac.jp>

next in thread | raw e-mail | index | archive | help

>Number:         32602
>Category:       ports
>Synopsis:       Update port: emulators/xsystem35 to 1.4.2
>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:   Sat Dec 08 05:40:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Akio Morita
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
Kyoto Univ.
>Environment:
System: FreeBSD sasami.jyurai 4.4-STABLE FreeBSD 4.4-STABLE #0: Thu Dec 6 07:49:34 JST 2001 amorita@sasami.jyurai:/usr/SRC/src/sys/compile/SASAMI i386
>Description:
	- Update to 1.4.2

	Remove file:
	files/patch-af
>How-To-Repeat:
>Fix:
diff -durN xsystem35.ORIG/Makefile xsystem35/Makefile
--- xsystem35.ORIG/Makefile	Sun Dec 31 06:58:16 2000
+++ xsystem35/Makefile	Wed Dec  5 22:37:54 2001
@@ -6,52 +6,123 @@
 #
 
 PORTNAME=	xsystem35
-PORTVERSION=	1.2.5.1
+PORTVERSION=	1.4.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/
-DISTNAME=	${PORTNAME}-1.2.5-1
 
 MAINTAINER=	sf@FreeBSD.org
 
-USE_IMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_GTK=	yes
 WANT_ESOUND=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 PKGMESSAGE=	${WRKSRC}/MESSAGE
 
-DOC_FILES=	BUGS ChangeLog FAQ GRFMT.TXT INSTALL MISCGAME.TXT README \
-		README.color README.joystick README.miko README.music \
-		README.pastel THANKS TODO
-EXAMPLES=	README.TXT ambi.inf atlach.inf dalk.inf darcrows.inf \
-		diabo.inf drstop.inf hushaby.inf katsumi.inf kichiku.inf \
-		mamatoto.inf mamori.inf miko.inf mugen.inf ningen.inf \
-		oudou.inf panyo.inf pascha.inf progood.inf rance1.inf \
-		rance2.inf rance3.inf rance4.inf toushin.inf toushin2.inf \
-		zero.inf
+DOC_FILES=	BUGS ChangeLog ChangeLog.1 FAQ GAMES.TXT GRFMT.TXT \
+		INSTALL MISCGAME.TXT \
+		README README.color README.joystick README.music \
+		TECH.TXT THANKS TODO
+
+EXAMPLES=	README.TXT \
+		456atlach.inf 456ningen.inf 456zero.inf \
+		ambi.inf atlach_new.inf dalk.inf darcrows.inf diabo.inf \
+		drstop.inf hushaby.inf kakurezuki.inf katsumi.inf \
+		kichiku.inf mamatoto.inf mamori.inf miko.inf mugen.inf \
+		oudou.inf panyo.inf panyo_new.inf pascha.inf persiom.inf \
+		progood.inf rance1.inf rance2.inf rance3.inf rance4.inf \
+		seeinao.inf toushin.inf toushin2.inf
+
+PATCHES=	pastel.diff
 
 .include <bsd.port.pre.mk>
 
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+
+SDL_CONFIG?=    ${LOCALBASE}/bin/sdl11-config
+FREETYPE_CONFIG?=    ${LOCALBASE}/bin/freetype-config
+
+CONFIGURE_ARGS+=--without-included-gettext --with-cachesize=20 \
+	--enable-midi=seq,extp,raw --enable-cdrom=bsd,mp3
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
 .if defined(HAVE_ESOUND)
 USE_ESOUND=	yes
-pre-configure:
-	${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h.orig
-	${SED} -e 43,43d -e 45,45d ${WRKSRC}/config.h.orig > ${WRKSRC}/config.h
+CONFIGURE_ARGS+=--enable-audio=oss,esd --with-default-output=esd
+.else
+CONFIGURE_ARGS+=--enable-audio=oss --with-default-output=oss
+.endif
+
+.ifdef(WITH_SDL)
+LIB_DEPENDS+=   SDL-1.1.3:${PORTSDIR}/devel/sdl12
+
+CONFIGURE_ARGS+= --enable-sdl
+CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}"
+.else
+CONFIGURE_ARGS+= --disable-sdl
 .endif
 
+.ifdef(WITH_FREETYPE)
+CONFIGURE_ARGS+= --enable-ttf
+.else
+CONFIGURE_ARGS+= --disable-ttf
+.endif
+
+.if ${ARCH} == "i386"
+.if defined(WITHOUT_MMX)
+CONFIGURE_ARGS+=--disable-mmx
+.else
+CONFIGURE_ARGS+=--enable-mmx
+BUILD_DEPENDS+=	nasm-0.98:${PORTSDIR}/devel/nasm
+.endif
+.endif
+
+pre-everything:
+.ifndef(WITH_SDL)
+	@${ECHO_MSG} '===> Define WITH_SDL to use SDL support'
+.endif
+.ifndef(WITH_FREETYPE)
+	@${ECHO_MSG} '===> Define WITH_FREETYPE to use FreeType support'
+.endif
+.if ${ARCH} == "i386"
+.if !defined(WITHOUT_MMX)
+	@${ECHO_MSG} '===> Define WITHOUT_MMX to disable MMX routines'
+.endif
+.endif
+
+post-extract:
+	@${CP} ${WRKSRC}/INSTALL ${WRKSRC}/doc/INSTALL
+
+post-patch:
+	@for file in `${FIND} ${WRKSRC}/src -type f | ${XARGS} ${GREP} '<SDL/SDL' /dev/null | ${SED} -e 's/:.*//'`; do \
+		${SED} -e s@\<SDL/@\<@ $${file} > $${file}.new; \
+		mv -f $${file}.new $${file}; \
+	done
+
+pre-configure:
+	@${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in \
+		${WRKSRC}/src/Makefile.in ${WRKSRC}/configure.in \
+		${WRKSRC}/stamp-h.in ${WRKSRC}/configure
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xsystem35 ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/../contrib/instgame ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xsystem35 ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/instgame ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/share/locale/ja/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/po/ja.mo ${PREFIX}/share/locale/ja/LC_MESSAGES/xsystem35.mo
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/ja/xsystem35
-	(cd ${WRKSRC}/../doc;\
+	(cd ${WRKSRC}/doc;\
 		${INSTALL_MAN} ${DOC_FILES} ${PREFIX}/share/doc/ja/xsystem35)
 .endif
 	@${MKDIR} ${PREFIX}/share/examples/xsystem35
-	${INSTALL_DATA} ${WRKSRC}/xsys35rc.sample ${PREFIX}/share/examples/xsystem35
-	@(cd ${WRKSRC}/../contrib; \
+	${INSTALL_DATA} ${WRKSRC}/src/xsys35rc.sample ${PREFIX}/share/examples/xsystem35
+	@(cd ${WRKSRC}/contrib; \
 		${INSTALL_DATA} ${EXAMPLES} ${PREFIX}/share/examples/xsystem35)
+	@(cd ${WRKSRC}/patch; \
+		${INSTALL_DATA} ${PATCHES} ${PREFIX}/share/examples/xsystem35)
 	@${SED} -e s,PREFIX,${PREFIX}, ${PKGDIR}/pkg-message > ${WRKSRC}/MESSAGE
 	@${CAT} ${WRKSRC}/MESSAGE
 
diff -durN xsystem35.ORIG/distinfo xsystem35/distinfo
--- xsystem35.ORIG/distinfo	Wed Feb  9 22:43:03 2000
+++ xsystem35/distinfo	Wed Dec  5 22:39:53 2001
@@ -1 +1 @@
-MD5 (xsystem35-1.2.5-1.tar.gz) = dc84549b4fc5b7b6c5251f3205290465
+MD5 (xsystem35-1.4.2.tar.gz) = d775ddb4ae2c355ee416efbfb4bbc7f3
diff -durN xsystem35.ORIG/files/patch-af xsystem35/files/patch-af
--- xsystem35.ORIG/files/patch-af	Mon Jan 22 03:58:15 2001
+++ xsystem35/files/patch-af	Thu Jan  1 09:00:00 1970
@@ -1,32 +0,0 @@
---- Imakefile.orig	Sun Jan  9 02:23:15 2000
-+++ Imakefile	Sun Jan 21 15:45:27 2001
-@@ -28,7 +28,6 @@
-   OSDEPDEF = -DUSE_OSS
-   OSDEPINC = -I/usr/local/lib/oss/include
- ****/
--OSDEPLIB = -lxpg4
- CDROM_S  = cdrom.FreeBSD
- AUDIO_IO = audioIO_oss
- JOY_S    = joystick_dmy
-@@ -160,13 +159,13 @@
- /*
-  * include / library / definition
-  */
--SYS_LIBRARIES   = -lm `gtk-config --libs`
-+SYS_LIBRARIES   = -lm `$(GTK_CONFIG) --libs`
- #ifdef ENABLE_ESD
- EXTRA_LIBRARIES = $(OSDEPLIB) -lesd
- #else
- EXTRA_LIBRARIES = $(OSDEPLIB)
- #endif
--EXTRA_INCLUDES  = `gtk-config --cflags` $(OSDEPINC)
-+EXTRA_INCLUDES  = `$(GTK_CONFIG) --cflags` $(OSDEPINC)
- EXTRA_DEFINES   = $(OSDEPDEF)
- 
- /*
-@@ -196,4 +195,4 @@
- /*
-  * install program
-  */
--ComplexProgramTarget(xsystem35)
-+ComplexProgramTargetNoMan(xsystem35)
diff -durN xsystem35.ORIG/pkg-plist xsystem35/pkg-plist
--- xsystem35.ORIG/pkg-plist	Mon Jan 22 03:58:15 2001
+++ xsystem35/pkg-plist	Wed Dec  5 22:35:45 2001
@@ -1,45 +1,53 @@
 bin/instgame
 bin/xsystem35
+share/locale/ja/LC_MESSAGES/xsystem35.mo
 %%PORTDOCS%%share/doc/ja/xsystem35/BUGS
 %%PORTDOCS%%share/doc/ja/xsystem35/ChangeLog
+%%PORTDOCS%%share/doc/ja/xsystem35/ChangeLog.1
 %%PORTDOCS%%share/doc/ja/xsystem35/FAQ
+%%PORTDOCS%%share/doc/ja/xsystem35/GAMES.TXT
 %%PORTDOCS%%share/doc/ja/xsystem35/GRFMT.TXT
 %%PORTDOCS%%share/doc/ja/xsystem35/INSTALL
 %%PORTDOCS%%share/doc/ja/xsystem35/MISCGAME.TXT
 %%PORTDOCS%%share/doc/ja/xsystem35/README
 %%PORTDOCS%%share/doc/ja/xsystem35/README.color
 %%PORTDOCS%%share/doc/ja/xsystem35/README.joystick
-%%PORTDOCS%%share/doc/ja/xsystem35/README.miko
 %%PORTDOCS%%share/doc/ja/xsystem35/README.music
-%%PORTDOCS%%share/doc/ja/xsystem35/README.pastel
+%%PORTDOCS%%share/doc/ja/xsystem35/TECH.TXT
 %%PORTDOCS%%share/doc/ja/xsystem35/THANKS
 %%PORTDOCS%%share/doc/ja/xsystem35/TODO
 share/examples/xsystem35/README.TXT
+share/examples/xsystem35/456atlach.inf
+share/examples/xsystem35/456ningen.inf
+share/examples/xsystem35/456zero.inf
 share/examples/xsystem35/ambi.inf
-share/examples/xsystem35/atlach.inf
+share/examples/xsystem35/atlach_new.inf
 share/examples/xsystem35/dalk.inf
 share/examples/xsystem35/darcrows.inf
 share/examples/xsystem35/diabo.inf
 share/examples/xsystem35/drstop.inf
 share/examples/xsystem35/hushaby.inf
+share/examples/xsystem35/kakurezuki.inf
 share/examples/xsystem35/katsumi.inf
 share/examples/xsystem35/kichiku.inf
 share/examples/xsystem35/mamatoto.inf
 share/examples/xsystem35/mamori.inf
 share/examples/xsystem35/miko.inf
 share/examples/xsystem35/mugen.inf
-share/examples/xsystem35/ningen.inf
 share/examples/xsystem35/oudou.inf
 share/examples/xsystem35/panyo.inf
+share/examples/xsystem35/panyo_new.inf
 share/examples/xsystem35/pascha.inf
+share/examples/xsystem35/persiom.inf
 share/examples/xsystem35/progood.inf
 share/examples/xsystem35/rance1.inf
 share/examples/xsystem35/rance2.inf
 share/examples/xsystem35/rance3.inf
 share/examples/xsystem35/rance4.inf
+share/examples/xsystem35/seeinao.inf
 share/examples/xsystem35/toushin.inf
 share/examples/xsystem35/toushin2.inf
 share/examples/xsystem35/xsys35rc.sample
-share/examples/xsystem35/zero.inf
+share/examples/xsystem35/pastel.diff
 %%PORTDOCS%%@dirrm share/doc/ja/xsystem35
 @dirrm share/examples/xsystem35
>Release-Note:
>Audit-Trail:
>Unformatted:

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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20011208133242.51579.qmail>