Date: Tue, 22 Apr 2014 19:40:16 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351880 - head/print/splix Message-ID: <201404221940.s3MJeGlp095964@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Tue Apr 22 19:40:15 2014 New Revision: 351880 URL: http://svnweb.freebsd.org/changeset/ports/351880 QAT: https://qat.redports.org/buildarchive/r351880/ Log: - Add stage support [1] - cups-image(1) is part of print/cups-image, so depend on that port instead of on print/cups-base [1] - Convert USE_GMAKE and USE_BZIP2 to their corresponding USES [1] - Fix pkg-plist - Use modern LIB_DEPENDS - Add dependency on print/cups-client for cups-config(1) and correctly reference it - Bump PORTREVISION PR: ports/188864 [1] Submitted by: Zsolt Udvari <udvzsolt@gmail.com> Modified: head/print/splix/Makefile head/print/splix/pkg-plist Modified: head/print/splix/Makefile ============================================================================== --- head/print/splix/Makefile Tue Apr 22 19:36:32 2014 (r351879) +++ head/print/splix/Makefile Tue Apr 22 19:40:15 2014 (r351880) @@ -2,18 +2,18 @@ PORTNAME= splix PORTVERSION= 2.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= print MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= CUPS printer drivers for Samsung Printer Language printers -BUILD_DEPENDS= cups-config:${PORTSDIR}/print/cups-base +LIB_DEPENDS= libcupsimage.so:${PORTSDIR}/print/cups-image +BUILD_DEPENDS= cups-config:${PORTSDIR}/print/cups-client RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_GMAKE= yes -USE_BZIP2= yes +USES= gmake tar:bzip2 MODELS= DELL SAMSUNG XEROX PPD_DELL= 1100 1110 @@ -28,7 +28,7 @@ PPD_SAMSUNG_JBIG= clp200 clp300 clp600 c PPD_XEROX_JBIG= ph6110 FILTER_FILE= rastertoqpdl pstoqpdl -CUPS_CONFIG= ${PREFIX}/bin/cups-config +CUPS_CONFIG= ${LOCALBASE}/bin/cups-config BIN_DEST_DIR= `${CUPS_CONFIG} --serverbin | ${SED} \ 's|${LOCALBASE}|${PREFIX}|'`/filter CUPS_DATA_DIR= `${CUPS_CONFIG} --datadir | ${SED} \ @@ -42,7 +42,6 @@ JBIG_DESC= Enable use of JBIG algorithm BLACKOPTIM_DESC= Enable black correction algorithm OPTIONS_DEFAULT= JBIG BLACKOPTIM -NO_STAGE= yes .include "bsd.port.options.mk" post-patch: @@ -55,7 +54,7 @@ post-configure: .if ${PORT_OPTIONS:MJBIG} PPD_SAMSUNG+= ${PPD_SAMSUNG_JBIG} PPD_XEROX+= ${PPD_XEROX_JBIG} -LIB_DEPENDS+= jbig:${PORTSDIR}/graphics/jbigkit +LIB_DEPENDS+= libjbig.so:${PORTSDIR}/graphics/jbigkit .else MAKE_ARGS+= DISABLE_JBIG=1 .endif @@ -69,15 +68,16 @@ MAKE_ARGS+= CACHESIZE=${CACHESIZE} .endif do-install: + ${MKDIR} ${STAGEDIR}${BIN_DEST_DIR} .for MODEL in ${MODELS} - ${MKDIR} ${DEST_DIR_${MODEL}} + ${MKDIR} ${STAGEDIR}${DEST_DIR_${MODEL}} .for PPD in $(PPD_${MODEL}) - ${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd $(DEST_DIR_${MODEL}) + ${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd ${STAGEDIR}$(DEST_DIR_${MODEL}) .endfor .endfor .for FILTER in ${FILTER_FILE} - ${INSTALL_PROGRAM} ${WRKSRC}/optimized/${FILTER} ${BIN_DEST_DIR} + ${INSTALL_PROGRAM} ${WRKSRC}/optimized/${FILTER} ${STAGEDIR}${BIN_DEST_DIR} .endfor .include <bsd.port.mk> Modified: head/print/splix/pkg-plist ============================================================================== --- head/print/splix/pkg-plist Tue Apr 22 19:36:32 2014 (r351879) +++ head/print/splix/pkg-plist Tue Apr 22 19:40:15 2014 (r351880) @@ -48,3 +48,5 @@ share/cups/model/xerox/wc3119.ppd @dirrm share/cups/model/dell @dirrm share/cups/model/samsung @dirrm share/cups/model/xerox +@dirrmtry share/cups/model +@dirrmtry share/cups
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404221940.s3MJeGlp095964>