Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -7823,3 +7823,10 @@ sysutils/rubygem-bundler17||2015-08-13|Has expired: not used by other ports anymore sysutils/fpkg||2015-08-15|Has expired: Does not support pkg(8) games/galaxymage||2015-08-16|Has expired: Runtime broken and abandoned upstream +graphics/libwmf-nox11|graphics/libwmf|2015-08-1X| +graphics/ImageMagick-nox11|graphics/ImageMagick|2015-08-1X| +graphics/ImageMagick7-nox11|graphics/ImageMagick7|2015-08-1X| +print/ghostscript7-nox11|print/ghostscript7|2015-08-1X| +print/ghostscript8-nox11|print/ghostscript8|2015-08-1X| +print/ghostscript9-agpl-nox11|print/ghostscript9-agpl|2015-08-1X| +print/ghostscript9-nox11|print/ghostscript9|2015-08-1X| Index: Mk/Uses/ghostscript.mk =================================================================== --- Mk/Uses/ghostscript.mk +++ Mk/Uses/ghostscript.mk @@ -4,7 +4,7 @@ # # Feature: ghostscript # Usage: USES=ghostscript or USES=ghostscript:args -# Valid ARGS: , build, run, nox11 +# Valid ARGS: , build, run # # version The chooseable versions are 7, 8 and 9. If no version is # specified version 9 is selected. @@ -13,7 +13,6 @@ # USES=ghostscript:run # Use the set default Ghostscript as a run dependancy # USES=ghostscript:8,build # Use ghostscript 8 as a build dependancy. # -# nox11 Indicate that the Ghostscript nox11 port is required. # build Indicates that Ghostscript is needed at build time and adds # it as BUILD_DEPENDS. # run Indicates that Ghostscript is needed at run time and adds @@ -32,7 +31,7 @@ _GS_ARGS= ${ghostscript_ARGS} -.if ${_GS_ARGS:N[789]:Nnox11:Nbuild:Nrun} +.if ${_GS_ARGS:N[789]:Nbuild:Nrun} IGNORE?= Unknown ghostscript argument ${_GS_ARGS} .endif @@ -85,16 +84,7 @@ .endif # dependencies -_GS_PORT= ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}${_GS_NOX11_SUFFIX} - -.undef _GS_NOX11_SUFFIX -.if ${_GS_ARGS:Mnox11} || \ - (defined(OPTIONS_DEFINE) && defined(PORT_OPTIONS) && \ - ${OPTIONS_DEFINE:MX11} && ${PORT_OPTIONS:MX11} == "") -# XXX -#DEPENDS_ARGS+= print_${_GS_PORT}_UNSET_FORCE+=X11 -_GS_NOX11_SUFFIX= -nox11 -.endif +_GS_PORT= ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX} .if defined(_GS_BUILD_DEP) BUILD_DEPENDS+= gs:${PORTSDIR}/print/${_GS_PORT} Index: audio/beets/Makefile =================================================================== --- audio/beets/Makefile +++ audio/beets/Makefile @@ -70,14 +70,8 @@ WEB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask>=0:${PORTSDIR}/www/py-flask WEB_CORS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Flask-Cors>=0:${PORTSDIR}/www/py-flask-cors -.include - -.if ! ${PORT_OPTIONS:MX11} -IMAGEMAGICK_RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick-nox11 -.endif - post-install: ${INSTALL} ${WRKSRC}/man/beet.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL} ${WRKSRC}/man/beetsconfig.5 ${STAGEDIR}${PREFIX}/man/man5/ -.include +.include Index: devel/aegis/Makefile =================================================================== --- devel/aegis/Makefile +++ devel/aegis/Makefile @@ -12,11 +12,10 @@ LICENSE= GPLv3 -BUILD_DEPENDS= ps2pdf:${PORTSDIR}/print/ghostscript9-nox11 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= tkdiff:${PORTSDIR}/textproc/tkdiff -USES= gettext perl5 tk +USES= gettext ghostscript:build perl5 tk USE_GNOME= libxml2 USE_GCC= any GNU_CONFIGURE= yes Index: graphics/GraphicsMagick/Makefile =================================================================== --- graphics/GraphicsMagick/Makefile +++ graphics/GraphicsMagick/Makefile @@ -17,7 +17,8 @@ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff \ - libfreetype.so:${PORTSDIR}/print/freetype2 + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libwmflite.so:${PORTSDIR}/graphics/libwmf PORTSCOUT= limit:^1\.3\. @@ -51,7 +52,6 @@ TESTS_RUN_DEPENDS= webfonts>0:${PORTSDIR}/x11-fonts/webfonts WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp WEBP_CONFIGURE_WITH= webp -X11_LIB_DEPENDS= libwmflite.so:${PORTSDIR}/graphics/${LIBWMF_PORT} X11_USE= XORG=xext X11_CONFIGURE_WITH= x @@ -83,12 +83,6 @@ .endif .endif -.if ${PORT_OPTIONS:MX11} -LIBWMF_PORT= libwmf -.else -LIBWMF_PORT= libwmf-nox11 -.endif - .include .if !defined(WINDOWS_FONT_DIR) Index: graphics/ImageMagick-nox11/Makefile =================================================================== --- graphics/ImageMagick-nox11/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: mm@FreeBSD.org -# $FreeBSD$ - -# the SVG and PANGO plugins need X11 -OPTIONS_EXCLUDE= X11 SVG PANGO -PORTSCOUT= ignore:1 -# workaround until bsd.port.mk code can grok the disabling of the X11 option -WITHOUT_X11=yes - -MASTERDIR= ${.CURDIR}/../ImageMagick - -.include "${MASTERDIR}/Makefile" Index: graphics/ImageMagick/Makefile =================================================================== --- graphics/ImageMagick/Makefile +++ graphics/ImageMagick/Makefile @@ -220,11 +220,7 @@ .if ${PORT_OPTIONS:MGSLIB} CONFIGURE_ARGS+= --with-gslib -. if ${PORT_OPTIONS:MX11} USES+= ghostscript -. else -USES+= ghostscript:nox11 -. endif .else CONFIGURE_ARGS+= --without-gslib .endif @@ -326,11 +322,7 @@ # WMF (Windows Meta File) images .if ${PORT_OPTIONS:MWMF} -. if ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libwmf.so:${PORTSDIR}/graphics/libwmf -. else -LIB_DEPENDS+= libwmf.so:${PORTSDIR}/graphics/libwmf-nox11 -. endif CONFIGURE_ARGS+= --with-wmf=yes PLIST_SUB+= WMF="" .else @@ -357,20 +349,13 @@ # PDF (Adobe Portable Document Format) support .if ${PORT_OPTIONS:MPDF} -. if ${PORT_OPTIONS:MX11} USES+= ghostscript -. else -USES+= ghostscript:nox11 -. endif .endif .if ! ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --without-x -CONFLICTS+= ImageMagick-6* PLIST_SUB+= X11='@comment ' -PKGNAMESUFFIX= -nox11 .else -CONFLICTS+= ImageMagick-nox11-6* CONFLICTS+= display-[0-9]* CONFIGURE_ARGS+= --with-x USE_XORG= xext xt @@ -384,11 +369,7 @@ .endif .if ${PORT_OPTIONS:MTESTS} -. if ${PORT_OPTIONS:MX11} USES+= ghostscript:build -. else -USES+= ghostscript:build,nox11 -. endif .endif post-patch: Index: graphics/ImageMagick7-nox11/Makefile =================================================================== --- graphics/ImageMagick7-nox11/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: mm@FreeBSD.org -# $FreeBSD$ - -# the SVG and PANGO plugins need X11 -OPTIONS_EXCLUDE= X11 SVG PANGO -PORTSCOUT= ignore:1 -# workaround until bsd.port.mk code can grok the disabling of the X11 option -WITHOUT_X11=yes - -MASTERDIR= ${.CURDIR}/../ImageMagick7 - -.include "${MASTERDIR}/Makefile" Index: graphics/ImageMagick7/Makefile =================================================================== --- graphics/ImageMagick7/Makefile +++ graphics/ImageMagick7/Makefile @@ -226,11 +226,7 @@ .if ${PORT_OPTIONS:MGSLIB} CONFIGURE_ARGS+= --with-gslib -. if ${PORT_OPTIONS:MX11} USES+= ghostscript -. else -USES+= ghostscript:nox11 -. endif .else CONFIGURE_ARGS+= --without-gslib .endif @@ -332,11 +328,7 @@ # WMF (Windows Meta File) images .if ${PORT_OPTIONS:MWMF} -. if ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libwmf.so:${PORTSDIR}/graphics/libwmf -. else -LIB_DEPENDS+= libwmf.so:${PORTSDIR}/graphics/libwmf-nox11 -. endif CONFIGURE_ARGS+= --with-wmf=yes PLIST_SUB+= WMF="" .else @@ -363,20 +355,13 @@ # PDF (Adobe Portable Document Format) support .if ${PORT_OPTIONS:MPDF} -. if ${PORT_OPTIONS:MX11} USES+= ghostscript -. else -USES+= ghostscript:nox11 -. endif .endif .if ! ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --without-x -CONFLICTS+= ImageMagick7-* PLIST_SUB+= X11='@comment ' -PKGNAMESUFFIX= 7-nox11 .else -CONFLICTS+= ImageMagick7-nox11-* CONFLICTS+= display-[0-9]* CONFIGURE_ARGS+= --with-x USE_XORG= xext xt @@ -390,11 +375,7 @@ .endif .if ${PORT_OPTIONS:MTESTS} -. if ${PORT_OPTIONS:MX11} USES+= ghostscript:build -. else -USES+= ghostscript:build,nox11 -. endif .endif .if defined(USER) && ${USER} == kwm Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -10,9 +10,7 @@ SUBDIR += Hermes SUBDIR += IPA SUBDIR += ImageMagick - SUBDIR += ImageMagick-nox11 SUBDIR += ImageMagick7 - SUBDIR += ImageMagick7-nox11 SUBDIR += O2-tools SUBDIR += OpenEXR SUBDIR += R-cran-DiagrammeR @@ -534,7 +532,6 @@ SUBDIR += libvisual04 SUBDIR += libvisual04-plugins SUBDIR += libwmf - SUBDIR += libwmf-nox11 SUBDIR += libwpg SUBDIR += libwpg03 SUBDIR += lightzone Index: graphics/libwmf-nox11/Makefile =================================================================== --- graphics/libwmf-nox11/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: mm@FreeBSD.org -# $FreeBSD$ - -PKGNAMESUFFIX= -nox11 -PORTSCOUT= ignore:1 - -CONFLICTS= libwmf-[0-9]* -MASTERDIR= ${.CURDIR}/../libwmf -OPTIONS_EXCLUDE= X11 -OPTIONS_FILE_UNSET= X11 - -.include "${MASTERDIR}/Makefile" Index: graphics/libwmf/Makefile =================================================================== --- graphics/libwmf/Makefile +++ graphics/libwmf/Makefile @@ -16,8 +16,6 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ libfreetype.so:${PORTSDIR}/print/freetype2 -CONFLICTS?= libwmf-nox11-[0-9]* - GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sys-gd=no \ --with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \ Index: graphics/pecl-imagick/Makefile =================================================================== --- graphics/pecl-imagick/Makefile +++ graphics/pecl-imagick/Makefile @@ -14,10 +14,7 @@ LICENSE= PHP301 -OPTIONS_DEFINE= X11 - -X11_LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick -X11_LIB_DEPENDS_OFF= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11 +LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick USES= pkgconfig tar:tgz USE_PHP= yes Index: graphics/rubygem-mini_magick/Makefile =================================================================== --- graphics/rubygem-mini_magick/Makefile +++ graphics/rubygem-mini_magick/Makefile @@ -11,15 +11,11 @@ LICENSE= MIT -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT=X11 - NO_ARCH= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -X11_RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick -X11_RUN_DEPENDS_OFF= convert:${PORTSDIR}/graphics/ImageMagick-nox11 +RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick .include Index: graphics/rubygem-rmagick/Makefile =================================================================== --- graphics/rubygem-rmagick/Makefile +++ graphics/rubygem-rmagick/Makefile @@ -10,15 +10,11 @@ LICENSE= MIT -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT=X11 - USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes USES= pkgconfig -X11_LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick -X11_LIB_DEPENDS_OFF= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11 +LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick .include Index: multimedia/emby-server/Makefile =================================================================== --- multimedia/emby-server/Makefile +++ multimedia/emby-server/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ libmediainfo.so:${PORTSDIR}/multimedia/libmediainfo \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ - libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11 + libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick CONFLICTS_INSTALL= mediabrowser Index: print/Makefile =================================================================== --- print/Makefile +++ print/Makefile @@ -67,13 +67,9 @@ SUBDIR += ghostscript7-commfont SUBDIR += ghostscript7-jpnfont SUBDIR += ghostscript7-korfont - SUBDIR += ghostscript7-nox11 SUBDIR += ghostscript8 - SUBDIR += ghostscript8-nox11 SUBDIR += ghostscript9 SUBDIR += ghostscript9-agpl - SUBDIR += ghostscript9-agpl-nox11 - SUBDIR += ghostscript9-nox11 SUBDIR += gimp-gutenprint SUBDIR += gl2ps SUBDIR += gnome-cups-manager Index: print/ghostscript7-commfont/Makefile =================================================================== --- print/ghostscript7-commfont/Makefile +++ print/ghostscript7-commfont/Makefile @@ -27,11 +27,8 @@ CONFLICTS_INSTALL= \ ghostscript8-[0-9]* \ - ghostscript8-nox11-[0-9]* \ ghostscript9-[0-9]* \ - ghostscript9-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + ghostscript9-agpl-[0-9]* CMAPDIR?= ${LOCALBASE}/share/fonts/adobe-cmaps GS_RESDIR?= share/ghostscript/Resource Index: print/ghostscript7-nox11/Makefile =================================================================== --- print/ghostscript7-nox11/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Nik Clayton -# $FreeBSD$ - -print_ghostscript7-nox11_UNSET_FORCE+= X11 - -MASTERDIR= ${.CURDIR}/../ghostscript7 - -.include "${MASTERDIR}/Makefile" Index: print/ghostscript7/Makefile =================================================================== --- print/ghostscript7/Makefile +++ print/ghostscript7/Makefile @@ -24,9 +24,7 @@ CONFLICTS_INSTALL= \ gambc-[0-9]* \ ghostscript[89]-[0-9]* \ - ghostscript[89]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + ghostscript9-agpl-[0-9]* USES= gmake jpeg shebangfix tar:bzip2 USE_LDCONFIG= yes Index: print/ghostscript7/files/Makefile.drivers_post =================================================================== --- print/ghostscript7/files/Makefile.drivers_post +++ print/ghostscript7/files/Makefile.drivers_post @@ -52,11 +52,8 @@ CONFIGURE_ARGS+=--with-x \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib -CONFLICTS_INSTALL+= ghostscript7-nox11-[0-9]* .else # defined(_X11_DEVS) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11 CONFIGURE_ARGS+=--without-x -CONFLICTS_INSTALL+= ghostscript7-[0-9]* .endif # defined(_X11_DEVS) .if ${PORT_OPTIONS:MGS_cdj670} || \ Index: print/ghostscript8-nox11/Makefile =================================================================== --- print/ghostscript8-nox11/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# Created by: Nik Clayton -# $FreeBSD$ - -print_ghostscript8-nox11_UNSET_FORCE+= X11 - -MASTERDIR= ${.CURDIR}/../ghostscript8 - -.include "${MASTERDIR}/Makefile" Index: print/ghostscript8/Makefile =================================================================== --- print/ghostscript8/Makefile +++ print/ghostscript8/Makefile @@ -31,9 +31,7 @@ CONFLICTS_INSTALL= \ gambc-[0-9]* \ ghostscript[79]-[0-9]* \ - ghostscript[79]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + ghostscript9-agpl-[0-9]* USES= gmake jpeg pkgconfig tar:xz shebangfix SHEBANG_FILES= ${WRKSRC}/lib/fixmswrd.pl Index: print/ghostscript8/files/Makefile.drivers_post =================================================================== --- print/ghostscript8/files/Makefile.drivers_post +++ print/ghostscript8/files/Makefile.drivers_post @@ -82,7 +82,6 @@ CONFIGURE_ARGS+=--with-x \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib -CONFLICTS_INSTALL+= ghostscript8-nox11-[0-9]* .if ${PORT_OPTIONS:MGTK2} USE_GNOME= atk gdkpixbuf2 glib20 gtk20 CONFIGURE_ARGS+=--enable-gtk @@ -90,9 +89,7 @@ CONFIGURE_ARGS+=--disable-gtk .endif .else # defined(_X11_DEVS) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11 CONFIGURE_ARGS+=--without-x --disable-gtk -CONFLICTS_INSTALL+= ghostscript8-[0-9]* .endif # defined(_X11_DEVS) # iconv specific Index: print/ghostscript9-agpl-nox11/Makefile =================================================================== --- print/ghostscript9-agpl-nox11/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -print_ghostscript9-agpl-nox11_UNSET_FORCE+= X11 - -MASTERDIR= ${.CURDIR}/../ghostscript9-agpl - -.include "${MASTERDIR}/Makefile" Index: print/ghostscript9-agpl/Makefile =================================================================== --- print/ghostscript9-agpl/Makefile +++ print/ghostscript9-agpl/Makefile @@ -30,8 +30,7 @@ CONFLICTS_INSTALL= \ gambc-[0-9]* \ - ghostscript[789]-[0-9]* \ - ghostscript[789]-nox11-[0-9]* + ghostscript[789]-[0-9]* USES= gmake jpeg pkgconfig:build autoreconf tar:bzip2 iconv WANT_GNOME= yes Index: print/ghostscript9-agpl/files/Makefile.drivers_post =================================================================== --- print/ghostscript9-agpl/files/Makefile.drivers_post +++ print/ghostscript9-agpl/files/Makefile.drivers_post @@ -84,7 +84,6 @@ CONFIGURE_ARGS+=--with-x \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib -CONFLICTS_INSTALL+= ghostscript9-nox11-[0-9]* .if ${PORT_OPTIONS:MGTK2} USE_GNOME= atk gdkpixbuf2 glib20 gtk20 CONFIGURE_ARGS+=--enable-gtk @@ -92,9 +91,7 @@ CONFIGURE_ARGS+=--disable-gtk .endif .else # defined(_X11_DEVS) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11 CONFIGURE_ARGS+=--without-x --disable-gtk -CONFLICTS_INSTALL+= ghostscript9-[0-9]* X11BITS= "@comment " .endif # defined(_X11_DEVS) Index: print/ghostscript9-nox11/Makefile =================================================================== --- print/ghostscript9-nox11/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -print_ghostscript9-nox11_UNSET_FORCE+= X11 - -MASTERDIR= ${.CURDIR}/../ghostscript9 - -.include "${MASTERDIR}/Makefile" Index: print/ghostscript9/Makefile =================================================================== --- print/ghostscript9/Makefile +++ print/ghostscript9/Makefile @@ -31,9 +31,7 @@ CONFLICTS_INSTALL= \ gambc-[0-9]* \ ghostscript[78]-[0-9]* \ - ghostscript[78]-nox11-[0-9]* \ - ghostscript9-agpl-[0-9]* \ - ghostscript9-agpl-nox11-[0-9]* + ghostscript9-agpl-[0-9]* USES= gmake jpeg pkgconfig:build tar:bzip2 WANT_GNOME= yes Index: print/ghostscript9/files/Makefile.drivers_post =================================================================== --- print/ghostscript9/files/Makefile.drivers_post +++ print/ghostscript9/files/Makefile.drivers_post @@ -83,7 +83,6 @@ CONFIGURE_ARGS+=--with-x \ --x-includes=${LOCALBASE}/include \ --x-libraries=${LOCALBASE}/lib -CONFLICTS_INSTALL+= ghostscript9-nox11-[0-9]* .if ${PORT_OPTIONS:MGTK2} USE_GNOME= atk gdkpixbuf2 glib20 gtk20 CONFIGURE_ARGS+=--enable-gtk @@ -91,9 +90,7 @@ CONFIGURE_ARGS+=--disable-gtk .endif .else # defined(_X11_DEVS) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11 CONFIGURE_ARGS+=--without-x --disable-gtk -CONFLICTS_INSTALL+= ghostscript9-[0-9]* X11BITS= "@comment " .endif # defined(_X11_DEVS) Index: print/muttprint/Makefile =================================================================== --- print/muttprint/Makefile +++ print/muttprint/Makefile @@ -21,9 +21,7 @@ NO_BUILD= yes REINPLACE_ARGS= -i "" -OPTIONS_DEFINE= CUPS DOCS X11 -OPTIONS_DEFAULT= X11 -X11_DESC= graphics/ImageMagick[-nox11] dependency +OPTIONS_DEFINE= CUPS DOCS CUPS_RUN_DEPENDS= cupstestppd:${PORTSDIR}/print/cups-base \ espgs:${PORTSDIR}/print/cups-pstoraster @@ -44,11 +42,7 @@ INSTALL_TARGET=install-with-doc .endif -.if ${PORT_OPTIONS:MX11} RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick -.else -RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick-nox11 -.endif pre-everything:: @${ECHO} Index: security/p5-GD-SecurityImage/Makefile =================================================================== --- security/p5-GD-SecurityImage/Makefile +++ security/p5-GD-SecurityImage/Makefile @@ -17,8 +17,7 @@ BUILD_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD RUN_DEPENDS:= ${BUILD_DEPENDS} -OPTIONS_DEFINE= IMAGEMAGICK X11 -OPTIONS_DEFAULT=X11 +OPTIONS_DEFINE= IMAGEMAGICK IMAGEMAGICK_DESC= Build ImageMagick module PORTSCOUT= skipv:1.581 @@ -29,13 +28,8 @@ .include .if ${PORT_OPTIONS:MIMAGEMAGICK} -.if ${PORT_OPTIONS:MX11} IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick -.else -IMAGEMAGICK_BUILD_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11 -IMAGEMAGICK_RUN_DEPENDS= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11 -.endif .endif .include Index: textproc/docproj/Makefile =================================================================== --- textproc/docproj/Makefile +++ textproc/docproj/Makefile @@ -33,8 +33,8 @@ DEPENDS_ARGS+= BATCH=yes NO_BUILD= yes -OPTIONS_DEFINE= X11 CJK SVN IGOR FOP JING DBLATEX -OPTIONS_DEFAULT= X11 CJK IGOR +OPTIONS_DEFINE= CJK SVN IGOR FOP JING DBLATEX +OPTIONS_DEFAULT= CJK IGOR .if !exists(/usr/bin/svnlite) OPTIONS_DEFAULT+= SVN .endif @@ -70,10 +70,6 @@ .endif .endif -.if !${PORT_OPTIONS:MX11} -DEPENDS_ARGS+= OPTIONS_UNSET_FORCE+=X11 -.endif - # generate MINIMALDOCPORTS for src/release/Makefile.inc.docports. # (XXX: incomplete yet) minimaldocports: Index: www/MT/Makefile =================================================================== --- www/MT/Makefile +++ www/MT/Makefile @@ -40,7 +40,7 @@ p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser\ p5-libwww>=0:${PORTSDIR}/www/p5-libwww\ p5-SOAP-Lite>=0.5:${PORTSDIR}/net/p5-SOAP-Lite\ - convert:${PORTSDIR}/graphics/ImageMagick-nox11\ + convert:${PORTSDIR}/graphics/ImageMagick\ p5-GD>=0:${PORTSDIR}/graphics/p5-GD\ p5-Imager>=0:${PORTSDIR}/graphics/p5-Imager \ p5-Crypt-DSA>=0:${PORTSDIR}/security/p5-Crypt-DSA\ Index: www/gallery3/Makefile =================================================================== --- www/gallery3/Makefile +++ www/gallery3/Makefile @@ -24,7 +24,7 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= DCRAW FFMPEG GD GRAPHMAGICK IMAGEMAGICK JHEAD \ - NETPBM NLS UNZIP X11 + NETPBM NLS UNZIP OPTIONS_DEFAULT= IMAGEMAGICK JHEAD UNZIP .include @@ -52,11 +52,7 @@ .endif .if ${PORT_OPTIONS:MIMAGEMAGICK} -.if ${PORT_OPTIONS:MX11} RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick -.else -RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick-nox11 -.endif .endif .if ${PORT_OPTIONS:MJHEAD} Index: www/piwigo/Makefile =================================================================== --- www/piwigo/Makefile +++ www/piwigo/Makefile @@ -30,7 +30,7 @@ WWWOWN="${WWWOWN}" \ WWWGRP="${WWWGRP}" -OPTIONS_DEFINE= IMAGICK X11 DOCS EXAMPLES +OPTIONS_DEFINE= IMAGICK DOCS EXAMPLES OPTIONS_DEFAULT=IMAGICK IMAGICK_DESC= ${IMAGEMAGICK_DESC} @@ -42,11 +42,7 @@ .include .if ${PORT_OPTIONS:MIMAGICK} -.if ${PORT_OPTIONS:MX11} RUN_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick -.else -RUN_DEPENDS+= ${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick-nox11 -.endif .endif post-extract: Index: www/typo3-lts/Makefile =================================================================== --- www/typo3-lts/Makefile +++ www/typo3-lts/Makefile @@ -50,11 +50,7 @@ .include .if ${PORT_OPTIONS:MIMAGICK} -.if ${PORT_OPTIONS:MX11} RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick -.else -RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick-nox11 -.endif .endif do-install: Index: www/typo3/Makefile =================================================================== --- www/typo3/Makefile +++ www/typo3/Makefile @@ -47,11 +47,7 @@ .include .if ${PORT_OPTIONS:MIMAGICK} -.if ${PORT_OPTIONS:MX11} RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick -.else -RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick-nox11 -.endif .endif do-install: