cvs commit: ports/misc/shared-mime-info Makefile ports/misc/shared-mime-info/files patch-Makefile.in

Peter Pentchev roam at ringlet.net
Fri Apr 27 11:16:57 UTC 2007


On Thu, Apr 26, 2007 at 07:09:22PM +0000, Joe Marcus Clarke wrote:
> marcus      2007-04-26 19:09:22 UTC
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     misc/shared-mime-info Makefile 
>     misc/shared-mime-info/files patch-Makefile.in 
>   Log:
>   Correct MIME dirs in patch.

Wasn't the patch-Makefile.in change a bit too aggressive? :)  What do
you think about the following patch to restore the pkgconfigdir setting,
so both the packing list is correct *and* pkg-config can actually find
the shared-mime-info.pc file? :)

G'luck,
Peter

Index: ports/misc/shared-mime-info/files/patch-Makefile.in
===================================================================
RCS file: /home/ncvs/ports/misc/shared-mime-info/files/patch-Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 patch-Makefile.in
--- ports/misc/shared-mime-info/files/patch-Makefile.in	26 Apr 2007 19:09:22 -0000	1.5
+++ ports/misc/shared-mime-info/files/patch-Makefile.in	27 Apr 2007 10:48:30 -0000
@@ -1,6 +1,15 @@
---- Makefile.in.orig	Sat Feb 10 04:50:08 2007
-+++ Makefile.in	Sat Feb 10 04:52:30 2007
-@@ -871,7 +871,11 @@ $(pkgconfig_DATA): config.status
+--- Makefile.in.orig	Fri Apr 27 10:41:23 2007
++++ Makefile.in	Fri Apr 27 10:41:52 2007
+@@ -274,7 +274,7 @@
+ 
+ CLEANFILES = freedesktop.org.xml po/stamp-it
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+-pkgconfigdir = $(datadir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = shared-mime-info.pc
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -901,7 +901,11 @@
  @INTLTOOL_DESKTOP_RULE@
  
  install-data-hook: 

-- 
Peter Pentchev	roam at ringlet.net    roam at cnsys.bg    roam at FreeBSD.org
PGP key:	http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint	FDBA FD79 C26F 3C51 C95E  DF9E ED18 B68D 1619 4553
If the meanings of 'true' and 'false' were switched, then this sentence wouldn't be false.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-ports/attachments/20070427/be85dfba/attachment.pgp


More information about the cvs-ports mailing list