From nobody@FreeBSD.org  Sun Jan 13 10:58:22 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A35C16A418
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Jan 2008 10:58:22 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C91613C447
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Jan 2008 10:58:22 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m0DAv9QD067349
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 13 Jan 2008 10:57:09 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m0DAv9hP067348;
	Sun, 13 Jan 2008 10:57:09 GMT
	(envelope-from nobody)
Message-Id: <200801131057.m0DAv9hP067348@www.freebsd.org>
Date: Sun, 13 Jan 2008 10:57:09 GMT
From: Jos Garca Juanino <jjuanino@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] print/cups-base installs files outside of /usr/local
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         119621
>Category:       ports
>Synopsis:       [patch] print/cups-base installs files outside of /usr/local
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 13 11:00:01 UTC 2008
>Closed-Date:    Thu Jan 17 10:04:18 CET 2008
>Last-Modified:  Thu Jan 17 10:04:18 CET 2008
>Originator:     Jos Garca Juanino
>Release:        6.2-RELEASE-p9
>Organization:
>Environment:
FreeBSD sanabria.inad.es 6.2-RELEASE-p9 FreeBSD 6.2-RELEASE-p9 #0: Sun Jan  6 22:58:30 CET 2008     root@sanabria.inad.es:/export/FreeBSD/obj62/export/FreeBSD/src62/sys/MK2007Jun29  i386
>Description:
print/cups-base port installs the file

/usr/share/applications/cups.desktop

It should be /usr/local/share/applications/cups.desktop
>How-To-Repeat:
Check the existence of /usr/share/applications/cups.desktop file before and after installing print/cups-base port.
>Fix:
Apply the submitted patch as follow:

# cd /usr/ports/print/cups-base
# patch -p1 < cups-base.diff


Patch attached with submission follows:

diff -uNr cups-base.orig/Makefile cups-base/Makefile
--- cups-base.orig/Makefile	Sun Jan 13 11:22:17 2008
+++ cups-base/Makefile	Sun Jan 13 11:24:51 2008
@@ -41,6 +41,7 @@
 			--with-system-groups=${CUPSSYSGRP}	\
 			--with-docdir=${DOCSDIR}		\
 			--with-icondir=${PREFIX}/share/icons	\
+			--with-menudir=${DESKTOPDIR}		\
 			--with-domainsocket=${CUPS_SOCKET}
 
 OPTIONS=	GNUTLS		"Build with GNUTLS library" on \
diff -uNr cups-base.orig/pkg-plist cups-base/pkg-plist
--- cups-base.orig/pkg-plist	Sun Jan 13 11:22:17 2008
+++ cups-base/pkg-plist	Sun Jan 13 11:40:49 2008
@@ -1566,6 +1566,7 @@
 %%DOCSDIR%%/zh_TW/images/button-view-page-log.gif
 %%DOCSDIR%%/zh_TW/images/button-view-printable-version.gif
 %%DOCSDIR%%/zh_TW/index.html
+share/applications/cups.desktop
 share/icons/hicolor/16x16/apps/cups.png
 share/icons/hicolor/32x32/apps/cups.png
 share/icons/hicolor/64x64/apps/cups.png


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Jan 13 11:00:07 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119621 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/119621: commit references a PR
Date: Mon, 14 Jan 2008 09:17:57 +0000 (UTC)

 dinoex      2008-01-14 09:17:52 UTC
 
   FreeBSD ports repository
 
   Modified files:
     print/cups-base      Makefile pkg-plist 
   Log:
   - force installation of cups.desktop
   PR:             119621
   Submitted by:   Jos Garca Juanino
   
   Revision  Changes    Path
   1.82      +2 -0      ports/print/cups-base/Makefile
   1.40      +1 -0      ports/print/cups-base/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Thu Jan 17 10:04:02 CET 2008 
State-Changed-Why:  
committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119621 
>Unformatted:
