Date: Tue, 2 Apr 2013 03:21:16 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/177559: emulators/xsystem35: Fix build Message-ID: <20130402032116.7bbb27dd77eb3a12f7bd7c2b@yahoo.com> Resent-Message-ID: <201304011840.r31Ie38U029688@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177559
>Category: ports
>Synopsis: emulators/xsystem35: Fix build
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 01 18:40:03 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Fix build
New file:
files/pkg-message.in
Remove file:
pkg-message
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/emulators/xsystem35/Makefile emulators/xsystem35/Makefile
--- /usr/ports/emulators/xsystem35/Makefile 2013-02-05 21:02:30.000000000 +0900
+++ emulators/xsystem35/Makefile 2013-03-31 01:18:27.000000000 +0900
@@ -10,44 +10,44 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= AliceSoft System 3.5/3.6/3.8/3.9 on X Window System
-BROKEN= Does not build
+LICENSE= GPLv2 # (or later)
-LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \
- jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \
+ jpeg:${PORTSDIR}/graphics/jpeg
-USE_AUTOTOOLS= autoconf libtool
+OPTIONS_DEFINE= ESOUND DOCS EXAMPLES
+
+USE_GNOME= gtk12
USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gtk12
-WANT_GNOME= yes
-
-PKGMESSAGE= ${WRKSRC}/MESSAGE
-
-DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME}
-PATCHES= pastel.diff
-
-.include <bsd.port.pre.mk>
-
+USE_AUTOTOOLS= autoconf libtool
CONFIGURE_ARGS= --without-included-gettext \
- --program-prefix="" \
--with-cachesize=20 \
--enable-midi=seq,extp,raw \
--enable-cdrom=bsd,mp3
+MAKE_JOBS_SAFE= yes
+
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.if ${HAVE_GNOME:Mesound}!=""
+SUB_FILES= pkg-message
+
+DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MESOUND}
USE_GNOME+= esound
CONFIGURE_ARGS+= --enable-audio=oss,esd --with-default-output=esd
.else
CONFIGURE_ARGS+= --enable-audio=oss --with-default-output=oss
.endif
-#.if defined(WITH_SDL)
+#.if ${PORT_OPTIONS:MSDL}
#USE_SDL= sdl
#CONFIGURE_ARGS+= --enable-sdl
-#CONFIGURE_ENV+= "CPPFLAGS=`$(SDL_CONFIG) --cflags`" \
-# "LIBS=`$(SDL_CONFIG) --libs`"
+#CPPFLAGS+= $$(${SDL_CONFIG} --cflags)
+#LDFLAGS+= $$(${SDL_CONFIG} --libs)
#.else
CONFIGURE_ARGS+= --disable-sdl
#.endif
@@ -59,11 +59,6 @@
CONFIGURE_ARGS+= --disable-mmx
.endif
-pre-everything::
-#.if !defined(WITH_SDL)
-# @${ECHO_MSG} '===> Define WITH_SDL to enable SDL support'
-#.endif
-
post-extract:
@${CP} ${WRKSRC}/INSTALL ${WRKSRC}/doc/INSTALL
@@ -71,24 +66,27 @@
${FIND} ${WRKSRC}/src -type f |\
${XARGS} ${GREP} -l '<SDL/SDL' /dev/null |\
${XARGS} ${REINPLACE_CMD} -e 's,<SDL/,<,'
+ @${REINPLACE_CMD} -e \
+ 's|__COUNTER__|__COUNTER_H__|' ${WRKSRC}/src/counter.h
pre-configure:
(cd ${WRKSRC}/libltdl; ${AUTOCONF})
post-install:
${INSTALL_SCRIPT} ${WRKSRC}/contrib/instgame ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
(cd ${WRKSRC}/doc;\
- ${INSTALL_MAN} * ${DOCSDIR})
+ ${INSTALL_DATA} * ${DOCSDIR})
.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
@${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/src/xsys35rc.sample ${EXAMPLESDIR}
@(cd ${WRKSRC}/contrib; \
${INSTALL_DATA} *.* ${EXAMPLESDIR})
@(cd ${WRKSRC}/patch; \
- ${INSTALL_DATA} ${PATCHES} ${EXAMPLESDIR})
- @${SED} -e s,PREFIX,${PREFIX}, ${PKGDIR}/pkg-message > ${WRKSRC}/MESSAGE
- @${CAT} ${WRKSRC}/MESSAGE
+ ${INSTALL_DATA} pastel.diff ${EXAMPLESDIR})
+.endif
+ @${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/emulators/xsystem35/files/pkg-message.in emulators/xsystem35/files/pkg-message.in
--- /usr/ports/emulators/xsystem35/files/pkg-message.in 1970-01-01 09:00:00.000000000 +0900
+++ emulators/xsystem35/files/pkg-message.in 2013-03-30 22:23:12.000000000 +0900
@@ -0,0 +1,15 @@
+
+o Make sure your kernel has been configured with options SHMMAXPGS=4096
+ when you run on display 16bpp or deeper color.
+
+o Copy %%PREFIX%%/share/example/xsystem35/xsys35rc.sample
+ to ~/.xsys35rc and fit it to your environment.
+
+o Install game data from AliceSoft's cdrom with
+ %%PREFIX%%/bin/instgame.
+
+o pcm0 sound device doesn't work well with this program for now.
+ Try snd0 instead, OSS commercial product or
+ `-devdsp none' command line option as the last resort.
+
+Enjoy!
diff -urN /usr/ports/emulators/xsystem35/pkg-message emulators/xsystem35/pkg-message
--- /usr/ports/emulators/xsystem35/pkg-message 2012-11-08 10:14:00.000000000 +0900
+++ emulators/xsystem35/pkg-message 1970-01-01 09:00:00.000000000 +0900
@@ -1,15 +0,0 @@
-
-o Make sure your kernel has been configured with options SHMMAXPGS=4096
- when you run on display 16bpp or deeper color.
-
-o Copy PREFIX/share/example/xsystem35/xsys35rc.sample
- to ~/.xsys35rc and fit it to your environment.
-
-o Install game data from AliceSoft's cdrom with
- PREFIX/bin/instgame.
-
-o pcm0 sound device doesn't work well with this program for now.
- Try snd0 instead, OSS commercial product or
- `-devdsp none' command line option as the last resort.
-
-Enjoy!
diff -urN /usr/ports/emulators/xsystem35/pkg-plist emulators/xsystem35/pkg-plist
--- /usr/ports/emulators/xsystem35/pkg-plist 2012-11-08 10:14:00.000000000 +0900
+++ emulators/xsystem35/pkg-plist 2013-03-31 00:07:47.000000000 +0900
@@ -87,52 +87,52 @@
%%PORTDOCS%%%%DOCSDIR%%/TECH.TXT
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%EXAMPLESDIR%%/20cDPS.inf
-%%EXAMPLESDIR%%/20cKaeru.inf
-%%EXAMPLESDIR%%/456atlach.inf
-%%EXAMPLESDIR%%/456ningen.inf
-%%EXAMPLESDIR%%/456zero.inf
-%%EXAMPLESDIR%%/README.TXT
-%%EXAMPLESDIR%%/ambi.inf
-%%EXAMPLESDIR%%/atlach_new.inf
-%%EXAMPLESDIR%%/chairs.inf
-%%EXAMPLESDIR%%/daiakuji.inf
-%%EXAMPLESDIR%%/dalk.inf
-%%EXAMPLESDIR%%/darcrows.inf
-%%EXAMPLESDIR%%/diabo.inf
-%%EXAMPLESDIR%%/diabo_new.inf
-%%EXAMPLESDIR%%/drstop.inf
-%%EXAMPLESDIR%%/esuka.inf
-%%EXAMPLESDIR%%/hushaby.inf
-%%EXAMPLESDIR%%/kakurezuki.inf
-%%EXAMPLESDIR%%/katsumi.inf
-%%EXAMPLESDIR%%/kichiku.inf
-%%EXAMPLESDIR%%/mamatoto.inf
-%%EXAMPLESDIR%%/mamori.inf
-%%EXAMPLESDIR%%/miko.inf
-%%EXAMPLESDIR%%/mugen.inf
-%%EXAMPLESDIR%%/nd.inf
-%%EXAMPLESDIR%%/onlyyou_r.inf
-%%EXAMPLESDIR%%/oudou.inf
-%%EXAMPLESDIR%%/panyo.inf
-%%EXAMPLESDIR%%/panyo_new.inf
-%%EXAMPLESDIR%%/pascha.inf
-%%EXAMPLESDIR%%/pastel.diff
-%%EXAMPLESDIR%%/persiom.inf
-%%EXAMPLESDIR%%/progood.inf
-%%EXAMPLESDIR%%/rance1.inf
-%%EXAMPLESDIR%%/rance2.inf
-%%EXAMPLESDIR%%/rance3.inf
-%%EXAMPLESDIR%%/rance4.inf
-%%EXAMPLESDIR%%/rance5d.inf
-%%EXAMPLESDIR%%/seeinao.inf
-%%EXAMPLESDIR%%/toushin.inf
-%%EXAMPLESDIR%%/toushin2.inf
-%%EXAMPLESDIR%%/tsuma.inf
-%%EXAMPLESDIR%%/tsuma2.inf
-%%EXAMPLESDIR%%/xsys35rc.sample
-%%EXAMPLESDIR%%/zero_new.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/20cDPS.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/20cKaeru.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/456atlach.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/456ningen.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/456zero.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.TXT
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ambi.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/atlach_new.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chairs.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/daiakuji.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dalk.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/darcrows.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diabo.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diabo_new.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drstop.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/esuka.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hushaby.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kakurezuki.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/katsumi.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kichiku.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mamatoto.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mamori.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/miko.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mugen.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nd.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/onlyyou_r.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oudou.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panyo.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panyo_new.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pascha.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pastel.diff
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/persiom.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/progood.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rance1.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rance2.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rance3.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rance4.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rance5d.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/seeinao.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toushin.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/toushin2.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tsuma.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tsuma2.inf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xsys35rc.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zero_new.inf
share/locale/ja/LC_MESSAGES/xsystem35.mo
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/xsystem35
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130402032116.7bbb27dd77eb3a12f7bd7c2b>