Date: Tue, 26 Jun 2018 17:15:38 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473400 - in head/print: ghostscript9-agpl-base ghostscript9-agpl-base/files ghostscript9-agpl-x11 Message-ID: <201806261715.w5QHFc5x046450@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Jun 26 17:15:37 2018 New Revision: 473400 URL: https://svnweb.freebsd.org/changeset/ports/473400 Log: - Restore patch that adds mappings for common CJK TeX fonts to cidfmap. Make the path in the mappings relative to LOCALBASE/share/fonts so print/gsfonts does not need to be installed. [1] - Remove --enable-threadsafe from CONFIGURE_ARGS so thread-unsafe devices like opvp (used by Canon printer drivers) are built. [2] - Fix detection of dlopen on FreeBSD < 11.2 (which doesn't have libdl). [2] - Remove reference to FAPI configuration from pkg-message. As far as I can tell it is only useful in combination with UFST, a commercial font renderer from Monotype and we don't (and can't) build with UFST support. PR: 229211 [1], 229332 [2] Tested by: Osamu Matsuda <omatsuda000@gmail.com> Added: head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap - copied, changed from r472238, head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap head/print/ghostscript9-agpl-base/pkg-message - copied, changed from r473399, head/print/ghostscript9-agpl-base/files/pkg-message.in Deleted: head/print/ghostscript9-agpl-base/files/pkg-message.in Modified: head/print/ghostscript9-agpl-base/Makefile head/print/ghostscript9-agpl-base/files/patch-configure head/print/ghostscript9-agpl-x11/Makefile Modified: head/print/ghostscript9-agpl-base/Makefile ============================================================================== --- head/print/ghostscript9-agpl-base/Makefile Tue Jun 26 17:13:21 2018 (r473399) +++ head/print/ghostscript9-agpl-base/Makefile Tue Jun 26 17:15:37 2018 (r473400) @@ -2,6 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.23 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/ PKGNAMESUFFIX= 9-agpl-base @@ -40,7 +41,6 @@ CONFIGURE_ARGS= --disable-compile-inits \ --enable-fontconfig \ --enable-freetype \ --enable-openjpeg \ - --enable-threadsafe \ --with-drivers=ALL \ --with-fontpath=${LOCALBASE}/share/fonts \ --with-jbig2dec \ @@ -52,8 +52,6 @@ CONFIGURE_ARGS= --disable-compile-inits \ ALL_TARGET= so INSTALL_TARGET= soinstall PLIST_SUB= GS_VERSION="${PORTVERSION}" -SUB_FILES= pkg-message -SUB_LIST= DATADIR="${DATADIR}" OPTIONS_DEFINE= DOCS CUPS IJS OPTIONS_DEFAULT=CUPS IJS Copied and modified: head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap (from r472238, head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap) ============================================================================== --- head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap Tue Jun 12 09:34:30 2018 (r472238, copy source) +++ head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap Tue Jun 26 17:15:37 2018 (r473400) @@ -4,8 +4,8 @@ % /ShinGo-Bold /HeiseiKakuGo-W5 ; % /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ; % /Ryumin-Medium << /FileType /TrueType /Path (windir) getenv not {(c:/windows)}if (/Fonts/BATANG.TTC)concatstrings /SubfontID 3 /CSI [(Japan1) 2] >> ; -+/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light) /SubfontID 0 /CSI [(Japan1) 6] >> ; -+/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium) /SubfontID 0 /CSI [(Japan1) 6] >> ; ++/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 ; @@ -61,10 +61,10 @@ +/HYSMyeongJo-Medium /Munhwa-Regular ; +/HYRGoThic-Medium /MunhwaGothic-Bold ; + -+/STHeiti-Regular << /FileType /TrueType /Path (STHeiti-Regular) /SubfontID 0 /CSI [(CNS1) 5] >> ; -+/STSong-Light << /FileType /TrueType /Path (STSong-Light) /SubfontID 0 /CSI [(GB1) 5] >> ; -+/MSung-Light << /FileType /TrueType /Path (MSung-Light) /SubfontID 0 /CSI [(CNS1) 5] >> ; -+/MHei-Medium << /FileType /TrueType /Path (MHei-Medium) /SubfontID 0 /CSI [(GB1) 5] >> ; ++/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] >> ; % % NOTE: getenv returns a boolean to indicate success of or failure, as well as the value on success. In the example, it uses this % to include a default value should getenv fail. Modified: head/print/ghostscript9-agpl-base/files/patch-configure ============================================================================== --- head/print/ghostscript9-agpl-base/files/patch-configure Tue Jun 26 17:13:21 2018 (r473399) +++ head/print/ghostscript9-agpl-base/files/patch-configure Tue Jun 26 17:15:37 2018 (r473400) @@ -9,8 +9,25 @@ fi -@@ -9950,42 +9950,42 @@ if test x$enable_threadsafe = xyes; then +@@ -5762,7 +5762,6 @@ if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldl $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -5795,7 +5794,7 @@ $as_echo "$ac_cv_lib_dl_dlopen" >&6; } + if test "x$ac_cv_lib_dl_dlopen" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" + if test "x$ac_cv_header_dlfcn_h" = xyes; then : +- GCFLAGS="$GCFLAGS -DHAVE_LIBDL=1";LIBS="-ldl $LIBS" ++ GCFLAGS="$GCFLAGS -DHAVE_LIBDL=1"; + fi + + +@@ -9950,42 +9949,42 @@ if test x$enable_threadsafe = xyes; then + for ntsdev in $NTS_DEVS ; do NTS_EXCLUDES="$(echo \"$P_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES" - P_DEVS0=`echo $P_DEVS0 | sed "s/\b$ntsdev\b//g"` @@ -60,7 +77,7 @@ done NTS_EXCLUDES=`echo "$NTS_EXCLUDES" | tr " " "\n" | sort | uniq | tr "\n" " "` -@@ -10145,7 +10145,12 @@ if test "${enable_dynamic+set}" = set; then : +@@ -10145,7 +10144,12 @@ if test "${enable_dynamic+set}" = set; then : DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS" ;; *BSD) Copied and modified: head/print/ghostscript9-agpl-base/pkg-message (from r473399, head/print/ghostscript9-agpl-base/files/pkg-message.in) ============================================================================== --- head/print/ghostscript9-agpl-base/files/pkg-message.in Tue Jun 26 17:13:21 2018 (r473399, copy source) +++ head/print/ghostscript9-agpl-base/pkg-message Tue Jun 26 17:15:37 2018 (r473400) @@ -1,5 +1,2 @@ -Note: in order to use the script "dvipdf", dvips must be installed. -This program is provided by another package print/tex-dvipsk. - -FAPIfontmap and FAPIcidfmap in %%DATADIR%%/Resource/Init -have to be configured if you want to use FAPI feature. +This package installs a script named dvipdf that depends on dvips. If you +want to use this script you need to install print/tex-dvipsk. Modified: head/print/ghostscript9-agpl-x11/Makefile ============================================================================== --- head/print/ghostscript9-agpl-x11/Makefile Tue Jun 26 17:13:21 2018 (r473399) +++ head/print/ghostscript9-agpl-x11/Makefile Tue Jun 26 17:15:37 2018 (r473400) @@ -2,6 +2,7 @@ PORTNAME= ghostscript PORTVERSION= 9.23 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/ PKGNAMESUFFIX= 9-agpl-x11 @@ -31,7 +32,6 @@ CONFIGURE_ARGS= --disable-compile-inits \ --enable-fontconfig \ --enable-freetype \ --enable-openjpeg \ - --enable-threadsafe \ --with-drivers=ALL \ --with-fontpath=${LOCALBASE}/share/fonts \ --with-jbig2dec \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806261715.w5QHFc5x046450>