Date: Sat, 18 Jul 2015 18:43:56 +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: r392441 - in head/print/ghostscript9-agpl: . files Message-ID: <201507181843.t6IIhuG9017176@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Sat Jul 18 18:43:55 2015 New Revision: 392441 URL: https://svnweb.freebsd.org/changeset/ports/392441 Log: - Fix build breakage due to _XOPEN_VERSION macro. - Fix iconv dependency. - Remove unnecessary lines for libjasper. Added: head/print/ghostscript9-agpl/files/patch-trio-triodef.h (contents, props changed) Modified: head/print/ghostscript9-agpl/Makefile Modified: head/print/ghostscript9-agpl/Makefile ============================================================================== --- head/print/ghostscript9-agpl/Makefile Sat Jul 18 18:15:17 2015 (r392440) +++ head/print/ghostscript9-agpl/Makefile Sat Jul 18 18:43:55 2015 (r392441) @@ -2,6 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.16 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \ SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \ @@ -32,7 +33,7 @@ CONFLICTS_INSTALL= \ ghostscript[789]-[0-9]* \ ghostscript[789]-nox11-[0-9]* -USES= gmake jpeg pkgconfig:build autoreconf tar:bzip2 +USES= gmake jpeg pkgconfig:build autoreconf tar:bzip2 iconv WANT_GNOME= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes @@ -44,14 +45,13 @@ CONFIGURE_ENV= ${MAKE_ENV} CONFIGURE_ARGS= --disable-compile-inits \ --enable-contrib \ --enable-dynamic \ + --with-libiconv=native \ --with-system-libtiff \ --with-ijs \ --with-libidn \ - --without-jasper \ --with-libpaper \ --with-drivers="" CPPFLAGS+= -DUPD_SIGNAL=0 -I. \ - -I${WRKSRC}/lcms2/include \ -I${LOCALBASE}/include/libpng \ -I${WRKSRC}/openjpeg/src/lib/openjp2 \ -I${LOCALBASE}/include @@ -71,7 +71,7 @@ OPTIONS_SUB= yes FONTCONFIG_DESC=Enable fontconfig support NO_OPTIONS_SORT=yes -EXCLUDE_DIRS= freetype jbig2dec jpeg expat jasper lcms libpng tiff zlib +EXCLUDE_DIRS= freetype jbig2dec jpeg expat lcms2 libpng tiff zlib .include "Makefile.drivers" .include <bsd.port.options.mk> Added: head/print/ghostscript9-agpl/files/patch-trio-triodef.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/ghostscript9-agpl/files/patch-trio-triodef.h Sat Jul 18 18:43:55 2015 (r392441) @@ -0,0 +1,26 @@ +--- trio/triodef.h.orig 2015-07-19 03:20:32.007345000 +0900 ++++ trio/triodef.h 2015-07-19 03:27:30.381863000 +0900 +@@ -185,12 +185,13 @@ + # endif + #endif + +-#if (_XOPEN_VERSION - 0 >= 3) || defined(_XOPEN_XPG3) ++#if (defined(_XOPEN_VERSION) && (_XOPEN_VERSION - 0 >= 3)) || defined(_XOPEN_XPG3) + # define PREDEF_STANDARD_XPG3 + #endif +-#if (_XOPEN_VERSION - 0 >= 4) || defined(_XOPEN_XPG4) ++#if (defined(_XOPEN_VERSION) && (_XOPEN_VERSION - 0 >= 4)) || defined(_XOPEN_XPG4) + # define PREDEF_STANDARD_XPG4 + #endif ++#if defined(_XOPEN_VERSION) + #if (_XOPEN_VERSION - 0 > 4) \ + || (defined(_XOPEN_UNIX) && (_XOPEN_VERSION - 0 == 4)) + # define PREDEF_STANDARD_UNIX95 +@@ -201,6 +202,7 @@ + #if (_XOPEN_VERSION - 0 >= 600) + # define PREDEF_STANDARD_UNIX03 + #endif ++#endif + + /************************************************************************* + * Generic defines
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507181843.t6IIhuG9017176>