ports/76812: [maintainer-update] polish/kadu desktop files handling

[Jacek Pelka]

>Number:         76812
>Category:       ports
>Synopsis:       [maintainer-update] polish/kadu desktop files handling
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 29 14:00:35 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jacek Pelka
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD home.combit.com.pl 5.3-STABLE FreeBSD 5.3-STABLE #3: Wed Jan 19 10:02:41 CET 2005 root at home.combit.com.pl:/usr/obj/usr/src/sys/BSD i386


	
>Description:
        This patch install kde/gnome .desktop files without detecting
        kde/gnome present at buildtime, and remove these files cleanly
        when package is deinstalled.
>How-To-Repeat:
	
>Fix:

	

--- kadu-diff-20050129 begins here ---
diff -ruN /usr/ports/polish/kadu.orig/Makefile /usr/ports/polish/kadu/Makefile
--- /usr/ports/polish/kadu.orig/Makefile	Wed Jan 26 16:23:17 2005
+++ /usr/ports/polish/kadu/Makefile	Sat Jan 29 11:18:54 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=		kadu
 PORTVERSION=		0.3.9
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		1
 CATEGORIES=		polish net
 MASTER_SITES=		http://www.kadu.net/download/stable/
@@ -34,16 +34,8 @@
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
-WANT_GNOME=		yes
-
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomehier}!=""
-PLIST_SUB+=	GNOME:=""
-.else
-PLIST_SUB+=	GNOME:="@comment "
-.endif
-
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  **************************************************************"
@@ -53,9 +45,7 @@
 	@${ECHO_MSG}
 
 post-install:
-.if ${HAVE_GNOME:Mgnomehier}!=""
 	${INSTALL_DATA} ${WRKSRC}/kadu/kadu.desktop ${X11BASE}/share/gnome/apps/Internet
-.endif
 	${INSTALL_DATA} ${WRKSRC}/kadu/kadu.desktop ${LOCALBASE}/share/applnk/Internet
 
 .include <bsd.port.post.mk>
diff -ruN /usr/ports/polish/kadu.orig/pkg-plist /usr/ports/polish/kadu/pkg-plist
--- /usr/ports/polish/kadu.orig/pkg-plist	Wed Jan 26 16:23:17 2005
+++ /usr/ports/polish/kadu/pkg-plist	Fri Jan 28 22:03:08 2005
@@ -461,5 +461,10 @@
 @dirrm include/kadu
 @cwd %%LOCALBASE%%
 share/applnk/Internet/kadu.desktop
-%%GNOME:%%@cwd %%X11BASE%%
-%%GNOME:%%share/gnome/apps/Internet/kadu.desktop
+ at unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
+ at unexec rmdir %D/share/applnk 2>/dev/null || true
+ at cwd %%X11BASE%%
+share/gnome/apps/Internet/kadu.desktop
+ at unexec rmdir %D/share/gnome/apps/Internet 2>/dev/null || true
+ at unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+ at unexec rmdir %D/share/gnome 2>/dev/null || true
--- kadu-diff-20050129 ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: