Date: Mon, 21 Jul 2014 17:47:53 +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: r362457 - in head: devel/ocaml-react editors/emacs-devel editors/emacs23 emulators/mtools graphics/pecl-imagick graphics/stamp lang/icon net/clusterit net/pfinger www/gallery3 www/webin... Message-ID: <201407211747.s6LHlrrV048535@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Mon Jul 21 17:47:52 2014 New Revision: 362457 URL: http://svnweb.freebsd.org/changeset/ports/362457 QAT: https://qat.redports.org/buildarchive/r362457/ Log: Remove some instances of WITHOUT_X11 and use an X11 OPTION instead. Modified: head/devel/ocaml-react/Makefile head/editors/emacs-devel/Makefile head/editors/emacs23/Makefile head/emulators/mtools/Makefile head/graphics/pecl-imagick/Makefile head/graphics/stamp/Makefile head/lang/icon/Makefile head/net/clusterit/Makefile head/net/pfinger/Makefile head/www/gallery3/Makefile head/www/webinject/Makefile Modified: head/devel/ocaml-react/Makefile ============================================================================== --- head/devel/ocaml-react/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/devel/ocaml-react/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -14,8 +14,13 @@ COMMENT= OCaml module for functional rea LICENSE= BSD3CLAUSE +OPTIONS_DEFINE= X11 + USE_OCAML= yes -.if defined (WITHOUT_X11) + +.include <bsd.port.options.mk> + +.if empty(PORT_OPTIONS:MX11) OCAMLC_DEPEND= ocaml-notk>=3.11:${OCAMLC_PORT} .else OCAMLC_DEPEND= ocaml>=3.11:${OCAMLC_PORT} Modified: head/editors/emacs-devel/Makefile ============================================================================== --- head/editors/emacs-devel/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/editors/emacs-devel/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -225,7 +225,7 @@ GNUTLS3_RPATH= post-patch: @${RM} -f ${WRKSRC}/info/* @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el -.if defined(WITHOUT_X11) +.if empty(PORT_OPTIONS:MX11) @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop .endif .if ${PORT_OPTIONS:MGNUTLS3} Modified: head/editors/emacs23/Makefile ============================================================================== --- head/editors/emacs23/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/editors/emacs23/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -177,7 +177,7 @@ BROKEN= Emacs 23.X does not currently bu post-patch: @${RM} -f ${WRKSRC}/info/* @${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el -.if defined(WITHOUT_X11) +.if empty(PORT_OPTIONS:MX11) @${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' ${WRKSRC}/etc/emacs.desktop .endif Modified: head/emulators/mtools/Makefile ============================================================================== --- head/emulators/mtools/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/emulators/mtools/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -43,7 +43,7 @@ PLIST_SUB= X11="" .else CONFIGURE_ARGS+= --without-x PLIST_SUB= X11="@comment " -MAKE_ENV+= WITHOUT_X11=${WITHOUT_X11} +MAKE_ENV+= WITHOUT_X11=yes .endif post-patch: Modified: head/graphics/pecl-imagick/Makefile ============================================================================== --- head/graphics/pecl-imagick/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/graphics/pecl-imagick/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -15,11 +15,10 @@ COMMENT= Provides a wrapper to the Image LICENSE= PHP301 -.if !defined(WITHOUT_X11) -LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick -.else -LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick-nox11 -.endif +OPTIONS_DEFINE= X11 + +X11_LIB_DEPENDS= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick +X11_LIB_DEPENDS_OFF= libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick-nox11 USES= pkgconfig USE_PHP= yes Modified: head/graphics/stamp/Makefile ============================================================================== --- head/graphics/stamp/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/graphics/stamp/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -15,9 +15,9 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -.if !defined(WITHOUT_X11) -USE_GNOME= gtk12 -.endif + +OPTIONS_DEFINE= X11 +X11_USE= GNOME=gtk12 post-patch: @${REINPLACE_CMD} -e 's#/usr/local/share/stamp#${DATADIR}#' \ Modified: head/lang/icon/Makefile ============================================================================== --- head/lang/icon/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/lang/icon/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -20,9 +20,11 @@ ICONDIR= ${PREFIX}/lib/${PORTNAME} BINS= icont iconx BINXS= colrbook colrpick fontpick palette vib wevents xgamma -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS X11 -.if defined(WITHOUT_X11) +.include <bsd.port.options.mk> + +.if empty(PORT_OPTIONS:MX11) CONFIG_CMD= Configure PLIST_SUB= WITHOUT_X11="@comment " .else @@ -60,7 +62,7 @@ do-install: @${LN} -sf ${ICONDIR}/bin/icont ${STAGEDIR}${PREFIX}/bin/icon @${MKDIR} ${STAGEDIR}${ICONDIR}/lib cd ${WRKSRC}/lib; ${INSTALL_DATA} *.* ${STAGEDIR}${ICONDIR}/lib -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} .for file in ${BINXS} ${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${STAGEDIR}${ICONDIR}/bin/${file} .endfor Modified: head/net/clusterit/Makefile ============================================================================== --- head/net/clusterit/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/net/clusterit/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -11,17 +11,16 @@ COMMENT= Collection of clustering tools GNU_CONFIGURE= yes -.include <bsd.port.pre.mk> +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT=X11 +OPTIONS_SUB= yes -.if defined (WITHOUT_X11) -PLIST_SUB+= X11='@comment ' -.else -PLIST_SUB+= X11='' -USE_XORG= x11 -.endif +X11_USE= XORG=x11 + +.include <bsd.port.options.mk> post-patch: -.if defined(WITHOUT_X11) +.if empty(PORT_OPTIONS:MX11) ${REINPLACE_CMD} -E 's,^(SUBDIRS) = .*,\1 = barrier dsh jsd pcp dtop tools,' ${WRKSRC}/Makefile.in .endif Modified: head/net/pfinger/Makefile ============================================================================== --- head/net/pfinger/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/net/pfinger/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -12,8 +12,13 @@ COMMENT= Highly configurable, secure, an CONFLICTS= gnu-finger-1.* +OPTIONS_DEFINE= X11 + GNU_CONFIGURE= yes -.if !defined(WITHOUT_X11) + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MX11} USE_GNOME= gtk12 PLIST_SUB+= WITHOUT_X11="" .else Modified: head/www/gallery3/Makefile ============================================================================== --- head/www/gallery3/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/www/gallery3/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -23,7 +23,7 @@ NO_BUILD= yes SUB_FILES= pkg-message OPTIONS_DEFINE= DCRAW FFMPEG GD GRAPHMAGICK IMAGEMAGICK JHEAD \ - NETPBM NLS UNZIP + NETPBM NLS UNZIP X11 OPTIONS_DEFAULT= IMAGEMAGICK JHEAD UNZIP .include <bsd.port.options.mk> @@ -51,7 +51,7 @@ RUN_DEPENDS+= gm:${PORTSDIR}/graphics/Gr .endif .if ${PORT_OPTIONS:MIMAGEMAGICK} -.if !defined(WITHOUT_X11) +.if ${PORT_OPTIONS:MX11} RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .else RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick-nox11 Modified: head/www/webinject/Makefile ============================================================================== --- head/www/webinject/Makefile Mon Jul 21 17:45:21 2014 (r362456) +++ head/www/webinject/Makefile Mon Jul 21 17:47:52 2014 (r362457) @@ -16,10 +16,10 @@ RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/ww p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \ p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay -.if !defined(WITHOUT_X11) +#.if !defined(WITHOUT_X11) # some work to do here #RUN_DEPENDS+= p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk -.endif +#.endif USES= perl5 shebangfix SHEBANG_FILES= webinject.pl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407211747.s6LHlrrV048535>