- Fix build New file: files/pkg-message.in Remove file: pkg-message
Responsible Changed From-To: freebsd-ports-bugs->miwi miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Remake of the patch against current tree.
State Changed From-To: open->closed Committed. Thanks!
Author: miwi Date: Fri Apr 26 06:56:29 2013 New Revision: 316577 URL: http://svnweb.freebsd.org/changeset/ports/316577 Log: - Fix build PR: 177559 Submitted by: Ports Fury Added: head/emulators/xsystem35/files/pkg-message.in (contents, props changed) Deleted: head/emulators/xsystem35/pkg-message Modified: head/emulators/xsystem35/Makefile head/emulators/xsystem35/pkg-plist (contents, props changed) Modified: head/emulators/xsystem35/Makefile ============================================================================== --- head/emulators/xsystem35/Makefile Fri Apr 26 06:48:12 2013 (r316576) +++ head/emulators/xsystem35/Makefile Fri Apr 26 06:56:29 2013 (r316577) @@ -10,44 +10,44 @@ MASTER_SITES= http://8ne.sakura.ne.jp:20 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 + +OPTIONS_DEFINE= ESOUND DOCS EXAMPLES -USE_AUTOTOOLS= autoconf libtool USES= gettext -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_GMAKE= yes +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 @@ BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/ 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 @@ post-patch: ${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> Added: head/emulators/xsystem35/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/xsystem35/files/pkg-message.in Fri Apr 26 06:56:29 2013 (r316577) @@ -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! Modified: head/emulators/xsystem35/pkg-plist ============================================================================== --- head/emulators/xsystem35/pkg-plist Fri Apr 26 06:48:12 2013 (r316576) +++ head/emulators/xsystem35/pkg-plist Fri Apr 26 06:56:29 2013 (r316577) @@ -87,52 +87,52 @@ lib/xsystem35/tDemo.so %%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 _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"