diff --git a/MOVED b/MOVED --- a/MOVED +++ b/MOVED @@ -8280,3 +8280,5 @@ www/py-dj41-django-prometheus|www/py-dj42-django-prometheus|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/ www/py-dj41-django-mptt|www/py-dj42-django-mptt|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/ www/py-dj41-drf-yasg|www/py-dj42-drf-yasg|2023-12-31|Has expired: Extended support of Django 4.1 ends December 2023, upgrade to the Django 4.2+ version of this port. See https://www.djangoproject.com/download/ +print/ghostscript9-agpl-x11|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10 +print/ghostscript9-agpl-base|print/ghostscript10|2023-12-31|Has expired: Obsolete and unsupported upstream, consider using print/ghostscipt10 diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk --- a/Mk/Uses/ghostscript.mk +++ b/Mk/Uses/ghostscript.mk @@ -4,12 +4,12 @@ # Usage: USES=ghostscript or USES=ghostscript:args # Valid ARGS: , build, lib, run, test, x11 # -# version The chooseable versions are 9, agpl and 10. If no version is -# specified version 10 is selected. 9 and agpl are synonymous. +# version The chooseable versions are 10 only. If no version is +# specified version 10 is selected. # # USES=ghostscript:10 # Use Ghostscript 10 # USES=ghostscript:run # Use to set default Ghostscript as a run dependency -# USES=ghostscript:9,build # Use Ghostscript 9 as a build dependency. +# USES=ghostscript:10,build # Use Ghostscript 10 as a build dependency. # # build Ghostscript is used as BUILD_DEPENDS # lib Ghostscript is used as LIB_DEPENDS @@ -29,15 +29,15 @@ # allowed versions # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -_GS_VERSION= 9 agpl 10 +_GS_VERSION= 10 _GS_ARGS= ${ghostscript_ARGS} -. if ${_GS_ARGS:N9:N10:Nagpl:Nbuild:Nlib:Nrun:Ntest:Nx11} +. if ${_GS_ARGS:N10:Nbuild:Nlib:Nrun:Ntest:Nx11} IGNORE?= Unknown ghostscript argument ${_GS_ARGS} . endif -. if ${GHOSTSCRIPT_DEFAULT:N9:Nagpl:N10} +. if ${GHOSTSCRIPT_DEFAULT:N10} IGNORE?= Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION} . endif @@ -72,48 +72,25 @@ _V=${V} . if ${_V:M10} _GS_SELECTED?= 10 -. elif ${_V:M9} -_GS_SELECTED?= 9-agpl -. elif ${_V:Magpl} -_GS_SELECTED?= 9-agpl . endif . endfor -. undef _GS_STATIC -. if empty(_GS_SELECTED:M9-agpl) -_GS_STATIC= yes -. endif - -# Resolve minor version number for X11.so library. . if !empty(_GS_SELECTED:M10) -_GS_VERSION_MINOR= 10.02.0 -. elif !empty(_GS_SELECTED:M9-agpl) -_GS_VERSION_MINOR= 9.56.1 +_GS_FULL_VERSION= 10.02.0 . endif # dependencies _GS_LIB= libgs.so -_GS_PKGNAME= ghostscript${_GS_SELECTED}${_GS_STATIC:?:-base} -_GS_X11_PKGNAME=ghostscript${_GS_SELECTED}${_GS_STATIC:?:-x11} -_GS_PORT= print/ghostscript${_GS_SELECTED}${_GS_STATIC:?:-base} -_GS_X11_PORT= print/ghostscript${_GS_SELECTED}${_GS_STATIC:?:-x11} +_GS_PKGNAME= ghostscript${_GS_SELECTED} +_GS_PORT= print/ghostscript${_GS_SELECTED} . for type in BUILD LIB RUN TEST . if defined(_GS_${type}_DEP) -. if !defined(_GS_STATIC) || !${_GS_ARGS:Mx11} . if ${type:MLIB} ${type}_DEPENDS+= ${_GS_LIB}:${_GS_PORT} . else -${type}_DEPENDS+= ${_GS_PKGNAME}>=${_GS_VERSION_MINOR}:${_GS_PORT} -. endif -. endif -. if ${_GS_ARGS:Mx11} -. if ${type:MLIB} -${type}_DEPENDS+= ${_GS_LIB}:${_GS_X11_PORT} -. else -${type}_DEPENDS+= ${_GS_X11_PKGNAME}>=${_GS_VERSION_MINOR}:${_GS_X11_PORT} +${type}_DEPENDS+= ${_GS_PKGNAME}>=${_GS_FULL_VERSION}:${_GS_PORT} . endif -. endif . endif . endfor diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -63,7 +63,7 @@ . else GCC_DEFAULT?= 12 . endif -# Possible values: 9, agpl, 10 +# Possible values: 10 GHOSTSCRIPT_DEFAULT?= 10 # Possible values: mesa-libs, mesa-devel GL_DEFAULT?= mesa-libs diff --git a/print/Makefile b/print/Makefile --- a/print/Makefile +++ b/print/Makefile @@ -56,8 +56,6 @@ SUBDIR += freetype2 SUBDIR += ft2demos SUBDIR += ghostscript10 - SUBDIR += ghostscript9-agpl-base - SUBDIR += ghostscript9-agpl-x11 SUBDIR += gimp-gutenprint SUBDIR += gl2ps SUBDIR += gsfonts diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile deleted file mode 100644 --- a/print/ghostscript9-agpl-base/Makefile +++ /dev/null @@ -1,100 +0,0 @@ -PORTNAME= ghostscript -PORTVERSION= 9.56.1 -PORTREVISION= 12 -CATEGORIES= print -MASTER_SITES= https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//g}/ -PKGNAMESUFFIX= 9-agpl-base - -MAINTAINER= hrs@FreeBSD.org -COMMENT= PostScript and PDF interpreter -WWW= https://ghostscript.com/ - -LICENSE= AGPLv3 -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= Obsolete and unsupported upstream, consider using print/ghostscipt10 -EXPIRATION_DATE= 2023-12-31 - -BUILD_DEPENDS= jbig2dec>=0.17:graphics/jbig2dec -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libidn.so:dns/libidn \ - libjbig2dec.so:graphics/jbig2dec \ - libopenjp2.so:graphics/openjpeg \ - libpaper.so:print/libpaper \ - libpng.so:graphics/png \ - libtiff.so:graphics/tiff -RUN_DEPENDS= poppler-data>=0.4.9:graphics/poppler-data - -USES= cpe gmake iconv jpeg localbase pkgconfig tar:xz -USE_LDCONFIG= yes - -CONFLICTS_INSTALL= \ - ghostscript[789] \ - ghostscript[789]-nox11 \ - ghostscript9-agpl \ - ghostscript9-agpl-nox11 -CPE_VENDOR= artifex -DATADIR= ${PREFIX}/share/${PORTNAME}/${PORTVERSION} -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} -EXTRACT_AFTER_ARGS= \ - --exclude cups/libs \ - --exclude freetype \ - --exclude ijs \ - --exclude jbig2dec \ - --exclude jpeg \ - --exclude libpng \ - --exclude openjpeg \ - --exclude zlib -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-compile-inits \ - --disable-dbus \ - --disable-gtk \ - --enable-contrib \ - --enable-dynamic \ - --enable-fontconfig \ - --enable-freetype \ - --enable-openjpeg \ - --with-drivers=ALL \ - --with-fontpath=${LOCALBASE}/share/fonts \ - --with-jbig2dec \ - --with-libiconv=maybe \ - --with-libidn \ - --with-libpaper \ - --with-system-libtiff \ - --without-x -ALL_TARGET= so -INSTALL_TARGET= soinstall -PLIST_SUB= GS_VERSION="${PORTVERSION:C/.[0-9]$//}" \ - PORTVERSION="${PORTVERSION}" - -OPTIONS_DEFINE= DOCS CUPS IJS -OPTIONS_DEFAULT=DOCS CUPS -OPTIONS_SUB= yes - -CUPS_CONFIGURE_ENABLE= cups -CUPS_LIB_DEPENDS= libcupsimage.so:print/cups - -IJS_CONFIGURE_WITH= ijs -IJS_DESC= Support libijs based Ghostscript devices -IJS_LIB_DEPENDS= libijs.so:print/libijs - -post-install: - ${MV} ${STAGEDIR}${PREFIX}/bin/gsc ${STAGEDIR}${PREFIX}/bin/gs - ${RM} ${STAGEDIR}${PREFIX}/bin/gsx - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgs.so - ${MKDIR} ${STAGEDIR}${PREFIX}/share/color/icc - ${MV} ${STAGEDIR}${DATADIR}/iccprofiles \ - ${STAGEDIR}${PREFIX}/share/color/icc/ghostscript - ${RLN} ${STAGEDIR}${PREFIX}/share/color/icc/ghostscript \ - ${STAGEDIR}${DATADIR}/iccprofiles - ${RLN} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}/doc - ${MKDIR} ${STAGEDIR}${PREFIX}/share/cmap - ${MV} ${STAGEDIR}${DATADIR}/Resource/CMap/Identity* \ - ${STAGEDIR}${PREFIX}/share/cmap - ${RM} -r ${STAGEDIR}${DATADIR}/Resource/CMap - ${RLN} ${STAGEDIR}${PREFIX}/share/cmap \ - ${STAGEDIR}${DATADIR}/Resource/CMap - -.include diff --git a/print/ghostscript9-agpl-base/distinfo b/print/ghostscript9-agpl-base/distinfo deleted file mode 100644 --- a/print/ghostscript9-agpl-base/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1651717085 -SHA256 (ghostscript-9.56.1.tar.xz) = d43406805650009b42c3d5f6dc535233454533c1e27c13a77dd1d462a056b8e4 -SIZE (ghostscript-9.56.1.tar.xz) = 62589232 diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps b/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_statd.ps +++ /dev/null @@ -1,15 +0,0 @@ ---- Resource/Init/gs_statd.ps.orig 2020-03-12 12:26:37 UTC -+++ Resource/Init/gs_statd.ps -@@ -125,6 +125,12 @@ statusdict begin - % Japanese postcard size, 100mm x 148mm - /hagaki {283 420 //.setpagesize stopped { pop pop /hagaki $error /errorname get signalerror } if } bind def - % U.S. ANSI/ASME Y14.1 paper sizes -+ /postcard {284 419 //.setpagesize exec} bind def -+ /dbl_postcard {419 568 //.setpagesize exec} bind def -+ /Executive {522 756 //.setpagesize exec} bind def -+ /jenv_you4 {298 666 //.setpagesize exec} bind def -+ /jenv_you2 {324 460 //.setpagesize exec} bind def -+ /jenv_kaku2 {682 942 //.setpagesize exec} bind def - /ANSI_A //letter def - /ANSI_B //11x17 def - /tabloid //11x17 def diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps b/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-gs_ttf.ps +++ /dev/null @@ -1,24 +0,0 @@ ---- Resource/Init/gs_ttf.ps.orig 2022-04-04 13:48:49 UTC -+++ Resource/Init/gs_ttf.ps -@@ -1116,10 +1116,17 @@ mark - } ifelse - % Stack: ... /FontInfo mark key1 value1 ... - post //null ne { -- /ItalicAngle first_post_string 4 gets32 65536.0 div -- /isFixedPitch first_post_string 12 getu32 0 ne -- /UnderlinePosition first_post_string 8 gets16 upem div -- /UnderlineThickness first_post_string 10 gets16 upem div -+ post type /arraytype eq { -+ % this post table is a big table. /post should be [(...) ...] -+ % data we actually need here should be first one in array. -+ /posttable post 1 get def -+ } { -+ /posttable post def -+ } ifelse -+ /ItalicAngle posttable 4 gets32 65536.0 div -+ /isFixedPitch posttable 12 getu32 0 ne -+ /UnderlinePosition posttable 8 gets16 upem div -+ /UnderlineThickness posttable 10 gets16 upem div - } if - counttomark 0 ne { .dicttomark } { pop pop } ifelse - /XUID [orgXUID 42 curxuid] diff --git a/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps b/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource-Init-pdf_font.ps +++ /dev/null @@ -1,15 +0,0 @@ ---- Resource/Init/pdf_font.ps.orig 2022-04-04 13:48:49 UTC -+++ Resource/Init/pdf_font.ps -@@ -2231,10 +2231,12 @@ currentdict /CMap_read_dict undef - - /buildCIDType0 { % buildCIDType0 - dup /BaseFont get findCIDFont exch pop -+ addCIDmetrics /CIDFont defineresource - } bind executeonly def - - /buildCIDType2 { % buildCIDType2 - dup /BaseFont get findCIDFont exch pop -+ addCIDmetrics /CIDFont defineresource - } bind executeonly def - - /processCIDToGIDMap { % processCIDToGIDMap diff --git a/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIcidfmap +++ /dev/null @@ -1,62 +0,0 @@ ---- Resource/Init/FAPIcidfmap.orig 2020-03-19 08:21:42 UTC -+++ Resource/Init/FAPIcidfmap -@@ -29,4 +29,59 @@ - % - % /Ryumin-Medium << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; - % /HeiseiKakuGo-W5 << /Path (F:/WIN2000/Fonts/BATANG.TTC) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; -+%/Ryumin-Light << /Path (Ryumin-Light) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; -+%/GothicBBB-Medium << /Path (GothicBBB-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ; - -+/Ryumin-Medium /Ryumin-Light ; -+/Ryumin-Regular /Ryumin-Light ; -+/RyuminPro-Light /Ryumin-Light ; -+ -+/GothicBBBPro-Medium /GothicBBB-Medium ; -+ -+/KozGoPro-Bold /GothicBBB-Medium ; -+/KozGoPro-Heavy /GothicBBB-Medium ; -+/KozGoPro-Medium /GothicBBB-Medium ; -+/KozGoPro-Regular /GothicBBB-Medium ; -+ -+/KozMinPro-Bold /Ryumin-Light ; -+/KozMinPro-Light /Ryumin-Light ; -+/KozMinPro-Medium /Ryumin-Light ; -+/KozMinPro-Regular /Ryumin-Light ; -+ -+/HiraKakuPro-W3 /GothicBBB-Medium ; -+/HiraKakuPro-W6 /GothicBBB-Medium ; -+/HiraKakuStd-W8 /GothicBBB-Medium ; -+ -+/HiraMaruPro-W4 /GothicBBB-Medium ; -+ -+/HiraMinPro-W3 /Ryumin-Light ; -+ -+/HeiseiMin-W3 /Ryumin-Light ; -+/HeiseiKakuGo-W5 /GothicBBB-Medium ; -+ -+/FutoMinA101-Bold /Ryumin-Light ; -+/FutoMinA101Pro-Bold /Ryumin-Light ; -+/FutoGoB101-Bold /GothicBBB-Medium ; -+/FutoGoB101Pro-Bold /GothicBBB-Medium ; -+ -+/Jun101-Light /Ryumin-Light ; -+/Jun101Pro-Light /Ryumin-Light ; -+ -+/MidashiGo-MB31 /GothicBBB-Medium ; -+/MidashiGoPro-MB31 /GothicBBB-Medium ; -+ -+/MidashiMinPro-MA31 /Ryumin-Light ; -+ -+%/Munhwa-Regular /Munhwa-Regular ; -+%/MunhwaGothic-Regular /MunhwaGothic-Regular ; -+%/Munhwa-Bold /Munhwa-Bold ; -+%/MunhwaGothic-Bold /MunhwaGothic-Bold ; -+ -+/HYGoThic-Medium /MunhwaGothic-Regular ; -+/HYSMyeongJo-Medium /Munhwa-Regular ; -+/HYRGoThic-Medium /MunhwaGothic-Bold ; -+ -+%/STHeiti-Regular << /Path (STHeiti-Regular) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ; -+%/STSong-Light << /Path (STSong-Light) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ; -+%/MSung-Light << /Path (MSung-Light) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ; -+%/MHei-Medium << /Path (MHei-Medium) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ; diff --git a/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig b/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource_Init_FAPIconfig +++ /dev/null @@ -1,10 +0,0 @@ ---- Resource/Init/FAPIconfig.orig 2012-08-08 08:01:36 UTC -+++ Resource/Init/FAPIconfig -@@ -12,3 +12,7 @@ - % and CID font resource files. - % "Embedded fonts" are fonts and CID fonts being embedded into a document. - -+/FontPath () % A default directory for FAPI-handled font files path in FAPIfontmap. -+/CIDFontPath () % A default directory for FAPI-handled CID font files path in FAPIcidfmap. -+/HookDiskFonts [] % FontType values for disk PS fonts to be redirected to FAPI. -+/HookEmbeddedFonts [] % FontType values for embedded PS fonts to be redirected to FAPI. diff --git a/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap b/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap +++ /dev/null @@ -1,67 +0,0 @@ ---- Resource/Init/cidfmap.orig 2022-04-04 13:48:49 UTC -+++ Resource/Init/cidfmap -@@ -46,3 +46,64 @@ - % - % Note the use of a string to cope with the name containing a space. - % -+/Ryumin-Light << /FileType /TrueType /Path (std.ja_JP/Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 6] >> ; -+/GothicBBB-Medium << /FileType /TrueType /Path (std.ja_JP/GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 6] >> ; -+ -+/Ryumin-Medium /Ryumin-Light ; -+/Ryumin-Regular /Ryumin-Light ; -+/RyuminPro-Light /Ryumin-Light ; -+ -+/GothicBBBPro-Medium /GothicBBB-Medium ; -+ -+/KozGoPro-Bold /GothicBBB-Medium ; -+/KozGoPro-Heavy /GothicBBB-Medium ; -+/KozGoPro-Medium /GothicBBB-Medium ; -+/KozGoPro-Regular /GothicBBB-Medium ; -+ -+/KozMinPro-Bold /Ryumin-Light ; -+/KozMinPro-Light /Ryumin-Light ; -+/KozMinPro-Medium /Ryumin-Light ; -+/KozMinPro-Regular /Ryumin-Light ; -+ -+/HiraKakuPro-W3 /GothicBBB-Medium ; -+/HiraKakuPro-W6 /GothicBBB-Medium ; -+/HiraKakuStd-W8 /GothicBBB-Medium ; -+ -+/HiraMaruPro-W4 /GothicBBB-Medium ; -+ -+/HiraMinPro-W3 /Ryumin-Light ; -+ -+/HeiseiMin-W3 /Ryumin-Light ; -+/HeiseiKakuGo-W5 /GothicBBB-Medium ; -+ -+/FutoMinA101-Bold /Ryumin-Light ; -+/FutoMinA101Pro-Bold /Ryumin-Light ; -+/FutoGoB101-Bold /GothicBBB-Medium ; -+/FutoGoB101Pro-Bold /GothicBBB-Medium ; -+ -+/Jun101-Light /Ryumin-Light ; -+/Jun101Pro-Light /Ryumin-Light ; -+ -+/MidashiGo-MB31 /GothicBBB-Medium ; -+/MidashiGoPro-MB31 /GothicBBB-Medium ; -+ -+/MidashiMinPro-MA31 /Ryumin-Light ; -+ -+/MS-Mincho /Ryumin-Light ; -+/MS-PMincho /Ryumin-Light ; -+/MS-Gothic /GothicBBB-Medium ; -+/MS-PGothic /GothicBBB-Medium ; -+ -+%/Munhwa-Regular /Munhwa-Regular ; -+%/MunhwaGothic-Regular /MunhwaGothic-Regular ; -+%/Munhwa-Bold /Munhwa-Bold ; -+%/MunhwaGothic-Bold /MunhwaGothic-Bold ; -+ -+/HYGoThic-Medium /MunhwaGothic-Regular ; -+/HYSMyeongJo-Medium /Munhwa-Regular ; -+/HYRGoThic-Medium /MunhwaGothic-Bold ; -+ -+/STHeiti-Regular << /FileType /TrueType /Path (std.zh_CN/STHeiti-Regular) /SubfontID 0 /CSI [(CNS1) 5] >> ; -+/STSong-Light << /FileType /TrueType /Path (std.zh_CN/STSong-Light) /SubfontID 0 /CSI [(GB1) 5] >> ; -+/MSung-Light << /FileType /TrueType /Path (std.zh_CN/MSung-Light) /SubfontID 0 /CSI [(CNS1) 5] >> ; -+/MHei-Medium << /FileType /TrueType /Path (std.zh_CN/MHei-Medium) /SubfontID 0 /CSI [(GB1) 5] >> ; diff --git a/print/ghostscript9-agpl-base/files/patch-base_cbcp.c b/print/ghostscript9-agpl-base/files/patch-base_cbcp.c deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-base_cbcp.c +++ /dev/null @@ -1,23 +0,0 @@ ---- base/sbcp.c -+++ base/sbcp.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2001-2021 Artifex Software, Inc. -+/* Copyright (C) 2001-2023 Artifex Software, Inc. - All Rights Reserved. - - This software is provided AS-IS with no warranty, either express or -@@ -50,6 +50,14 @@ s_xBCPE_process(stream_state * st, stream_cursor_read * pr, - byte ch = *++p; - - if (ch <= 31 && escaped[ch]) { -+ /* Make sure we have space to store two characters in the write buffer, -+ * if we don't then exit without consuming the input character, we'll process -+ * that on the next time round. -+ */ -+ if (pw->limit - q < 2) { -+ p--; -+ break; -+ } - if (p == rlimit) { - p--; - break; diff --git a/print/ghostscript9-agpl-base/files/patch-configure b/print/ghostscript9-agpl-base/files/patch-configure deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-configure +++ /dev/null @@ -1,16 +0,0 @@ ---- configure.orig 2022-04-04 13:48:49 UTC -+++ configure -@@ -11629,7 +11629,12 @@ if test "${enable_dynamic+set}" = set; then : - DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS" - ;; - *bsd*) -- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" -+ INSTALL_SHARED="install-shared" -+ if test "x$X_DEVS" != x; then -+ DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so" -+ else -+ DYNAMIC_DEVS="" -+ fi - DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\"" - X11_DEVS="" - OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS" diff --git a/print/ghostscript9-agpl-base/files/patch-tesseract_src_arch_simddetect.cpp b/print/ghostscript9-agpl-base/files/patch-tesseract_src_arch_simddetect.cpp deleted file mode 100644 --- a/print/ghostscript9-agpl-base/files/patch-tesseract_src_arch_simddetect.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- tesseract/src/arch/simddetect.cpp.orig 2021-09-27 07:44:02 UTC -+++ tesseract/src/arch/simddetect.cpp -@@ -40,10 +40,13 @@ - #if defined(HAVE_NEON) && !defined(__aarch64__) - #ifdef ANDROID - #include --#else -+#elif defined(__linux__) - /* Assume linux */ - #include - #include -+#elif defined(__FreeBSD__) -+#include -+#include - #endif - #endif - -@@ -188,9 +191,15 @@ SIMDDetect::SIMDDetect() { - neon_available_ = (android_getCpuFeatures() & - ANDROID_CPU_ARM_FEATURE_NEON); - } --#else -+#elif defined(__linux__) - /* Assume linux */ - neon_available_ = getauxval(AT_HWCAP) & HWCAP_NEON; -+#elif defined(__FreeBSD__) -+ unsigned long hwcap = 0; -+ elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap); -+ neon_available_ = hwcap & HWCAP_NEON; -+#else -+ neon_available_ = 0; - #endif - #endif - diff --git a/print/ghostscript9-agpl-base/pkg-descr b/print/ghostscript9-agpl-base/pkg-descr deleted file mode 100644 --- a/print/ghostscript9-agpl-base/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Ghostscript is an interpreter for PostScript and Portable Document -Format (PDF) files. It allows you to manipulate such files and to -convert them to various printer, image and other formats. diff --git a/print/ghostscript9-agpl-base/pkg-message b/print/ghostscript9-agpl-base/pkg-message deleted file mode 100644 --- a/print/ghostscript9-agpl-base/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: <=0.17:graphics/jbig2dec -LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libidn.so:dns/libidn \ - libjbig2dec.so:graphics/jbig2dec \ - libopenjp2.so:graphics/openjpeg \ - libpaper.so:print/libpaper \ - libpng.so:graphics/png \ - libtiff.so:graphics/tiff -RUN_DEPENDS= ghostscript9-agpl-base>=${PORTVERSION}:print/ghostscript9-agpl-base - -USES= cpe gmake iconv localbase pkgconfig tar:xz xorg -USE_LDCONFIG= yes -USE_XORG= ice sm x11 xext xt - -CONFLICTS_INSTALL= \ - ghostscript[789] \ - ghostscript[789]-nox11 \ - ghostscript9-agpl \ - ghostscript9-agpl-nox11 -DISTINFO_FILE= ${.CURDIR:H}/ghostscript9-agpl-base/distinfo -PATCHDIR= ${.CURDIR:H}/ghostscript9-agpl-base/files -CPE_VENDOR= artifex -EXTRACT_AFTER_ARGS= \ - --exclude freetype \ - --exclude ijs \ - --exclude jbig2dec \ - --exclude jpeg \ - --exclude libpng \ - --exclude openjpeg \ - --exclude zlib -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-compile-inits \ - --disable-cups \ - --disable-dbus \ - --disable-gtk \ - --disable-openjpeg \ - --enable-contrib \ - --enable-dynamic \ - --enable-fontconfig \ - --enable-freetype \ - --enable-openjpeg \ - --with-drivers=ALL \ - --with-fontpath=${LOCALBASE}/share/fonts \ - --with-jbig2dec \ - --with-libiconv=maybe \ - --with-libidn \ - --with-libpaper \ - --with-system-libtiff \ - --with-x \ - --without-ijs -ALL_TARGET= ./obj/X11.so -INSTALL_TARGET= install-shared -PLIST_FILES= lib/${PORTNAME}/${PORTVERSION}/X11.so - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/X11.so - -.include diff --git a/print/ghostscript9-agpl-x11/pkg-descr b/print/ghostscript9-agpl-x11/pkg-descr deleted file mode 100644 --- a/print/ghostscript9-agpl-x11/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Ghostscript is an interpreter for PostScript and Portable Document -Format (PDF) files. It allows you to manipulate such files and to -convert them to various printer, image and other formats. - -This package contains X11 devices for Ghostscript.