Index: head/print/ghostscript9-agpl-base/Makefile
===================================================================
--- head/print/ghostscript9-agpl-base/Makefile	(revision 473399)
+++ head/print/ghostscript9-agpl-base/Makefile	(revision 473400)
@@ -1,92 +1,90 @@
 # $FreeBSD$
 
 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
 
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	PostScript and PDF interpreter
 
 LICENSE=	AGPLv3
 
 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
 
 CONFLICTS_INSTALL= \
 		ghostscript[789]-[0-9]* \
 		ghostscript[789]-nox11-[0-9]* \
 		ghostscript9-agpl-[0-9]* \
 		ghostscript9-agpl-nox11-[0-9]*
 
 USES=		gmake iconv jpeg localbase pkgconfig tar:xz
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--disable-dbus \
 		--disable-gtk \
 		--enable-contrib \
 		--enable-dynamic \
 		--enable-fontconfig \
 		--enable-freetype \
 		--enable-openjpeg \
-		--enable-threadsafe \
 		--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}"
-SUB_FILES=	pkg-message
-SUB_LIST=	DATADIR="${DATADIR}"
 
 OPTIONS_DEFINE=	DOCS CUPS IJS
 OPTIONS_DEFAULT=CUPS IJS
 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-patch:
 	@${RM} -r ${WRKSRC}/freetype ${WRKSRC}/ijs ${WRKSRC}/jbig2dec \
 		${WRKSRC}/jpeg ${WRKSRC}/libpng ${WRKSRC}/openjpeg \
 		${WRKSRC}/zlib
 
 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 <bsd.port.mk>
Index: head/print/ghostscript9-agpl-base/files/pkg-message.in
===================================================================
--- head/print/ghostscript9-agpl-base/files/pkg-message.in	(revision 473399)
+++ head/print/ghostscript9-agpl-base/files/pkg-message.in	(nonexistent)
@@ -1,5 +0,0 @@
-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.

Property changes on: head/print/ghostscript9-agpl-base/files/pkg-message.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
===================================================================
--- head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap	(nonexistent)
+++ head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap	(revision 473400)
@@ -0,0 +1,70 @@
+--- Resource/Init/cidfmap.orig	2015-03-30 08:21:24 UTC
++++ Resource/Init/cidfmap
+@@ -29,6 +29,67 @@
+ %   /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 (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] >> ;
+ %
+ %   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.

Property changes on: head/print/ghostscript9-agpl-base/files/patch-Resource_Init_cidfmap
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/print/ghostscript9-agpl-base/files/patch-configure
===================================================================
--- head/print/ghostscript9-agpl-base/files/patch-configure	(revision 473399)
+++ head/print/ghostscript9-agpl-base/files/patch-configure	(revision 473400)
@@ -1,76 +1,93 @@
 --- configure.orig	2018-03-21 08:49:04 UTC
 +++ configure
 @@ -5100,7 +5100,7 @@ if test "${enable_threadsafe+set}" = set; then :
  fi
  
  if test x$enable_threadsafe = xyes ; then
 -    CFLAGS="-DGS_THREADSAFE"
 +    CFLAGS="$CFLAGS -DGS_THREADSAFE"
  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"`
 +    P_DEVS0=`echo $P_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
    done
  
    for ntsdev in $NTS_DEVS ; do
      NTS_EXCLUDES="$(echo \"$F_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
 -    F_DEVS0=`echo $F_DEVS0 | sed "s/\b$ntsdev\b//g"`
 +    F_DEVS0=`echo $F_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
    done
  
    for ntsdev in $NTS_DEVS ; do
      NTS_EXCLUDES="$(echo \"$CUPS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
 -    CUPS_DEVS0=`echo $CUPS_DEVS0 | sed "s/\b$ntsdev\b//g"`
 +    CUPS_DEVS0=`echo $CUPS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
    done
  
    for ntsdev in $NTS_DEVS ; do
      NTS_EXCLUDES="$(echo \"$XPS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
 -    XPS_DEVS0=`echo $XPS_DEVS0 | sed "s/\b$ntsdev\b//g"`
 +    XPS_DEVS0=`echo $XPS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
    done
  
    for ntsdev in $NTS_DEVS ; do
      NTS_EXCLUDES="$(echo \"$IJS_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
 -    IJS_DEVS0=`echo $IJS_DEVS0 | sed "s/\b$ntsdev\b//g"`
 +    IJS_DEVS0=`echo $IJS_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
    done
  
    for ntsdev in $NTS_DEVS ; do
      NTS_EXCLUDES="$(echo \"$PNG_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
 -    PNG_DEVS0=`echo $PNG_DEVS0 | sed "s/\b$ntsdev\b//g"`
 +    PNG_DEVS0=`echo $PNG_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
    done
  
    for ntsdev in $NTS_DEVS ; do
      NTS_EXCLUDES="$(echo \"$X11_DEVS0{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
 -    X11_DEVS0=`echo $X11_DEVS0 | sed "s/\b$ntsdev\b//g"`
 +    X11_DEVS0=`echo $X11_DEVS0 | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
    done
  
    for ntsdev in $NTS_DEVS ; do
      NTS_EXCLUDES="$(echo \"$JBIG2_DEVS{@:0}\" | grep -o $ntsdev) $NTS_EXCLUDES"
 -    JBIG2_DEVS=`echo $JBIG2_DEVS | sed "s/\b$ntsdev\b//g"`
 +    JBIG2_DEVS=`echo $JBIG2_DEVS | sed "s/[[:<:]]$ntsdev[[:>:]]//g"`
    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)
 -      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"
Index: head/print/ghostscript9-agpl-base/pkg-message
===================================================================
--- head/print/ghostscript9-agpl-base/pkg-message	(nonexistent)
+++ head/print/ghostscript9-agpl-base/pkg-message	(revision 473400)
@@ -0,0 +1,2 @@
+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.

Property changes on: head/print/ghostscript9-agpl-base/pkg-message
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/print/ghostscript9-agpl-x11/Makefile
===================================================================
--- head/print/ghostscript9-agpl-x11/Makefile	(revision 473399)
+++ head/print/ghostscript9-agpl-x11/Makefile	(revision 473400)
@@ -1,56 +1,56 @@
 # $FreeBSD$
 
 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
 
 MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	PostScript and PDF interpreter, X11 support
 
 LICENSE=	AGPLv3
 
 CONFLICTS_INSTALL= \
 		ghostscript[789]-[0-9]* \
 		ghostscript[789]-nox11-[0-9]* \
 		ghostscript9-agpl-[0-9]* \
 		ghostscript9-agpl-nox11-[0-9]*
 
 PATCHDIR=	${.CURDIR:H}/ghostscript9-agpl-base/files
 USES=		ghostscript:agpl gmake iconv localbase pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_XORG=	ice sm x11 xext xt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--disable-cups \
 		--disable-dbus \
 		--disable-gtk \
 		--enable-contrib \
 		--enable-dynamic \
 		--enable-fontconfig \
 		--enable-freetype \
 		--enable-openjpeg \
-		--enable-threadsafe \
 		--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-patch:
 	@${RM} -r ${WRKSRC}/freetype ${WRKSRC}/ijs ${WRKSRC}/jbig2dec \
 		${WRKSRC}/jpeg ${WRKSRC}/libpng ${WRKSRC}/openjpeg \
 		${WRKSRC}/zlib
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/X11.so
 
 .include <bsd.port.mk>