Date: Wed, 23 Jan 2013 13:41:23 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310865 - in head/print/hplip: . files Message-ID: <201301231341.r0NDfNne014209@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Wed Jan 23 13:41:23 2013 New Revision: 310865 URL: http://svnweb.freebsd.org/changeset/ports/310865 Log: - Fix shebang lines [1] - Rename and update patch - Switch to USE_PKGCONFIG Reported by: AN <andy at neu.net> via mail [1] Added: head/print/hplip/files/patch-installer__dcheck.py (contents, props changed) - copied, changed from r310622, head/print/hplip/files/patch-dcheck.py Deleted: head/print/hplip/files/patch-dcheck.py Modified: head/print/hplip/Makefile Modified: head/print/hplip/Makefile ============================================================================== --- head/print/hplip/Makefile Wed Jan 23 13:25:34 2013 (r310864) +++ head/print/hplip/Makefile Wed Jan 23 13:41:23 2013 (r310865) @@ -3,6 +3,7 @@ PORTNAME= hplip PORTVERSION= 3.12.11 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SF @@ -23,7 +24,8 @@ CONFLICTS_INSTALL= hpijs-[0-9]* USE_GHOSTSCRIPT_RUN= yes USE_PYTHON= 2.5+ -USE_GNOME= pkgconfig pygobject +USE_GNOME= pygobject +USE_PKGCONFIG= build GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-foomatic-ppd-install \ @@ -166,7 +168,17 @@ post-patch: ${FILES4FIX:S,^,${WRKSRC}/,} ${REINPLACE_CMD} -e 's,%USB_INCLUDE%,${USB_INCLUDE},' \ ${WRKSRC}/installer/core_install.py -.if defined(NOPORTDOCS) + cd ${WRKSRC} && \ + ${REINPLACE_CMD} -e "s,^#!/usr/bin/python,#!/usr/bin/env python," \ + base/magic.py \ + config_usb_printer.py \ + logcapture.py \ + makeuri.py \ + setup.py \ + ui/upgradeform.py \ + uninstall.py \ + upgrade.py +.if !${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e '/[[:space:]]install-docDATA/ s|install-docDATA||' \ ${WRKSRC}/Makefile.in .endif Copied and modified: head/print/hplip/files/patch-installer__dcheck.py (from r310622, head/print/hplip/files/patch-dcheck.py) ============================================================================== --- head/print/hplip/files/patch-dcheck.py Fri Jan 18 21:11:49 2013 (r310622, copy source) +++ head/print/hplip/files/patch-installer__dcheck.py Wed Jan 23 13:41:23 2013 (r310865) @@ -1,11 +1,24 @@ ---- installer/dcheck.py.orig 2009-08-05 09:37:17.000000000 +1200 -+++ installer/dcheck.py 2009-11-27 18:53:56.000000000 +1300 -@@ -46,7 +46,7 @@ +--- ./installer/dcheck.py.orig 2012-11-20 09:51:37.000000000 +0000 ++++ ./installer/dcheck.py 2013-01-22 14:25:58.685224662 +0000 +@@ -44,7 +44,11 @@ def update_ld_output(): # For library checks global ld_output - status, ld_output = utils.run('%s -p' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False) -+ status, ld_output = utils.run('%s -r' % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False) ++ if sys.platform.startswith('freebsd'): ++ ld_cmd = '%s -r' ++ else: # linux ++ ld_cmd = '%s -p' ++ status, ld_output = utils.run(ld_cmd % os.path.join(utils.which('ldconfig'), 'ldconfig'), log_output=False) if status != 0: log.debug("ldconfig failed.") +@@ -373,6 +377,8 @@ + except ImportError: + return '-' + else: ++ if sys.platform.startswith('freebsd'): ++ return '-' + LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True) + LIBC.gnu_get_libc_version.restype = ctypes.c_char_p + return LIBC.gnu_get_libc_version()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301231341.r0NDfNne014209>