Date: Thu, 2 May 2013 21:14:27 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317150 - in head/print: ghostscript7 ghostscript8 ghostscript8/files ghostscript9 ghostscript9-agpl Message-ID: <201305022114.r42LERG5028846@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Thu May 2 21:14:26 2013 New Revision: 317150 URL: http://svnweb.freebsd.org/changeset/ports/317150 Log: - Use OPTIONS_MULTI and OPTIONS_GROUP. - Add dependency on libpaper unconditionally to 8.x and 9.x. - Fix CONFLICTS_INSTALL. - Remove ABI version numbers from LIB_DEPENDS. Modified: head/print/ghostscript7/Makefile head/print/ghostscript7/Makefile.drivers head/print/ghostscript8/Makefile head/print/ghostscript8/Makefile.drivers head/print/ghostscript8/files/Makefile.drivers_post head/print/ghostscript9-agpl/Makefile head/print/ghostscript9-agpl/Makefile.drivers head/print/ghostscript9/Makefile head/print/ghostscript9/Makefile.drivers Modified: head/print/ghostscript7/Makefile ============================================================================== --- head/print/ghostscript7/Makefile Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript7/Makefile Thu May 2 21:14:26 2013 (r317150) @@ -25,9 +25,13 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/j png15:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -CONFLICTS_INSTALL= gambc-[0-9]* ghostscript[89]-[0-9]* \ - ghostscript[89]-nox11-[0-9]* \ - ghostscript9-agpl-*-[0-9]* +CONFLICTS_INSTALL= \ + gambc-[0-9]* \ + ghostscript[89]-[0-9]* \ + ghostscript[89]-nox11-[0-9]* \ + ghostscript9-agpl-[0-9]* \ + ghostscript9-agpl-nox11-[0-9]* + USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes @@ -50,8 +54,8 @@ XCFLAGS= ${PTHREAD_CFLAGS} XLDFLAGS= -L${LOCALBASE}/lib -L${WRKSRC}/gimp-print ${PTHREAD_LIBS} PLIST_SUB= GS_VERSION="${PORTVERSION}" -OPTIONS_DEFINE= DOCS A4SIZE X11 -OPTIONS_DEFAULT= A4SIZE X11 +OPTIONS_DEFINE= X11 DOCS A4SIZE +OPTIONS_DEFAULT=X11 DOCS A4SIZE NO_OPTIONS_SORT=yes A4SIZE_DESC= Set A4 (not Letter) as the default paper size Modified: head/print/ghostscript7/Makefile.drivers ============================================================================== --- head/print/ghostscript7/Makefile.drivers Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript7/Makefile.drivers Thu May 2 21:14:26 2013 (r317150) @@ -12,14 +12,16 @@ OPTIONS_X11= \ GS_x11mono \ GS_x11rg16x \ GS_x11rg32x +OPTIONS_MULTI= X11 +OPTIONS_MULTI_X11= ${OPTIONS_X11} OPTIONS_SVGALIB= \ GS_lvga256 \ GS_vgalib +OPTIONS_GROUP= SVGALIB +OPTIONS_GROUP_SVGALIB= ${OPTIONS_SVGALIB} OPTIONS_DEFINE+= \ - ${OPTIONS_X11} \ - ${OPTIONS_SVGALIB} \ GS_md2k \ GS_md5k \ GS_md50Mono \ Modified: head/print/ghostscript8/Makefile ============================================================================== --- head/print/ghostscript8/Makefile Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript8/Makefile Thu May 2 21:14:26 2013 (r317150) @@ -3,7 +3,7 @@ PORTNAME= ghostscript PORTVERSION= 8.71 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ @@ -26,11 +26,16 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ jbig2dec:${PORTSDIR}/graphics/jbig2dec \ jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ + paper:${PORTSDIR}/print/libpaper \ tiff:${PORTSDIR}/graphics/tiff RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -CONFLICTS_INSTALL= gambc-[0-9]* ghostscript[79]-[0-9]* \ - ghostscript[79]-*-[0-9]* +CONFLICTS_INSTALL= \ + gambc-[0-9]* \ + ghostscript[79]-[0-9]* \ + ghostscript[79]-nox11-[0-9]* \ + ghostscript9-agpl-[0-9]* \ + ghostscript9-agpl-nox11-[0-9]* USE_XZ= yes USE_GMAKE= yes @@ -45,18 +50,20 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ EXTRALIBS="${EXTRALIBS}" \ SOC_LOADER="dxmainc.c" CONFIGURE_ENV= ${MAKE_ENV} -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-compile-inits \ --enable-contrib \ --enable-dynamic \ --with-ijs \ --with-jasper \ + --with-libpaper \ --with-drivers="" CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/jasper/src/libjasper/include \ -I${LOCALBASE}/include/libpng15 \ -I${LOCALBASE}/include -XCFLAGS= ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib +XCFLAGS= ${PTHREAD_CFLAGS} \ + -DA4 XLDFLAGS= ${PTHREAD_LIBS} PLIST_SUB= GS_VERSION="${PORTVERSION}" \ @@ -65,9 +72,8 @@ SUB_FILES= pkg-message SUB_LIST= DATADIR=${DATADIR} PORTVERSION=${PORTVERSION} PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS_DEFINE= A4SIZE CAIRO CUPS FONTCONFIG FT_BRIDGE LIBPAPER GTK2 X11 -OPTIONS_DEFAULT= CAIRO CUPS FONTCONFIG LIBPAPER X11 -A4SIZE_DESC= Set A4 (not Letter) as the default paper size +OPTIONS_DEFINE= X11 DOCS CAIRO CUPS FONTCONFIG FT_BRIDGE GTK2 ICONV +OPTIONS_DEFAULT=X11 DOCS CAIRO CUPS FONTCONFIG ICONV FONTCONFIG_DESC=Enable fontconfig support FT_BRIDGE_DESC= Enable FreeType Bridge support NO_OPTIONS_SORT=yes @@ -98,32 +104,15 @@ PLIST_SUB+= GS_${D}="@comment " .endif .endfor -.if ${PORT_OPTIONS:MA4SIZE} -DEFAULTPAPERSIZE?= a4 -XCFLAGS+= -DA4 -MSG_PAPERSIZE= "NOTE: Default paper size will be A4." -.endif -DEFAULTPAPERSIZE?= letter - -.if ${PORT_OPTIONS:MLIBPAPER} -LIB_DEPENDS+= paper:${PORTSDIR}/print/libpaper -CONFIGURE_ARGS+= --with-libpaper -.if ${DEFAULTPAPERSIZE:L} == a4 -RUN_DEPENDS+= ${LOCALBASE}/etc/papersize:${PORTSDIR}/print/papersize-default-a4 -.endif -.else -CONFIGURE_ARGS+= --without-libpaper -.endif - .if ${PORT_OPTIONS:MFONTCONFIG} -LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --enable-fontconfig .else CONFIGURE_ARGS+= --disable-fontconfig .endif .if ${PORT_OPTIONS:MFT_BRIDGE} -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 MAKE_ENV+= FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".so" CPPFLAGS+= -I${LOCALBASE}/include/freetype2 PLIST_SUB+= FAPI="" @@ -151,9 +140,6 @@ PORTDOC_FILES= japanese/Gdevlips.htm jap lxm3200-tweaked/RELEASE_NOTES \ lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis -pre-everything:: - @${ECHO_MSG} ${MSG_PAPERSIZE} - post-patch: ${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \ s|%%GS_VERSION%%|${PORTVERSION}|g' \ @@ -179,7 +165,7 @@ pre-build-drivers.mak: pre-build: pre-build-drivers.mak ${MKDIR} ${WRKSRC}/obj ${MKDIR} ${WRKSRC}/bin -.if defined(WITH_FT_BRIDGE) +.if ${PORT_OPTIONS:MFT_BRIDGE} ${MKDIR} ${WRKSRC}/freetype/include ${LN} -s -f ${LOCALBASE}/include/ft2build.h \ ${WRKSRC}/freetype/include/ft2build.h @@ -201,7 +187,7 @@ post-install-docs: ${TAR} -cf - ${PORTDOC_FILES} | \ ( cd ${DOCSDIR} && ${TAR} -xof - ) -.if defined(WITH_FT_BRIDGE) +.if ${PORT_OPTIONS:MFT_BRIDGE} post-install-fapi: ${INSTALL_DATA} ${WRKSRC}/lib/FAPIcidfmap \ ${WRKSRC}/lib/FAPIconfig ${WRKSRC}/lib/FAPIfontmap \ @@ -219,7 +205,7 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: post-install-docs .endif Modified: head/print/ghostscript8/Makefile.drivers ============================================================================== --- head/print/ghostscript8/Makefile.drivers Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript8/Makefile.drivers Thu May 2 21:14:26 2013 (r317150) @@ -12,14 +12,20 @@ OPTIONS_X11= \ GS_x11mono \ GS_x11rg16x \ GS_x11rg32x +OPTIONS_MULTI= X11 +OPTIONS_MULTI_X11= ${OPTIONS_X11} OPTIONS_SVGALIB= \ GS_lvga256 \ GS_vgalib +OPTIONS_GROUP= SVGALIB +OPTIONS_GROUP_SVGALIB= ${OPTIONS_SVGALIB} OPTIONS_ICONV= \ GS_oprp \ GS_opvp +OPTIONS_GROUP+= ICONV +OPTIONS_GROUP_ICONV= ${OPTIONS_ICONV} OPTIONS_CAIRO= \ GS_cairo @@ -28,9 +34,6 @@ OPTIONS_CUPS= \ GS_cups OPTIONS_DEFINE+= \ - ${OPTIONS_X11} \ - ${OPTIONS_SVGALIB} \ - ${OPTIONS_ICONV} \ ${OPTIONS_CAIRO} \ ${OPTIONS_CUPS} \ GS_display \ Modified: head/print/ghostscript8/files/Makefile.drivers_post ============================================================================== --- head/print/ghostscript8/files/Makefile.drivers_post Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript8/files/Makefile.drivers_post Thu May 2 21:14:26 2013 (r317150) @@ -125,7 +125,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:NGS_${D}} .endfor .if defined(_CAIRO_DEVS) -LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo +LIB_DEPENDS+= cairo:${PORTSDIR}/graphics/cairo CONFIGURE_ARGS+= --enable-cairo .else CONFIGURE_ARGS+= --disable-cairo Modified: head/print/ghostscript9-agpl/Makefile ============================================================================== --- head/print/ghostscript9-agpl/Makefile Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript9-agpl/Makefile Thu May 2 21:14:26 2013 (r317150) @@ -2,6 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.07 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ @@ -25,12 +26,14 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ - lcms2:${PORTSDIR}/graphics/lcms2 + lcms2:${PORTSDIR}/graphics/lcms2 \ + paper:${PORTSDIR}/print/libpaper RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -CONFLICTS_INSTALL= gambc-[0-9]* ghostscript[789]-[0-9]* \ - ghostscript[78]-*-[0-9]* \ - ghostscript9-nox11-[0-9]* +CONFLICTS_INSTALL= \ + gambc-[0-9]* \ + ghostscript[789]-[0-9]* \ + ghostscript[789]-nox11-[0-9]* USE_BZIP2= yes USE_GMAKE= yes @@ -45,7 +48,6 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ EXTRALIBS="${EXTRALIBS}" \ SOC_LOADER="dxmainc.c" CONFIGURE_ENV= ${MAKE_ENV} -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-compile-inits \ --enable-contrib \ --enable-dynamic \ @@ -53,6 +55,7 @@ CONFIGURE_ARGS= --disable-compile-inits --with-ijs \ --with-libidn \ --without-jasper \ + --with-libpaper \ --with-drivers="" CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/lcms2/include \ @@ -60,7 +63,9 @@ CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/openjpeg/libopenjpeg \ -I${WRKSRC}/openjpeg \ -I${LOCALBASE}/include -XCFLAGS= ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib +XCFLAGS= ${PTHREAD_CFLAGS} \ + -DA4 XLDFLAGS= ${PTHREAD_LIBS} PLIST_SUB= GS_VERSION="${PORTVERSION}" \ @@ -69,9 +74,8 @@ SUB_FILES= pkg-message SUB_LIST= DATADIR=${DATADIR} PORTVERSION=${PORTVERSION} PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS_DEFINE= DOCS A4SIZE CUPS FONTCONFIG ICONV LIBPAPER GTK2 X11 -OPTIONS_DEFAULT= CUPS FONTCONFIG ICONV LIBPAPER X11 -A4SIZE_DESC= Set A4 (not Letter) as the default paper size +OPTIONS_DEFINE= X11 DOCS CUPS FONTCONFIG ICONV GTK2 +OPTIONS_DEFAULT=X11 DOCS CUPS FONTCONFIG ICONV FONTCONFIG_DESC=Enable fontconfig support NO_OPTIONS_SORT=yes @@ -102,23 +106,6 @@ PLIST_SUB+= GS_${D}="@comment " .endif .endfor -.if ${PORT_OPTIONS:MA4SIZE} -DEFAULTPAPERSIZE?= a4 -XCFLAGS+= -DA4 -MSG_PAPERSIZE= "NOTE: Default paper size will be A4." -.endif -DEFAULTPAPERSIZE?= letter - -.if ${PORT_OPTIONS:MLIBPAPER} -LIB_DEPENDS+= paper:${PORTSDIR}/print/libpaper -CONFIGURE_ARGS+= --with-libpaper -.if ${DEFAULTPAPERSIZE:L} == a4 -RUN_DEPENDS+= ${LOCALBASE}/etc/papersize:${PORTSDIR}/print/papersize-default-a4 -.endif -.else -CONFIGURE_ARGS+= --without-libpaper -.endif - .if ${PORT_OPTIONS:MFONTCONFIG} LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --enable-fontconfig @@ -150,9 +137,6 @@ PORTDOC_FILES= japanese/Gdevlips.htm jap lxm3200-tweaked/RELEASE_NOTES \ lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis -pre-everything:: - @${ECHO_MSG} ${MSG_PAPERSIZE} - post-patch: ${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \ s|%%GS_VERSION%%|${PORTVERSION}|g' \ @@ -205,7 +189,7 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.if !empty(PORT_OPTIONS:MDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: post-install-docs .endif Modified: head/print/ghostscript9-agpl/Makefile.drivers ============================================================================== --- head/print/ghostscript9-agpl/Makefile.drivers Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript9-agpl/Makefile.drivers Thu May 2 21:14:26 2013 (r317150) @@ -12,22 +12,25 @@ OPTIONS_X11= \ GS_x11mono \ GS_x11rg16x \ GS_x11rg32x +OPTIONS_MULTI= X11 +OPTIONS_MULTI_X11= ${OPTIONS_X11} OPTIONS_SVGALIB= \ GS_lvga256 \ GS_vgalib +OPTIONS_GROUP= SVGALIB +OPTIONS_GROUP_SVGALIB= ${OPTIONS_SVGALIB} OPTIONS_ICONV= \ GS_oprp \ GS_opvp +OPTIONS_GROUP+= ICONV +OPTIONS_GROUP_ICONV= ${OPTIONS_ICONV} OPTIONS_CUPS= \ GS_cups OPTIONS_DEFINE+= \ - ${OPTIONS_X11} \ - ${OPTIONS_SVGALIB} \ - ${OPTIONS_ICONV} \ ${OPTIONS_CUPS} \ GS_display \ GS_omni \ Modified: head/print/ghostscript9/Makefile ============================================================================== --- head/print/ghostscript9/Makefile Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript9/Makefile Thu May 2 21:14:26 2013 (r317150) @@ -2,7 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.06 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ @@ -26,11 +26,16 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ - lcms2:${PORTSDIR}/graphics/lcms2 + lcms2:${PORTSDIR}/graphics/lcms2 \ + paper:${PORTSDIR}/print/libpaper RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -CONFLICTS_INSTALL= gambc-[0-9]* ghostscript[78]-[0-9]* \ - ghostscript[78]-*-[0-9]* +CONFLICTS_INSTALL= \ + gambc-[0-9]* \ + ghostscript[78]-[0-9]* \ + ghostscript[78]-nox11-[0-9]* \ + ghostscript9-agpl-[0-9]* \ + ghostscript9-agpl-nox11-[0-9]* USE_BZIP2= yes USE_GMAKE= yes @@ -45,7 +50,6 @@ MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ EXTRALIBS="${EXTRALIBS}" \ SOC_LOADER="dxmainc.c" CONFIGURE_ENV= ${MAKE_ENV} -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-compile-inits \ --enable-contrib \ --enable-dynamic \ @@ -53,6 +57,7 @@ CONFIGURE_ARGS= --disable-compile-inits --with-ijs \ --with-libidn \ --without-jasper \ + --with-libpaper \ --with-drivers="" CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/lcms/include \ @@ -60,7 +65,9 @@ CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ -I${WRKSRC}/openjpeg/libopenjpeg \ -I${WRKSRC}/openjpeg \ -I${LOCALBASE}/include -XCFLAGS= ${PTHREAD_CFLAGS} +LDFLAGS+= -L${LOCALBASE}/lib +XCFLAGS= ${PTHREAD_CFLAGS} \ + -DA4 XLDFLAGS= ${PTHREAD_LIBS} PLIST_SUB= GS_VERSION="${PORTVERSION}" \ @@ -69,9 +76,8 @@ SUB_FILES= pkg-message SUB_LIST= DATADIR=${DATADIR} PORTVERSION=${PORTVERSION} PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS_DEFINE= A4SIZE CUPS FONTCONFIG ICONV LIBPAPER GTK2 X11 -OPTIONS_DEFAULT= CUPS FONTCONFIG ICONV LIBPAPER X11 -A4SIZE_DESC= Set A4 (not Letter) as the default paper size +OPTIONS_DEFINE= X11 DOCS CUPS FONTCONFIG ICONV GTK2 +OPTIONS_DEFAULT=X11 DOCS CUPS FONTCONFIG ICONV FONTCONFIG_DESC=Enable fontconfig support NO_OPTIONS_SORT=yes @@ -102,23 +108,6 @@ PLIST_SUB+= GS_${D}="@comment " .endif .endfor -.if ${PORT_OPTIONS:MA4SIZE} -DEFAULTPAPERSIZE?= a4 -XCFLAGS+= -DA4 -MSG_PAPERSIZE= "NOTE: Default paper size will be A4." -.endif -DEFAULTPAPERSIZE?= letter - -.if ${PORT_OPTIONS:MLIBPAPER} -LIB_DEPENDS+= paper:${PORTSDIR}/print/libpaper -CONFIGURE_ARGS+= --with-libpaper -.if ${DEFAULTPAPERSIZE:L} == a4 -RUN_DEPENDS+= ${LOCALBASE}/etc/papersize:${PORTSDIR}/print/papersize-default-a4 -.endif -.else -CONFIGURE_ARGS+= --without-libpaper -.endif - .if ${PORT_OPTIONS:MFONTCONFIG} LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --enable-fontconfig @@ -150,9 +139,6 @@ PORTDOC_FILES= japanese/Gdevlips.htm jap lxm3200-tweaked/RELEASE_NOTES \ lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis -pre-everything:: - @${ECHO_MSG} ${MSG_PAPERSIZE} - post-patch: ${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \ s|%%GS_VERSION%%|${PORTVERSION}|g' \ @@ -205,7 +191,7 @@ post-install: @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: post-install-docs .endif Modified: head/print/ghostscript9/Makefile.drivers ============================================================================== --- head/print/ghostscript9/Makefile.drivers Thu May 2 21:13:42 2013 (r317149) +++ head/print/ghostscript9/Makefile.drivers Thu May 2 21:14:26 2013 (r317150) @@ -12,22 +12,25 @@ OPTIONS_X11= \ GS_x11mono \ GS_x11rg16x \ GS_x11rg32x +OPTIONS_MULTI= X11 +OPTIONS_MULTI_X11= ${OPTIONS_X11} OPTIONS_SVGALIB= \ GS_lvga256 \ GS_vgalib +OPTIONS_GROUP= SVGALIB +OPTIONS_GROUP_SVGALIB= ${OPTIONS_SVGALIB} OPTIONS_ICONV= \ GS_oprp \ GS_opvp +OPTIONS_GROUP+= ICONV +OPTIONS_GROUP_ICONV= ${OPTIONS_ICONV} OPTIONS_CUPS= \ GS_cups OPTIONS_DEFINE+= \ - ${OPTIONS_X11} \ - ${OPTIONS_SVGALIB} \ - ${OPTIONS_ICONV} \ ${OPTIONS_CUPS} \ GS_display \ GS_omni \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305022114.r42LERG5028846>