- Update to 2.0.0

PR:		137456
Submitted by:	Tomas Verbaitis <tomasv@megalogika.lt> (maintainer)

6 files changed, 145 insertions, 84 deletions

diff --git a/print/splix/Makefile b/print/splix/Makefile
index 9d02143cd8d3..fda32716a5a2 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -6,48 +6,83 @@
 #
 
 PORTNAME=	splix
-PORTVERSION=	1.1.0
-PORTREVISION=	2
-CATEGORIES=	print
+PORTVERSION=	2.0.0
+CATEGORIES?=	print
 MASTER_SITES=	SF
 
 MAINTAINER=	tomasv@megalogika.lt
 COMMENT=	A set of CUPS printer drivers for Samsung Printer Language printers
 
-LIB_DEPENDS=	jbig:${PORTSDIR}/graphics/jbigkit
+LIB_DEPENDS=
 BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-base \
-				ppdc:${PORTSDIR}/print/cupsddk
+		ppdc:${PORTSDIR}/print/cupsddk
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 
-MODELS=			DELL SAMSUNG XEROX
-PPD_DELL=		1100 1110
-PPD_SAMSUNG=	clp200 clp300 clp500 clp510 clp600 clp610 clx2170 clx3160 \
-				ml1510 ml1520 ml1610 ml1630 ml1710 ml1740 ml1750 ml2010 \
-				ml2150 ml2250 ml2510 ml2550 ml3050 ml3560
-PPD_XEROX=		ph3115 ph3116 ph3117 ph3120 ph3121 ph3122 ph3130 ph3150 \
-				ph3420 ph3425 ph5500 ph6100 ph6110
-
-FILTER_FILE=		rastertospl2
-CUPS_CONFIG=		${PREFIX}/bin/cups-config
-BIN_DEST_DIR=		`${CUPS_CONFIG} --serverbin | ${SED} \
-					's|${LOCALBASE}|${PREFIX}|'`/filter
-CUPS_DATA_DIR=		`${CUPS_CONFIG} --datadir | ${SED} \
-					's|${LOCALBASE}|${PREFIX}|'`
-DEST_DIR_DELL=		${CUPS_DATA_DIR}/model/dell
+MODELS=		DELL SAMSUNG XEROX
+PPD_DELL=	1100 1110
+PPD_SAMSUNG=	clp500 clp510 clp550 clp610 \
+		ml1510 ml1520 ml1610 ml1630 ml1640 ml1710 ml1740 ml1750 \
+		ml2010 ml2150 ml2250 ml2251 ml2510 ml2550 \
+		ml3050 ml3560 \
+		scx4200 scx4500
+PPD_XEROX=	ph3115 ph3116 ph3117 ph3120 ph3121 ph3122 ph3130 ph3150 \
+		ph3420 ph3425 ph5500 ph6100 wc3119 ph3160
+PPD_SAMSUNG_JBIG=	clp200 clp300 clp600 clx216x clx2170 clx3160
+PPD_XEROX_JBIG=		ph6110
+
+FILTER_FILE=	rastertoqpdl pstoqpdl
+CUPS_CONFIG=	${PREFIX}/bin/cups-config
+BIN_DEST_DIR=	`${CUPS_CONFIG} --serverbin | ${SED} \
+		's|${LOCALBASE}|${PREFIX}|'`/filter
+CUPS_DATA_DIR=	`${CUPS_CONFIG} --datadir | ${SED} \
+		's|${LOCALBASE}|${PREFIX}|'`
+DEST_DIR_DELL=	${CUPS_DATA_DIR}/model/dell
 DEST_DIR_SAMSUNG=	${CUPS_DATA_DIR}/model/samsung
-DEST_DIR_XEROX=		${CUPS_DATA_DIR}/model/xerox
+DEST_DIR_XEROX=	${CUPS_DATA_DIR}/model/xerox
 
-do-install:
+THREADS=	2
+WITH_THREADS=	1
+
+OPTIONS=	JBIG "Enable use of JBIG algorithm (pattented)" on \
+		BLACKOPTIM "Enable black correction algorithm" on \
 
+.include "bsd.port.options.mk"
+
+.include "bsd.port.pre.mk"
+
+post-configure:
+
+.if !defined(WITHOUT_JBIG)
+PPD_SAMSUNG+=	${PPD_SAMSUNG_JBIG}
+PPD_XEROX+=	${PPD_XEROX_JBIG}
+LIB_DEPENDS=	jbig:${PORTSDIR}/graphics/jbigkit
+.endif
+
+.if defined(WITHOUT_JBIG)
+MAKE_ARGS+=	DISABLE_JBIG=1
+.endif
+
+.if defined(WITHOUT_BLACKOPTIM)
+MAKE_ARGS+=	DISABLE_BLACKOPTIM=1
+.endif
+
+.if defined(CACHESIZE)
+MAKE_ARGS+=	CACHESIZE=${CACHESIZE}
+.endif
+
+do-install:
 .for MODEL in ${MODELS}
 	${MKDIR} ${DEST_DIR_${MODEL}}
 .for PPD in $(PPD_${MODEL})
-		${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd $(DEST_DIR_${MODEL})
+	${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd $(DEST_DIR_${MODEL})
+.endfor
 .endfor
+
+.for FILTER in ${FILTER_FILE}
+	${INSTALL_PROGRAM} ${WRKSRC}/optimized/${FILTER} ${BIN_DEST_DIR}
 .endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${FILTER_FILE} ${BIN_DEST_DIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/splix/distinfo b/print/splix/distinfo
index b6eab7ae6ad2..030e47ee8e33 100644
--- a/print/splix/distinfo
+++ b/print/splix/distinfo
@@ -1,3 +1,3 @@
-MD5 (splix-1.1.0.tar.bz2) = ade37edad8cee878f2d90f91ef8486fe
-SHA256 (splix-1.1.0.tar.bz2) = 0210c5015bccd08f0e9c25d40bcd01556a9b10528d40737493c1ef8b16b43491
-SIZE (splix-1.1.0.tar.bz2) = 63855
+MD5 (splix-2.0.0.tar.bz2) = f3aa735c22a926818b3d8b26c9964186
+SHA256 (splix-2.0.0.tar.bz2) = 97f703fc73a2940e63da43130615f3ef2a06d4d1f85fe6edfed0c0cd79de912f
+SIZE (splix-2.0.0.tar.bz2) = 101197
diff --git a/print/splix/files/patch-Makefile b/print/splix/files/patch-Makefile
deleted file mode 100644
index e993b895fc59..000000000000
--- a/print/splix/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile	Sun Feb  4 02:44:21 2007
-+++ Makefile.port	Thu Apr 19 22:33:09 2007
-@@ -4,7 +4,7 @@
- #  This project has been placed under the GPL Licence.
- #
- 
--CXXFLAGS	:= -O2 `cups-config --cflags` 
-+CXXFLAGS	+= `cups-config --cflags` 
- LDFLAGS		:= `cups-config --ldflags`
- CUPSFILTER	:= `cups-config --serverbin`/filter
- CUPSPPD		:= `cups-config --datadir`/model
diff --git a/print/splix/pkg-descr b/print/splix/pkg-descr
index 1afc75db5b67..030820c0b78b 100644
--- a/print/splix/pkg-descr
+++ b/print/splix/pkg-descr
@@ -1,46 +1,50 @@
 SpliX is a set of CUPS printer drivers for SPL (Samsung Printer Language)
-printers. Below is a non-exhaustive list of currently supported printers. Note
-that only SPL2 and SPLc printers are currently supported!
+printers. Below is a non-exhaustive list of currently supported printers.
 
-Manufacturer	Model	    State
-Dell	        1100	    Works
-Dell	        1110	    Works
-Samsung	        CLP-200	    Untested
-Samsung	        CLP-300	    Works
-Samsung	        CLP-500	    Works
-Samsung	        CLP-510	    Works
-Samsung	        CLP-600	    Untested
-Samsung	        CLP-610	    Untested
-Samsung	        CLX-216X    Untested
-Samsung	        CLX-2170    Untested
-Samsung	        CLX-3160    Untested
-Samsung	        ML-1510	    Works
-Samsung	        ML-1520	    Works
-Samsung	        ML-1610	    Works
-Samsung	        ML-1630	    Untested
-Samsung	        ML-1710	    Works
-Samsung	        ML-1740	    Works
-Samsung	        ML-1750	    Works
-Samsung	        ML-2010	    Works
-Samsung	        ML-2150	    Untested
-Samsung	        ML-2250	    Works
-Samsung	        ML-2510	    Works
-Samsung	        ML-2550	    Works
-Samsung	        ML-2571	    Works
-Samsung	        ML-3050	    Untested
-Samsung	        ML-3560	    Untested
-Xerox	        Phaser 3115	Untested
-Xerox	        Phaser 3116	Untested
-Xerox	        Phaser 3117	Works
-Xerox	        Phaser 3120	Untested
-Xerox	        Phaser 3121	Untested
-Xerox	        Phaser 3122	Untested
-Xerox	        Phaser 3130	Untested
-Xerox	        Phaser 3150	Untested
-Xerox	        Phaser 3420	Untested
-Xerox	        Phaser 3425	Untested
-Xerox	        Phaser 5500	Untested
-Xerox	        Phaser 6100	Works
-Xerox	        Phaser 6110	Untested
-
-WWW:	http://splix.sourceforge.net/
+Manufacturer	Model	        State
+Dell	        1100	        Works
+Dell	        1110	        Works
+Samsung	        CLP-200	        Untested
+Samsung	        CLP-300	        Works
+Samsung	        CLP-500	        Works
+Samsung	        CLP-510	        Works
+Samsung	        CLP-550	        Works
+Samsung	        CLP-600	        Untested
+Samsung	        CLP-610	        Untested
+Samsung	        CLX-216X        Works
+Samsung	        CLX-2170        Untested
+Samsung	        CLX-3160        Works
+Samsung	        ML-1510	        Works
+Samsung	        ML-1520	        Works
+Samsung	        ML-1610	        Works
+Samsung	        ML-1630	        Works
+Samsung	        ML-1640	        Works
+Samsung	        ML-1710	        Works
+Samsung	        ML-1740	        Works
+Samsung	        ML-1750	        Works
+Samsung	        ML-2010	        Works
+Samsung	        ML-2150	        Untested
+Samsung	        ML-2250	        Works
+Samsung	        ML-2251	        Works
+Samsung	        ML-2510	        Works
+Samsung	        ML-2570	        Works
+Samsung	        ML-2550	        Works
+Samsung	        ML-3050	        Untested
+Samsung	        ML-3560	        Works
+Samsung	        SCX-4200	    Works
+Samsung	        SCX-4500	    Works
+Xerox	        Phaser 3115	    Untested
+Xerox	        Phaser 3116	    Untested
+Xerox	        Phaser 3117	    Works
+Xerox	        Phaser 3120	    Untested
+Xerox	        Phaser 3121	    Works
+Xerox	        Phaser 3122	    Untested
+Xerox	        Phaser 3130	    Works
+Xerox	        Phaser 3150	    Untested
+Xerox	        Phaser 3160	    Works
+Xerox	        Phaser 3420	    Untested
+Xerox	        Phaser 3425	    Untested
+Xerox	        Phaser 5500	    Untested
+Xerox	        Phaser 6100	    Works
+Xerox	        Phaser 6110	    Works
+Xerox	        WorkCentre 3119	Untested
diff --git a/print/splix/pkg-message b/print/splix/pkg-message
new file mode 100644
index 000000000000..3b7af4afa6b4
--- /dev/null
+++ b/print/splix/pkg-message
@@ -0,0 +1,24 @@
+  +=======================================================================+
+  |                  !!!      IMPORTANT NOTICE      !!!                   |
+  +=======================================================================+
+  |      If you are upgrading your current version, you MUST delete       |
+  |     your printer in the CUPS interface and install it again. This     |
+  |   operation MUST be done since CUPS make a copy of the PPD file and   |
+  |                this file is modified between versions.                |
+  +=======================================================================+
+
+Installation of the color profile for color printers:
+-----------------------------------------------------
+
+        Color printers needs color profile files to get better results. These
+files are provided by your printer manufacturer and you have to install them
+manually. To do that, download the linux official drivers and locate the "cms"
+directory. Install them with the command:
+
+                # make installcms CMSDIR=/path/to/cms/directory \
+                        MANUFACTURER=samsung or xerox or dell
+
+        Samsung color profile files are available at:
+                (Then use MANUFACTURER=samsung)
+
+                http://splix.ap2c.org/samsung_cms.tar.bz2
diff --git a/print/splix/pkg-plist b/print/splix/pkg-plist
index ea9692c8e8a5..bc48a3604cfc 100644
--- a/print/splix/pkg-plist
+++ b/print/splix/pkg-plist
@@ -1,29 +1,36 @@
 @comment $FreeBSD$
-libexec/cups/filter/rastertospl2
+libexec/cups/filter/rastertoqpdl
+libexec/cups/filter/pstoqpdl
 share/cups/model/dell/1100.ppd
 share/cups/model/dell/1110.ppd
 share/cups/model/samsung/clp200.ppd
 share/cups/model/samsung/clp300.ppd
 share/cups/model/samsung/clp500.ppd
 share/cups/model/samsung/clp510.ppd
+share/cups/model/samsung/clp550.ppd
 share/cups/model/samsung/clp600.ppd
 share/cups/model/samsung/clp610.ppd
+share/cups/model/samsung/clx216x.ppd
 share/cups/model/samsung/clx2170.ppd
 share/cups/model/samsung/clx3160.ppd
 share/cups/model/samsung/ml1510.ppd
 share/cups/model/samsung/ml1520.ppd
 share/cups/model/samsung/ml1610.ppd
 share/cups/model/samsung/ml1630.ppd
+share/cups/model/samsung/ml1640.ppd
 share/cups/model/samsung/ml1710.ppd
 share/cups/model/samsung/ml1740.ppd
 share/cups/model/samsung/ml1750.ppd
 share/cups/model/samsung/ml2010.ppd
 share/cups/model/samsung/ml2150.ppd
 share/cups/model/samsung/ml2250.ppd
+share/cups/model/samsung/ml2251.ppd
 share/cups/model/samsung/ml2510.ppd
 share/cups/model/samsung/ml2550.ppd
 share/cups/model/samsung/ml3050.ppd
 share/cups/model/samsung/ml3560.ppd
+share/cups/model/samsung/scx4200.ppd
+share/cups/model/samsung/scx4500.ppd
 share/cups/model/xerox/ph3115.ppd
 share/cups/model/xerox/ph3116.ppd
 share/cups/model/xerox/ph3117.ppd
@@ -32,11 +39,13 @@ share/cups/model/xerox/ph3121.ppd
 share/cups/model/xerox/ph3122.ppd
 share/cups/model/xerox/ph3130.ppd
 share/cups/model/xerox/ph3150.ppd
+share/cups/model/xerox/ph3160.ppd
 share/cups/model/xerox/ph3420.ppd
 share/cups/model/xerox/ph3425.ppd
 share/cups/model/xerox/ph5500.ppd
 share/cups/model/xerox/ph6100.ppd
 share/cups/model/xerox/ph6110.ppd
+share/cups/model/xerox/wc3119.ppd
 @dirrm share/cups/model/dell
 @dirrm share/cups/model/samsung
 @dirrm share/cups/model/xerox