5 files changed, 79 insertions, 51 deletions

diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index 12ca6d4b42a4..e5731575b996 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pslib
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -33,7 +33,7 @@ OPTIONS=	EXAMPLES	"Install additional examples" On \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_EXAMPLES)
-EX_NAME=	pslib-examples-0.0.8
+EX_NAME=	pslib-examples-0.0.9
 EX_WRKSRC=	${WRKDIR}/${EX_NAME}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX} ${EX_NAME}${EXTRACT_SUFX}
 PLIST_SUB+=	EXAMPLES=""
@@ -64,9 +64,10 @@ post-patch:
 .endif
 
 post-install:
-.if !defined(WITHOUT_EXAMPLES)
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} -m 0755 ${EXAMPLESDIR}
-	@${RM} -f ${EX_WRKSRC}/Makefile ${EX_WRKSRC}/ChangeLog
+	@${RM} -f ${EX_WRKSRC}/Makefile.unix ${EX_WRKSRC}/ChangeLog \
+		${EX_WRKSRC}/CMakeLists.txt
 	cd ${EX_WRKSRC} && ${PAX} -rw * ${EXAMPLESDIR}
 .endif
 
diff --git a/print/pslib/distinfo b/print/pslib/distinfo
index efe9f051c662..9122b18a8e13 100644
--- a/print/pslib/distinfo
+++ b/print/pslib/distinfo
@@ -1,6 +1,6 @@
-MD5 (pslib-0.3.0.tar.gz) = ada1e74f3d7eea899da402898e6b8a88
-SHA256 (pslib-0.3.0.tar.gz) = a612b34c912d183e5c01b2eae614276aae93a2f44d80c3a40fabba37f2550374
-SIZE (pslib-0.3.0.tar.gz) = 520186
-MD5 (pslib-examples-0.0.8.tar.gz) = ef7ea1c869047b9510fb1ea55cfa9e76
-SHA256 (pslib-examples-0.0.8.tar.gz) = cfab81f3639e2863e92c226ba6b6a06b0c482afc524d041bcb1df4cbe74f8ebd
-SIZE (pslib-examples-0.0.8.tar.gz) = 175792
+MD5 (pslib-0.4.0.tar.gz) = d7708b38ff3bb154943d24554d36b9fc
+SHA256 (pslib-0.4.0.tar.gz) = 988645a5c7a4e1b9e1fcaf21d0cacd3b2d435f3d454f8117ec25622578ba3236
+SIZE (pslib-0.4.0.tar.gz) = 528467
+MD5 (pslib-examples-0.0.9.tar.gz) = 36396c82eaf43654b9d3decfedb10438
+SHA256 (pslib-examples-0.0.9.tar.gz) = d615dfb9b5ce37b67f4ca4f69fd60dd5ba4bd1c3f4438ff696139e3a90353ec9
+SIZE (pslib-examples-0.0.9.tar.gz) = 658619
diff --git a/print/pslib/files/man3 b/print/pslib/files/man3
index e542ba69e793..9b9b9d7270bf 100644
--- a/print/pslib/files/man3
+++ b/print/pslib/files/man3
@@ -1,11 +1,15 @@
 PS_add_bookmark.3
+PS_add_kerning.3
 PS_add_launchlink.3
+PS_add_ligature.3
 PS_add_locallink.3
 PS_add_note.3
 PS_add_pdflink.3
 PS_add_weblink.3
 PS_arc.3
 PS_arcn.3
+PS_begin_font.3
+PS_begin_glyph.3
 PS_begin_page.3
 PS_begin_pattern.3
 PS_begin_template.3
@@ -21,12 +25,15 @@ PS_continue_text2.3
 PS_create_gstate.3
 PS_curveto.3
 PS_delete.3
+PS_end_font.3
+PS_end_glyph.3
 PS_end_page.3
 PS_end_pattern.3
 PS_end_template.3
 PS_fill.3
 PS_fill_stroke.3
 PS_findfont.3
+PS_free_glyph_list.3
 PS_get_buffer.3
 PS_get_majorversion.3
 PS_get_minorversion.3
@@ -34,6 +41,8 @@ PS_get_opaque.3
 PS_get_parameter.3
 PS_get_subminorversion.3
 PS_get_value.3
+PS_glyph_list.3
+PS_glyph_show.3
 PS_hyphenate.3
 PS_include_file.3
 PS_lineto.3
diff --git a/print/pslib/files/patch-src-ght_hash_table.h.in b/print/pslib/files/patch-src-ght_hash_table.h.in
index 2ae260c05702..d689f4e3aac8 100644
--- a/print/pslib/files/patch-src-ght_hash_table.h.in
+++ b/print/pslib/files/patch-src-ght_hash_table.h.in
@@ -1,10 +1,10 @@
---- src/ght_hash_table.h.in.orig	Sun Jun 24 14:12:27 2007
-+++ src/ght_hash_table.h.in	Sun Jun 24 14:12:45 2007
+--- src/ght_hash_table.h.in.orig	Sat Jul 14 10:40:00 2007
++++ src/ght_hash_table.h.in	Sat Jul 14 10:40:29 2007
 @@ -60,6 +60,7 @@
  #define GHT_HASH_TABLE_H
  
  #include <stdlib.h>                    /* size_t */
 +#include <sys/types.h>
- 
- #ifdef __cplusplus
- extern "C" {
+ #ifndef WIN32
+ #include <stdint.h>                    /* uint32_t */
+ #endif
diff --git a/print/pslib/pkg-plist b/print/pslib/pkg-plist
index 592deacb2531..8eca6fbcca35 100644
--- a/print/pslib/pkg-plist
+++ b/print/pslib/pkg-plist
@@ -4,46 +4,64 @@ include/libps/psversion.h
 lib/libps.a
 lib/libps.la
 lib/libps.so
-lib/libps.so.3
+lib/libps.so.4
 libdata/pkgconfig/libps.pc
 %%NLS%%share/locale/de/LC_MESSAGES/pslib.mo
 %%DATADIR%%/draft.ps
 %%DATADIR%%/exectime.ps
 %%DATADIR%%/grid.ps
-%%EXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.afm
-%%EXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.enc
-%%EXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.pfb
-%%EXAMPLES%%%%EXAMPLESDIR%%/Courier.afm
-%%EXAMPLES%%%%EXAMPLESDIR%%/Helvetica.afm
-%%EXAMPLES%%%%EXAMPLESDIR%%/Helvetica.pro
-%%EXAMPLES%%%%EXAMPLESDIR%%/README
-%%EXAMPLES%%%%EXAMPLESDIR%%/cork.enc
-%%EXAMPLES%%%%EXAMPLESDIR%%/debian.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/dice.afm
-%%EXAMPLES%%%%EXAMPLESDIR%%/dice.pfb
-%%EXAMPLES%%%%EXAMPLESDIR%%/draw.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/einstein.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/einstein.txt
-%%EXAMPLES%%%%EXAMPLESDIR%%/fontsample.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/hyperlinks.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/hyph_de.dic
-%%EXAMPLES%%%%EXAMPLESDIR%%/hyph_en.dic
-%%EXAMPLES%%%%EXAMPLESDIR%%/hyphenate.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/image.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/indexed-alpha.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/indexed.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/ligatures.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/memory.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/mmk.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/overprint.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/pagehook.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/picture.eps
-%%EXAMPLES%%%%EXAMPLESDIR%%/psclock.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/rgb-alpha.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/rgb.png
-%%EXAMPLES%%%%EXAMPLESDIR%%/shading.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/spotcolor.c
-%%EXAMPLES%%%%EXAMPLESDIR%%/txt2ps.c
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.afm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.enc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/AlteSchwabacher.pfb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Courier.afm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Helvetica.afm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Helvetica.pro
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmyk.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cne-cmyk.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cork.enc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian-transparent.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.bmp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/debian.tiff
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dice.afm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dice.pfb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/draw.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/einstein.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/einstein.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/exiftest.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontcreate.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontsample.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glyphlist.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu-head.jpg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyperlinks.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyph_de.dic
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyph_en.dic
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hyphenate.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/indexed-alpha.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/indexed.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/interlaced.gif
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ligatures.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ligexperts.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logos.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/memory.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mmk.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/overprint.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pagehook.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/picture.eps
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/polish.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poster.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/psclock.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgb-alpha.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgb.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/schematic.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shading.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/showbox.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spotcolor.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/txt2ps.c
+%%PORTEXAMPLES%%
+@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
 @dirrm include/libps