Bug 168220 - [patch] misc/shared-mime-info: do not register auto-generated files
Summary: [patch] misc/shared-mime-info: do not register auto-generated files
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-gnome (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-05-22 08:50 UTC by Alberto Villa
Modified: 2012-12-30 06:40 UTC (History)
0 users

See Also:


Attachments
file.diff (30.35 KB, patch)
2012-05-22 08:50 UTC, Alberto Villa
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alberto Villa freebsd_committer freebsd_triage 2012-05-22 08:50:01 UTC
shared-mime-info currently registers in plist all auto-generated files (those in share/mime/*/ directories), while only files in share/mime/packages/ should be registered, and then update-mime-database should generate the others. The same applies to many more ports, but that's not the point here. Anyway, registering those files can create conflicts when another package updates the definition of one of such auto-generated files.

Fix: The attached patch, apart from doing some spring cleanup, removes auto-generated files and directories from plist, just forcing their deletion on package deinstallation. It also avoids running update-mime-database in install target, and does that in post-install instead (unifying port and package installation).

Patch attached with submission follows:
How-To-Repeat: make install -C misc/shared-mime-info
make install -C x11/kdelibs4 KDE4_PREFIX=/usr/local
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2012-05-22 08:50:12 UTC
Responsible Changed
From-To: freebsd-ports-bugs->gnome

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2012-12-30 06:33:38 UTC
Author: mezz
Date: Sun Dec 30 06:33:28 2012
New Revision: 309653
URL: http://svnweb.freebsd.org/changeset/ports/309653

Log:
  shared-mime-info currently registers in plist all auto-generated files (those
  in share/mime/*/ directories), while only files in share/mime/packages/ should
  be registered, and then update-mime-database should generate the others. The
  same applies to many more ports, but that's not the point here. Anyway,
  registering those files can create conflicts when another package updates the
  definition of one of such auto-generated files. (written by avilla@)
  
  -Minor correct grammar in COMMENT/pkg-descr.
  -some clean up
  -Bump the PORTREVISION.
  
  PR:		ports/168220
  Submitted by:	avilla

Deleted:
  head/misc/shared-mime-info/files/patch-Makefile.in
Modified:
  head/misc/shared-mime-info/Makefile   (contents, props changed)
  head/misc/shared-mime-info/pkg-descr   (contents, props changed)
  head/misc/shared-mime-info/pkg-plist   (contents, props changed)

Modified: head/misc/shared-mime-info/Makefile
==============================================================================
--- head/misc/shared-mime-info/Makefile	Sun Dec 30 06:20:27 2012	(r309652)
+++ head/misc/shared-mime-info/Makefile	Sun Dec 30 06:33:28 2012	(r309653)
@@ -1,22 +1,19 @@
-# New ports collection makefile for:	shared-mime-info
-# Date created:        31 May 2002
-# Whom:                olgeni@FreeBSD.org
-#
+# Created by: olgeni@FreeBSD.org
 # $FreeBSD$
 #   $MCom: ports/misc/shared-mime-info/Makefile,v 1.16 2009/11/28 05:59:02 mezz Exp $
-#
 
 PORTNAME=	shared-mime-info
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A MIME type database from the FreeDesktop project
+COMMENT=	MIME types database from the freedesktop.org project
 
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-update-mimedb
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 libxml2 intltool gnomehack intlhack pkgconfig
@@ -26,7 +23,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 MAN1=		update-mime-database.1
 
-PKGINSTALL=	${WRKDIR}/pkg-install
+SUB_FILES=	pkg-install
+SUB_LIST=	MIMEDIRS="${MIMEDIRS:O:u}"
 
 MIMEDIRS=	${LOCALBASE}/share/mime \
 		${PREFIX}/share/mime
@@ -34,14 +32,10 @@ MIMESUBDIRS=	application audio image ino
 		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' \
 		${WRKSRC}/update-mime-database.c
 
 post-install:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
-		s|%%MIMEDIRS%%|${MIMEDIRS}|' \
-		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>

Modified: head/misc/shared-mime-info/pkg-descr
==============================================================================
--- head/misc/shared-mime-info/pkg-descr	Sun Dec 30 06:20:27 2012	(r309652)
+++ head/misc/shared-mime-info/pkg-descr	Sun Dec 30 06:33:28 2012	(r309653)
@@ -1,6 +1,6 @@
 The freedesktop.org project provides a shared MIME database to avoid
 inconsistencies between desktops. This database has been created by
-converting the existing KDE and GNOME databases to the a format and
-merging them together. 
+converting the existing KDE and GNOME databases to a common format and
+merging them together.
 
 WWW: http://www.freedesktop.org/wiki/Software/shared-mime-info

Modified: head/misc/shared-mime-info/pkg-plist
==============================================================================
--- head/misc/shared-mime-info/pkg-plist	Sun Dec 30 06:20:27 2012	(r309652)
+++ head/misc/shared-mime-info/pkg-plist	Sun Dec 30 06:33:28 2012	(r309653)
@@ -56,692 +56,31 @@ share/locale/vi/LC_MESSAGES/shared-mime-
 share/locale/wa/LC_MESSAGES/shared-mime-info.mo
 share/locale/zh_CN/LC_MESSAGES/shared-mime-info.mo
 share/locale/zh_TW/LC_MESSAGES/shared-mime-info.mo
-share/mime/application/andrew-inset.xml
-share/mime/application/annodex.xml
-share/mime/application/atom+xml.xml
-share/mime/application/dicom.xml
-share/mime/application/docbook+xml.xml
-share/mime/application/ecmascript.xml
-share/mime/application/epub+zip.xml
-share/mime/application/gnunet-directory.xml
-share/mime/application/illustrator.xml
-share/mime/application/javascript.xml
-share/mime/application/mac-binhex40.xml
-share/mime/application/mathematica.xml
-share/mime/application/mathml+xml.xml
-share/mime/application/mbox.xml
-share/mime/application/metalink+xml.xml
-share/mime/application/metalink4+xml.xml
-share/mime/application/msword-template.xml
-share/mime/application/msword.xml
-share/mime/application/mxf.xml
-share/mime/application/octet-stream.xml
-share/mime/application/oda.xml
-share/mime/application/ogg.xml
-share/mime/application/oxps.xml
-share/mime/application/pdf.xml
-share/mime/application/pgp-encrypted.xml
-share/mime/application/pgp-keys.xml
-share/mime/application/pgp-signature.xml
-share/mime/application/pkcs10.xml
-share/mime/application/pkcs7-mime.xml
-share/mime/application/pkcs7-signature.xml
-share/mime/application/pkcs8.xml
-share/mime/application/pkix-cert.xml
-share/mime/application/pkix-crl.xml
-share/mime/application/pkix-pkipath.xml
-share/mime/application/postscript.xml
-share/mime/application/prs.plucker.xml
-share/mime/application/ram.xml
-share/mime/application/rdf+xml.xml
-share/mime/application/relax-ng-compact-syntax.xml
-share/mime/application/rss+xml.xml
-share/mime/application/rtf.xml
-share/mime/application/sdp.xml
-share/mime/application/sieve.xml
-share/mime/application/smil.xml
-share/mime/application/vnd.android.package-archive.xml
-share/mime/application/vnd.apple.mpegurl.xml
-share/mime/application/vnd.corel-draw.xml
-share/mime/application/vnd.emusic-emusic_package.xml
-share/mime/application/vnd.google-earth.kml+xml.xml
-share/mime/application/vnd.google-earth.kmz.xml
-share/mime/application/vnd.hp-hpgl.xml
-share/mime/application/vnd.hp-pcl.xml
-share/mime/application/vnd.iccprofile.xml
-share/mime/application/vnd.lotus-1-2-3.xml
-share/mime/application/vnd.mozilla.xul+xml.xml
-share/mime/application/vnd.ms-access.xml
-share/mime/application/vnd.ms-cab-compressed.xml
-share/mime/application/vnd.ms-excel.addin.macroEnabled.12.xml
-share/mime/application/vnd.ms-excel.sheet.binary.macroEnabled.12.xml
-share/mime/application/vnd.ms-excel.sheet.macroEnabled.12.xml
-share/mime/application/vnd.ms-excel.template.macroEnabled.12.xml
-share/mime/application/vnd.ms-excel.xml
-share/mime/application/vnd.ms-htmlhelp.xml
-share/mime/application/vnd.ms-powerpoint.addin.macroEnabled.12.xml
-share/mime/application/vnd.ms-powerpoint.presentation.macroEnabled.12.xml
-share/mime/application/vnd.ms-powerpoint.slide.macroEnabled.12.xml
-share/mime/application/vnd.ms-powerpoint.slideshow.macroEnabled.12.xml
-share/mime/application/vnd.ms-powerpoint.template.macroEnabled.12.xml
-share/mime/application/vnd.ms-powerpoint.xml
-share/mime/application/vnd.ms-tnef.xml
-share/mime/application/vnd.ms-word.document.macroEnabled.12.xml
-share/mime/application/vnd.ms-word.template.macroEnabled.12.xml
-share/mime/application/vnd.ms-works.xml
-share/mime/application/vnd.ms-wpl.xml
-share/mime/application/vnd.oasis.opendocument.chart-template.xml
-share/mime/application/vnd.oasis.opendocument.chart.xml
-share/mime/application/vnd.oasis.opendocument.database.xml
-share/mime/application/vnd.oasis.opendocument.formula-template.xml
-share/mime/application/vnd.oasis.opendocument.formula.xml
-share/mime/application/vnd.oasis.opendocument.graphics-flat-xml.xml
-share/mime/application/vnd.oasis.opendocument.graphics-template.xml
-share/mime/application/vnd.oasis.opendocument.graphics.xml
-share/mime/application/vnd.oasis.opendocument.image.xml
-share/mime/application/vnd.oasis.opendocument.presentation-flat-xml.xml
-share/mime/application/vnd.oasis.opendocument.presentation-template.xml
-share/mime/application/vnd.oasis.opendocument.presentation.xml
-share/mime/application/vnd.oasis.opendocument.spreadsheet-flat-xml.xml
-share/mime/application/vnd.oasis.opendocument.spreadsheet-template.xml
-share/mime/application/vnd.oasis.opendocument.spreadsheet.xml
-share/mime/application/vnd.oasis.opendocument.text-flat-xml.xml
-share/mime/application/vnd.oasis.opendocument.text-master.xml
-share/mime/application/vnd.oasis.opendocument.text-template.xml
-share/mime/application/vnd.oasis.opendocument.text-web.xml
-share/mime/application/vnd.oasis.opendocument.text.xml
-share/mime/application/vnd.openofficeorg.extension.xml
-share/mime/application/vnd.openxmlformats-officedocument.presentationml.presentation.xml
-share/mime/application/vnd.openxmlformats-officedocument.presentationml.slide.xml
-share/mime/application/vnd.openxmlformats-officedocument.presentationml.slideshow.xml
-share/mime/application/vnd.openxmlformats-officedocument.presentationml.template.xml
-share/mime/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.xml
-share/mime/application/vnd.openxmlformats-officedocument.spreadsheetml.template.xml
-share/mime/application/vnd.openxmlformats-officedocument.wordprocessingml.document.xml
-share/mime/application/vnd.openxmlformats-officedocument.wordprocessingml.template.xml
-share/mime/application/vnd.rn-realmedia.xml
-share/mime/application/vnd.stardivision.calc.xml
-share/mime/application/vnd.stardivision.chart.xml
-share/mime/application/vnd.stardivision.draw.xml
-share/mime/application/vnd.stardivision.impress.xml
-share/mime/application/vnd.stardivision.mail.xml
-share/mime/application/vnd.stardivision.math.xml
-share/mime/application/vnd.stardivision.writer.xml
-share/mime/application/vnd.sun.xml.calc.template.xml
-share/mime/application/vnd.sun.xml.calc.xml
-share/mime/application/vnd.sun.xml.draw.template.xml
-share/mime/application/vnd.sun.xml.draw.xml
-share/mime/application/vnd.sun.xml.impress.template.xml
-share/mime/application/vnd.sun.xml.impress.xml
-share/mime/application/vnd.sun.xml.math.xml
-share/mime/application/vnd.sun.xml.writer.global.xml
-share/mime/application/vnd.sun.xml.writer.template.xml
-share/mime/application/vnd.sun.xml.writer.xml
-share/mime/application/vnd.symbian.install.xml
-share/mime/application/vnd.tcpdump.pcap.xml
-share/mime/application/vnd.visio.xml
-share/mime/application/vnd.wordperfect.xml
-share/mime/application/x-7z-compressed.xml
-share/mime/application/x-abiword.xml
-share/mime/application/x-ace.xml
-share/mime/application/x-alz.xml
-share/mime/application/x-amipro.xml
-share/mime/application/x-aportisdoc.xml
-share/mime/application/x-apple-diskimage.xml
-share/mime/application/x-applix-spreadsheet.xml
-share/mime/application/x-applix-word.xml
-share/mime/application/x-arc.xml
-share/mime/application/x-archive.xml
-share/mime/application/x-arj.xml
-share/mime/application/x-asp.xml
-share/mime/application/x-awk.xml
-share/mime/application/x-bcpio.xml
-share/mime/application/x-bittorrent.xml
-share/mime/application/x-blender.xml
-share/mime/application/x-bzdvi.xml
-share/mime/application/x-bzip-compressed-tar.xml
-share/mime/application/x-bzip.xml
-share/mime/application/x-bzpdf.xml
-share/mime/application/x-bzpostscript.xml
-share/mime/application/x-cb7.xml
-share/mime/application/x-cbr.xml
-share/mime/application/x-cbt.xml
-share/mime/application/x-cbz.xml
-share/mime/application/x-cd-image.xml
-share/mime/application/x-cdrdao-toc.xml
-share/mime/application/x-chess-pgn.xml
-share/mime/application/x-cisco-vpn-settings.xml
-share/mime/application/x-class-file.xml
-share/mime/application/x-compress.xml
-share/mime/application/x-compressed-tar.xml
-share/mime/application/x-core.xml
-share/mime/application/x-cpio-compressed.xml
-share/mime/application/x-cpio.xml
-share/mime/application/x-csh.xml
-share/mime/application/x-cue.xml
-share/mime/application/x-dar.xml
-share/mime/application/x-dbf.xml
-share/mime/application/x-dc-rom.xml
-share/mime/application/x-deb.xml
-share/mime/application/x-designer.xml
-share/mime/application/x-desktop.xml
-share/mime/application/x-dia-diagram.xml
-share/mime/application/x-dia-shape.xml
-share/mime/application/x-dvi.xml
-share/mime/application/x-e-theme.xml
-share/mime/application/x-egon.xml
-share/mime/application/x-executable.xml
-share/mime/application/x-fictionbook+xml.xml
-share/mime/application/x-fluid.xml
-share/mime/application/x-font-afm.xml
-share/mime/application/x-font-bdf.xml
-share/mime/application/x-font-dos.xml
-share/mime/application/x-font-framemaker.xml
-share/mime/application/x-font-libgrx.xml
-share/mime/application/x-font-linux-psf.xml
-share/mime/application/x-font-otf.xml
-share/mime/application/x-font-pcf.xml
-share/mime/application/x-font-speedo.xml
-share/mime/application/x-font-sunos-news.xml
-share/mime/application/x-font-tex-tfm.xml
-share/mime/application/x-font-tex.xml
-share/mime/application/x-font-ttf.xml
-share/mime/application/x-font-ttx.xml
-share/mime/application/x-font-type1.xml
-share/mime/application/x-font-vfont.xml
-share/mime/application/x-frame.xml
-share/mime/application/x-gameboy-rom.xml
-share/mime/application/x-gba-rom.xml
-share/mime/application/x-gdbm.xml
-share/mime/application/x-gedcom.xml
-share/mime/application/x-genesis-rom.xml
-share/mime/application/x-gettext-translation.xml
-share/mime/application/x-glade.xml
-share/mime/application/x-gmc-link.xml
-share/mime/application/x-gnucash.xml
-share/mime/application/x-gnumeric.xml
-share/mime/application/x-gnuplot.xml
-share/mime/application/x-go-sgf.xml
-share/mime/application/x-graphite.xml
-share/mime/application/x-gtktalog.xml
-share/mime/application/x-gz-font-linux-psf.xml
-share/mime/application/x-gzdvi.xml
-share/mime/application/x-gzip.xml
-share/mime/application/x-gzpdf.xml
-share/mime/application/x-gzpostscript.xml
-share/mime/application/x-hdf.xml
-share/mime/application/x-hwp.xml
-share/mime/application/x-hwt.xml
-share/mime/application/x-ica.xml
-share/mime/application/x-ipod-firmware.xml
-share/mime/application/x-it87.xml
-share/mime/application/x-java-archive.xml
-share/mime/application/x-java-jce-keystore.xml
-share/mime/application/x-java-jnlp-file.xml
-share/mime/application/x-java-keystore.xml
-share/mime/application/x-java-pack200.xml
-share/mime/application/x-java.xml
-share/mime/application/x-jbuilder-project.xml
-share/mime/application/x-karbon.xml
-share/mime/application/x-kchart.xml
-share/mime/application/x-kexi-connectiondata.xml
-share/mime/application/x-kexiproject-shortcut.xml
-share/mime/application/x-kexiproject-sqlite2.xml
-share/mime/application/x-kexiproject-sqlite3.xml
-share/mime/application/x-kformula.xml
-share/mime/application/x-killustrator.xml
-share/mime/application/x-kivio.xml
-share/mime/application/x-kontour.xml
-share/mime/application/x-kpovmodeler.xml
-share/mime/application/x-kpresenter.xml
-share/mime/application/x-krita.xml
-share/mime/application/x-kspread-crypt.xml
-share/mime/application/x-kspread.xml
-share/mime/application/x-ksysv-package.xml
-share/mime/application/x-kugar.xml
-share/mime/application/x-kword-crypt.xml
-share/mime/application/x-kword.xml
-share/mime/application/x-lha.xml
-share/mime/application/x-lhz.xml
-share/mime/application/x-lrzip-compressed-tar.xml
-share/mime/application/x-lrzip.xml
-share/mime/application/x-lyx.xml
-share/mime/application/x-lzip.xml
-share/mime/application/x-lzma-compressed-tar.xml
-share/mime/application/x-lzma.xml
-share/mime/application/x-lzop.xml
-share/mime/application/x-m4.xml
-share/mime/application/x-macbinary.xml
-share/mime/application/x-magicpoint.xml
-share/mime/application/x-markaby.xml
-share/mime/application/x-matroska.xml
-share/mime/application/x-mif.xml
-share/mime/application/x-mobipocket-ebook.xml
-share/mime/application/x-mozilla-bookmarks.xml
-share/mime/application/x-ms-dos-executable.xml
-share/mime/application/x-ms-wim.xml
-share/mime/application/x-msi.xml
-share/mime/application/x-mswinurl.xml
-share/mime/application/x-mswrite.xml
-share/mime/application/x-msx-rom.xml
-share/mime/application/x-n64-rom.xml
-share/mime/application/x-nautilus-link.xml
-share/mime/application/x-navi-animation.xml
-share/mime/application/x-nes-rom.xml
-share/mime/application/x-netcdf.xml
-share/mime/application/x-netshow-channel.xml
-share/mime/application/x-nintendo-ds-rom.xml
-share/mime/application/x-nzb.xml
-share/mime/application/x-object.xml
-share/mime/application/x-ole-storage.xml
-share/mime/application/x-oleo.xml
-share/mime/application/x-pak.xml
-share/mime/application/x-palm-database.xml
-share/mime/application/x-par2.xml
-share/mime/application/x-pef-executable.xml
-share/mime/application/x-perl.xml
-share/mime/application/x-php.xml
-share/mime/application/x-pkcs12.xml
-share/mime/application/x-pkcs7-certificates.xml
-share/mime/application/x-planperfect.xml
-share/mime/application/x-pocket-word.xml
-share/mime/application/x-profile.xml
-share/mime/application/x-pw.xml
-share/mime/application/x-python-bytecode.xml
-share/mime/application/x-quattropro.xml
-share/mime/application/x-quicktime-media-link.xml
-share/mime/application/x-qw.xml
-share/mime/application/x-rar.xml
-share/mime/application/x-rpm.xml
-share/mime/application/x-ruby.xml
-share/mime/application/x-sami.xml
-share/mime/application/x-sc.xml
-share/mime/application/x-shar.xml
-share/mime/application/x-shared-library-la.xml
-share/mime/application/x-sharedlib.xml
-share/mime/application/x-shellscript.xml
-share/mime/application/x-shockwave-flash.xml
-share/mime/application/x-shorten.xml
-share/mime/application/x-siag.xml
-share/mime/application/x-slp.xml
-share/mime/application/x-smaf.xml
-share/mime/application/x-sms-rom.xml
-share/mime/application/x-snes-rom.xml
-share/mime/application/x-spss-por.xml
-share/mime/application/x-spss-sav.xml
-share/mime/application/x-sqlite2.xml
-share/mime/application/x-sqlite3.xml
-share/mime/application/x-stuffit.xml
-share/mime/application/x-subrip.xml
-share/mime/application/x-sv4cpio.xml
-share/mime/application/x-sv4crc.xml
-share/mime/application/x-t602.xml
-share/mime/application/x-tar.xml
-share/mime/application/x-tarz.xml
-share/mime/application/x-tex-gf.xml
-share/mime/application/x-tex-pk.xml
-share/mime/application/x-tgif.xml
-share/mime/application/x-theme.xml
-share/mime/application/x-toutdoux.xml
-share/mime/application/x-trash.xml
-share/mime/application/x-troff-man-compressed.xml
-share/mime/application/x-troff-man.xml
-share/mime/application/x-tzo.xml
-share/mime/application/x-ufraw.xml
-share/mime/application/x-ustar.xml
-share/mime/application/x-wais-source.xml
-share/mime/application/x-windows-themepack.xml
-share/mime/application/x-wpg.xml
-share/mime/application/x-wwf.xml
-share/mime/application/x-x509-ca-cert.xml
-share/mime/application/x-xbel.xml
-share/mime/application/x-xliff.xml
-share/mime/application/x-xpinstall.xml
-share/mime/application/x-xz-compressed-tar.xml
-share/mime/application/x-xz.xml
-share/mime/application/x-xzpdf.xml
-share/mime/application/x-yaml.xml
-share/mime/application/x-zerosize.xml
-share/mime/application/x-zoo.xml
-share/mime/application/xhtml+xml.xml
-share/mime/application/xml-dtd.xml
-share/mime/application/xml-external-parsed-entity.xml
-share/mime/application/xml.xml
-share/mime/application/xslt+xml.xml
-share/mime/application/xspf+xml.xml
-share/mime/application/zip.xml
-share/mime/audio/AMR-WB.xml
-share/mime/audio/AMR.xml
-share/mime/audio/ac3.xml
-share/mime/audio/annodex.xml
-share/mime/audio/basic.xml
-share/mime/audio/flac.xml
-share/mime/audio/midi.xml
-share/mime/audio/mp2.xml
-share/mime/audio/mp4.xml
-share/mime/audio/mpeg.xml
-share/mime/audio/ogg.xml
-share/mime/audio/prs.sid.xml
-share/mime/audio/vnd.rn-realaudio.xml
-share/mime/audio/webm.xml
-share/mime/audio/x-adpcm.xml
-share/mime/audio/x-aifc.xml
-share/mime/audio/x-aiff.xml
-share/mime/audio/x-aiffc.xml
-share/mime/audio/x-ape.xml
-share/mime/audio/x-flac+ogg.xml
-share/mime/audio/x-gsm.xml
-share/mime/audio/x-iriver-pla.xml
-share/mime/audio/x-it.xml
-share/mime/audio/x-m4b.xml
-share/mime/audio/x-matroska.xml
-share/mime/audio/x-minipsf.xml
-share/mime/audio/x-mo3.xml
-share/mime/audio/x-mod.xml
-share/mime/audio/x-mpegurl.xml
-share/mime/audio/x-ms-asx.xml
-share/mime/audio/x-ms-wma.xml
-share/mime/audio/x-musepack.xml
-share/mime/audio/x-psf.xml
-share/mime/audio/x-psflib.xml
-share/mime/audio/x-riff.xml
-share/mime/audio/x-s3m.xml
-share/mime/audio/x-scpls.xml
-share/mime/audio/x-speex+ogg.xml
-share/mime/audio/x-speex.xml
-share/mime/audio/x-stm.xml
-share/mime/audio/x-tta.xml
-share/mime/audio/x-voc.xml
-share/mime/audio/x-vorbis+ogg.xml
-share/mime/audio/x-wav.xml
-share/mime/audio/x-wavpack-correction.xml
-share/mime/audio/x-wavpack.xml
-share/mime/audio/x-xi.xml
-share/mime/audio/x-xm.xml
-share/mime/audio/x-xmf.xml
-share/mime/image/bmp.xml
-share/mime/image/cgm.xml
-share/mime/image/dpx.xml
-share/mime/image/fax-g3.xml
-share/mime/image/fits.xml
-share/mime/image/g3fax.xml
-share/mime/image/gif.xml
-share/mime/image/ief.xml
-share/mime/image/jp2.xml
-share/mime/image/jpeg.xml
-share/mime/image/openraster.xml
-share/mime/image/png.xml
-share/mime/image/rle.xml
-share/mime/image/svg+xml-compressed.xml
-share/mime/image/svg+xml.xml
-share/mime/image/tiff.xml
-share/mime/image/vnd.adobe.photoshop.xml
-share/mime/image/vnd.djvu.xml
-share/mime/image/vnd.dwg.xml
-share/mime/image/vnd.dxf.xml
-share/mime/image/vnd.microsoft.icon.xml
-share/mime/image/vnd.ms-modi.xml
-share/mime/image/vnd.rn-realpix.xml
-share/mime/image/vnd.wap.wbmp.xml
-share/mime/image/x-3ds.xml
-share/mime/image/x-adobe-dng.xml
-share/mime/image/x-applix-graphics.xml
-share/mime/image/x-bzeps.xml
-share/mime/image/x-canon-cr2.xml
-share/mime/image/x-canon-crw.xml
-share/mime/image/x-cmu-raster.xml
-share/mime/image/x-compressed-xcf.xml
-share/mime/image/x-dcraw.xml
-share/mime/image/x-dds.xml
-share/mime/image/x-dib.xml
-share/mime/image/x-emf.xml
-share/mime/image/x-eps.xml
-share/mime/image/x-exr.xml
-share/mime/image/x-fpx.xml
-share/mime/image/x-fuji-raf.xml
-share/mime/image/x-gzeps.xml
-share/mime/image/x-icns.xml
-share/mime/image/x-iff.xml
-share/mime/image/x-ilbm.xml
-share/mime/image/x-jng.xml
-share/mime/image/x-kodak-dcr.xml
-share/mime/image/x-kodak-k25.xml
-share/mime/image/x-kodak-kdc.xml
-share/mime/image/x-lwo.xml
-share/mime/image/x-lws.xml
-share/mime/image/x-macpaint.xml
-share/mime/image/x-minolta-mrw.xml
-share/mime/image/x-msod.xml
-share/mime/image/x-niff.xml
-share/mime/image/x-nikon-nef.xml
-share/mime/image/x-olympus-orf.xml
-share/mime/image/x-panasonic-raw.xml
-share/mime/image/x-panasonic-raw2.xml
-share/mime/image/x-pcx.xml
-share/mime/image/x-pentax-pef.xml
-share/mime/image/x-photo-cd.xml
-share/mime/image/x-pict.xml
-share/mime/image/x-portable-anymap.xml
-share/mime/image/x-portable-bitmap.xml
-share/mime/image/x-portable-graymap.xml
-share/mime/image/x-portable-pixmap.xml
-share/mime/image/x-quicktime.xml
-share/mime/image/x-rgb.xml
-share/mime/image/x-sgi.xml
-share/mime/image/x-sigma-x3f.xml
-share/mime/image/x-skencil.xml
-share/mime/image/x-sony-arw.xml
-share/mime/image/x-sony-sr2.xml
-share/mime/image/x-sony-srf.xml
-share/mime/image/x-sun-raster.xml
-share/mime/image/x-tga.xml
-share/mime/image/x-win-bitmap.xml
-share/mime/image/x-wmf.xml
-share/mime/image/x-xbitmap.xml
-share/mime/image/x-xcf.xml
-share/mime/image/x-xcursor.xml
-share/mime/image/x-xfig.xml
-share/mime/image/x-xpixmap.xml
-share/mime/image/x-xwindowdump.xml
-share/mime/inode/blockdevice.xml
-share/mime/inode/chardevice.xml
-share/mime/inode/directory.xml
-share/mime/inode/fifo.xml
-share/mime/inode/mount-point.xml
-share/mime/inode/socket.xml
-share/mime/inode/symlink.xml
-share/mime/message/delivery-status.xml
-share/mime/message/disposition-notification.xml
-share/mime/message/external-body.xml
-share/mime/message/news.xml
-share/mime/message/partial.xml
-share/mime/message/rfc822.xml
-share/mime/message/x-gnu-rmail.xml
-share/mime/model/vrml.xml
-share/mime/multipart/alternative.xml
-share/mime/multipart/appledouble.xml
-share/mime/multipart/digest.xml
-share/mime/multipart/encrypted.xml
-share/mime/multipart/mixed.xml
-share/mime/multipart/related.xml
-share/mime/multipart/report.xml
-share/mime/multipart/signed.xml
-share/mime/multipart/x-mixed-replace.xml
 share/mime/packages/freedesktop.org.xml
-share/mime/text/cache-manifest.xml
-share/mime/text/calendar.xml
-share/mime/text/css.xml
-share/mime/text/csv.xml
-share/mime/text/enriched.xml
-share/mime/text/html.xml
-share/mime/text/htmlh.xml
-share/mime/text/plain.xml
-share/mime/text/rfc822-headers.xml
-share/mime/text/richtext.xml
-share/mime/text/sgml.xml
-share/mime/text/spreadsheet.xml
-share/mime/text/tab-separated-values.xml
-share/mime/text/troff.xml
-share/mime/text/vcard.xml
-share/mime/text/vnd.graphviz.xml
-share/mime/text/vnd.rn-realtext.xml
-share/mime/text/vnd.sun.j2me.app-descriptor.xml
-share/mime/text/vnd.trolltech.linguist.xml
-share/mime/text/vnd.wap.wml.xml
-share/mime/text/vnd.wap.wmlscript.xml
-share/mime/text/vtt.xml
-share/mime/text/x-adasrc.xml
-share/mime/text/x-authors.xml
-share/mime/text/x-bibtex.xml
-share/mime/text/x-c++hdr.xml
-share/mime/text/x-c++src.xml
-share/mime/text/x-changelog.xml
-share/mime/text/x-chdr.xml
-share/mime/text/x-cmake.xml
-share/mime/text/x-cobol.xml
-share/mime/text/x-copying.xml
-share/mime/text/x-credits.xml
-share/mime/text/x-csharp.xml
-share/mime/text/x-csrc.xml
-share/mime/text/x-dcl.xml
-share/mime/text/x-dsl.xml
-share/mime/text/x-dsrc.xml
-share/mime/text/x-eiffel.xml
-share/mime/text/x-emacs-lisp.xml
-share/mime/text/x-erlang.xml
-share/mime/text/x-fortran.xml
-share/mime/text/x-gettext-translation-template.xml
-share/mime/text/x-gettext-translation.xml
-share/mime/text/x-go.xml
-share/mime/text/x-google-video-pointer.xml
-share/mime/text/x-haskell.xml
-share/mime/text/x-iMelody.xml
-share/mime/text/x-idl.xml
-share/mime/text/x-install.xml
-share/mime/text/x-iptables.xml
-share/mime/text/x-java.xml
-share/mime/text/x-ldif.xml
-share/mime/text/x-lilypond.xml
-share/mime/text/x-literate-haskell.xml
-share/mime/text/x-log.xml
-share/mime/text/x-lua.xml
-share/mime/text/x-makefile.xml
-share/mime/text/x-markdown.xml
-share/mime/text/x-matlab.xml
-share/mime/text/x-microdvd.xml
-share/mime/text/x-moc.xml
-share/mime/text/x-mof.xml
-share/mime/text/x-mpsub.xml
-share/mime/text/x-mrml.xml
-share/mime/text/x-ms-regedit.xml
-share/mime/text/x-mup.xml
-share/mime/text/x-nfo.xml
-share/mime/text/x-objcsrc.xml
-share/mime/text/x-ocaml.xml
-share/mime/text/x-ocl.xml
-share/mime/text/x-ooc.xml
-share/mime/text/x-opml+xml.xml
-share/mime/text/x-pascal.xml
-share/mime/text/x-patch.xml
-share/mime/text/x-python.xml
-share/mime/text/x-qml.xml
-share/mime/text/x-readme.xml
-share/mime/text/x-reject.xml
-share/mime/text/x-rpm-spec.xml
-share/mime/text/x-scala.xml
-share/mime/text/x-scheme.xml
-share/mime/text/x-setext.xml
-share/mime/text/x-sql.xml
-share/mime/text/x-ssa.xml
-share/mime/text/x-subviewer.xml
-share/mime/text/x-svhdr.xml
-share/mime/text/x-svsrc.xml
-share/mime/text/x-tcl.xml
-share/mime/text/x-tex.xml
-share/mime/text/x-texinfo.xml
-share/mime/text/x-troff-me.xml
-share/mime/text/x-troff-mm.xml
-share/mime/text/x-troff-ms.xml
-share/mime/text/x-txt2tags.xml
-share/mime/text/x-uil.xml
-share/mime/text/x-uri.xml
-share/mime/text/x-vala.xml
-share/mime/text/x-verilog.xml
-share/mime/text/x-vhdl.xml
-share/mime/text/x-xmi.xml
-share/mime/text/x-xslfo.xml
-share/mime/text/xmcd.xml
-share/mime/video/3gpp.xml
-share/mime/video/3gpp2.xml
-share/mime/video/annodex.xml
-share/mime/video/dv.xml
-share/mime/video/isivideo.xml
-share/mime/video/mp2t.xml
-share/mime/video/mp4.xml
-share/mime/video/mpeg.xml
-share/mime/video/ogg.xml
-share/mime/video/quicktime.xml
-share/mime/video/vivo.xml
-share/mime/video/vnd.mpegurl.xml
-share/mime/video/vnd.rn-realvideo.xml
-share/mime/video/wavelet.xml
-share/mime/video/webm.xml
-share/mime/video/x-anim.xml
-share/mime/video/x-flic.xml
-share/mime/video/x-flv.xml
-share/mime/video/x-javafx.xml
-share/mime/video/x-matroska.xml
-share/mime/video/x-mng.xml
-share/mime/video/x-ms-asf.xml
-share/mime/video/x-ms-wmv.xml
-share/mime/video/x-msvideo.xml
-share/mime/video/x-nsv.xml
-share/mime/video/x-ogm+ogg.xml
-share/mime/video/x-sgi-movie.xml
-share/mime/video/x-theora+ogg.xml
-share/mime/x-content/audio-cdda.xml
-share/mime/x-content/audio-dvd.xml
-share/mime/x-content/audio-player.xml
-share/mime/x-content/blank-bd.xml
-share/mime/x-content/blank-cd.xml
-share/mime/x-content/blank-dvd.xml
-share/mime/x-content/blank-hddvd.xml
-share/mime/x-content/ebook-reader.xml
-share/mime/x-content/image-dcf.xml
-share/mime/x-content/image-picturecd.xml
-share/mime/x-content/software.xml
-share/mime/x-content/unix-software.xml
-share/mime/x-content/video-bluray.xml
-share/mime/x-content/video-dvd.xml
-share/mime/x-content/video-hddvd.xml
-share/mime/x-content/video-svcd.xml
-share/mime/x-content/video-vcd.xml
-share/mime/x-content/win32-software.xml
-share/mime/x-epoc/x-sisx-app.xml
-@unexec [ -f %D/share/mime/XMLnamespaces ] && rm -f %D/share/mime/XMLnamespaces || true
-@unexec [ -f %D/share/mime/aliases ] && rm -f %D/share/mime/aliases || true
-@unexec [ -f %D/share/mime/generic-icons ] && rm -f %D/share/mime/generic-icons || true
-@unexec [ -f %D/share/mime/globs ] && rm -f %D/share/mime/globs || true
-@unexec [ -f %D/share/mime/globs2 ] && rm -f %D/share/mime/globs2 || true
-@unexec [ -f %D/share/mime/icons ] && rm -f %D/share/mime/icons || true
-@unexec [ -f %D/share/mime/magic ] && rm -f %D/share/mime/magic || true
-@unexec [ -f %D/share/mime/mime.cache ] && rm -f %D/share/mime/mime.cache || true
-@unexec [ -f %D/share/mime/subclasses ] && rm -f %D/share/mime/subclasses || true
-@unexec [ -f %D/share/mime/treemagic ] && rm -f %D/share/mime/treemagic || true
-@unexec [ -f %D/share/mime/types ] && rm -f %D/share/mime/types || true
-@unexec [ -f %D/share/mime/version ]&&  rm -f %D/share/mime/version || true
-@dirrmtry share/mime/x-epoc
-@dirrmtry share/mime/x-content
-@dirrmtry share/mime/video
-@dirrmtry share/mime/text
+@rmtry share/mime/XMLnamespaces
+@rmtry share/mime/aliases
+@rmtry share/mime/generic-icons
+@rmtry share/mime/globs
+@rmtry share/mime/globs2
+@rmtry share/mime/icons
+@rmtry share/mime/magic
+@rmtry share/mime/mime.cache
+@rmtry share/mime/subclasses
+@rmtry share/mime/treemagic
+@rmtry share/mime/types
+@rmtry share/mime/version
+@unexec rm -fr %D/share/mime/x-epoc 2>/dev/null || true
+@unexec rm -fr %D/share/mime/x-content 2>/dev/null || true
+@unexec rm -fr %D/share/mime/video 2>/dev/null || true
+@unexec rm -fr %D/share/mime/text 2>/dev/null || true
 @dirrmtry share/mime/packages
-@dirrmtry share/mime/multipart
-@dirrmtry share/mime/model
-@dirrmtry share/mime/message
-@dirrmtry share/mime/inode
-@dirrmtry share/mime/image
-@dirrmtry share/mime/audio
-@dirrmtry share/mime/application
+@unexec rm -fr %D/share/mime/multipart 2>/dev/null || true
+@unexec rm -fr %D/share/mime/model 2>/dev/null || true
+@unexec rm -fr %D/share/mime/message 2>/dev/null || true
+@unexec rm -fr %D/share/mime/inode 2>/dev/null || true
+@unexec rm -fr %D/share/mime/image 2>/dev/null || true
+@unexec rm -fr %D/share/mime/audio 2>/dev/null || true
+@unexec rm -fr %D/share/mime/application 2>/dev/null || true
 @dirrmtry share/mime
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Jeremy Messenger freebsd_committer freebsd_triage 2012-12-30 06:33:41 UTC
State Changed
From-To: open->closed

Committed, thanks! Next time, you can commit it if we don't respone back as 
in result of maintainer timeout. :-)