cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove X-Red-Hat category for .desktop files (from jasper@)

Browse Source 
- make the manage printer job entry appear (from jasper@)
- fix path to system-config-printer in applet.py
- use SUBST_FILES

ok jasper@
This commit is contained in:
ajacoutot 2008-06-12 21:51:42 +00:00
parent e02a94359d
commit 1228e6a72e
13 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
print/system-config-printer/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2008/05/31 22:24:50 jasper Exp $
# $OpenBSD: Makefile,v 1.3 2008/06/12 21:51:42 ajacoutot Exp $
COMMENT= printer (CUPS) administration tool
DISTNAME= system-config-printer-0.9.90
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= print sysutils
HOMEPAGE= http://cyberelk.net/tim/software/system-config-printer/
@ -49,10 +49,7 @@ pre-configure:
xargs perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g;' \
-e 's,/usr/bin/python,${MODPY_BIN},g'
.for f in ${SUBST_FILES}
@perl -pi -e 's,!!LOCALBASE!!,${LOCALBASE},g;' \
-e 's,!!PREFIX!!,${PREFIX},g;' \
-e 's,!!SYSCONFDIR!!,${SYSCONFDIR},g' \
${WRKSRC}/$f
${SUBST_CMD} ${WRKSRC}/$f
.endfor
.include <bsd.port.mk>

26
print/system-config-printer/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- Makefile.in.orig Thu Apr 3 17:54:22 2008
+++ Makefile.in Tue Apr 8 15:23:20 2008
+++ Makefile.in Thu Jun 12 19:57:58 2008
@@ -290,7 +290,7 @@ man_MANS = \
dbus_DATA = \
newprinternotification.conf
@ -10,7 +10,27 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
desktop_DATA = \
system-config-printer.desktop \
print-applet.desktop \
@@ -933,13 +933,6 @@ install-desktopDATA: $(desktop_DATA)
@@ -912,7 +912,6 @@ install-desktopDATA: $(desktop_DATA)
mkdir -p $(DESTDIR)$(desktopdir)
desktop-file-install --vendor redhat \
--dir $(DESTDIR)$(desktopdir) \
- --add-category X-Red-Hat-Base \
--add-category System \
--add-category Settings \
--add-category HardwareSettings \
@@ -921,25 +920,16 @@ install-desktopDATA: $(desktop_DATA)
system-config-printer.desktop
desktop-file-install --vendor redhat \
--dir $(DESTDIR)$(desktopdir) \
- --add-category X-Red-Hat-Base \
--add-category System \
--add-category Monitor \
--add-category GTK \
manage-print-jobs.desktop
desktop-file-install --vendor redhat \
--dir $(DESTDIR)$(desktopdir) \
- --add-category X-Red-Hat-Base \
--add-category Settings \
--add-category HardwareSettings \
--add-category GTK \
my-default-printer.desktop

6
print/system-config-printer/patches/patch-applet_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-applet_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-applet_py,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- applet.py.orig Thu Apr 3 17:54:02 2008
+++ applet.py Tue Apr 8 15:23:21 2008
@@ -31,7 +31,7 @@ import gobject
@ -6,7 +6,7 @@ $OpenBSD: patch-applet_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
import time
-APPDIR="/usr/share/system-config-printer"
+APPDIR="!!PREFIX!!/share/system-config-printer"
+APPDIR="${PREFIX}/share/system-config-printer"
DOMAIN="system-config-printer"
GLADE="applet.glade"
ICON="printer"
@ -15,7 +15,7 @@ $OpenBSD: patch-applet_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
if pid == 0:
# Child.
- cmd = "/usr/bin/system-config-printer"
+ cmd = "!!PREFIX!!/system-config-printer"
+ cmd = "${PREFIX}/sbin/system-config-printer"
argv.insert (0, cmd)
os.execvp (cmd, argv)
sys.exit (1)

6
print/system-config-printer/patches/patch-cupshelpers_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-cupshelpers_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-cupshelpers_py,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- cupshelpers.py.orig Thu Apr 3 17:54:02 2008
+++ cupshelpers.py Tue Apr 8 15:23:21 2008
@@ -19,7 +19,7 @@
@ -15,7 +15,7 @@ $OpenBSD: patch-cupshelpers_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
# First, a local function. How to check that something exists
# in a path:
- def pathcheck (name, path="/usr/bin:/bin"):
+ def pathcheck (name, path="/usr/bin:/bin:!!PREFIX!!/bin:!!LOCALBASE!!/bin"):
+ def pathcheck (name, path="/usr/bin:/bin:${PREFIX}/bin:${LOCALBASE}/bin"):
# Strip out foomatic '%'-style place-holders.
p = name.find ('%')
if p != -1:
@ -24,7 +24,7 @@ $OpenBSD: patch-cupshelpers_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
exepath = pathcheck (exe,
- "/usr/lib/cups/filter:"
+ "!!PREFIX!!/libexec/cups/filter:"
+ "${PREFIX}/libexec/cups/filter:"
"/usr/lib64/cups/filter")
if exe and not exepath:

12
print/system-config-printer/patches/patch-manage-print-jobs_desktop_in
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-manage-print-jobs_desktop_in,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
--- manage-print-jobs.desktop.in.orig Thu Mar 27 18:28:56 2008
+++ manage-print-jobs.desktop.in Thu Mar 27 18:30:18 2008
@@ -2,7 +2,7 @@
$OpenBSD: patch-manage-print-jobs_desktop_in,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- manage-print-jobs.desktop.in.orig Thu Apr 3 17:54:02 2008
+++ manage-print-jobs.desktop.in Thu Jun 12 19:58:44 2008
@@ -2,8 +2,8 @@
Encoding=UTF-8
_Name=Manage Print Jobs
_Comment=Cancel, pause, resume or reprint jobs
-Exec=/usr/bin/system-config-printer-applet --no-tray-icon
+Exec=!!PREFIX!!/bin/system-config-printer-applet --no-tray-icon
+Exec=${PREFIX}/bin/system-config-printer-applet
Terminal=false
Type=Application
Icon=printer
-NoDisplay=true
+NoDisplay=false

4
print/system-config-printer/patches/patch-my-default-printer
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-my-default-printer,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-my-default-printer,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- my-default-printer.orig Thu Mar 27 18:30:41 2008
+++ my-default-printer Thu Mar 27 18:30:56 2008
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/share/system-config-printer/my-default-printer.py "$@"
+exec !!PREFIX!!/share/system-config-printer/my-default-printer.py "$@"
+exec ${PREFIX}/share/system-config-printer/my-default-printer.py "$@"

4
print/system-config-printer/patches/patch-my-default-printer_desktop_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-my-default-printer_desktop_in,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-my-default-printer_desktop_in,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- my-default-printer.desktop.in.orig Thu Mar 27 18:26:45 2008
+++ my-default-printer.desktop.in Thu Mar 27 18:26:56 2008
@@ -2,7 +2,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-my-default-printer_desktop_in,v 1.1.1.1 2008/04/10 10:23:04 jasp
_Name=Default Printer
_Comment=Select default printer
-Exec=/usr/bin/my-default-printer
+Exec=!!PREFIX!!/bin/my-default-printer
+Exec=${PREFIX}/bin/my-default-printer
Terminal=false
Type=Application
Icon=printer

4
print/system-config-printer/patches/patch-print-applet_desktop_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-print-applet_desktop_in,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-print-applet_desktop_in,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- print-applet.desktop.in.orig Thu Mar 27 18:26:21 2008
+++ print-applet.desktop.in Thu Mar 27 18:26:31 2008
@@ -2,7 +2,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-print-applet_desktop_in,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp
_Name=Print Queue Applet
_Comment=System tray icon for managing print jobs
-Exec=/usr/bin/system-config-printer-applet
+Exec=!!PREFIX!!/bin/system-config-printer-applet
+Exec=${PREFIX}/bin/system-config-printer-applet
Terminal=false
Type=Application
Icon=printer

8
print/system-config-printer/patches/patch-pysmb_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-pysmb_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-pysmb_py,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- pysmb.py.orig Thu Mar 27 18:08:43 2008
+++ pysmb.py Thu Mar 27 18:17:37 2008
@@ -24,13 +24,13 @@ import os
@ -7,14 +7,14 @@ $OpenBSD: patch-pysmb_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
-nmblookup = "/usr/bin/nmblookup"
-smbclient = "/usr/bin/smbclient"
+nmblookup = "!!LOCALBASE!!/bin/nmblookup"
+smbclient = "!!LOCALBASE!!/bin/smbclient"
+nmblookup = "${LOCALBASE}/bin/nmblookup"
+smbclient = "${LOCALBASE}/bin/smbclient"
wins = None
def get_wins_server():
- smbconf = "/etc/samba/smb.conf"
+ smbconf = "!!SYSCONFDIR!!/samba/smb.conf"
+ smbconf = "${SYSCONFDIR}/samba/smb.conf"
wsregex = re.compile("\s*wins\s*server.*",re.IGNORECASE)
global wins

4
print/system-config-printer/patches/patch-system-config-printer
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-system-config-printer,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-system-config-printer,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- system-config-printer.orig Thu Mar 27 18:31:07 2008
+++ system-config-printer Thu Mar 27 18:31:14 2008
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/share/system-config-printer/system-config-printer.py "$@"
+exec !!PREFIX!!/share/system-config-printer/system-config-printer.py "$@"
+exec ${PREFIX}/share/system-config-printer/system-config-printer.py "$@"

4
print/system-config-printer/patches/patch-system-config-printer-applet
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-system-config-printer-applet,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-system-config-printer-applet,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- system-config-printer-applet.orig Thu Mar 27 18:31:27 2008
+++ system-config-printer-applet Thu Mar 27 18:31:36 2008
@@ -1,2 +1,2 @@
#!/bin/sh
-exec /usr/share/system-config-printer/applet.py "$@"
+exec !!PREFIX!!/share/system-config-printer/applet.py "$@"
+exec ${PREFIX}/share/system-config-printer/applet.py "$@"

4
print/system-config-printer/patches/patch-system-config-printer_desktop_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-system-config-printer_desktop_in,v 1.2 2008/05/31 22:24:50 jasper Exp $
$OpenBSD: patch-system-config-printer_desktop_in,v 1.3 2008/06/12 21:51:43 ajacoutot Exp $
--- system-config-printer.desktop.in.orig Thu Mar 27 18:24:56 2008
+++ system-config-printer.desktop.in Thu Mar 27 18:25:09 2008
@@ -2,7 +2,7 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-system-config-printer_desktop_in,v 1.2 2008/05/31 22:24:50 jaspe
_Name=Printing
_Comment=Configure printers
-Exec=/usr/bin/system-config-printer
+Exec=!!PREFIX!!/sbin/system-config-printer
+Exec=${PREFIX}/sbin/system-config-printer
Terminal=false
Type=Application
Icon=printer

8
print/system-config-printer/patches/patch-system-config-printer_py
View File

@ -1,7 +1,7 @@
set_program_name(domain) requires newer py-gtk2, but is kept back
due to implied py-Nummeric update.
$OpenBSD: patch-system-config-printer_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Exp $
$OpenBSD: patch-system-config-printer_py,v 1.2 2008/06/12 21:51:43 ajacoutot Exp $
--- system-config-printer.py.orig Thu Apr 3 17:54:02 2008
+++ system-config-printer.py Tue Apr 8 15:36:56 2008
@@ -77,7 +77,7 @@ from gettext import gettext as _
@ -9,7 +9,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Ex
gettext.textdomain (domain)
gtk.glade.bindtextdomain (domain)
-pkgdata = '/usr/share/' + domain
+pkgdata = '!!PREFIX!!/share/' + domain
+pkgdata = '${PREFIX}/share/' + domain
iconpath = pkgdata + '/icons/'
glade_file = pkgdata + '/' + domain + '.glade'
sys.path.append (pkgdata)
@ -36,7 +36,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Ex
if host:
os.environ["HOST"] = host
- cmd = '/usr/lib/cups/backend/snmp "${HOST}" 2>/dev/null'
+ cmd = '!!LOCALBASE!!/libexec/cups/backend/snmp "${HOST}" 2>/dev/null'
+ cmd = '${LOCALBASE}/libexec/cups/backend/snmp "${HOST}" 2>/dev/null'
debugprint (host + ": " + cmd)
p = os.popen(cmd, 'r')
output = p.read ().strip ()
@ -45,7 +45,7 @@ $OpenBSD: patch-system-config-printer_py,v 1.1.1.1 2008/04/10 10:23:04 jasper Ex
# We want this to be in the current natural language,
# so we intentionally don't set LC_ALL=C here.
- p = os.popen ('/usr/bin/cupstestppd -rvv "$PPD"', 'r')
+ p = os.popen ('!!LOCALBASE!!/bin/cupstestppd -rvv "$PPD"', 'r')
+ p = os.popen ('${LOCALBASE}/bin/cupstestppd -rvv "$PPD"', 'r')
output = p.readlines ()
p.close ()
err += reduce (lambda x, y: x + y, output)