[Midnightbsd-cvs] mports: misc/shared-mime-info: Update to 0.23.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Apr 6 13:21:12 EDT 2008 

Log Message:
-----------
Update to 0.23.  I'm not sure this is quite right.

Modified Files:
--------------
    mports/misc/shared-mime-info:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.2 -> r1.3)
    mports/misc/shared-mime-info/files:
        patch-Makefile.in (r1.1 -> r1.2)
        patch-update-mime-database.c (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/misc/shared-mime-info/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L misc/shared-mime-info/pkg-plist -L misc/shared-mime-info/pkg-plist -u -r1.2 -r1.3
--- misc/shared-mime-info/pkg-plist
+++ misc/shared-mime-info/pkg-plist
@@ -8,15 +8,19 @@
 @exec mkdir -p %D/share/mime/packages
 @exec mkdir -p %D/share/mime/text
 @exec mkdir -p %D/share/mime/video
+ at exec mkdir -p %D/share/mime/x-epoc
+ at exec mkdir -p %D/share/mime/x-content
 bin/update-mime-database
 libdata/pkgconfig/shared-mime-info.pc
 share/locale/az/LC_MESSAGES/shared-mime-info.mo
 share/locale/bg/LC_MESSAGES/shared-mime-info.mo
+share/locale/ca/LC_MESSAGES/shared-mime-info.mo
 share/locale/cs/LC_MESSAGES/shared-mime-info.mo
 share/locale/cy/LC_MESSAGES/shared-mime-info.mo
 share/locale/da/LC_MESSAGES/shared-mime-info.mo
 share/locale/de/LC_MESSAGES/shared-mime-info.mo
 share/locale/el/LC_MESSAGES/shared-mime-info.mo
+share/locale/en_GB/LC_MESSAGES/shared-mime-info.mo
 share/locale/eo/LC_MESSAGES/shared-mime-info.mo
 share/locale/es/LC_MESSAGES/shared-mime-info.mo
 share/locale/eu/LC_MESSAGES/shared-mime-info.mo
@@ -57,7 +61,11 @@
 @unexec [ -f %D/share/mime/packages ] && rm -f %D/share/mime/packages || true
 @unexec [ -f %D/share/mime/text ] && rm -f %D/share/mime/text || true
 @unexec [ -f %D/share/mime/video ] && rm -f %D/share/mime/video || true
+ at unexec [ -f %D/share/mime/x-epoc ] && rm -f %D/share/mime/x-epoc || true
+ at unexec [ -f %D/share/mime/x-content ] && rm -rf %D/share/mime/x-content || true
 @unexec [ -f %D/share/mime/XMLnamespaces ] && rm -f %D/share/mime/XMLnamespaces || true
+ at dirrmtry share/mime/x-content
+ at dirrmtry share/mime/x-epoc
 @dirrmtry share/mime/video
 @dirrmtry share/mime/text
 @dirrmtry share/mime/packages
@@ -70,40 +78,5 @@
 @dirrmtry share/mime/application
 @unexec [ -f %D/share/mime/mime.cache ] && rm -f %D/share/mime/mime.cache || true
 @dirrmtry share/mime
- at unexec [ -f %%X11BASE%%/share/mime/XMLnamespaces ] && rm -f %%X11BASE%%/share/mime/XMLnamespaces || true
- at unexec [ -f %%X11BASE%%/share/mime/globs ] && rm -f %%X11BASE%%/share/mime/globs || true
- at unexec [ -f %%X11BASE%%/share/mime/magic ] && rm -f %%X11BASE%%/share/mime/magic || true
- at unexec [ -f %%X11BASE%%/share/mime/aliases ] && rm -f %%X11BASE%%/share/mime/aliases || true
- at unexec [ -f %%X11BASE%%/share/mime/subclasses ] && rm -f %%X11BASE%%/share/mime/subclasses || true
- at unexec rmdir %%X11BASE%%/share/mime/video 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/text 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/packages 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/multipart 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/model 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/message 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/inode 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/image 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/audio 2>/dev/null || true
- at unexec rmdir %%X11BASE%%/share/mime/application 2>/dev/null || true
- at unexec [ -f %%X11BASE%%/share/mime/mime.cache ] && rm -f %%X11BASE%%/share/mime/mime.cache || true
- at unexec rmdir %%X11BASE%%/share/mime 2>/dev/null || true
- at dirrmtry share/locale/zh_TW/LC_MESSAGES
- at dirrmtry share/locale/zh_TW
- at dirrmtry share/locale/zh_CN/LC_MESSAGES
- at dirrmtry share/locale/zh_CN
- at dirrmtry share/locale/uk/LC_MESSAGES
- at dirrmtry share/locale/uk
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
- at dirrmtry share/locale/pt/LC_MESSAGES
- at dirrmtry share/locale/pt
- at dirrmtry share/locale/pl/LC_MESSAGES
- at dirrmtry share/locale/pl
- at dirrmtry share/locale/nn/LC_MESSAGES
- at dirrmtry share/locale/nn
- at dirrmtry share/locale/ko/LC_MESSAGES
- at dirrmtry share/locale/ko
- at dirrmtry share/locale/fi/LC_MESSAGES
- at dirrmtry share/locale/fi
- at dirrmtry share/locale/cs/LC_MESSAGES
- at dirrmtry share/locale/cs
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/misc/shared-mime-info/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L misc/shared-mime-info/Makefile -L misc/shared-mime-info/Makefile -u -r1.3 -r1.4
--- misc/shared-mime-info/Makefile
+++ misc/shared-mime-info/Makefile
@@ -6,15 +6,16 @@
 # $FreeBSD: ports/misc/shared-mime-info/Makefile,v 1.40 2006/09/04 00:24:54 marcus Exp $
 
 PORTNAME=	shared-mime-info
-PORTVERSION=	0.19
+PORTVERSION=	0.23
+PORTREVISION=	1
 CATEGORIES=	misc gnome
-MASTER_SITES=	http://www.marcuscom.com/downloads/ \
-		http://people.freedesktop.org/~hadess/
-DISTNAME=	shared-mime-info-${PORTVERSION}
+MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A MIME type database from the FreeDesktop project
+LICENSE=	gpl2
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -26,20 +27,15 @@
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-MIMEDIRS=	${X11BASE}/share/gnome/mime \
-		${LOCALBASE}/share/gnome/mime \
-		${X11BASE}/share/mime \
-		${LOCALBASE}/share/mime \
-		${PREFIX}/share/mime \
-		/usr/share/mime
+MIMEDIRS=	${LOCALBASE}/share/mime \
+		${PREFIX}/share/mime
 MIMESUBDIRS=	application audio image inode message model multipart \
-		packages text video
+		packages text video x-epoc x-content
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%MIMEDIRS%%|${MIMEDIRS}|g' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/update-mime-database.c
 
 pre-install:
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/misc/shared-mime-info/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L misc/shared-mime-info/distinfo -L misc/shared-mime-info/distinfo -u -r1.1 -r1.2
--- misc/shared-mime-info/distinfo
+++ misc/shared-mime-info/distinfo
@@ -1,3 +1,3 @@
-MD5 (shared-mime-info-0.19.tar.gz) = 056a86a8245aecfd9c80740380c5265a
-SHA256 (shared-mime-info-0.19.tar.gz) = 4aae542285cdf011d8486ece8c2c8b0431ce1e25e7eb7efd39593f04bc76d118
-SIZE (shared-mime-info-0.19.tar.gz) = 595168
+MD5 (shared-mime-info-0.23.tar.bz2) = 3120a720f6a94881614b533f37a7671f
+SHA256 (shared-mime-info-0.23.tar.bz2) = 038faac46b629968f98dd8ead54ad0ced71fa438b59fca3a144000e0b7f01620
+SIZE (shared-mime-info-0.23.tar.bz2) = 475904
Index: patch-update-mime-database.c
===================================================================
RCS file: /home/cvs/mports/misc/shared-mime-info/files/patch-update-mime-database.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L misc/shared-mime-info/files/patch-update-mime-database.c -L misc/shared-mime-info/files/patch-update-mime-database.c -u -r1.1 -r1.2
--- misc/shared-mime-info/files/patch-update-mime-database.c
+++ misc/shared-mime-info/files/patch-update-mime-database.c
@@ -1,6 +1,6 @@
---- update-mime-database.c.orig	Fri Dec  3 15:46:28 2004
-+++ update-mime-database.c	Fri Mar 25 14:51:30 2005
-@@ -408,7 +408,8 @@
+--- update-mime-database.c.orig	2007-06-27 15:46:53.000000000 -0400
++++ update-mime-database.c	2007-08-09 15:32:31.000000000 -0400
+@@ -445,7 +445,8 @@ static void remove_old(Type *type, xmlNo
  		}
  	}
  
@@ -10,12 +10,12 @@
  }
  
  /* 'node' is a <mime-type> node from a source file, whose type is 'type'.
-@@ -1458,7 +1459,7 @@
+@@ -1510,7 +1511,7 @@ static void check_in_path_xdg_data(const
  
  	env = getenv("XDG_DATA_DIRS");
  	if (!env)
--		env = "/usr/local/share/:/usr/share/";
-+		env = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
- 	dirs = g_strsplit(env, ":", 0);
+-		env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
++		env = "/usr/local/share/";
+ 	dirs = g_strsplit(env, PATH_SEPARATOR, 0);
  	g_return_if_fail(dirs != NULL);
  	for (n = 0; dirs[n]; n++)
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/misc/shared-mime-info/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L misc/shared-mime-info/files/patch-Makefile.in -L misc/shared-mime-info/files/patch-Makefile.in -u -r1.1 -r1.2
--- misc/shared-mime-info/files/patch-Makefile.in
+++ misc/shared-mime-info/files/patch-Makefile.in
@@ -1,16 +1,15 @@
---- Makefile.in.orig	Sat Dec  4 16:05:36 2004
-+++ Makefile.in	Sat Dec  4 16:06:17 2004
-@@ -795,7 +795,12 @@
+--- Makefile.in.orig	Fri Apr 27 16:56:45 2007
++++ Makefile.in	Fri Apr 27 16:57:14 2007
+@@ -901,7 +901,11 @@ $(pkgconfig_DATA): config.status
  @INTLTOOL_DESKTOP_RULE@
  
  install-data-hook: 
-- at ENABLE_UPDATE_MIMEDB_TRUE@	$(DESTDIR)"$(bindir)/update-mime-database" "$(DESTDIR)${mimedir}"
+- at ENABLE_UPDATE_MIMEDB_TRUE@	$(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime"
 + at ENABLE_UPDATE_MIMEDB_TRUE@	for mdir in %%MIMEDIRS%%; do \
 + at ENABLE_UPDATE_MIMEDB_TRUE@		if [ -d $${mdir} ]; then \
 + at ENABLE_UPDATE_MIMEDB_TRUE@			$(DESTDIR)"$(bindir)/update-mime-database" "$${mdir}" ; \
 + at ENABLE_UPDATE_MIMEDB_TRUE@		fi; \
 + at ENABLE_UPDATE_MIMEDB_TRUE@	done
-+
  
  uninstall-hook:
- 	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)${mimedir}/$${media}/"*.xml; done
+ 	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(datadir)/mime/$${media}/"*.xml; done

More information about the Midnightbsd-cvs mailing list