Index: head/print/system-config-printer/Makefile =================================================================== --- head/print/system-config-printer/Makefile (revision 378774) +++ head/print/system-config-printer/Makefile (revision 378775) @@ -1,49 +1,50 @@ # Created by: Michael Johnson # $FreeBSD$ -# $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= 3 +PORTVERSION= 1.4.7 CATEGORIES= print gnome MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/ MAINTAINER= gnome@FreeBSD.org COMMENT= CUPS configuration Gtk+2.0 GUI BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \ docbook-xml>0:${PORTSDIR}/textproc/docbook-xml LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \ ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \ ${LOCALBASE}/libexec/cups-pk-helper-mechanism:${PORTSDIR}/print/cups-pk-helper +# 1.5 series is python3 ignore them for now. +PORTSCOUT= limitw:1,even + GNU_CONFIGURE= yes -USES= desktop-file-utils gettext gmake pathfix pkgconfig python \ +USES= desktop-file-utils gettext gmake pathfix pkgconfig python:2 \ shebangfix tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GNOME= intlhack pygobject3 CONFIGURE_ARGS= --without-udev-rules \ --without-systemdsystemunitdir PLIST_SUB= PYTHON_VER=${PYTHON_VERSION:S/python//} SHEBANG_FILES= *.py troubleshoot/*.py xml/validate.py PYDISTUTILS_PKGNAME= cupshelpers PYDISTUTILS_PKGVERSION= 1.0 post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/applet.py ${WRKSRC}/check-device-ids.py \ ${WRKSRC}/cupshelpers/cupshelpers.py \ ${WRKSRC}/cupshelpers/xmldriverprefs.py \ ${WRKSRC}/dbus/org.fedoraproject.Config.Printing.service \ ${WRKSRC}/newprinter.py ${WRKSRC}/probe_printer.py @${REINPLACE_CMD} -e 's|setup.py install.*|setup.py install -c -O1 --prefix=${PREFIX} --root=${STAGEDIR}|g' \ ${WRKSRC}/Makefile.in .include Index: head/print/system-config-printer/distinfo =================================================================== --- head/print/system-config-printer/distinfo (revision 378774) +++ head/print/system-config-printer/distinfo (revision 378775) @@ -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.7.tar.xz) = 6a20074c809109ce0208aa431590cac318edd13ebd96feac08ad2942105c8926 +SIZE (system-config-printer-1.4.7.tar.xz) = 901920 Index: head/print/system-config-printer/files/patch-newprinter.py =================================================================== --- head/print/system-config-printer/files/patch-newprinter.py (revision 378774) +++ head/print/system-config-printer/files/patch-newprinter.py (revision 378775) @@ -1,29 +1,29 @@ ---- 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 2015-01-13 11:56:34.450684352 +0100 ++++ newprinter.py 2015-01-13 11:57:28.467679877 +0100 +@@ -1067,7 +1067,7 @@ + + (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)): + debugprint ("No smb backend so attempting install") + try: + pk = installpackage.PackageKit () +@@ -1909,7 +1909,7 @@ host = device.uri[s:s+e] # Try to get make and model via SNMP if host: - args = ["/usr/lib/cups/backend/snmp", host] + args = ["%%PREFIX%%/libexec/cups/backend/snmp", host] debugprint (host + ": " + repr(args)) stdout = None try: -@@ -3799,7 +3799,7 @@ +@@ -3842,7 +3842,7 @@ try: # We want this to be in the current natural language, # so we intentionally don't set LC_ALL=C here. - p = subprocess.Popen (['/usr/bin/cupstestppd', + p = subprocess.Popen (['%%PREFIX%%/bin/cupstestppd', '-rvv', filename], close_fds=True, stdin=file("/dev/null"), Index: head/print/system-config-printer/pkg-plist =================================================================== --- head/print/system-config-printer/pkg-plist (revision 378774) +++ head/print/system-config-printer/pkg-plist (revision 378775) @@ -1,181 +1,183 @@ bin/install-printerdriver bin/scp-dbus-service bin/system-config-printer bin/system-config-printer-applet etc/cupshelpers/preferreddrivers.xml etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf etc/xdg/autostart/print-applet.desktop %%PYTHON_SITELIBDIR%%/cupshelpers-1.0-py%%PYTHON_VER%%.egg-info %%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 man/man1/system-config-printer-applet.1.gz man/man1/system-config-printer.1.gz +share/appdata/system-config-printer.appdata.xml share/applications/system-config-printer.desktop share/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml share/dbus-1/services/org.fedoraproject.Config.Printing.service 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 share/locale/bn/LC_MESSAGES/system-config-printer.mo share/locale/bn_IN/LC_MESSAGES/system-config-printer.mo share/locale/br/LC_MESSAGES/system-config-printer.mo share/locale/bs/LC_MESSAGES/system-config-printer.mo share/locale/ca/LC_MESSAGES/system-config-printer.mo share/locale/cs/LC_MESSAGES/system-config-printer.mo share/locale/cy/LC_MESSAGES/system-config-printer.mo share/locale/da/LC_MESSAGES/system-config-printer.mo share/locale/de/LC_MESSAGES/system-config-printer.mo share/locale/el/LC_MESSAGES/system-config-printer.mo share/locale/en_GB/LC_MESSAGES/system-config-printer.mo share/locale/es/LC_MESSAGES/system-config-printer.mo share/locale/et/LC_MESSAGES/system-config-printer.mo share/locale/fa/LC_MESSAGES/system-config-printer.mo share/locale/fi/LC_MESSAGES/system-config-printer.mo share/locale/fr/LC_MESSAGES/system-config-printer.mo share/locale/gu/LC_MESSAGES/system-config-printer.mo share/locale/he/LC_MESSAGES/system-config-printer.mo share/locale/hi/LC_MESSAGES/system-config-printer.mo share/locale/hr/LC_MESSAGES/system-config-printer.mo share/locale/hu/LC_MESSAGES/system-config-printer.mo share/locale/hy/LC_MESSAGES/system-config-printer.mo share/locale/id/LC_MESSAGES/system-config-printer.mo share/locale/is/LC_MESSAGES/system-config-printer.mo share/locale/it/LC_MESSAGES/system-config-printer.mo share/locale/ja/LC_MESSAGES/system-config-printer.mo share/locale/ka/LC_MESSAGES/system-config-printer.mo share/locale/kn/LC_MESSAGES/system-config-printer.mo share/locale/ko/LC_MESSAGES/system-config-printer.mo share/locale/lo/LC_MESSAGES/system-config-printer.mo share/locale/lv/LC_MESSAGES/system-config-printer.mo share/locale/mai/LC_MESSAGES/system-config-printer.mo share/locale/mk/LC_MESSAGES/system-config-printer.mo share/locale/ml/LC_MESSAGES/system-config-printer.mo share/locale/mr/LC_MESSAGES/system-config-printer.mo share/locale/ms/LC_MESSAGES/system-config-printer.mo share/locale/my/LC_MESSAGES/system-config-printer.mo share/locale/nb/LC_MESSAGES/system-config-printer.mo share/locale/nds/LC_MESSAGES/system-config-printer.mo share/locale/nl/LC_MESSAGES/system-config-printer.mo share/locale/nn/LC_MESSAGES/system-config-printer.mo share/locale/or/LC_MESSAGES/system-config-printer.mo share/locale/pa/LC_MESSAGES/system-config-printer.mo share/locale/pl/LC_MESSAGES/system-config-printer.mo share/locale/pt/LC_MESSAGES/system-config-printer.mo share/locale/pt_BR/LC_MESSAGES/system-config-printer.mo share/locale/ro/LC_MESSAGES/system-config-printer.mo share/locale/ru/LC_MESSAGES/system-config-printer.mo share/locale/si/LC_MESSAGES/system-config-printer.mo share/locale/sk/LC_MESSAGES/system-config-printer.mo share/locale/sl/LC_MESSAGES/system-config-printer.mo share/locale/sr/LC_MESSAGES/system-config-printer.mo share/locale/sr@latin/LC_MESSAGES/system-config-printer.mo share/locale/sv/LC_MESSAGES/system-config-printer.mo share/locale/ta/LC_MESSAGES/system-config-printer.mo share/locale/te/LC_MESSAGES/system-config-printer.mo share/locale/th/LC_MESSAGES/system-config-printer.mo share/locale/tr/LC_MESSAGES/system-config-printer.mo share/locale/uk/LC_MESSAGES/system-config-printer.mo share/locale/vi/LC_MESSAGES/system-config-printer.mo share/locale/zh_CN/LC_MESSAGES/system-config-printer.mo share/locale/zh_TW/LC_MESSAGES/system-config-printer.mo share/system-config-printer/HIG.py +share/system-config-printer/OpenPrintingRequest.py share/system-config-printer/PhysicalDevice.py share/system-config-printer/SearchCriterion.py share/system-config-printer/ToolbarSearchEntry.py share/system-config-printer/applet.py share/system-config-printer/asyncconn.py share/system-config-printer/asyncipp.py share/system-config-printer/asyncpk1.py share/system-config-printer/authconn.py share/system-config-printer/check-device-ids.py share/system-config-printer/config.py share/system-config-printer/cupspk.py share/system-config-printer/debug.py share/system-config-printer/dnssdresolve.py share/system-config-printer/errordialogs.py share/system-config-printer/firewallsettings.py share/system-config-printer/gtkinklevel.py share/system-config-printer/gui.py share/system-config-printer/icons/i-network-printer.png share/system-config-printer/install-printerdriver.py share/system-config-printer/installpackage.py share/system-config-printer/jobviewer.py share/system-config-printer/monitor.py share/system-config-printer/newprinter.py share/system-config-printer/options.py share/system-config-printer/optionwidgets.py share/system-config-printer/ppdcache.py share/system-config-printer/ppdippstr.py share/system-config-printer/ppdsloader.py share/system-config-printer/printerproperties.py share/system-config-printer/probe_printer.py share/system-config-printer/pysmb.py share/system-config-printer/scp-dbus-service.py share/system-config-printer/serversettings.py share/system-config-printer/smburi.py share/system-config-printer/statereason.py share/system-config-printer/system-config-printer.py share/system-config-printer/timedops.py share/system-config-printer/troubleshoot/CheckLocalServerPublishing.py share/system-config-printer/troubleshoot/CheckNetworkServerSanity.py share/system-config-printer/troubleshoot/CheckPPDSanity.py share/system-config-printer/troubleshoot/CheckPrinterSanity.py share/system-config-printer/troubleshoot/CheckSELinux.py share/system-config-printer/troubleshoot/CheckUSBPermissions.py share/system-config-printer/troubleshoot/ChooseNetworkPrinter.py share/system-config-printer/troubleshoot/ChoosePrinter.py share/system-config-printer/troubleshoot/DeviceListed.py share/system-config-printer/troubleshoot/ErrorLogCheckpoint.py share/system-config-printer/troubleshoot/ErrorLogFetch.py share/system-config-printer/troubleshoot/ErrorLogParse.py share/system-config-printer/troubleshoot/LocalOrRemote.py share/system-config-printer/troubleshoot/Locale.py share/system-config-printer/troubleshoot/NetworkCUPSPrinterShared.py share/system-config-printer/troubleshoot/PrintTestPage.py share/system-config-printer/troubleshoot/PrinterStateReasons.py share/system-config-printer/troubleshoot/QueueNotEnabled.py share/system-config-printer/troubleshoot/QueueRejectingJobs.py share/system-config-printer/troubleshoot/RemoteAddress.py share/system-config-printer/troubleshoot/SchedulerNotRunning.py share/system-config-printer/troubleshoot/ServerFirewalled.py share/system-config-printer/troubleshoot/Shrug.py share/system-config-printer/troubleshoot/VerifyPackages.py share/system-config-printer/troubleshoot/Welcome.py share/system-config-printer/troubleshoot/__init__.py share/system-config-printer/troubleshoot/base.py share/system-config-printer/ui/AboutDialog.ui share/system-config-printer/ui/ConnectDialog.ui share/system-config-printer/ui/ConnectingDialog.ui share/system-config-printer/ui/InstallDialog.ui share/system-config-printer/ui/JobsWindow.ui share/system-config-printer/ui/NewPrinterName.ui share/system-config-printer/ui/NewPrinterWindow.ui share/system-config-printer/ui/PrinterPropertiesDialog.ui share/system-config-printer/ui/PrintersWindow.ui share/system-config-printer/ui/SMBBrowseDialog.ui share/system-config-printer/ui/ServerSettingsDialog.ui share/system-config-printer/ui/WaitWindow.ui share/system-config-printer/ui/statusicon_popupmenu.ui share/system-config-printer/userdefault.py share/system-config-printer/xml/preferreddrivers.rng share/system-config-printer/xml/validate.py