diff options
| author | tijl <tijl@FreeBSD.org> | 2014-07-09 02:56:33 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-07-09 02:56:33 +0800 |
| commit | 33a76533656f75fbff5a9799fcb238b7a426b35b (patch) | |
| tree | 4a30c1054052f72f955cd9359d0b78e66a9c1a76 /print/hplip | |
| parent | 7b723b17db9ccc7a9fd0743a0cb57bf0ee9e91b3 (diff) | |
| download | freebsd-ports-gnome-33a76533656f75fbff5a9799fcb238b7a426b35b.tar.gz freebsd-ports-gnome-33a76533656f75fbff5a9799fcb238b7a426b35b.tar.zst freebsd-ports-gnome-33a76533656f75fbff5a9799fcb238b7a426b35b.zip | |
- Convert to USES=libtool and INSTALL_TARGET=install-strip
- Remove references to PTHREAD_LIBS
Diffstat (limited to 'print/hplip')
| -rw-r--r-- | print/hplip/Makefile | 22 | ||||
| -rw-r--r-- | print/hplip/pkg-plist | 10 |
2 files changed, 9 insertions, 23 deletions
diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 2fcc4855f77a..a40730b83948 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -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/cups-pstoraster \ 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-install \ --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 <bsd.port.mk> diff --git a/print/hplip/pkg-plist b/print/hplip/pkg-plist index bebcacb3db15..56515c4fbfd2 100644 --- a/print/hplip/pkg-plist +++ b/print/hplip/pkg-plist @@ -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 |