4 files changed, 118 insertions, 259 deletions

diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index be58afd38c9e..e061d85e69f3 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -1,27 +1,33 @@
 # New ports collection makefile for:   dgs
-# Version required:    0.5.0
+# Version required:    0.5.8
 # Date created:        22 April 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dgs-0.5.0
+DISTNAME=	dgs-0.5.8
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	dgs
 
-MAINTAINER=	nacai@iname.com
+MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS= 	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		glib12.3:${PORTSDIR}/devel/glib12
+BUILD_DEPENDS=	gs:${PORTSDIR}/print/ghostscript55
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/dgs
+GLIB_CONFIG=	${LOCALBASE}/bin/glib12-config
 
-GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	GLIB_CONFIG=${GLIB_CONFIG}
+MAKE_ENV=	INSTALL=${INSTALL}
 
-MAN1=		gs.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1
+MAN1=		gs.1
+MANM=		dpsexec makepsres xepsf
 
 .include <bsd.port.mk>
diff --git a/x11/dgs/distinfo b/x11/dgs/distinfo
index 32ca7420cefd..b6f3aab4ff77 100644
--- a/x11/dgs/distinfo
+++ b/x11/dgs/distinfo
@@ -1 +1 @@
-MD5 (dgs-0.5.0.tar.gz) = 462e965e26dee022cc84d59b329b2d68
+MD5 (dgs-0.5.8.tar.gz) = bcea9c022f0a16173022d23b33f0e69a
diff --git a/x11/dgs/files/patch-ah b/x11/dgs/files/patch-ah
new file mode 100644
index 000000000000..3d5e1f2e2ab9
--- /dev/null
+++ b/x11/dgs/files/patch-ah
@@ -0,0 +1,19 @@
+--- configure.orig	Wed Oct 20 15:57:45 1999
++++ configure	Wed Oct 20 15:58:34 1999
+@@ -2952,6 +2952,7 @@
+ s%@oldincludedir@%$oldincludedir%g
+ s%@infodir@%$infodir%g
+ s%@mandir@%$mandir%g
++s%@INSTALL@%install%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+@@ -3096,7 +3097,7 @@
+ s%@configure_input@%$configure_input%g
+ s%@srcdir@%$srcdir%g
+ s%@top_srcdir@%$top_srcdir%g
+-s%@INSTALL@%$INSTALL%g
++s%@INSTALL@%install%g
+ " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+ fi; done
+ rm -f conftest.s*
diff --git a/x11/dgs/pkg-plist b/x11/dgs/pkg-plist
index 663d1d248899..5b9fb4efb285 100644
--- a/x11/dgs/pkg-plist
+++ b/x11/dgs/pkg-plist
@@ -1,24 +1,9 @@
-bin/bdftops
 bin/dgs
 bin/dpsexec
 bin/dpsnx.agent
-bin/font2c
-bin/gsbj
-bin/gsdj
-bin/gsdj500
-bin/gslj
-bin/gslp
-bin/gsnd
 bin/makepsres
-bin/pdf2dsc
-bin/pdf2ps
-bin/printafm
-bin/ps2ascii
-bin/ps2epsi
-bin/ps2pdf
 bin/pswrap
 bin/texteroids
-bin/wftopfa
 bin/xepsf
 include/DPS/ColorSB.h
 include/DPS/ColorSBP.h
@@ -46,243 +31,92 @@ include/DPS/dpsexcept.h
 include/DPS/dpsfriends.h
 include/DPS/dpsops.h
 include/DPS/psops.h
-lib/DGS/4.03/Fontmap
-lib/DGS/4.03/acctest.ps
-lib/DGS/4.03/align.ps
-lib/DGS/4.03/bdftops.ps
-lib/DGS/4.03/caption.ps
-lib/DGS/4.03/cbjc600.ppd
-lib/DGS/4.03/cbjc800.ppd
-lib/DGS/4.03/decrypt.ps
-lib/DGS/4.03/doc/COPYING
-lib/DGS/4.03/doc/NEWS
-lib/DGS/4.03/doc/PUBLIC
-lib/DGS/4.03/doc/README
-lib/DGS/4.03/doc/c-style.txt
-lib/DGS/4.03/doc/current.txt
-lib/DGS/4.03/doc/devices.txt
-lib/DGS/4.03/doc/drivers.txt
-lib/DGS/4.03/doc/fonts.txt
-lib/DGS/4.03/doc/gs.1
-lib/DGS/4.03/doc/helpers.txt
-lib/DGS/4.03/doc/hershey.txt
-lib/DGS/4.03/doc/history1.txt
-lib/DGS/4.03/doc/history2.txt
-lib/DGS/4.03/doc/history3.txt
-lib/DGS/4.03/doc/humor.txt
-lib/DGS/4.03/doc/install.txt
-lib/DGS/4.03/doc/language.txt
-lib/DGS/4.03/doc/lib.txt
-lib/DGS/4.03/doc/make.txt
-lib/DGS/4.03/doc/new-user.txt
-lib/DGS/4.03/doc/pdf2ps.1
-lib/DGS/4.03/doc/ps2ascii.1
-lib/DGS/4.03/doc/ps2epsi.1
-lib/DGS/4.03/doc/ps2epsi.txt
-lib/DGS/4.03/doc/ps2pdf.1
-lib/DGS/4.03/doc/ps2pdf.txt
-lib/DGS/4.03/doc/psfiles.txt
-lib/DGS/4.03/doc/public.txt
-lib/DGS/4.03/doc/unix-lpr.txt
-lib/DGS/4.03/doc/use.txt
-lib/DGS/4.03/doc/xfonts.txt
-lib/DGS/4.03/docie.ps
-lib/DGS/4.03/examples/alphabet.ps
-lib/DGS/4.03/examples/cheq.ps
-lib/DGS/4.03/examples/chess.ps
-lib/DGS/4.03/examples/colorcir.ps
-lib/DGS/4.03/examples/escher.ps
-lib/DGS/4.03/examples/golfer.ps
-lib/DGS/4.03/examples/grayalph.ps
-lib/DGS/4.03/examples/snowflak.ps
-lib/DGS/4.03/examples/tiger.ps
-lib/DGS/4.03/examples/waterfal.ps
-lib/DGS/4.03/font2c.ps
-lib/DGS/4.03/gs_btokn.ps
-lib/DGS/4.03/gs_ccfnt.ps
-lib/DGS/4.03/gs_cidfn.ps
-lib/DGS/4.03/gs_cmap.ps
-lib/DGS/4.03/gs_dbt_e.ps
-lib/DGS/4.03/gs_dps1.ps
-lib/DGS/4.03/gs_dpsx.ps
-lib/DGS/4.03/gs_fonts.ps
-lib/DGS/4.03/gs_init.ps
-lib/DGS/4.03/gs_iso_e.ps
-lib/DGS/4.03/gs_kanji.ps
-lib/DGS/4.03/gs_ksb_e.ps
-lib/DGS/4.03/gs_l2img.ps
-lib/DGS/4.03/gs_lev2.ps
-lib/DGS/4.03/gs_mex_e.ps
-lib/DGS/4.03/gs_mro_e.ps
-lib/DGS/4.03/gs_pdf.ps
-lib/DGS/4.03/gs_pdf_e.ps
-lib/DGS/4.03/gs_pdfwr.ps
-lib/DGS/4.03/gs_pfile.ps
-lib/DGS/4.03/gs_res.ps
-lib/DGS/4.03/gs_setpd.ps
-lib/DGS/4.03/gs_statd.ps
-lib/DGS/4.03/gs_std_e.ps
-lib/DGS/4.03/gs_sym_e.ps
-lib/DGS/4.03/gs_ttf.ps
-lib/DGS/4.03/gs_typ42.ps
-lib/DGS/4.03/gs_type1.ps
-lib/DGS/4.03/gs_wan_e.ps
-lib/DGS/4.03/gslp.ps
-lib/DGS/4.03/impath.ps
-lib/DGS/4.03/landscap.ps
-lib/DGS/4.03/level1.ps
-lib/DGS/4.03/lines.ps
-lib/DGS/4.03/markhint.ps
-lib/DGS/4.03/markpath.ps
-lib/DGS/4.03/packfile.ps
-lib/DGS/4.03/pcharstr.ps
-lib/DGS/4.03/pdf2dsc.ps
-lib/DGS/4.03/pdf_2ps.ps
-lib/DGS/4.03/pdf_base.ps
-lib/DGS/4.03/pdf_draw.ps
-lib/DGS/4.03/pdf_font.ps
-lib/DGS/4.03/pdf_main.ps
-lib/DGS/4.03/pdf_sec.ps
-lib/DGS/4.03/pfbtogs.ps
-lib/DGS/4.03/ppath.ps
-lib/DGS/4.03/prfont.ps
-lib/DGS/4.03/printafm.ps
-lib/DGS/4.03/ps2ai.ps
-lib/DGS/4.03/ps2ascii.ps
-lib/DGS/4.03/ps2epsi.ps
-lib/DGS/4.03/ps2image.ps
-lib/DGS/4.03/pstoppm.ps
-lib/DGS/4.03/quit.ps
-lib/DGS/4.03/showchar.ps
-lib/DGS/4.03/showpage.ps
-lib/DGS/4.03/stcinfo.ps
-lib/DGS/4.03/stcolor.ps
-lib/DGS/4.03/traceimg.ps
-lib/DGS/4.03/traceop.ps
-lib/DGS/4.03/type1enc.ps
-lib/DGS/4.03/type1ops.ps
-lib/DGS/4.03/unprot.ps
-lib/DGS/4.03/viewcmyk.ps
-lib/DGS/4.03/viewgif.ps
-lib/DGS/4.03/viewjpeg.ps
-lib/DGS/4.03/viewpbm.ps
-lib/DGS/4.03/viewpcx.ps
-lib/DGS/4.03/viewps2a.ps
-lib/DGS/4.03/wftopfa.ps
-lib/DGS/4.03/winmaps.ps
-lib/DGS/4.03/wrfont.ps
-lib/DGS/4.03/zeroline.ps
-lib/DGS/fonts/a010013l.afm
-lib/DGS/fonts/a010013l.pfb
-lib/DGS/fonts/a010013l.pfm
-lib/DGS/fonts/a010015l.afm
-lib/DGS/fonts/a010015l.pfb
-lib/DGS/fonts/a010015l.pfm
-lib/DGS/fonts/a010033l.afm
-lib/DGS/fonts/a010033l.pfb
-lib/DGS/fonts/a010033l.pfm
-lib/DGS/fonts/a010035l.afm
-lib/DGS/fonts/a010035l.pfb
-lib/DGS/fonts/a010035l.pfm
-lib/DGS/fonts/b018012l.afm
-lib/DGS/fonts/b018012l.pfb
-lib/DGS/fonts/b018012l.pfm
-lib/DGS/fonts/b018015l.afm
-lib/DGS/fonts/b018015l.pfb
-lib/DGS/fonts/b018015l.pfm
-lib/DGS/fonts/b018032l.afm
-lib/DGS/fonts/b018032l.pfb
-lib/DGS/fonts/b018032l.pfm
-lib/DGS/fonts/b018035l.afm
-lib/DGS/fonts/b018035l.pfb
-lib/DGS/fonts/b018035l.pfm
-lib/DGS/fonts/c059013l.afm
-lib/DGS/fonts/c059013l.pfb
-lib/DGS/fonts/c059013l.pfm
-lib/DGS/fonts/c059016l.afm
-lib/DGS/fonts/c059016l.pfb
-lib/DGS/fonts/c059016l.pfm
-lib/DGS/fonts/c059033l.afm
-lib/DGS/fonts/c059033l.pfb
-lib/DGS/fonts/c059033l.pfm
-lib/DGS/fonts/c059036l.afm
-lib/DGS/fonts/c059036l.pfb
-lib/DGS/fonts/c059036l.pfm
-lib/DGS/fonts/d050000l.afm
-lib/DGS/fonts/d050000l.pfb
-lib/DGS/fonts/d050000l.pfm
-lib/DGS/fonts/n019003l.afm
-lib/DGS/fonts/n019003l.pfb
-lib/DGS/fonts/n019003l.pfm
-lib/DGS/fonts/n019004l.afm
-lib/DGS/fonts/n019004l.pfb
-lib/DGS/fonts/n019004l.pfm
-lib/DGS/fonts/n019023l.afm
-lib/DGS/fonts/n019023l.pfb
-lib/DGS/fonts/n019023l.pfm
-lib/DGS/fonts/n019024l.afm
-lib/DGS/fonts/n019024l.pfb
-lib/DGS/fonts/n019024l.pfm
-lib/DGS/fonts/n019043l.afm
-lib/DGS/fonts/n019043l.pfb
-lib/DGS/fonts/n019043l.pfm
-lib/DGS/fonts/n019044l.afm
-lib/DGS/fonts/n019044l.pfb
-lib/DGS/fonts/n019044l.pfm
-lib/DGS/fonts/n019063l.afm
-lib/DGS/fonts/n019063l.pfb
-lib/DGS/fonts/n019063l.pfm
-lib/DGS/fonts/n019064l.afm
-lib/DGS/fonts/n019064l.pfb
-lib/DGS/fonts/n019064l.pfm
-lib/DGS/fonts/n021003l.afm
-lib/DGS/fonts/n021003l.pfb
-lib/DGS/fonts/n021003l.pfm
-lib/DGS/fonts/n021004l.afm
-lib/DGS/fonts/n021004l.pfb
-lib/DGS/fonts/n021004l.pfm
-lib/DGS/fonts/n021023l.afm
-lib/DGS/fonts/n021023l.pfb
-lib/DGS/fonts/n021023l.pfm
-lib/DGS/fonts/n021024l.afm
-lib/DGS/fonts/n021024l.pfb
-lib/DGS/fonts/n021024l.pfm
-lib/DGS/fonts/n022003l.afm
-lib/DGS/fonts/n022003l.pfb
-lib/DGS/fonts/n022003l.pfm
-lib/DGS/fonts/n022004l.afm
-lib/DGS/fonts/n022004l.pfb
-lib/DGS/fonts/n022004l.pfm
-lib/DGS/fonts/n022023l.afm
-lib/DGS/fonts/n022023l.pfb
-lib/DGS/fonts/n022023l.pfm
-lib/DGS/fonts/n022024l.afm
-lib/DGS/fonts/n022024l.pfb
-lib/DGS/fonts/n022024l.pfm
-lib/DGS/fonts/p052003l.afm
-lib/DGS/fonts/p052003l.pfb
-lib/DGS/fonts/p052003l.pfm
-lib/DGS/fonts/p052004l.afm
-lib/DGS/fonts/p052004l.pfb
-lib/DGS/fonts/p052004l.pfm
-lib/DGS/fonts/p052023l.afm
-lib/DGS/fonts/p052023l.pfb
-lib/DGS/fonts/p052023l.pfm
-lib/DGS/fonts/p052024l.afm
-lib/DGS/fonts/p052024l.pfb
-lib/DGS/fonts/p052024l.pfm
-lib/DGS/fonts/s050000l.afm
-lib/DGS/fonts/s050000l.pfb
-lib/DGS/fonts/s050000l.pfm
-lib/DGS/fonts/z003034l.afm
-lib/DGS/fonts/z003034l.pfb
-lib/DGS/fonts/z003034l.pfm
 lib/libdps.a
+lib/libdps.la
+lib/libdps.so
+lib/libdps.so.0
 lib/libdpstk.a
+lib/libdpstk.la
+lib/libdpstk.so
+lib/libdpstk.so.0
 lib/libpsres.a
+lib/libpsres.la
+lib/libpsres.so
+lib/libpsres.so.0
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+man/manm/dpsexec.man
+man/manm/makepsres.man
+man/manm/xepsf.man
+share/ghostscript/5.50/Fontmap
+share/ghostscript/5.50/doc/Bug-form.htm
+share/ghostscript/5.50/doc/C-style.htm
+share/ghostscript/5.50/doc/Commprod.htm
+share/ghostscript/5.50/doc/Copying.htm
+share/ghostscript/5.50/doc/Current.htm
+share/ghostscript/5.50/doc/DLL.htm
+share/ghostscript/5.50/doc/Devices.htm
+share/ghostscript/5.50/doc/Drivers.htm
+share/ghostscript/5.50/doc/Fonts.htm
+share/ghostscript/5.50/doc/Helpers.htm
+share/ghostscript/5.50/doc/Hershey.htm
+share/ghostscript/5.50/doc/History1.htm
+share/ghostscript/5.50/doc/History2.htm
+share/ghostscript/5.50/doc/History3.htm
+share/ghostscript/5.50/doc/History4.htm
+share/ghostscript/5.50/doc/Htmstyle.htm
+share/ghostscript/5.50/doc/Humor.htm
+share/ghostscript/5.50/doc/Install.htm
+share/ghostscript/5.50/doc/Language.htm
+share/ghostscript/5.50/doc/Lib.htm
+share/ghostscript/5.50/doc/Make.htm
+share/ghostscript/5.50/doc/New-user.htm
+share/ghostscript/5.50/doc/News.htm
+share/ghostscript/5.50/doc/Ps2pdf.htm
+share/ghostscript/5.50/doc/Psfiles.htm
+share/ghostscript/5.50/doc/Public.htm
+share/ghostscript/5.50/doc/Readme.htm
+share/ghostscript/5.50/doc/Source.htm
+share/ghostscript/5.50/doc/Unix-lpr.htm
+share/ghostscript/5.50/doc/Use.htm
+share/ghostscript/5.50/doc/Xfonts.htm
+share/ghostscript/5.50/examples/ridt91.eps
+share/ghostscript/5.50/gs_btokn.ps
+share/ghostscript/5.50/gs_ccfnt.ps
+share/ghostscript/5.50/gs_cff.ps
+share/ghostscript/5.50/gs_cidfn.ps
+share/ghostscript/5.50/gs_cmap.ps
+share/ghostscript/5.50/gs_dbt_e.ps
+share/ghostscript/5.50/gs_diskf.ps
+share/ghostscript/5.50/gs_dpnxt.ps
+share/ghostscript/5.50/gs_dps.ps
+share/ghostscript/5.50/gs_dps1.ps
+share/ghostscript/5.50/gs_dps2.ps
+share/ghostscript/5.50/gs_dpsx.ps
+share/ghostscript/5.50/gs_epsf.ps
+share/ghostscript/5.50/gs_fonts.ps
+share/ghostscript/5.50/gs_init.ps
+share/ghostscript/5.50/gs_iso_e.ps
+share/ghostscript/5.50/gs_kanji.ps
+share/ghostscript/5.50/gs_ksb_e.ps
+share/ghostscript/5.50/gs_l2img.ps
+share/ghostscript/5.50/gs_lev2.ps
+share/ghostscript/5.50/gs_ll3.ps
+share/ghostscript/5.50/gs_mex_e.ps
+share/ghostscript/5.50/gs_mro_e.ps
+share/ghostscript/5.50/gs_pdf_e.ps
+share/ghostscript/5.50/gs_pdfwr.ps
+share/ghostscript/5.50/gs_pfile.ps
+share/ghostscript/5.50/gs_res.ps
+share/ghostscript/5.50/gs_setpd.ps
+share/ghostscript/5.50/gs_statd.ps
+share/ghostscript/5.50/gs_std_e.ps
+share/ghostscript/5.50/gs_sym_e.ps
+share/ghostscript/5.50/gs_ttf.ps
+share/ghostscript/5.50/gs_typ32.ps
+share/ghostscript/5.50/gs_typ42.ps
+share/ghostscript/5.50/gs_type1.ps
+share/ghostscript/5.50/gs_wan_e.ps
 @dirrm include/DPS
-@dirrm lib/DGS/4.03/doc
-@dirrm lib/DGS/4.03/examples
-@dirrm lib/DGS/4.03
-@dirrm lib/DGS/fonts
-@dirrm lib/DGS
+@dirrm share/ghostscript/5.50/doc
+@dirrm share/ghostscript/5.50/examples