From nobody Fri Mar 31 00:01:53 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PngSf1z1nz42Ywy; Fri, 31 Mar 2023 00:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PngSf0SxQz4P2Y; Fri, 31 Mar 2023 00:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UX7cbG64mRMY4pDTPyP0h47pDq8V/dKOmVFFw5nbHX0=; b=FEEW1W6b5SnDaGwsbAiJlKPvByXYk4/b6fVVycNt76/KtpzsFBkDLGJ7gm4yj1CKPVfUzG Q2Ux5cokG/V9yGvIz4mZ/maEsqQGqASQCnmiEAbF9PlGrP7emawoAb2gJEbWUQQopGboh1 pCBi2n+cF9jaAM3zZayEQ2TE1QyAzBJycA9k0VCMydNXS5E1Mj6J5S9SieBtXwpa6N5Qk7 kxQTTuijr1UYC0tqZOZd/N03s7YmK7A3JCJWV2cXS1bA1/PkaQrZv0PnaOtNYtv7fJJ1nk 6ZWftgOHZcElJV9O9vEX1plyZh8+rxotbuPgS1B5xfzEkKjAkW6ag79RA6IaBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680220914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UX7cbG64mRMY4pDTPyP0h47pDq8V/dKOmVFFw5nbHX0=; b=jYhH2HaNuzXtK53Oad4oe+xbM31zuMLcnDALukWUMtjwl5hpQECTqFlWw1Y+eq5v23UHpR RVMrwJdUsFQbgTW2hk80lhidsjE+22b5yRZJYzvo9q+K7/f8CwVUpiAp69sUjJ1oE188km SElzuYf+Mr4ieYG1eL933W/o0AGCzU8SyFX8M+3uJVgPWa3oPzs0RmhAFP4gTqLEuVQ2k/ iAIUMz6GBVrtRoSCRduo/Sn3UY4qXdznLiomGaHxMBgZOcNZqWijLyKvbMQ0Z9T9klIxh5 fjBsEnNcB4q0dYJiNLuNI9/QQ62jQE7HFB1Qt4nfFIM5RirrMijryPF4Qctq9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680220914; a=rsa-sha256; cv=none; b=Ri7gNVHO+7WneVyi5KCaXKI/OUi3yz1L3FAohf1ZmNlNsLhkUriogwSG4qM87074uzz5bT 2lQN2xK1qDfK3rxniDdMlUEMgpwHOs/SdgmCuhprVVi4Mzg6E1VI3eEdUpilQ7FL0Xab0L vPbH6HbOhirKzMH4aHQCQ9L3CLMSeDGhNcgo5Moii86/2QPDOCEK4c1Vy5AYby+UqknPNr n1fZ44wTTMNcFEhbs8FP1GpxHcSqXLaUXGyldAaLE7mVeYW0tmFa/nmRP5o1jfFTBjlq/j e+mWUwK5JjUKQ7/JSZd5IKWvdmqmlyaWrocn//cTvBaukAf0kTXl6udNPKaUmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PngSd6fmSzXMt; Fri, 31 Mar 2023 00:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32V01rJe014387; Fri, 31 Mar 2023 00:01:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32V01rvX014386; Fri, 31 Mar 2023 00:01:53 GMT (envelope-from git) Date: Fri, 31 Mar 2023 00:01:53 GMT Message-Id: <202303310001.32V01rvX014386@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 0b26df7d0192 - main - print/ghostscript9-x11: Remove expired port: List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b26df7d019273a79f512137140e1e65246c98b6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b26df7d019273a79f512137140e1e65246c98b6 commit 0b26df7d019273a79f512137140e1e65246c98b6 Author: Muhammad Moinur Rahman AuthorDate: 2023-03-25 14:58:17 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-03-30 23:59:41 +0000 print/ghostscript9-x11: Remove expired port: 2023-03-31 print/ghostscript9-x11: Released over 10 years ago and unsupported by upstream, consider print/ghostscript9-agpl-x11 --- MOVED | 1 + print/Makefile | 1 - print/ghostscript9-x11/Makefile | 61 --------- print/ghostscript9-x11/distinfo | 4 - .../ghostscript9-x11/files/patch-base_Makefile.in | 141 --------------------- .../ghostscript9-x11/files/patch-base_configure.ac | 121 ------------------ print/ghostscript9-x11/files/patch-base_devs.mak | 33 ----- print/ghostscript9-x11/files/patch-base_gdevl256.c | 15 --- print/ghostscript9-x11/files/patch-base_gdevperm.c | 19 --- print/ghostscript9-x11/files/patch-base_gdevplib.c | 14 -- print/ghostscript9-x11/files/patch-base_gp__unix.c | 47 ------- print/ghostscript9-x11/files/patch-base_gs.mak | 11 -- .../files/patch-base_gsicc__create.c | 10 -- print/ghostscript9-x11/files/patch-base_gsmalloc.c | 11 -- print/ghostscript9-x11/files/patch-base_gxobj.h | 18 --- print/ghostscript9-x11/files/patch-base_lib.mak | 11 -- .../ghostscript9-x11/files/patch-base_unix-dll.mak | 13 -- .../ghostscript9-x11/files/patch-base_unixinst.mak | 20 --- print/ghostscript9-x11/pkg-descr | 7 - 19 files changed, 1 insertion(+), 557 deletions(-) diff --git a/MOVED b/MOVED index cf6ddde8ecab..5b48beac377d 100644 --- a/MOVED +++ b/MOVED @@ -17861,3 +17861,4 @@ net/minisapserver||2023-03-31|Has expired: Obsolete utility, functionality is no net/tightvnc||2023-03-31|Has expired: Last release in 2009, newer version 2.x is available for Windows only. news/nntpcache||2023-03-31|Has expired: Upstream site no longer available ports-mgmt/p5-FreeBSD-Portindex||2023-03-31|Has expired: Not working, and no fix forthcoming +print/ghostscript9-x11||2023-03-31|Has expired: Released over 10 years ago and unsupported by upstream, consider print/ghostscript9-agpl-x11 diff --git a/print/Makefile b/print/Makefile index dd79be191a0e..818eeddb55b6 100644 --- a/print/Makefile +++ b/print/Makefile @@ -67,7 +67,6 @@ SUBDIR += ghostscript9-agpl-base SUBDIR += ghostscript9-agpl-x11 SUBDIR += ghostscript9-base - SUBDIR += ghostscript9-x11 SUBDIR += gimp-gutenprint SUBDIR += gl2ps SUBDIR += gsfonts diff --git a/print/ghostscript9-x11/Makefile b/print/ghostscript9-x11/Makefile deleted file mode 100644 index efbfced440d2..000000000000 --- a/print/ghostscript9-x11/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -PORTNAME= ghostscript -PORTVERSION= 9.06 -PORTREVISION= 12 -CATEGORIES= print -MASTER_SITES= http://downloads.ghostscript.com/public/ \ - SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}/ -PKGNAMESUFFIX= 9-x11 -DIST_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Ghostscript 9.x PostScript interpreter, X11 support -WWW= https://www.cs.wisc.edu/~ghost/doc/GPL/index.htm - -LICENSE= GPLv3 - -DEPRECATED= Released over 10 years ago and unsupported by upstream, consider print/ghostscript9-agpl-x11 -EXPIRATION_DATE=2023-03-31 - -CONFLICTS_INSTALL= \ - gambc \ - ghostscript[789] \ - ghostscript[789]-nox11 \ - ghostscript9-agpl \ - ghostscript9-agpl-nox11 - -USES= autoreconf cpe ghostscript:9 gmake tar:bzip2 xorg -USE_LDCONFIG= yes -USE_XORG= ice sm x11 xext xt -CPE_VENDOR= artifex -EXTRACT_AFTER_ARGS= ${EXCLUDE_DIRS:S/^/--exclude /} -GNU_CONFIGURE= yes -MAKE_ENV= CFLAGS_STANDARD="${CFLAGS}" \ - XLDFLAGS="${XLDFLAGS}" -CONFIGURE_ENV= ${MAKE_ENV} -CONFIGURE_ARGS= --disable-compile-inits \ - --disable-contrib \ - --enable-dynamic \ - --disable-freetype \ - --without-system-libtiff \ - --without-ijs \ - --without-libidn \ - --without-jasper \ - --without-libpaper \ - --with-x \ - --x-includes=${LOCALBASE}/include \ - --x-libraries=${LOCALBASE}/lib \ - --with-drivers="" -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -XLDFLAGS= -lpthread -ALL_TARGET= ./obj/X11.so -INSTALL_TARGET= install-shared -PLIST_FILES= ${GS_LIBDIR}/X11.so - -GS_LIBDIR= lib/${PORTNAME}/${PORTVERSION} -EXCLUDE_DIRS= freetype jbig2dec jpeg expat jasper lcms lcms2 libpng tiff zlib - -pre-build: - ${MKDIR} ${WRKSRC}/obj - -.include diff --git a/print/ghostscript9-x11/distinfo b/print/ghostscript9-x11/distinfo deleted file mode 100644 index 9fc6dde08cfd..000000000000 --- a/print/ghostscript9-x11/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -SHA256 (ghostscript/ghostscript-9.06.tar.bz2) = 05acd1b576899572ef8ecbc25637cf73cbd0be267e651732db3012db33088e04 -SIZE (ghostscript/ghostscript-9.06.tar.bz2) = 29246039 -SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b -SIZE (ghostscript/epag-3.09.tar.gz) = 12858 diff --git a/print/ghostscript9-x11/files/patch-base_Makefile.in b/print/ghostscript9-x11/files/patch-base_Makefile.in deleted file mode 100644 index 7cd1aa240222..000000000000 --- a/print/ghostscript9-x11/files/patch-base_Makefile.in +++ /dev/null @@ -1,141 +0,0 @@ ---- base/Makefile.in.orig 2012-08-08 08:01:36 UTC -+++ base/Makefile.in -@@ -49,9 +49,9 @@ PSD=$(PSGENDIR)/ - # the directories also define the default search path for the - # initialization files (gs_*.ps) and the fonts. - --INSTALL = $(GLSRCDIR)/instcopy -c --INSTALL_PROGRAM = $(INSTALL) -m 755 --INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM} -+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT} -+INSTALL_DATA = ${BSD_INSTALL_DATA} - INSTALL_SHARED = @INSTALL_SHARED@ - - prefix = @prefix@ -@@ -202,7 +202,7 @@ JSRCDIR=@LIBJPEGDIR@ - # some older JPEG streams that violate the standard. If the JPEG - # library built from local sources, the patch will be applied. - --SHARE_JPEG=@SHARE_LIBJPEG@ -+SHARE_JPEG=1 - JPEG_NAME=jpeg - - # Define the directory where the PNG library sources are stored, -@@ -210,12 +210,12 @@ JPEG_NAME=jpeg - # You may need to change this if the libpng version changes. - # See png.mak for more information. - --SHARE_LIBPNG=@SHARE_LIBPNG@ -+SHARE_LIBPNG=1 - PNGSRCDIR=@LIBPNGDIR@ - LIBPNG_NAME=png - - # libtiff --SHARE_LIBTIFF=@SHARE_LIBTIFF@ -+SHARE_LIBTIFF=1 - TIFFSRCDIR=@LIBTIFFDIR@ - TIFFPLATFORM=unix - TIFFCONFIG_SUFFIX= -@@ -224,7 +224,7 @@ LIBTIFF_NAME=tiff - # Define the directory where the zlib sources are stored. - # See zlib.mak for more information. - --SHARE_ZLIB=@SHARE_ZLIB@ -+SHARE_ZLIB=1 - ZSRCDIR=@ZLIBDIR@ - #ZLIB_NAME=gz - ZLIB_NAME=z -@@ -251,7 +251,7 @@ JBIG2_CFLAGS=@JBIG2_AUTOCONF_CFLAGS@ - JPX_LIB=@JPX_DECODER@ - SHARE_JPX=@SHARE_JPX@ - JPXSRCDIR=@JPXDIR@ --JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@ -+JPX_CFLAGS=@JPX_AUTOCONF_CFLAGS@ -ffast-math -DOPJ_STATIC -std=c99 - - # uncomment the following three lines and one of the last two to - # compile in the Luratech lwf_jp2 codec -@@ -331,7 +331,7 @@ GCFLAGS=@CPPFLAGS@ @GCFLAGS@ @CFLAGS@ - # Define the added flags for standard, debugging, profiling - # and shared object builds. - --CFLAGS_STANDARD=@OPT_CFLAGS@ -+CFLAGS_STANDARD?=@OPT_CFLAGS@ - CFLAGS_DEBUG=@DBG_CFLAGS@ - CFLAGS_PROFILE=-pg @OPT_CFLAGS@ - CFLAGS_SO=@DYNAMIC_CFLAGS@ -@@ -382,7 +382,7 @@ LDFLAGS=@LDFLAGS@ $(AC_LDFLAGS) $(XLDFLA - # Solaris may need -lnsl -lsocket -lposix4. - # (Libraries required by individual drivers are handled automatically.) - --EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ -+EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ -Wl,-export-dynamic - - # Define the standard libraries to search at the end of linking. - # Most platforms require -lpthread for the POSIX threads library; -@@ -426,7 +426,7 @@ XLIBS=@X_LIBS@ - # the pthread library. Otherwise use SYNC=nosync - #SYNC=posync - #SYNC=nosync --SYNC=@SYNC@ -+SYNC=nosync - - # programs we use - RM=rm -f -@@ -518,27 +518,27 @@ DISPLAY_DEV=$(DD)bbox.dev - #DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev - #DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev - DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@ --DEVICE_DEVS1=@F_DEVS@ --DEVICE_DEVS2=@P_DEVS@ --DEVICE_DEVS3=@CUPS_DEVS@ --DEVICE_DEVS4=@IJS_DEVS@ --DEVICE_DEVS5=@OMNIDEVS@ --DEVICE_DEVS6=@PNG_DEVS@ --DEVICE_DEVS7=@JBIG2_DEVS@ --DEVICE_DEVS8=@SVG_DEVS@ --DEVICE_DEVS9= --DEVICE_DEVS10= --DEVICE_DEVS11= --DEVICE_DEVS12= --DEVICE_DEVS13= --DEVICE_DEVS14= --DEVICE_DEVS15= --DEVICE_DEVS16= --DEVICE_DEVS17= --DEVICE_DEVS18= --DEVICE_DEVS19= --DEVICE_DEVS20= --DEVICE_DEVS21= -+#DEVICE_DEVS1=@F_DEVS@ -+#DEVICE_DEVS2=@P_DEVS@ -+#DEVICE_DEVS3=@CUPS_DEVS@ -+#DEVICE_DEVS4=@IJS_DEVS@ -+#DEVICE_DEVS5=@OMNIDEVS@ -+#DEVICE_DEVS6=@PNG_DEVS@ -+#DEVICE_DEVS7=@JBIG2_DEVS@ -+#DEVICE_DEVS8=@SVG_DEVS@ -+#DEVICE_DEVS9= -+#DEVICE_DEVS10= -+#DEVICE_DEVS11= -+#DEVICE_DEVS12= -+#DEVICE_DEVS13= -+#DEVICE_DEVS14= -+#DEVICE_DEVS15= -+#DEVICE_DEVS16= -+#DEVICE_DEVS17= -+#DEVICE_DEVS18= -+#DEVICE_DEVS19= -+#DEVICE_DEVS20= -+#DEVICE_DEVS21= - - - # Shared library target to build. -@@ -601,7 +601,6 @@ include $(GLSRCDIR)/ldf_jb2.mak - include $(GLSRCDIR)/lwf_jp2.mak - include $(GLSRCDIR)/openjpeg.mak - include $(GLSRCDIR)/icclib.mak --include $(GLSRCDIR)/$(WHICH_CMS).mak - include $(GLSRCDIR)/ijs.mak - @LCUPSINCLUDE@ - @LCUPSIINCLUDE@ diff --git a/print/ghostscript9-x11/files/patch-base_configure.ac b/print/ghostscript9-x11/files/patch-base_configure.ac deleted file mode 100644 index f5fafb8c2784..000000000000 --- a/print/ghostscript9-x11/files/patch-base_configure.ac +++ /dev/null @@ -1,121 +0,0 @@ ---- base/configure.ac.orig 2012-08-08 08:01:36 UTC -+++ base/configure.ac -@@ -623,35 +623,6 @@ AC_SUBST(FTSRCDIR) - AC_SUBST(FT_CFLAGS) - AC_SUBST(FT_LIBS) - --AC_MSG_CHECKING([for local jpeg library source]) --dnl At present, we give the local source priority over the shared --dnl build, so that the D_MAX_BLOCKS_IN_MCU patch will be applied. --dnl A more sophisticated approach would be to test the shared lib --dnl to see whether it has already been patched. --LIBJPEGDIR=src --if test -f jpeg/jpeglib.h; then -- AC_MSG_RESULT([jpeg]) -- SHARE_LIBJPEG=0 -- LIBJPEGDIR=jpeg --elif test -f jpeg-6b/jpeglib.h; then -- AC_MSG_RESULT([jpeg-6b]) -- SHARE_LIBJPEG=0 -- LIBJPEGDIR=jpeg-6b --else -- AC_MSG_RESULT([no]) -- AC_CHECK_LIB(jpeg, jpeg_set_defaults, [ -- AC_CHECK_HEADERS([jpeglib.h], [SHARE_LIBJPEG=1]) -- ]) --fi --if test -z "$SHARE_LIBJPEG"; then -- AC_MSG_ERROR([I wasn't able to find a copy -- of the jpeg library. This is required for compiling -- ghostscript. Please download a copy of the source, -- e.g. from http://www.ijg.org/, unpack it at the -- top level of the gs source tree, and rename -- the directory to 'jpeg'. -- ]) --fi - AC_SUBST(SHARE_LIBJPEG) - AC_SUBST(LIBJPEGDIR) - dnl check for the internal jpeg memory header -@@ -731,44 +702,6 @@ AC_SUBST(SHARE_LIBPNG) - AC_SUBST(LIBPNGDIR) - #AC_SUBST(PNGDEVS) - --WHICHLCMS= -- --AC_ARG_WITH([lcms], AC_HELP_STRING([--with-lcms], -- [try to use LittleCMS 1.x instead of the default of LittleCMS 2.x])) -- --if test x$with_lcms != xyes; then -- AC_MSG_CHECKING([for local lcms2 library source]) -- LCMS2DIR=lcms2 -- if test -f $LCMS2DIR/include/lcms2.h; then -- AC_MSG_RESULT([yes]) -- SHARELCMS=0 -- WHICHLCMS=lcms2 -- else -- AC_MSG_RESULT([no]) -- AC_MSG_CHECKING([for system lcms2 library]) -- AC_CHECK_LIB(lcms2, cmsCreateXYZProfile, [ -- AC_CHECK_HEADERS([lcms2.h], [LCMS2DIR="";SHARELCMS=1;WHICHLCMS=lcms2]) -- ]) -- fi --fi -- --if test x$WHICHLCMS = x; then -- AC_MSG_CHECKING([for local lcms library source]) -- LCMSDIR=lcms -- SHARELCMS=0 -- if test -f $LCMSDIR/include/lcms.h; then -- AC_MSG_RESULT([yes]) -- SHARELCMS=0 -- WHICHLCMS=lcms -- else -- -- AC_MSG_ERROR([LittleCMS source not found!]) -- #AC_CHECK_LIB(lcms, cmsCreateXYZProfile, [ -- # AC_CHECK_HEADERS([lcms.h], [SHARELCMS=1;LCMSDIR=""]) -- # ]) -- fi --fi -- - AC_SUBST(SHARELCMS) - AC_SUBST(WHICHLCMS) - AC_SUBST(LCMSDIR) -@@ -1303,7 +1236,7 @@ X_CFLAGS="" - X_DEVS="" - X_LIBS="" - --if test x$no_x != xyes; then -+if test x$with_x != xno; then - if test "$x_libraries" = "/usr/lib"; then - echo "Ignoring X library directory \"$x_libraries\" requested by configure." - x_libraries="NONE" -@@ -1701,7 +1634,12 @@ AC_ARG_ENABLE([dynamic], AC_HELP_STRING( - DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS" - ;; - *BSD) -- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" -+ if test "x$X_DEVS" != x; then -+ DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" -+ INSTALL_SHARED="install-shared" -+ else -+ DYNAMIC_DEVS="" -+ fi - DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\"" - X11_DEVS="" - OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS" -@@ -1758,11 +1696,11 @@ if test "x$fontpath" = "x"; then - fontpath="${fontpath}:$datadir/fonts/default/TrueType" - - # These font directories are used by IRIX... -- fontpath="${fontpath}:/usr/lib/DPS/outline/base" -+ # fontpath="${fontpath}:/usr/lib/DPS/outline/base" - - # These font directories are used by Solaris... -- fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1" -- fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType" -+ # fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/Type1" -+ # fontpath="${fontpath}:/usr/openwin/lib/X11/fonts/TrueType" - - # This font directory is used by CUPS... - if test "x$CUPSCONFIG" != x; then diff --git a/print/ghostscript9-x11/files/patch-base_devs.mak b/print/ghostscript9-x11/files/patch-base_devs.mak deleted file mode 100644 index 422476f62c01..000000000000 --- a/print/ghostscript9-x11/files/patch-base_devs.mak +++ /dev/null @@ -1,33 +0,0 @@ ---- base/devs.mak.orig 2012-08-08 08:01:36 UTC -+++ base/devs.mak -@@ -434,10 +434,10 @@ $(GLOBJ)gdevvglb.$(OBJ) : $(GLSRC)gdevvg - ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - - $(GLOBJ)lvga256.so : $(lvga256_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl $(XLDFLAGS) - - $(GLOBJ)vgalib.so : $(vgalib_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl $(XLDFLAGS) - - ### -------------------------- The X11 device -------------------------- ### - -@@ -479,7 +479,7 @@ $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxi - # const/non-const cast required by the X headers that we can't work around. - $(GLOBJ)gdevxres.$(OBJ) : $(GLSRC)gdevxres.c $(std_h) $(x__h)\ - $(gsmemory_h) $(gstypes_h) $(gxdevice_h) $(gdevx_h) -- $(CC_NO_WARN) $(GLCCFLAGS) $(XINCLUDE) $(GLO_)gdevxres.$(OBJ) $(C_) $(GLSRC)gdevxres.c -+ $(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxres.$(OBJ) $(C_) $(GLSRC)gdevxres.c - - # Alternate X11-based devices to help debug other drivers. - # x11alpha pretends to have 4 bits of alpha channel. -@@ -535,7 +535,7 @@ $(GLOBJ)gdevxalt.$(OBJ) : $(GLSRC)gdevxa - ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT - - $(GLOBJ)X11.so : $(x11alt_) $(x11_) -- $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) -+ $(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L$(LOCALBASE)/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS) - - ###### --------------- Memory-buffered printer devices --------------- ###### - diff --git a/print/ghostscript9-x11/files/patch-base_gdevl256.c b/print/ghostscript9-x11/files/patch-base_gdevl256.c deleted file mode 100644 index 5e109c1a71ef..000000000000 --- a/print/ghostscript9-x11/files/patch-base_gdevl256.c +++ /dev/null @@ -1,15 +0,0 @@ ---- base/gdevl256.c.orig 2012-08-08 08:01:36 UTC -+++ base/gdevl256.c -@@ -303,12 +303,3 @@ lvga256_draw_line(gx_device * dev, int x - gl_line(x0, y0, x1, y1, color); - return 0; - } -- --#ifdef GS_DEVS_SHARED --extern void gs_lib_register_device(const gx_device *dev); --void --gs_shared_init(void) --{ -- gs_lib_register_device(&gs_lvga256_device); --} --#endif diff --git a/print/ghostscript9-x11/files/patch-base_gdevperm.c b/print/ghostscript9-x11/files/patch-base_gdevperm.c deleted file mode 100644 index 2d767054a0b1..000000000000 --- a/print/ghostscript9-x11/files/patch-base_gdevperm.c +++ /dev/null @@ -1,19 +0,0 @@ ---- base/gdevperm.c.orig 2012-08-08 08:01:36 UTC -+++ base/gdevperm.c -@@ -287,7 +287,7 @@ perm_get_color_mapping_procs(const gx_de - (strncmp((const char *)name, (const char *)str, name_size) == 0)) - - static int --perm_get_color_comp_index(const gx_device *pdev, const char *pname, -+perm_get_color_comp_index(gx_device *pdev, const char *pname, - int name_size, int component_type) - { - const gx_device_perm_t * const dev = (const gx_device_perm_t *)pdev; -@@ -334,7 +334,6 @@ static int - perm_decode_color(gx_device *dev, gx_color_index color, gx_color_value *out) - { - int bpc = 8; -- int drop = sizeof(gx_color_value) * 8 - bpc; - int mask = (1 << bpc) - 1; - int i = 0; - int ncomp = dev->color_info.num_components; diff --git a/print/ghostscript9-x11/files/patch-base_gdevplib.c b/print/ghostscript9-x11/files/patch-base_gdevplib.c deleted file mode 100644 index b9212022cbeb..000000000000 --- a/print/ghostscript9-x11/files/patch-base_gdevplib.c +++ /dev/null @@ -1,14 +0,0 @@ ---- base/gdevplib.c.orig 2012-08-08 08:01:36 UTC -+++ base/gdevplib.c -@@ -153,7 +153,11 @@ void __aebi_memmove(void *dest, const vo - - #ifdef TESTING_WITH_NO_BAND_DONOR - -+#if !defined(__FreeBSD__) - #include -+#else -+#include -+#endif - - static void *my_buffer; - diff --git a/print/ghostscript9-x11/files/patch-base_gp__unix.c b/print/ghostscript9-x11/files/patch-base_gp__unix.c deleted file mode 100644 index 84d1cdcb4f73..000000000000 --- a/print/ghostscript9-x11/files/patch-base_gp__unix.c +++ /dev/null @@ -1,47 +0,0 @@ ---- base/gp_unix.c.orig 2012-08-08 08:01:36 UTC -+++ base/gp_unix.c -@@ -52,6 +52,7 @@ extern char *getenv(const char *); - * and applied as a patch (preferable). - */ - #include -+#include - #include - #include - #include -@@ -61,26 +62,25 @@ gp_init(void) - { - DIR* dir = NULL; - struct dirent* dirent; -- char buff[1024]; -+ char buff[PATH_MAX]; - char* pbuff; - void* handle; - void (*gs_shared_init)(void); - -- strncpy(buff, GS_DEVS_SHARED_DIR, sizeof(buff) - 2); -- pbuff = buff + strlen(buff); -- *pbuff++ = '/'; *pbuff = '\0'; -- - dir = opendir(GS_DEVS_SHARED_DIR); - if (dir == 0) return; - - while ((dirent = readdir(dir)) != 0) { -- strncpy(pbuff, dirent->d_name, sizeof(buff) - (pbuff - buff) - 1); -- if ((handle = dlopen(buff, RTLD_NOW)) != 0) { -- if ((gs_shared_init = dlsym(handle, "gs_shared_init")) != 0) { -+ snprintf(buff, sizeof(buff), "%s/%s", GS_DEVS_SHARED_DIR, dirent->d_name); -+ pbuff = buff + strlen(buff) - 3; -+ if (strcmp(pbuff, ".so") != 0) -+ continue; -+ handle = dlopen(buff, RTLD_NOW); -+ if (handle == NULL) -+ continue; -+ gs_shared_init = dlsym(handle, "gs_shared_init"); -+ if (gs_shared_init != NULL) - (*gs_shared_init)(); -- } else { -- } -- } - } - - closedir(dir); diff --git a/print/ghostscript9-x11/files/patch-base_gs.mak b/print/ghostscript9-x11/files/patch-base_gs.mak deleted file mode 100644 index 99f9426dc787..000000000000 --- a/print/ghostscript9-x11/files/patch-base_gs.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- base/gs.mak.orig 2012-08-08 08:01:36 UTC -+++ base/gs.mak -@@ -437,7 +437,7 @@ GCONFIG_EXTRAS= - ld_tr=$(GLGENDIR)$(D)ld.tr - $(ld_tr) : \ - $(GS_MAK) $(TOP_MAKEFILES) $(GLSRCDIR)$(D)version.mak $(GENCONF_XE) $(ECHOGS_XE) $(devs_tr) $(DEVS_ALL) $(GLGENDIR)$(D)libcore.dev -- $(EXP)$(GENCONF_XE) $(devs_tr) -h $(gconfxx_h) $(CONFILES) $(CONFLDTR) $(ld_tr) -+ $(EXP)$(GENCONF_XE) $(devs_tr) -h /dev/stdout $(CONFILES) $(CONFLDTR) $(ld_tr) | awk 'BEGIN{j=0; p=1;} /jpeg_device/ {if(j++ > 0) p=0;} // { if(p==1) { print; } else { p=1 } }' > $(gconfxx_h) - $(EXP)$(ECHOGS_XE) -a $(gconfxx_h) $(GCONFIG_EXTRAS) - - $(gconfxx_h) : $(ld_tr) diff --git a/print/ghostscript9-x11/files/patch-base_gsicc__create.c b/print/ghostscript9-x11/files/patch-base_gsicc__create.c deleted file mode 100644 index fdf8f5e33be3..000000000000 --- a/print/ghostscript9-x11/files/patch-base_gsicc__create.c +++ /dev/null @@ -1,10 +0,0 @@ ---- base/gsicc_create.c.orig 2012-08-08 08:01:36 UTC -+++ base/gsicc_create.c -@@ -116,6 +116,7 @@ Note: All profile data must be encoded a - - */ - -+#include - #include "icc34.h" /* Note this header is needed even if lcms is not - compiled as default CMS */ - #include "string_.h" diff --git a/print/ghostscript9-x11/files/patch-base_gsmalloc.c b/print/ghostscript9-x11/files/patch-base_gsmalloc.c deleted file mode 100644 index 734cfd079a2e..000000000000 --- a/print/ghostscript9-x11/files/patch-base_gsmalloc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- base/gsmalloc.c.orig 2012-08-08 08:01:36 UTC -+++ base/gsmalloc.c -@@ -178,7 +178,7 @@ gs_heap_alloc_bytes(gs_memory_t * mem, u - } else { - uint added = size + sizeof(gs_malloc_block_t); - -- if (mmem->limit - added < mmem->used) -+ if (added <= size || mmem->limit - added < mmem->used) - set_msg("exceeded limit"); - else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0) - set_msg("failed"); diff --git a/print/ghostscript9-x11/files/patch-base_gxobj.h b/print/ghostscript9-x11/files/patch-base_gxobj.h deleted file mode 100644 index 762709c55265..000000000000 --- a/print/ghostscript9-x11/files/patch-base_gxobj.h +++ /dev/null @@ -1,18 +0,0 @@ ---- base/gxobj.h.orig 2012-08-08 08:01:36 UTC -+++ base/gxobj.h -@@ -109,11 +109,15 @@ typedef struct obj_header_data_s { - * required by the hardware, regardless of the value of obj_align_mod. - * See gsmemraw.h for more information about this. - */ -+#if !defined(__ia64__) && !defined(__amd64__) - #define obj_align_mod\ - (((ARCH_ALIGN_MEMORY_MOD - 1) |\ - (align_bitmap_mod - 1) |\ - (obj_back_scale - 1)) + 1) - /* The only possible values for obj_align_mod are 4, 8, or 16.... */ -+#else -+#define obj_align_mod 16 -+#endif - #if obj_align_mod == 4 - # define log2_obj_align_mod 2 - #else diff --git a/print/ghostscript9-x11/files/patch-base_lib.mak b/print/ghostscript9-x11/files/patch-base_lib.mak deleted file mode 100644 index 3c8c2a846b9f..000000000000 --- a/print/ghostscript9-x11/files/patch-base_lib.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- base/lib.mak.orig 2012-08-08 08:01:36 UTC -+++ base/lib.mak -@@ -990,7 +990,7 @@ $(GLOBJ)gsparam.$(OBJ) : $(GLSRC)gsparam - $(GLOBJ)gsparamx.$(OBJ) : $(AK) $(GLSRC)gsparamx.c $(string__h)\ - $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\ - $(gstypes_h) $(MAKEDIRS) -- $(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c -+ $(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c - - # Future replacement for gsparams.c - $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(AK) $(gx_h)\ diff --git a/print/ghostscript9-x11/files/patch-base_unix-dll.mak b/print/ghostscript9-x11/files/patch-base_unix-dll.mak deleted file mode 100644 index a835e46c90a6..000000000000 --- a/print/ghostscript9-x11/files/patch-base_unix-dll.mak +++ /dev/null @@ -1,13 +0,0 @@ ---- base/unix-dll.mak.orig 2012-08-08 08:01:36 UTC -+++ base/unix-dll.mak -@@ -162,8 +162,8 @@ install-so-subtarget: so-subtarget$(FOR_ - -mkdir -p $(DESTDIR)$(bindir) - -mkdir -p $(DESTDIR)$(libdir) - -mkdir -p $(DESTDIR)$(gsincludedir) -- $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) -- $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) -+ $(INSTALL_PROGRAM) -s $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME) -+ $(INSTALL_PROGRAM) -s $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME) - $(INSTALL_PROGRAM) $(BINDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR) - $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME) - ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME) diff --git a/print/ghostscript9-x11/files/patch-base_unixinst.mak b/print/ghostscript9-x11/files/patch-base_unixinst.mak deleted file mode 100644 index 75d285cb2c60..000000000000 --- a/print/ghostscript9-x11/files/patch-base_unixinst.mak +++ /dev/null @@ -1,20 +0,0 @@ ---- base/unixinst.mak.orig 2012-08-08 08:01:36 UTC -+++ base/unixinst.mak -@@ -45,7 +45,7 @@ ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf1 - wftopfa fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\ - do if ( test -f $(PSLIBDIR)/$$f ); then \ - (cat $(PSLIBDIR)/$$f | sed -e "s/GS_EXECUTABLE=gs/GS_EXECUTABLE=$(GS)/" > $(PSOBJDIR)/$$f); \ -- $(INSTALL_PROGRAM) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ -+ $(INSTALL_SCRIPT) $(PSOBJDIR)/$$f $(DESTDIR)$(scriptdir)/$$f; \ - fi;\ - done' - -@@ -142,7 +142,7 @@ install-doc: $(PSDOCDIR)/News.htm - done' - - # install the man pages for each locale --MAN_LCDIRS=. de -+MAN_LCDIRS=. - MAN1_LINKS_PS2PS=eps2eps - MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13 ps2pdf14 - MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj diff --git a/print/ghostscript9-x11/pkg-descr b/print/ghostscript9-x11/pkg-descr deleted file mode 100644 index cf5ca853b844..000000000000 --- a/print/ghostscript9-x11/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -This package installs X11 support library which adds the following -devices to the installed Ghostscript: - - x11, x11alpha. x11cmyk, x11mono, x11_, x11alt_, x11cmyk2, x11cmyk4, - x11cmyk8, x11rg16x, x11rg32x, x11gray2, and x11gray4. - - http://www.ghostscript.com/