4 files changed, 52 insertions, 4 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index f9213d774bbd..2f982811007d 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ghostscript
 PORTVERSION=	7.04
 PORTREVISION=	7
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,gprint,bjc250/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:dj970 \
@@ -23,6 +23,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/:fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs704/
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,gs_fonts,ports_jp_gs \
+			gimp-print/:gprint \
 			bjc250gs/:bjc250 \
 			./:ports_jp
 PKGNAMESUFFIX=	-afpl
@@ -33,6 +34,7 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${HPDJ_SRCS}:hpdj_pcl3 \
 		${PCL3_SRCS}:hpdj_pcl3 \
 		${DJ970_SRCS}:dj970 \
+		${GPRINT_SRCS}:gprint \
 		${MD2K_SRCS}:md2k \
 		${ALPS_SRCS}:ports_jp_gs \
 		${BJ10V_SRCS}:ports_jp_gs \
@@ -140,6 +142,20 @@ PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 DJ970=		gdevdj9
 DJ970_SRCS=	${DJ970}.c.gz
 
+# Gimp-Print - very high quality driver for Epson, HPs,...
+# http://gimp-print.sourceforge.net/
+#
+# NOTE:
+# Support of stp driver interface has already been discontinued, and using
+# ijs driver with ijsgimpprint (part of print/gimp-print port) is highly
+# recommended.
+#
+# For that reason, integlation of stp driver is disabled by default.
+GPRINT=		gimp-print
+GPRINT_VERS=	4.2.1
+GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
+GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
+
 # MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
 # http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
 MD2K=		md2k
@@ -248,6 +264,9 @@ post-extract:
 	${ECHO_MSG} ">>>   extracting ${DJ970_SRCS} ..."
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src
 	${GUNZIP_CMD} ${WRKSRC}/src/${DJ970_SRCS}
+# for Gimp-Print driver
+	${ECHO_MSG} ">>>   extracting ${GPRINT_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GPRINT_SRCS}
 # for MD2K driver
 	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
@@ -265,7 +284,6 @@ post-extract:
 	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${BJC250_SRCS} | \
 		${PATCH} -d ${WRKSRC}/${BJC250_NAME} -f -s -N -E -p1 \
 		2>/dev/null || ${TRUE}
-
 # for LIPS driver
 	${ECHO_MSG} ">>>   extracting ${LIPS_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRCS}
@@ -323,6 +341,10 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${DJ970} driver to contrib.mak ..."
 	${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for Gimp-Print driver
+	${ECHO_MSG} ">>>   adding ${GPRINT} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/stp.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 # for MD2K driver
 	${ECHO_MSG} ">>>   adding ${MD2K} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.mak-5.50 \
@@ -378,12 +400,36 @@ do-configure:
 	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 
+post-configure:
+	${ECHO_MSG} ">>> in post-configure ..."
+# for Gimp-Print driver
+	${ECHO_MSG} ">>>   running configure script for ${GPRINT} library ..."
+	cd ${WRKSRC}/${GPRINT_NAME} ; \
+		${SETENV} ${MAKE_ENV} ${SH} ./configure \
+			--without-translated-ppds --with-ghost \
+			--without-gimp --without-samples \
+			--without-user-guide --disable-escputil \
+			--disable-nls --disable-shared \
+			--prefix=${PREFIX}
+
 pre-build:
 	${ECHO_MSG} ">>> in pre-build ..."
 	${ECHO_MSG} ">>>   creating directories for compilation ..."
 	${MKDIR} ${WRKSRC}/obj
 	${MKDIR} ${WRKSRC}/bin
 	${LN} -sf ${WRKSRC}/src/unix-gcc.mak ${WRKSRC}/Makefile
+# for Gimp-Print driver
+	${ECHO_MSG} ">>>   building ${GPRINT} library ..."
+	cd ${WRKSRC}/${GPRINT_NAME} ; \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
+	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT} ..."
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/ghost/*.[ch] \
+		${WRKSRC}/src
+	${MKDIR} ${WRKSRC}/${GPRINT}
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/include/gimp-print \
+		${WRKSRC}/${GPRINT}/gimp-print
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/src/main/.libs/libgimpprint.a \
+		${WRKSRC}/${GPRINT}/libgimpprint.a
 # for MD2K driver
 	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
 .for i in gdevmd2k.c
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index e953668eb784..8d862f65f2a0 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -5,6 +5,7 @@ MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
+MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
 MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
diff --git a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
index dca774800545..c27a7c5e6610 100644
--- a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak
@@ -101,7 +101,7 @@
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
 -XCFLAGS=
-+#XCFLAGS=
++XCFLAGS+=-I${.CURDIR}/gimp-print
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
@@ -110,7 +110,7 @@
  # giving the full path names of the shared library directories.
  # XLDFLAGS can be set from the command line.
 -XLDFLAGS=
-+XLDFLAGS=-L${LOCALBASE}/lib
++XLDFLAGS=-L${.CURDIR}/gimp-print -L${LOCALBASE}/lib
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index 0b337569834a..dad3e9790fe1 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -54,6 +54,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "m8510"    "C.Itoh M8510 printer" OFF \
   "coslw2p"  "CoStar LabelWriter II II/Plus" OFF \
   "coslwxl"  "CoStar LabelWriter XL" OFF \
+  "stp"      "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" OFF \
   "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" ON \
   "dmprt"    "Configurable dot matrix printer driver [DMPRT]" ON \
   "lj250"    "DEC LJ250 Companion color printer" OFF \