diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile index 846ff966bde..2a3306911e4 100644 --- a/print/system-config-printer/Makefile +++ b/print/system-config-printer/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.10 2009/02/02 23:10:05 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.11 2009/02/10 17:19:42 ajacoutot Exp $ COMMENT= printer (CUPS) administration tool DISTNAME= system-config-printer-1.0.13 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= print sysutils HOMEPAGE= http://cyberelk.net/tim/software/system-config-printer/ @@ -37,14 +37,16 @@ CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib SUBST_FILES= applet.py cupshelpers/cupshelpers.py pysmb.py \ - system-config-printer.py my-default-printer \ - system-config-printer system-config-printer-applet \ + system-config-printer.py \ manage-print-jobs.desktop.in \ my-default-printer.desktop.in \ print-applet.desktop.in \ system-config-printer.desktop.in \ troubleshoot/SchedulerNotRunning.py +FAKE_FLAGS= dbusdir=${PREFIX}/share/examples/system-config-printer/dbus-1/system.d/ \ + autostartdir=${PREFIX}/share/examples/system-config-printer/xdg/autostart/ + pre-configure: find ${WRKDIST} -name \*.py | \ xargs perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g;' \ diff --git a/print/system-config-printer/patches/patch-Makefile_in b/print/system-config-printer/patches/patch-Makefile_in index d62e2ff3b51..ff417a2c567 100644 --- a/print/system-config-printer/patches/patch-Makefile_in +++ b/print/system-config-printer/patches/patch-Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.5 2009/01/31 12:37:30 ajacoutot Exp $ +$OpenBSD: patch-Makefile_in,v 1.6 2009/02/10 17:19:42 ajacoutot Exp $ --- Makefile.in.orig Fri Jan 16 11:37:10 2009 -+++ Makefile.in Sat Jan 31 12:11:42 2009 ++++ Makefile.in Tue Feb 10 17:40:25 2009 @@ -308,7 +308,7 @@ man_MANS = \ dbus_DATA = \ newprinternotification.conf @@ -10,24 +10,30 @@ $OpenBSD: patch-Makefile_in,v 1.5 2009/01/31 12:37:30 ajacoutot Exp $ desktop_DATA = \ system-config-printer.desktop \ print-applet.desktop \ -@@ -1042,7 +1042,6 @@ install-desktopDATA: $(desktop_DATA) +@@ -1040,35 +1040,31 @@ clean-local: + install-desktopDATA: $(desktop_DATA) mkdir -p $(DESTDIR)$(desktopdir) - desktop-file-install --vendor redhat \ + mkdir -p $(DESTDIR)$(desktopdir) +- desktop-file-install --vendor redhat \ ++ desktop-file-install \ --dir $(DESTDIR)$(desktopdir) \ - --add-category X-Red-Hat-Base \ --add-category System \ --add-category Settings \ --add-category HardwareSettings \ -@@ -1051,25 +1050,16 @@ install-desktopDATA: $(desktop_DATA) + --add-category Printing \ + --add-category GTK \ system-config-printer.desktop - desktop-file-install --vendor redhat \ +- desktop-file-install --vendor redhat \ ++ desktop-file-install \ --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 \ +- desktop-file-install --vendor redhat \ ++ desktop-file-install \ --dir $(DESTDIR)$(desktopdir) \ - --add-category X-Red-Hat-Base \ --add-category Settings \ @@ -40,7 +46,11 @@ $OpenBSD: patch-Makefile_in,v 1.5 2009/01/31 12:37:30 ajacoutot Exp $ - --add-category System \ - --add-category Monitor \ - --add-category GTK \ -- print-applet.desktop ++ desktop-file-install \ ++ --dir $(DESTDIR)$(autostartdir) \ ++ --add-category System \ ++ --add-category Monitor \ ++ --add-category GTK \ + print-applet.desktop uninstall-desktopDATA: - rm -f $(DESTDIR)$(desktopdir)/redhat-system-config-printer.desktop diff --git a/print/system-config-printer/patches/patch-manage-print-jobs_desktop_in b/print/system-config-printer/patches/patch-manage-print-jobs_desktop_in index 61a452cf1ab..fbf9064e3c2 100644 --- a/print/system-config-printer/patches/patch-manage-print-jobs_desktop_in +++ b/print/system-config-printer/patches/patch-manage-print-jobs_desktop_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-manage-print-jobs_desktop_in,v 1.3 2008/07/08 09:33:21 ajacoutot Exp $ ---- manage-print-jobs.desktop.in.orig Wed Jul 2 15:34:17 2008 -+++ manage-print-jobs.desktop.in Wed Jul 2 15:34:57 2008 +$OpenBSD: patch-manage-print-jobs_desktop_in,v 1.4 2009/02/10 17:19:42 ajacoutot Exp $ +--- manage-print-jobs.desktop.in.orig Fri Dec 5 16:45:20 2008 ++++ manage-print-jobs.desktop.in Tue Feb 10 17:29:49 2009 @@ -2,8 +2,8 @@ Encoding=UTF-8 _Name=Manage Print Jobs _Comment=Cancel, pause, resume or reprint jobs -Exec=system-config-printer-applet --no-tray-icon -+Exec=${PREFIX}/bin/system-config-printer-applet ++Exec=${PREFIX}/bin/system-config-printer-applet --no-tray-icon Terminal=false Type=Application Icon=printer diff --git a/print/system-config-printer/patches/patch-my-default-printer b/print/system-config-printer/patches/patch-my-default-printer deleted file mode 100644 index efd64d0149e..00000000000 --- a/print/system-config-printer/patches/patch-my-default-printer +++ /dev/null @@ -1,8 +0,0 @@ -$OpenBSD: patch-my-default-printer,v 1.3 2008/07/08 09:33:21 ajacoutot Exp $ ---- my-default-printer.orig Fri May 23 16:05:59 2008 -+++ my-default-printer Wed Jul 2 15:40:23 2008 -@@ -1,3 +1,3 @@ - #!/bin/sh --prefix=/usr/local -+exec ${PREFIX}/share/system-config-printer/my-default-printer.py "$@" - exec ${prefix}/share/system-config-printer/my-default-printer.py "$@" diff --git a/print/system-config-printer/patches/patch-system-config-printer b/print/system-config-printer/patches/patch-system-config-printer deleted file mode 100644 index 180a091cbfb..00000000000 --- a/print/system-config-printer/patches/patch-system-config-printer +++ /dev/null @@ -1,8 +0,0 @@ -$OpenBSD: patch-system-config-printer,v 1.3 2008/07/08 09:33:21 ajacoutot Exp $ ---- system-config-printer.orig Fri May 23 16:06:00 2008 -+++ system-config-printer Wed Jul 2 15:40:23 2008 -@@ -1,3 +1,3 @@ - #!/bin/sh --prefix=/usr/local -+exec ${PREFIX}/share/system-config-printer/system-config-printer.py "$@" - exec ${prefix}/share/system-config-printer/system-config-printer.py "$@" diff --git a/print/system-config-printer/patches/patch-system-config-printer-applet b/print/system-config-printer/patches/patch-system-config-printer-applet deleted file mode 100644 index f4fca66b997..00000000000 --- a/print/system-config-printer/patches/patch-system-config-printer-applet +++ /dev/null @@ -1,8 +0,0 @@ -$OpenBSD: patch-system-config-printer-applet,v 1.3 2008/07/08 09:33:21 ajacoutot Exp $ ---- system-config-printer-applet.orig Fri May 23 16:06:00 2008 -+++ system-config-printer-applet Wed Jul 2 15:40:23 2008 -@@ -1,3 +1,3 @@ - #!/bin/sh --prefix=/usr/local -+exec ${PREFIX}/share/system-config-printer/applet.py "$@" - exec ${prefix}/share/system-config-printer/applet.py "$@" diff --git a/print/system-config-printer/patches/patch-system-config-printer_py b/print/system-config-printer/patches/patch-system-config-printer_py index 32bbb464711..8ac752d6cda 100644 --- a/print/system-config-printer/patches/patch-system-config-printer_py +++ b/print/system-config-printer/patches/patch-system-config-printer_py @@ -1,9 +1,6 @@ -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.7 2009/01/31 12:37:30 ajacoutot Exp $ +$OpenBSD: patch-system-config-printer_py,v 1.8 2009/02/10 17:19:42 ajacoutot Exp $ --- system-config-printer.py.orig Fri Jan 16 11:35:26 2009 -+++ system-config-printer.py Sat Jan 31 12:11:42 2009 ++++ system-config-printer.py Tue Feb 10 17:20:21 2009 @@ -101,10 +101,6 @@ busy_cursor = gtk.gdk.Cursor(gtk.gdk.WATCH) ready_cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR) ellipsis = unichr(0x2026) @@ -15,24 +12,6 @@ $OpenBSD: patch-system-config-printer_py,v 1.7 2009/01/31 12:37:30 ajacoutot Exp try: try_CUPS_SERVER_REMOTE_ANY = cups.CUPS_SERVER_REMOTE_ANY except AttributeError: -@@ -336,7 +332,7 @@ class GUI(GtkGUI, monitor.Watcher): - np.NewPrinterWindow.set_transient_for(self.MainWindow) - - # Set up "About" dialog -- self.AboutDialog.set_program_name(domain) -+ #self.AboutDialog.set_program_name(domain) - self.AboutDialog.set_version(config.VERSION) - self.AboutDialog.set_icon_name('printer') - -@@ -381,7 +377,7 @@ class GUI(GtkGUI, monitor.Watcher): - self.dests_iconview.set_row_spacing (20) - self.dests_iconview.set_pixbuf_column (1) - self.dests_iconview.set_text_column (2) -- self.dests_iconview.set_tooltip_column (3) -+ #self.dests_iconview.set_tooltip_column (3) - self.dests_iconview.connect ('item-activated', - self.dests_iconview_item_activated) - self.dests_iconview.connect ('selection-changed', @@ -2511,25 +2507,6 @@ class GUI(GtkGUI, monitor.Watcher): self.changed = set() self.setDataButtonState() diff --git a/print/system-config-printer/pkg/PLIST b/print/system-config-printer/pkg/PLIST index 965b474d243..0216491a12e 100644 --- a/print/system-config-printer/pkg/PLIST +++ b/print/system-config-printer/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2008/12/21 11:40:40 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.6 2009/02/10 17:19:42 ajacoutot Exp $ bin/my-default-printer bin/system-config-printer bin/system-config-printer-applet @@ -14,12 +14,20 @@ lib/python${MODPY_VERSION}/site-packages/cupshelpers/ppds.py lib/python${MODPY_VERSION}/site-packages/cupshelpers/ppds.pyc @man man/man1/system-config-printer-applet.1 @man man/man1/system-config-printer.1 -share/applications/redhat-manage-print-jobs.desktop -share/applications/redhat-my-default-printer.desktop -share/applications/redhat-system-config-printer.desktop +share/applications/manage-print-jobs.desktop +share/applications/my-default-printer.desktop +share/applications/system-config-printer.desktop share/examples/system-config-printer/ -share/examples/system-config-printer/newprinternotification.conf +share/examples/system-config-printer/dbus-1/ +share/examples/system-config-printer/dbus-1/system.d/ +share/examples/system-config-printer/dbus-1/system.d/newprinternotification.conf @sample ${SYSCONFDIR}/dbus-1/system.d/newprinternotification.conf +share/examples/system-config-printer/xdg/ +@sample ${SYSCONFDIR}/xdg/ +share/examples/system-config-printer/xdg/autostart/ +@sample ${SYSCONFDIR}/xdg/autostart/ +share/examples/system-config-printer/xdg/autostart/print-applet.desktop +@sample ${SYSCONFDIR}/xdg/autostart/print-applet.desktop share/locale/ar/LC_MESSAGES/system-config-printer.mo share/locale/as/LC_MESSAGES/system-config-printer.mo share/locale/bg/LC_MESSAGES/system-config-printer.mo