Index: print/system-config-printer/Makefile =================================================================== --- print/system-config-printer/Makefile (revision 348886) +++ print/system-config-printer/Makefile (working copy) @@ -3,8 +3,7 @@ # $MCom: ports/print/system-config-printer/Makefile,v 1.6 2009/12/29 16:03:58 ahze Exp $ PORTNAME= system-config-printer -PORTVERSION= 1.4.2 -PORTREVISION= 1 +PORTVERSION= 1.4.4 CATEGORIES= print gnome MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/ @@ -18,19 +17,16 @@ ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \ ${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/print/cups-pk-helper -USE_XZ= yes USE_PYTHON= yes GNU_CONFIGURE= yes -USES= desktop-file-utils gettext gmake pathfix pkgconfig shebangfix +USES= gettext gmake libtool pathfix pkgconfig shebangfix tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= intlhack pygobject3 +USE_GNOME= intlhack CONFIGURE_ARGS= --without-udev-rules \ --without-systemdsystemunitdir -MAN1= system-config-printer-applet.1 \ - system-config-printer.1 PLIST_SUB= PYTHON_VER=${PYTHON_VERSION:S/python//} SHEBANG_FILES= *.py troubleshoot/*.py xml/validate.py @@ -39,7 +35,6 @@ PYDISTUTILS_PKGNAME= cupshelpers PYDISTUTILS_PKGVERSION= 1.0 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PREFIX%%|${PREFIX}|g' \ @@ -51,4 +46,10 @@ @${REINPLACE_CMD} -e 's|setup.py install|setup.py install -c -O1|g' \ ${WRKSRC}/Makefile.in +post-install: + @${RM} ${STAGEDIR}${PYTHON_SITELIBDIR}/cupshelpers/*.py[co] + cd ${STAGEDIR}${PREFIX} \ + && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} + .include Index: print/system-config-printer/distinfo =================================================================== --- print/system-config-printer/distinfo (revision 348886) +++ print/system-config-printer/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (system-config-printer-1.4.2.tar.xz) = f0e464435532f73cf8c328ceb1220f02ab2acfc1dcdec729cf5a0acf4193dbea -SIZE (system-config-printer-1.4.2.tar.xz) = 888848 +SHA256 (system-config-printer-1.4.4.tar.xz) = 4200c1a7b44dff9f04badfe14514b1fa144878e142fb0858dedf34575eb7254e +SIZE (system-config-printer-1.4.4.tar.xz) = 894064 Index: print/system-config-printer/files/patch-applet.py =================================================================== --- print/system-config-printer/files/patch-applet.py (revision 348886) +++ print/system-config-printer/files/patch-applet.py (working copy) @@ -1,5 +1,5 @@ ---- applet.py.orig 2013-07-22 15:58:32.000000000 +0200 -+++ applet.py 2013-08-29 11:06:43.000000000 +0200 +--- applet.py.orig 2014-03-23 21:53:18.000000000 +0100 ++++ applet.py 2014-03-23 21:56:33.000000000 +0100 @@ -43,7 +43,7 @@ from gi.repository import Notify Index: print/system-config-printer/files/patch-newprinter.py =================================================================== --- print/system-config-printer/files/patch-newprinter.py (revision 348886) +++ print/system-config-printer/files/patch-newprinter.py (working copy) @@ -1,15 +1,15 @@ ---- newprinter.py.orig 2013-08-29 15:46:51.000000000 +0200 -+++ newprinter.py 2013-08-29 15:48:44.000000000 +0200 -@@ -1038,7 +1038,7 @@ - # Does the backend need to be installed? - if ((self._host == 'localhost' or - self._host[0] == '/') and -- not os.access ("/usr/lib/cups/backend/smb", os.F_OK)): -+ not os.access ("%%PREFIX%%/libexec/cups/backend/smb", os.F_OK)): - p = subprocess.Popen (["gpk-install-package-name", - "samba-client"], - close_fds=True, -@@ -1844,7 +1844,7 @@ +--- newprinter.py.orig 2014-03-23 21:57:42.000000000 +0100 ++++ newprinter.py 2014-03-23 21:58:13.000000000 +0100 +@@ -1057,7 +1057,7 @@ + # Does the backend need to be installed? + if ((self._host == 'localhost' or + self._host[0] == '/') and +- not os.access ("/usr/lib/cups/backend/smb", os.F_OK)): ++ not os.access ("%%PREFIX%%/libexec/cups/backend/smb", os.F_OK)): + p = subprocess.Popen (["gpk-install-package-name", + "samba-client"], + close_fds=True, +@@ -1884,7 +1884,7 @@ host = device.uri[s:s+e] # Try to get make and model via SNMP if host: @@ -18,7 +18,7 @@ debugprint (host + ": " + repr(args)) stdout = None try: -@@ -3799,7 +3799,7 @@ +@@ -3849,7 +3849,7 @@ try: # We want this to be in the current natural language, # so we intentionally don't set LC_ALL=C here. Index: print/system-config-printer/pkg-plist =================================================================== --- print/system-config-printer/pkg-plist (revision 348886) +++ print/system-config-printer/pkg-plist (working copy) @@ -8,25 +8,21 @@ etc/xdg/autostart/print-applet.desktop %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.py %%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyc -%%PYTHON_SITELIBDIR%%/cupshelpers/__init__.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/config.py %%PYTHON_SITELIBDIR%%/cupshelpers/config.pyc -%%PYTHON_SITELIBDIR%%/cupshelpers/config.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.py %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.pyc -%%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.py %%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.pyc -%%PYTHON_SITELIBDIR%%/cupshelpers/installdriver.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.py %%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.pyc -%%PYTHON_SITELIBDIR%%/cupshelpers/openprinting.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.py %%PYTHON_SITELIBDIR%%/cupshelpers/ppds.pyc -%%PYTHON_SITELIBDIR%%/cupshelpers/ppds.pyo %%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.py %%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.pyc -%%PYTHON_SITELIBDIR%%/cupshelpers/xmldriverprefs.pyo +%%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py%%PYTHON_VER%%.egg-info +man/man1/system-config-printer-applet.1.gz +man/man1/system-config-printer.1.gz share/applications/system-config-printer.desktop share/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml share/dbus-1/services/org.fedoraproject.Config.Printing.service @@ -187,6 +183,8 @@ @dirrmtry share/locale/sr@latin @dirrmtry share/locale/si/LC_MESSAGES @dirrmtry share/locale/si +@dirrmtry share/locale/nds/LC_MESSAGES +@dirrmtry share/locale/nds @dirrmtry share/locale/my/LC_MESSAGES @dirrmtry share/locale/my @dirrmtry share/locale/mr/LC_MESSAGES