From owner-freebsd-gnome@FreeBSD.ORG Thu Mar 10 13:37:34 2011 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83435106567C; Thu, 10 Mar 2011 13:37:34 +0000 (UTC) (envelope-from bsdkaffee@gmail.com) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id F411C8FC1A; Thu, 10 Mar 2011 13:37:33 +0000 (UTC) Received: by qyk27 with SMTP id 27so1329354qyk.13 for ; Thu, 10 Mar 2011 05:37:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:to:subject:from:reply-to:cc :x-send-pr-version:x-gnats-notify; bh=4uKGGvgEoeSLmVCiqWTN/JI4B4yGn+VQY8JtMICeidc=; b=xhWU1oflp2gCO7wP2QGxeA9y/iW778rTDog9mxfRoJ8ttgvS/WVK2wJWzSP4gQFkb+ P7CbLPG+WuRU9YP+Fdtu5SkqNuZ7MIhrhYlQ8PE/kzeYGypZreAWAaFQyxv8+n6fCJ5R iIdJeOd00MCA/u6YyIgN/HDax1G17C2+iUuhs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:to:subject:from:reply-to:cc:x-send-pr-version :x-gnats-notify; b=whC/+kdVvFCjwRO6qUVb68kyLNTm/qs+9H6VoFcx+3bukcFumtMSrmefqvDblREQ9v 4Qtu658424xpDY1Uojwe3qthA5+TjWLx8hs7xdXkHPrYTqg5vW7ekxIcryQ9/0xJwVvD HBXtzzq+kEajKz31jrIeHyZcFbcKKIbLBiqUY= Received: by 10.224.46.100 with SMTP id i36mr4542306qaf.153.1299764252571; Thu, 10 Mar 2011 05:37:32 -0800 (PST) Received: from mocha.verizon.net (c-24-3-43-53.hsd1.oh.comcast.net [24.3.43.53]) by mx.google.com with ESMTPS id s9sm2298949qco.12.2011.03.10.05.37.30 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Mar 2011 05:37:31 -0800 (PST) Message-ID: <4d78d41b.4969e50a.19a9.7cd6@mx.google.com> Date: Thu, 10 Mar 2011 05:37:31 -0800 (PST) To: FreeBSD-gnats-submit@freebsd.org From: Jason E. Hale X-send-pr-version: 3.113 X-GNATS-Notify: Cc: gnome@FreeBSD.org Subject: [PATCH] print/system-config-printer: Leaves .pyo files upon deinstall X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Jason E. Hale" List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Mar 2011 13:37:35 -0000 >Submitter-Id: current-users >Originator: Jason E. Hale >Organization: none >Confidential: no >Synopsis: [PATCH] print/system-config-printer: Leaves .pyo files upon deinstall >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 8.2-RELEASE i386 >Environment: System: FreeBSD mocha.verizon.net 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Tue Feb 22 19:19:42 EST 2011 root@mocha.verizon.net:/usr/obj/usr/src/sys/MOCHA8 i386 >Description: print/system-config-printer leaves Python ".pyo" files upon deinstall. They are not installed when the port is built, but they get generated when the module is used. I have patched the port to install the .pyo files when the port is built so that they can be included in the pkg-plist. Also, remove .egg-info file from the pkg-plist and deal with it in the Makefile. While here, remove MD5. >How-To-Repeat: Use attached diff. >Fix: --- 2011-03-10-system-config-printer.diff begins here --- diff -ruN system-config-printer.orig/Makefile system-config-printer/Makefile --- system-config-printer.orig/Makefile 2010-05-30 22:00:44.000000000 -0400 +++ system-config-printer/Makefile 2011-03-10 06:18:55.000000000 -0500 @@ -8,7 +8,7 @@ PORTNAME= system-config-printer PORTVERSION= 1.1.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print gnome MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/ @@ -37,8 +37,14 @@ MAN1= system-config-printer-applet.1 system-config-printer.1 PLIST_SUB= PYTHON_VER=${PYTHON_VERSION:S/python//} +INSTALLS_EGGINFO= yes +PYDISTUTILS_PKGNAME= cupshelpers +PYDISTUTILS_PKGVERSION= 1.0 + post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|%%LOCALBASE%%|${LOCALBASE}|g; s|%%PREFIX%%|${PREFIX}|g' + @${REINPLACE_CMD} -e 's|setup.py install|setup.py install -c -O1|g' \ + ${WRKSRC}/Makefile.in .include diff -ruN system-config-printer.orig/distinfo system-config-printer/distinfo --- system-config-printer.orig/distinfo 2010-05-10 17:18:33.000000000 -0400 +++ system-config-printer/distinfo 2011-03-10 06:21:04.000000000 -0500 @@ -1,3 +1,2 @@ -MD5 (system-config-printer-1.1.16.tar.bz2) = 22394a052fa730a890f6bfea1aec0aa2 SHA256 (system-config-printer-1.1.16.tar.bz2) = 176b63ee6af2208313469192eb34eb12b41fe8b890a18c8a5ab693010a8e785d SIZE (system-config-printer-1.1.16.tar.bz2) = 1036604 diff -ruN system-config-printer.orig/pkg-plist system-config-printer/pkg-plist --- system-config-printer.orig/pkg-plist 2010-05-23 16:24:39.000000000 -0400 +++ system-config-printer/pkg-plist 2011-03-10 06:11:47.000000000 -0500 @@ -3,15 +3,18 @@ bin/system-config-printer-applet etc/dbus-1/system.d/newprinternotification.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/cupshelpers.py %%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.pyc +%%PYTHON_SITELIBDIR%%/cupshelpers/cupshelpers.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 share/applications/manage-print-jobs.desktop share/applications/my-default-printer.desktop share/applications/system-config-printer.desktop --- 2011-03-10-system-config-printer.diff ends here ---