mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-20 08:27:15 +00:00
- Fix shebang lines [1]
- Rename and update patch - Switch to USE_PKGCONFIG Reported by: AN <andy at neu.net> via mail [1]
This commit is contained in:
parent
6e7e62445d
commit
8311b2e412
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=310865
@ -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
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- 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 @@
|
||||
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 status != 0:
|
||||
log.debug("ldconfig failed.")
|
24
print/hplip/files/patch-installer__dcheck.py
Normal file
24
print/hplip/files/patch-installer__dcheck.py
Normal file
@ -0,0 +1,24 @@
|
||||
--- ./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)
|
||||
+ 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()
|
Loading…
Reference in New Issue
Block a user