From owner-svn-ports-head@FreeBSD.ORG Tue Jul 8 18:56:34 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24D3C2D1; Tue, 8 Jul 2014 18:56:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 11B29244E; Tue, 8 Jul 2014 18:56:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s68IuXWl031612; Tue, 8 Jul 2014 18:56:33 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s68IuXYn031610; Tue, 8 Jul 2014 18:56:33 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201407081856.s68IuXYn031610@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 8 Jul 2014 18:56:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361277 - head/print/hplip X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2014 18:56:34 -0000 Author: tijl Date: Tue Jul 8 18:56:33 2014 New Revision: 361277 URL: http://svnweb.freebsd.org/changeset/ports/361277 QAT: https://qat.redports.org/buildarchive/r361277/ Log: - Convert to USES=libtool and INSTALL_TARGET=install-strip - Remove references to PTHREAD_LIBS Modified: head/print/hplip/Makefile head/print/hplip/pkg-plist Modified: head/print/hplip/Makefile ============================================================================== --- head/print/hplip/Makefile Tue Jul 8 18:50:21 2014 (r361276) +++ head/print/hplip/Makefile Tue Jul 8 18:56:33 2014 (r361277) @@ -3,7 +3,7 @@ PORTNAME= hplip PORTVERSION= 3.14.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= SF @@ -22,10 +22,12 @@ RUN_DEPENDS= espgs:${PORTSDIR}/print/cup CONFLICTS_INSTALL= hpijs-[0-9]* +INSTALL_TARGET= install-strip +USES= dos2unix libtool pkgconfig shebangfix USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= yes USE_GNOME= pygobject -USES= dos2unix pkgconfig shebangfix +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-foomatic-ppd-install \ @@ -42,9 +44,7 @@ CONFIGURE_ARGS= --enable-foomatic-ppd-in --with-drvdir=${PREFIX}/libexec/cups/driver \ --enable-libusb01_build CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} - -USE_LDCONFIG= yes +LIBS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message DOS2UNIX_REGEX=.+\.(c|cpp|h|py)$ @@ -77,11 +77,6 @@ FILES4FIX= Makefile.in \ ui4/devmgr5.py PYTHON_SITELIBDIR_REL= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} -STRIP_FILES= lib/libhpip.so.0 \ - lib/libhpmud.so.0 \ - ${PYTHON_SITELIBDIR_REL}/pcardext.so \ - ${PYTHON_SITELIBDIR_REL}/hpmudext.so \ - ${PYTHON_SITELIBDIR_REL}/cupsext.so OPTIONS_DEFINE= QT FAX SNMP SCAN XSANE DOCS OPTIONS_DEFAULT= QT @@ -116,14 +111,10 @@ DOCS_CONFIGURE_ENABLE= doc-build . if ${PORT_OPTIONS:MXSANE} RUN_DEPENDS+= xsane:${PORTSDIR}/graphics/xsane . endif - -STRIP_FILES+= ${PYTHON_SITELIBDIR_REL}/scanext.so \ - lib/sane/libsane-hpaio.so.1 .endif post-patch: - ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g' \ - -e 's|-ldld||g; s|-ldl||g' \ + ${REINPLACE_CMD} -e 's|-ldld||g; s|-ldl||g' \ ${WRKSRC}/configure \ ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -e '/[[:space:]]install-dist_rulesDATA/ s,install-dist_rulesDATA,,' \ @@ -161,7 +152,6 @@ post-install: .endif ${MKDIR} ${STAGEDIR}${PREFIX}/etc/hp ${INSTALL_DATA} ${WRKSRC}/hplip.conf ${STAGEDIR}${PREFIX}/etc/hp/hplip.conf.sample - ${STRIP_CMD} ${STRIP_FILES:S,^,${STAGEDIR}${PREFIX}/,} ${LN} -sf ${LOCALBASE}/bin/foomatic-rip ${STAGEDIR}${PREFIX}/libexec/cups/filter/foomatic-rip-hplip .include Modified: head/print/hplip/pkg-plist ============================================================================== --- head/print/hplip/pkg-plist Tue Jul 8 18:50:21 2014 (r361276) +++ head/print/hplip/pkg-plist Tue Jul 8 18:56:33 2014 (r361277) @@ -39,23 +39,19 @@ bin/hpijs %%FAX%%etc/cups/pstotiff.types @sample etc/hp/hplip.conf.sample %%QT%%etc/xdg/autostart/hplip-systray.desktop -lib/libhpip.la lib/libhpip.so lib/libhpip.so.0 -lib/libhpmud.la +lib/libhpip.so.0.0.1 lib/libhpmud.so lib/libhpmud.so.0 -%%PYTHON_SITELIBDIR%%/cupsext.la +lib/libhpmud.so.0.0.6 %%PYTHON_SITELIBDIR%%/cupsext.so -%%PYTHON_SITELIBDIR%%/hpmudext.la %%PYTHON_SITELIBDIR%%/hpmudext.so -%%PYTHON_SITELIBDIR%%/pcardext.la %%PYTHON_SITELIBDIR%%/pcardext.so -%%SCAN%%%%PYTHON_SITELIBDIR%%/scanext.la %%SCAN%%%%PYTHON_SITELIBDIR%%/scanext.so -%%SCAN%%lib/sane/libsane-hpaio.la %%SCAN%%lib/sane/libsane-hpaio.so %%SCAN%%lib/sane/libsane-hpaio.so.1 +%%SCAN%%lib/sane/libsane-hpaio.so.1.0.0 libexec/cups/backend/hp %%FAX%%libexec/cups/backend/hpfax libexec/cups/driver/hpcups.drv