- Update to 1.1.0

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

4 files changed, 85 insertions, 26 deletions

diff --git a/print/splix/Makefile b/print/splix/Makefile
index c4d75f870f65..53faf3d37b18 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	splix
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.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
 BUILD_DEPENDS=	cups-config:${PORTSDIR}/print/cups-base \
 				ppdc:${PORTSDIR}/print/cupsddk
 RUN_DEPENDS=	${BUILD_DEPENDS}
@@ -20,19 +21,31 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 
-PPD_FILES=	ml1510 ml1520 ml1610 ml1710 ml1740 ml1750 ml2010 ml2150 ml2250 \
-		ml2550 clp300 clp500 clp510 clp600 xerox-phaser6100
-FILTER_FILE=	rastertospl2
-CUPS_CONFIG=	${PREFIX}/bin/cups-config
-DATA_DEST_DIR=	`${CUPS_CONFIG} --datadir | ${SED} \
-			's|${LOCALBASE}|${PREFIX}|'`/model/samsung
-BIN_DEST_DIR=	`${CUPS_CONFIG} --serverbin | ${SED} \
-			's|${LOCALBASE}|${PREFIX}|'`/filter
+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
+DEST_DIR_SAMSUNG=	${CUPS_DATA_DIR}/model/samsung
+DEST_DIR_XEROX=		${CUPS_DATA_DIR}/model/xerox
 
 do-install:
-	${MKDIR} ${DATA_DEST_DIR}
-.for PPD in ${PPD_FILES}
-	${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd ${DATA_DEST_DIR}
+
+.for MODEL in ${MODELS}
+	${MKDIR} ${DEST_DIR_${MODEL}}
+.for PPD in $(PPD_${MODEL})
+		${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd $(DEST_DIR_${MODEL})
+.endfor
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${FILTER_FILE} ${BIN_DEST_DIR}
 
diff --git a/print/splix/distinfo b/print/splix/distinfo
index 8dc971554d23..b6eab7ae6ad2 100644
--- a/print/splix/distinfo
+++ b/print/splix/distinfo
@@ -1,3 +1,3 @@
-MD5 (splix-1.0.2.tar.bz2) = 2bc6f0dbc4ba8eb6367e7ba240ea5836
-SHA256 (splix-1.0.2.tar.bz2) = fe346aa87d2023c7677dece720e2840e693184dad85b55a8d19912685424540e
-SIZE (splix-1.0.2.tar.bz2) = 37778
+MD5 (splix-1.1.0.tar.bz2) = ade37edad8cee878f2d90f91ef8486fe
+SHA256 (splix-1.1.0.tar.bz2) = 0210c5015bccd08f0e9c25d40bcd01556a9b10528d40737493c1ef8b16b43491
+SIZE (splix-1.1.0.tar.bz2) = 63855
diff --git a/print/splix/pkg-descr b/print/splix/pkg-descr
index 301d0a73b464..1afc75db5b67 100644
--- a/print/splix/pkg-descr
+++ b/print/splix/pkg-descr
@@ -2,23 +2,45 @@ 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!
 
-Manufacturer    Model       State
-Xerox	        Phaser 6100	Works
-Samsung	        CLP-300 	Non-working
+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	    Non-working
+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-2550	    Untested
+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/
diff --git a/print/splix/pkg-plist b/print/splix/pkg-plist
index 576ebf46a206..ea9692c8e8a5 100644
--- a/print/splix/pkg-plist
+++ b/print/splix/pkg-plist
@@ -1,18 +1,42 @@
 @comment $FreeBSD$
 libexec/cups/filter/rastertospl2
+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/clp600.ppd
+share/cups/model/samsung/clp610.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/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/ml2510.ppd
 share/cups/model/samsung/ml2550.ppd
-share/cups/model/samsung/clp300.ppd
-share/cups/model/samsung/clp500.ppd
-share/cups/model/samsung/clp510.ppd
-share/cups/model/samsung/clp600.ppd
-share/cups/model/samsung/xerox-phaser6100.ppd
+share/cups/model/samsung/ml3050.ppd
+share/cups/model/samsung/ml3560.ppd
+share/cups/model/xerox/ph3115.ppd
+share/cups/model/xerox/ph3116.ppd
+share/cups/model/xerox/ph3117.ppd
+share/cups/model/xerox/ph3120.ppd
+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/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
+@dirrm share/cups/model/dell
 @dirrm share/cups/model/samsung
+@dirrm share/cups/model/xerox