Date: Thu, 3 Jul 2014 22:10:07 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360470 - in head/emulators: darcnes m2000 o2em stella wine yape Message-ID: <201407032210.s63MA7Bs012839@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Thu Jul 3 22:10:07 2014 New Revision: 360470 URL: http://svnweb.freebsd.org/changeset/ports/360470 QAT: https://qat.redports.org/buildarchive/r360470/ Log: Remove NOPORTDOCS, and convert some stuff to OPTIONS helpers. Modified: head/emulators/darcnes/Makefile head/emulators/m2000/Makefile head/emulators/o2em/Makefile head/emulators/stella/Makefile head/emulators/wine/Makefile head/emulators/yape/Makefile Modified: head/emulators/darcnes/Makefile ============================================================================== --- head/emulators/darcnes/Makefile Thu Jul 3 22:08:59 2014 (r360469) +++ head/emulators/darcnes/Makefile Thu Jul 3 22:10:07 2014 (r360470) @@ -23,6 +23,8 @@ USES= gmake MAKE_ARGS= CC="${CC}" TARGET_CC="${CC}" CXX="${CXX}" TARGET_CXX="${CXX}" \ AS="${AS}" TARGET_AS="${CC}" LD="${LD}" TARGET_LD="${CC}" +OPTIONS_DEFINE= DOCS + .include <bsd.port.pre.mk> .if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM) @@ -50,9 +52,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/darcnes ${STAGEDIR}${PREFIX}/bin -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.post.mk> Modified: head/emulators/m2000/Makefile ============================================================================== --- head/emulators/m2000/Makefile Thu Jul 3 22:08:59 2014 (r360469) +++ head/emulators/m2000/Makefile Thu Jul 3 22:10:07 2014 (r360470) @@ -46,6 +46,8 @@ USE_XORG= x11 xi SUB_FILES= m2000.sh PORTDOCS= M2000.txt +OPTIONS_DEFINE= DOCS + post-extract: ${MKDIR} ${WRKDIR}/tapeconv ${UNZIP_CMD} ${DISTDIR}/${DIST_SUBDIR}/tapeconv.zip -d ${WRKDIR}/tapeconv @@ -62,10 +64,8 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/P2000ROM.bin ${STAGEDIR}${DATADIR} @${INSTALL_DATA} ${WRKSRC}/Default.fnt ${STAGEDIR}${DATADIR} @${INSTALL_DATA} ${WRKSRC}/BASIC.bin ${STAGEDIR}${DATADIR} -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/M2000.txt ${STAGEDIR}${DOCSDIR} -.endif .for f in ${M2000TAPES} @${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f}.gz > ${WRKDIR}/${f} @${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${DATADIR} Modified: head/emulators/o2em/Makefile ============================================================================== --- head/emulators/o2em/Makefile Thu Jul 3 22:08:59 2014 (r360469) +++ head/emulators/o2em/Makefile Thu Jul 3 22:10:07 2014 (r360470) @@ -1,24 +1,26 @@ # Created by: Gunter Wambaugh <techgunter@yahoo.com> # $FreeBSD$ -PORTNAME= o2em -PORTVERSION= 1.17 -PORTREVISION= 2 -CATEGORIES= emulators games -MASTER_SITES= SF/${PORTNAME}/OldFiles:1 \ - http://o2em.sourceforge.net/files/:2 -DISTFILES= o2em117src.zip:1 \ - o2mainsamp.zip:2 +PORTNAME= o2em +PORTVERSION= 1.17 +PORTREVISION= 2 +CATEGORIES= emulators games +MASTER_SITES= SF/${PORTNAME}/OldFiles:1 \ + http://o2em.sourceforge.net/files/:2 +DISTFILES= o2em117src.zip:1 \ + o2mainsamp.zip:2 -MAINTAINER= techgunter@yahoo.com +MAINTAINER= techgunter@yahoo.com COMMENT= Odyssey2 / Videopac console emulator -LIB_DEPENDS= alleg:${PORTSDIR}/devel/allegro +LIB_DEPENDS= alleg:${PORTSDIR}/devel/allegro -WRKSRC= ${WRKDIR}/o2em117src -MAKEFILE= Makefile.freebsd -USES= gmake zip -LDFLAGS+= ${PTHREAD_LIBS} +WRKSRC= ${WRKDIR}/o2em117src +MAKEFILE= Makefile.freebsd +USES= gmake zip +LDFLAGS+= ${PTHREAD_LIBS} + +OPTIONS_DEFINE= DOCS post-extract: @${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|h|txt)" -print0 | \ @@ -32,12 +34,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/O2ROM.BIN ${STAGEDIR}${PREFIX}/${PORTNAME}/bios/o2rom.bin @${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/voice ${INSTALL_DATA} ${WRKDIR}/*.WAV ${STAGEDIR}${PREFIX}/${PORTNAME}/voice/ -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/O2EM.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/changelog.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/license.txt ${STAGEDIR}${DOCSDIR} -.endif post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/o2em/roms Modified: head/emulators/stella/Makefile ============================================================================== --- head/emulators/stella/Makefile Thu Jul 3 22:08:59 2014 (r360469) +++ head/emulators/stella/Makefile Thu Jul 3 22:10:07 2014 (r360470) @@ -21,6 +21,8 @@ HAS_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +OPTIONS_DEFINE= DOCS + post-patch: @${REINPLACE_CMD} -e \ 's|=sdl-config|="$$SDL_CONFIG"|g' ${WRKSRC}/configure @@ -29,10 +31,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/stella ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/emucore/stella.pro ${STAGEDIR}${DATADIR} -.if !defined(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/docs && ${FIND} . | \ ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk> Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Thu Jul 3 22:08:59 2014 (r360469) +++ head/emulators/wine/Makefile Thu Jul 3 22:10:07 2014 (r360470) @@ -48,11 +48,12 @@ SHEBANG_FILES= tools/winemaker tools/win USE_BZIP2= yes USE_GL= glu USE_XORG= xcomposite xcursor xi xpm xrandr xrender +OPTIONS_SUB= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS_DEFINE= CUPS DOSBOX GNUTLS HAL LDAP LIBXSLT OPENAL WINEMAKER GECKO MONO +OPTIONS_DEFINE= CUPS DOSBOX GNUTLS HAL LDAP LIBXSLT OPENAL WINEMAKER GECKO MONO DOCS DOSBOX_DESC= Use DOSBox to run MS-DOS programs LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) WINEMAKER_DESC= Fully support winemaker (requires Perl) @@ -66,66 +67,32 @@ PORTDATA= fonts/ generic.ppd l_intl.nls PORTSCOUT= limitw:1,even -.include <bsd.port.pre.mk> +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_CONFIGURE_WITH= cups -.if ${PORT_OPTIONS:MCUPS} -CONFIGURE_ARGS+= --with-cups -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client -.else -CONFIGURE_ARGS+= --without-cups -.endif +DOSBOX_RUN_DEPENDS= dosbox:${PORTSDIR}/emulators/dosbox -.if ${PORT_OPTIONS:MDOSBOX} -RUN_DEPENDS+= dosbox:${PORTSDIR}/emulators/dosbox -.endif +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls -.if ${PORT_OPTIONS:MGNUTLS} -CONFIGURE_ARGS+= --with-gnutls -LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls -.else -CONFIGURE_ARGS+= --without-gnutls -.endif +HAL_LIB_DEPENDS= libhal.so:${PORTSDIR}/sysutils/hal +HAL_CONFIGURE_WITH= hal -.if ${PORT_OPTIONS:MHAL} -CONFIGURE_ARGS+= --with-hal -LIB_DEPENDS+= libhal.so:${PORTSDIR}/sysutils/hal -.else -CONFIGURE_ARGS+= --without-hal -.endif +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_WITH= ldap -.if ${PORT_OPTIONS:MLDAP} -CONFIGURE_ARGS+= --with-ldap -USE_OPENLDAP= yes -.else -CONFIGURE_ARGS+= --without-ldap -.endif +LIBXSLT_LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt +LIBXSLT_CONFIGURE_WITH= xslt -.if ${PORT_OPTIONS:MLIBXSLT} -CONFIGURE_ARGS+= --with-xslt -LIB_DEPENDS+= libxslt.so:${PORTSDIR}/textproc/libxslt -.else -CONFIGURE_ARGS+= --without-xslt -.endif +OPENAL_CONFIGURE_WITH= openal -.if ${PORT_OPTIONS:MOPENAL} -CONFIGURE_ARGS+= --with-openal -PLIST_SUB+= OPENAL="" -.else -CONFIGURE_ARGS+= --without-openal -PLIST_SUB+= OPENAL="@comment " -.endif +WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML -.if ${PORT_OPTIONS:MWINEMAKER} -RUN_DEPENDS+= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML -.endif +GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko -.if ${PORT_OPTIONS:MGECKO} -RUN_DEPENDS+= ${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko -.endif +MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono -.if ${PORT_OPTIONS:MMONO} -RUN_DEPENDS+= ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono -.endif +.include <bsd.port.pre.mk> .if ${OSVERSION} < 800000 IGNORE= lacks required sound support on FreeBSD before 8.0 @@ -138,15 +105,11 @@ post-install: @${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \ ${STAGEDIR}${WINELIBDIR}/libwine.so.1 @${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so -.if !defined(NOPORTDOCS) -@${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ANNOUNCE AUTHORS @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor @${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg @${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump -.endif - @${ECHO} - @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> Modified: head/emulators/yape/Makefile ============================================================================== --- head/emulators/yape/Makefile Thu Jul 3 22:08:59 2014 (r360469) +++ head/emulators/yape/Makefile Thu Jul 3 22:10:07 2014 (r360470) @@ -19,6 +19,8 @@ ALL_TARGET= yape PLIST_FILES= bin/yape PORTDOCS= README.SDL +OPTIONS_DEFINE= DOCS + post-extract: @${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|cpp|h|txt)" -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' @@ -32,9 +34,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/yape ${STAGEDIR}${PREFIX}/bin post-install: -.ifndef(NOPORTDOCS) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.SDL ${STAGEDIR}${DOCSDIR} -.endif .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407032210.s63MA7Bs012839>