[Midnightbsd-cvs] mports: devel/desktop-file-utils: license, install tweaks

[laffer1 at midnightbsd.org]

Log Message:
-----------
license, install tweaks

Modified Files:
--------------
    mports/devel/desktop-file-utils:
        Makefile (r1.5 -> r1.6)
    mports/devel/desktop-file-utils/files:
        pkg-deinstall.in (r1.1 -> r1.2)
        pkg-install.in (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/desktop-file-utils/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L devel/desktop-file-utils/Makefile -L devel/desktop-file-utils/Makefile -u -r1.5 -r1.6
--- devel/desktop-file-utils/Makefile
+++ devel/desktop-file-utils/Makefile
@@ -6,38 +6,31 @@
 # $FreeBSD: ports/devel/desktop-file-utils/Makefile,v 1.16 2006/05/04 21:40:31 edwin Exp $
 #
 
-PORTNAME=		desktop-file-utils
-PORTVERSION=		0.15
-CATEGORIES=		devel
-MASTER_SITES=		http://freedesktop.org/software/${PORTNAME}/releases/
+PORTNAME=	desktop-file-utils
+PORTVERSION=	0.15
+PORTREVISION=	1
+CATEGORIES=	devel
+MASTER_SITES=	http://freedesktop.org/software/${PORTNAME}/releases/
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	A couple of command line utilities for working with desktop entries
+LICENSE=	gpl2
 
-MAINTAINER=		ports at MidnightBSD.org
-COMMENT=		A couple of command line utilities for working with desktop entries
+USE_GNOME=	glib20
+WANT_GNOME=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-lispdir
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" EMACS="no"
 
-LIB_DEPENDS=		popt:${PORTSDIR}/devel/popt
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
-USE_GNOME=		glib20
-WANT_GNOME=		yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=		--with-lispdir=${PREFIX}/share/emacs/site-lisp
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
-
-PKGINSTALL=		${WRKDIR}/pkg-install
-PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
-
-PORT_MIMEDIRS=		${X11BASE}/share/applications \
-			${LOCALBASE}/share/applications \
-			${X11BASE}/share/gnome/applications \
-			${LOCALBASE}/share/gnome/applications
-
-MIMEDIRS=		${PORT_MIMEDIRS} \
-			/usr/share/applications \
-			/usr/share/gnome/applications
-
-RMDIRS=			${PORT_MIMEDIRS} \
-			${LOCALBASE}/share/gnome \
-			${X11BASE}/share/gnome
+PORT_MIMEDIRS=	${LOCALBASE}/share/applications
+
+MIMEDIRS=	${PORT_MIMEDIRS}
+
+RMDIRS=		${PORT_MIMEDIRS}
 
 post-patch:
 	@${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}| ;\
@@ -47,4 +40,11 @@
 	@${SED} -e 's|%%PORT_MIMEDIRS%%|${PORT_MIMEDIRS}|' \
 		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/misc/desktop-entry-mode.el \
+	    	${PREFIX}/share/emacs/site-lisp/desktop-entry-mode.el
+.if !defined(PACKAGE_BUILDING)
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
 .include <bsd.port.mk>
Index: pkg-install.in
===================================================================
RCS file: /home/cvs/mports/devel/desktop-file-utils/files/pkg-install.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/desktop-file-utils/files/pkg-install.in -L devel/desktop-file-utils/files/pkg-install.in -u -r1.1 -r1.2
--- devel/desktop-file-utils/files/pkg-install.in
+++ devel/desktop-file-utils/files/pkg-install.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# $MidnightBSD$
 # $FreeBSD: ports/devel/desktop-file-utils/files/pkg-install.in,v 1.1 2005/01/13 07:09:24 marcus Exp $
 #
 # Initialize the desktop directories and MIME cache.
Index: pkg-deinstall.in
===================================================================
RCS file: /home/cvs/mports/devel/desktop-file-utils/files/pkg-deinstall.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/desktop-file-utils/files/pkg-deinstall.in -L devel/desktop-file-utils/files/pkg-deinstall.in -u -r1.1 -r1.2
--- devel/desktop-file-utils/files/pkg-deinstall.in
+++ devel/desktop-file-utils/files/pkg-deinstall.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# $MidnightBSD$
 # $FreeBSD: ports/devel/desktop-file-utils/files/pkg-deinstall.in,v 1.3 2006/02/26 01:03:37 marcus Exp $
 #
 # Remove leftover mimeinfo.cache files.