ports/151378: [PATCH] fix pkg-cofig file created by www/kompozer and other build issues

[Steve Wills]

>Number:         151378
>Category:       ports
>Synopsis:       [PATCH] fix pkg-cofig file created by www/kompozer and other build issues
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 11 02:20:00 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Steve Wills
>Release:        8.1-amd64
>Organization:
>Environment:
>Description:
installing www/kompozer creates a pkg-config file which is invalid and can cause problems when installing other ports.
>How-To-Repeat:
Install www/kompozer, run pkg-config. You'll see this error message:

Cflags field occurs twice in '/usr/local/libdata/pkgconfig/kompozer-xpcom.pc' 

and pkg-config will exit with error before processing all pkg-config files.
>Fix:
see attached patch

Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/kompozer/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- Makefile	28 Mar 2010 06:44:51 -0000	1.48
+++ Makefile	11 Oct 2010 01:56:57 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	kompozer
 DISTVERSION=	0.8b3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/current/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
@@ -21,6 +21,9 @@
 USE_BZIP2=	yes
 USE_GECKO=	gecko
 USE_GMAKE=	yes
+USE_XORG=	xext xt x11
+MAKE_JOBS_UNSAFE=	yes
+USE_GNOME=	gnomelibs
 WRKSRC=		${WRKDIR}/mozilla
 MAKEFILE=	client.mk
 ALL_TARGET=	build_all
Index: files/patch-build_unix_mozilla-xpcom.pc.in
===================================================================
RCS file: /home/ncvs/ports/www/kompozer/files/patch-build_unix_mozilla-xpcom.pc.in,v
retrieving revision 1.2
diff -u -r1.2 patch-build_unix_mozilla-xpcom.pc.in
--- files/patch-build_unix_mozilla-xpcom.pc.in	9 Oct 2007 00:26:21 -0000	1.2
+++ files/patch-build_unix_mozilla-xpcom.pc.in	11 Oct 2010 02:02:07 -0000
@@ -1,8 +1,9 @@
---- build/unix/mozilla-xpcom.pc.in.orig	Thu Jun 24 12:23:09 2004
-+++ build/unix/mozilla-xpcom.pc.in	Thu Jun 24 12:23:18 2004
-@@ -8,4 +8,4 @@
+--- build/unix/mozilla-xpcom.pc.in.orig	2009-05-02 12:41:00.000000000 -0400
++++ build/unix/mozilla-xpcom.pc.in	2010-10-10 21:56:08.718545662 -0400
+@@ -8,5 +8,4 @@
+ Description: The Mozilla Cross Platform Component Library
  Version: %MOZILLA_VERSION%
- Requires: mozilla-nspr = %MOZILLA_VERSION%
- Libs: -L${libdir} -lxpcom
--Cflags: -I${includedir}/xpcom -I${includedir}/string
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${libdir} -lxpcom
+-Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
 +Cflags: -I${includedir}/xpcom -I${includedir}/string -I${includedir}


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