12 files changed, 100 insertions, 6 deletions

diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 5da63088082f..2f0007e69351 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -23,6 +23,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		http://www.linuxprinting.org/download/printing/:lxm3200 \
 		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
+		http://www.openprinting.org/download/printing/ghostscript-8.x/drivers/hl1250/:hl1250 \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			bjc250gs/:bjc250 \
@@ -46,7 +47,8 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${GDI_SRCS}:gdi \
 		${LXM3200_SRCS}:lxm3200 \
 		${LX5000_SRCS}:lx5000 \
-		${LEX7000_SRCS}:lx5000
+		${LEX7000_SRCS}:lx5000 \
+		${HL1250_SRCS}:hl1250
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SRCS}
 
@@ -226,6 +228,10 @@ LX5000_SRCS=	gdevlx50.c
 LEX7000=	lex7000
 LEX7000_SRCS=	gs6.0.lexmark7000.patch
 
+# HL1250 - additional driver for Brother HL-1050/1070/1250/1270N/1030/1240
+HL1250=		hl1250
+HL1250_SRCS=	gdevhl12.c
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -317,6 +323,11 @@ post-extract:
 		${PATCH} -d ${WRKSRC}/${LEX7000} -f -s -N -E -p1 \
 		2>/dev/null || ${TRUE}
 
+# for HL1250 driver
+	${ECHO_MSG} ">>>   extracting ${HL1250_SRCS} ..."
+	${MKDIR} ${WRKSRC}/${HL1250}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HL1250_SRCS} ${WRKSRC}/src
+
 post-patch:
 	${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
 		${WRKSRC}/src/unix-gcc.mak
@@ -402,6 +413,11 @@ pre-configure:
 	${CAT} ${FILESDIR}/lex7000.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 
+# for HL1250 driver
+	${ECHO_MSG} ">>>   adding ${HL1250} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/gdevhl12-hl1250.mak \
+		>> ${WRKSRC}/src/contrib.mak
+
 post-configure:
 	${ECHO_MSG} ">>> in post-configure ..."
 	cd ${WRKSRC}/jasper ; \
diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc
index 95727dda0203..20f6b6c3ff6b 100644
--- a/print/ghostscript-gpl/Makefile.inc
+++ b/print/ghostscript-gpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.56
-GS_REVISION=	0
+GS_REVISION=	1
 GS_EPOCH=	0
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 4d6163572198..8bbf6bfe2598 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -52,3 +52,6 @@ SIZE (ghostscript/gdevlx50.c) = 99428
 MD5 (ghostscript/gs6.0.lexmark7000.patch) = fd5018c18351bf64805fe5727be196de
 SHA256 (ghostscript/gs6.0.lexmark7000.patch) = 509dfc02436639ce6b9f98465ec306dd2e7f9342feded043c78b0c9cf44021df
 SIZE (ghostscript/gs6.0.lexmark7000.patch) = 27361
+MD5 (ghostscript/gdevhl12.c) = 277c5ddac9c6fb0e2897e95265eb1ff1
+SHA256 (ghostscript/gdevhl12.c) = 0abaa60cbe950b9c923753a687181b775910ecff0848917641e281737f03527a
+SIZE (ghostscript/gdevhl12.c) = 22001
diff --git a/print/ghostscript-gpl/files/gdevhl12-hl1250.mak b/print/ghostscript-gpl/files/gdevhl12-hl1250.mak
new file mode 100644
index 000000000000..8e1421ad1f03
--- /dev/null
+++ b/print/ghostscript-gpl/files/gdevhl12-hl1250.mak
@@ -0,0 +1,16 @@
+### -------------------- The Brother HL-1250 printer -------------------- ###
+### This printer is ljet4-compatible, plus support for source tray        ###
+### selection and special 1200x600 dpi mode.                              ###
+
+hl1250_=$(GLOBJ)gdevhl12.$(OBJ) $(HPDLJM)
+$(DD)hl1250.dev : $(hl1250_) $(DD)page.dev
+	$(SETPDEV) $(DD)hl1250 $(hl1250_)
+
+$(DD)hl1240.dev : $(hl1250_) $(DD)page.dev
+	$(SETPDEV) $(DD)hl1240 $(hl1250_)
+
+# Author: Marek Michalkiewicz <marekm@linux.org.pl>
+# Printer: Brother HL-1250 (may work with some other models too)
+$(GLOBJ)gdevhl12.$(OBJ) : $(GLSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h)
+	$(GLCC) $(GLO_)gdevhl12.$(OBJ) $(C_) $(GLSRC)gdevhl12.c
+
diff --git a/print/ghostscript-gpl/files/patch-src:gdevhl12.c b/print/ghostscript-gpl/files/patch-src:gdevhl12.c
new file mode 100644
index 000000000000..45c0472a983d
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-src:gdevhl12.c
@@ -0,0 +1,11 @@
+--- src/gdevhl12.c.orig	Wed Mar 28 14:10:35 2007
++++ src/gdevhl12.c	Wed Mar 28 14:13:21 2007
+@@ -472,7 +472,7 @@
+     for (y = ytop; y < ybottom; y++) {
+ 	if (hl1250_compress_line(s, y))
+ 	    continue;
+-#if 1
++#if 0
+ 	/* XXX - please report if you ever see this, then change to #if 0 */
+ 	fprintf(stderr,
+ 		"hl1250: compression failed (y=%u), doing 1200x300 dpi\n",
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index e866d102ba8b..0387c98890f4 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -24,7 +24,7 @@ else
 		$svgalibdevs \
 		md2k md5k \
 		md50Mono md50Eco md1xMono \
-		appledmp iwhi iwlo iwlq hl7x0 bj10e \
+		appledmp iwhi iwlo iwlq hl7x0 hl1250 bj10e \
 		bj10v bj10vh bj200 bjc600 bjc800 \
 		bjccmyk bjccolor bjcgray bjcmono \
 		lbp8 \
@@ -118,6 +118,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "iwlo"     "Apple Imagewriter, low-resolution mode" "$status_iwlo" \
   "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" "$status_iwlq" \
   "hl7x0"    "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" "$status_hl7x0" \
+  "hl1250"   "Brother HL-1030/1050/1070/1250/1270N/14x0" "$status_hl1250" \
   "bj10e"    "Canon BubbleJet BJ-10e" "$status_bj10e" \
   "bj10v"    "Canon BubbleJet BJ-10v [BJ10V]" "$status_bj10v" \
   "bj10vh"   "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" "$status_bj10vh" \
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 5da63088082f..2f0007e69351 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -23,6 +23,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		http://www.linuxprinting.org/download/printing/:lxm3200 \
 		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
+		http://www.openprinting.org/download/printing/ghostscript-8.x/drivers/hl1250/:hl1250 \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			bjc250gs/:bjc250 \
@@ -46,7 +47,8 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${GDI_SRCS}:gdi \
 		${LXM3200_SRCS}:lxm3200 \
 		${LX5000_SRCS}:lx5000 \
-		${LEX7000_SRCS}:lx5000
+		${LEX7000_SRCS}:lx5000 \
+		${HL1250_SRCS}:hl1250
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SRCS}
 
@@ -226,6 +228,10 @@ LX5000_SRCS=	gdevlx50.c
 LEX7000=	lex7000
 LEX7000_SRCS=	gs6.0.lexmark7000.patch
 
+# HL1250 - additional driver for Brother HL-1050/1070/1250/1270N/1030/1240
+HL1250=		hl1250
+HL1250_SRCS=	gdevhl12.c
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -317,6 +323,11 @@ post-extract:
 		${PATCH} -d ${WRKSRC}/${LEX7000} -f -s -N -E -p1 \
 		2>/dev/null || ${TRUE}
 
+# for HL1250 driver
+	${ECHO_MSG} ">>>   extracting ${HL1250_SRCS} ..."
+	${MKDIR} ${WRKSRC}/${HL1250}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HL1250_SRCS} ${WRKSRC}/src
+
 post-patch:
 	${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
 		${WRKSRC}/src/unix-gcc.mak
@@ -402,6 +413,11 @@ pre-configure:
 	${CAT} ${FILESDIR}/lex7000.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 
+# for HL1250 driver
+	${ECHO_MSG} ">>>   adding ${HL1250} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/gdevhl12-hl1250.mak \
+		>> ${WRKSRC}/src/contrib.mak
+
 post-configure:
 	${ECHO_MSG} ">>> in post-configure ..."
 	cd ${WRKSRC}/jasper ; \
diff --git a/print/ghostscript8/Makefile.inc b/print/ghostscript8/Makefile.inc
index 95727dda0203..20f6b6c3ff6b 100644
--- a/print/ghostscript8/Makefile.inc
+++ b/print/ghostscript8/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.56
-GS_REVISION=	0
+GS_REVISION=	1
 GS_EPOCH=	0
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 4d6163572198..8bbf6bfe2598 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -52,3 +52,6 @@ SIZE (ghostscript/gdevlx50.c) = 99428
 MD5 (ghostscript/gs6.0.lexmark7000.patch) = fd5018c18351bf64805fe5727be196de
 SHA256 (ghostscript/gs6.0.lexmark7000.patch) = 509dfc02436639ce6b9f98465ec306dd2e7f9342feded043c78b0c9cf44021df
 SIZE (ghostscript/gs6.0.lexmark7000.patch) = 27361
+MD5 (ghostscript/gdevhl12.c) = 277c5ddac9c6fb0e2897e95265eb1ff1
+SHA256 (ghostscript/gdevhl12.c) = 0abaa60cbe950b9c923753a687181b775910ecff0848917641e281737f03527a
+SIZE (ghostscript/gdevhl12.c) = 22001
diff --git a/print/ghostscript8/files/gdevhl12-hl1250.mak b/print/ghostscript8/files/gdevhl12-hl1250.mak
new file mode 100644
index 000000000000..8e1421ad1f03
--- /dev/null
+++ b/print/ghostscript8/files/gdevhl12-hl1250.mak
@@ -0,0 +1,16 @@
+### -------------------- The Brother HL-1250 printer -------------------- ###
+### This printer is ljet4-compatible, plus support for source tray        ###
+### selection and special 1200x600 dpi mode.                              ###
+
+hl1250_=$(GLOBJ)gdevhl12.$(OBJ) $(HPDLJM)
+$(DD)hl1250.dev : $(hl1250_) $(DD)page.dev
+	$(SETPDEV) $(DD)hl1250 $(hl1250_)
+
+$(DD)hl1240.dev : $(hl1250_) $(DD)page.dev
+	$(SETPDEV) $(DD)hl1240 $(hl1250_)
+
+# Author: Marek Michalkiewicz <marekm@linux.org.pl>
+# Printer: Brother HL-1250 (may work with some other models too)
+$(GLOBJ)gdevhl12.$(OBJ) : $(GLSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h)
+	$(GLCC) $(GLO_)gdevhl12.$(OBJ) $(C_) $(GLSRC)gdevhl12.c
+
diff --git a/print/ghostscript8/files/patch-src:gdevhl12.c b/print/ghostscript8/files/patch-src:gdevhl12.c
new file mode 100644
index 000000000000..45c0472a983d
--- /dev/null
+++ b/print/ghostscript8/files/patch-src:gdevhl12.c
@@ -0,0 +1,11 @@
+--- src/gdevhl12.c.orig	Wed Mar 28 14:10:35 2007
++++ src/gdevhl12.c	Wed Mar 28 14:13:21 2007
+@@ -472,7 +472,7 @@
+     for (y = ytop; y < ybottom; y++) {
+ 	if (hl1250_compress_line(s, y))
+ 	    continue;
+-#if 1
++#if 0
+ 	/* XXX - please report if you ever see this, then change to #if 0 */
+ 	fprintf(stderr,
+ 		"hl1250: compression failed (y=%u), doing 1200x300 dpi\n",
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index e866d102ba8b..0387c98890f4 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -24,7 +24,7 @@ else
 		$svgalibdevs \
 		md2k md5k \
 		md50Mono md50Eco md1xMono \
-		appledmp iwhi iwlo iwlq hl7x0 bj10e \
+		appledmp iwhi iwlo iwlq hl7x0 hl1250 bj10e \
 		bj10v bj10vh bj200 bjc600 bjc800 \
 		bjccmyk bjccolor bjcgray bjcmono \
 		lbp8 \
@@ -118,6 +118,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "iwlo"     "Apple Imagewriter, low-resolution mode" "$status_iwlo" \
   "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" "$status_iwlq" \
   "hl7x0"    "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" "$status_hl7x0" \
+  "hl1250"   "Brother HL-1030/1050/1070/1250/1270N/14x0" "$status_hl1250" \
   "bj10e"    "Canon BubbleJet BJ-10e" "$status_bj10e" \
   "bj10v"    "Canon BubbleJet BJ-10v [BJ10V]" "$status_bj10v" \
   "bj10vh"   "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" "$status_bj10vh" \