Make it build with new deprications. Also missing pkg-config at build time.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17252 df743ca5-7f9a-e211-a948-0013205c9059

19 files changed, 371 insertions, 14 deletions

diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
new file mode 100644
index 000000000..48cb26679
--- /dev/null
+++ b/devel/ORBit2/Makefile
@@ -0,0 +1,47 @@
+# Created by: Chia-liang Kao <clkao@CirX.ORG>
+# $FreeBSD: head/devel/ORBit2/Makefile 313633 2013-03-08 10:51:34Z kwm $
+#   $MCom: ports/devel/ORBit2/Makefile,v 1.57 2010/09/29 14:08:02 kwm Exp $
+
+PORTNAME=	ORBit2
+PORTVERSION=	2.14.19
+PORTREVISION?=	0
+CATEGORIES=	devel gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	High-performance CORBA ORB with support for the C language
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool
+USES=		pathfix
+USE_GNOME=	libidl ltverhack referencehack
+USE_PKGCONFIG=	build
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
+		--disable-gtk-doc
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/src/orb/orb-core/orbit-typelib.c
+	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/configure
+
+post-install:
+	@${ECHO_CMD} "ORBIIOPIPv4=0" > ${PREFIX}/etc/orbit2rc.default
+	@${ECHO_CMD} "ORBIIOPIPv6=0" >> ${PREFIX}/etc/orbit2rc.default
+	@if [ ! -f ${PREFIX}/etc/orbit2rc ]; then \
+		${CP} -p ${PREFIX}/etc/orbit2rc.default ${PREFIX}/etc/orbit2rc ; \
+	fi
+	@${MKDIR} ${PREFIX}/lib/orbit-2.0/idl-backends
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo
new file mode 100644
index 000000000..86ee9a51d
--- /dev/null
+++ b/devel/ORBit2/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/ORBit2-2.14.19.tar.bz2) = 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
+SIZE (gnome2/ORBit2-2.14.19.tar.bz2) = 764820
diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab
new file mode 100644
index 000000000..70131ebc1
--- /dev/null
+++ b/devel/ORBit2/files/patch-ab
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon Dec 18 07:20:12 2006
++++ Makefile.in	Mon Dec 18 07:20:47 2006
+@@ -239,7 +239,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+-SUBDIRS = linc2 src include test docs
++SUBDIRS = linc2 src include docs
+ bin_SCRIPTS = orbit2-config
+ EXTRA_DIST = \
+ 	ORBit2.m4	\
diff --git a/devel/ORBit2/files/patch-src::orb::util::Makefile.in b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
new file mode 100644
index 000000000..e048ca634
--- /dev/null
+++ b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
@@ -0,0 +1,11 @@
+--- src/orb/util/Makefile.in.orig	Fri Mar  5 23:39:16 2004
++++ src/orb/util/Makefile.in	Fri Mar  5 23:39:43 2004
+@@ -126,7 +126,7 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include				\
+ 	-I$(top_builddir)/include			\
+-	-DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbitrc\"	\
++	-DORBIT_SYSTEM_RCFILE=\"$(sysconfdir)/orbit2rc\"	\
+ 	-DORBIT2_INTERNAL_API				\
+ 	$(WARN_CFLAGS)					\
+ 	$(ORBIT_DEBUG_CFLAGS)				\
diff --git a/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
new file mode 100644
index 000000000..6af92e3af
--- /dev/null
+++ b/devel/ORBit2/files/patch-src_orb_orb-core_orbit-typelib.c
@@ -0,0 +1,10 @@
+--- src/orb/orb-core/orbit-typelib.c.orig	2007-07-27 10:58:37.000000000 -0500
++++ src/orb/orb-core/orbit-typelib.c	2007-07-27 10:58:41.000000000 -0500
+@@ -218,6 +218,7 @@
+ 	paths = g_ptr_array_sized_new (8);
+ 
+ 	g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR));
++	add_if_unique(paths, "%%LOCALBASE%%", TRUE);
+ 
+ 	if ((path = g_getenv ("ORBIT_TYPELIB_PATH"))) {
+ 		char **strv;
diff --git a/devel/ORBit2/pkg-descr b/devel/ORBit2/pkg-descr
new file mode 100644
index 000000000..711157675
--- /dev/null
+++ b/devel/ORBit2/pkg-descr
@@ -0,0 +1,3 @@
+ORBit is a high-performance CORBA ORB with support for the C language.
+It allows programs to communicate with each other, regardless of their
+physical and logical locations.
diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist
new file mode 100644
index 000000000..7730e1f92
--- /dev/null
+++ b/devel/ORBit2/pkg-plist
@@ -0,0 +1,83 @@
+bin/linc-cleanup-sockets
+bin/orbit-idl-2
+bin/orbit2-config
+@unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi
+etc/orbit2rc.default
+@exec if [ ! -f %D/etc/orbit2rc ] ; then cp -p %D/%F %B/orbit2rc; fi
+include/orbit-2.0/ORBitservices/CosNaming.h
+include/orbit-2.0/ORBitservices/CosNaming_impl.h
+include/orbit-2.0/ORBitservices/orbit-imodule.h
+include/orbit-2.0/orbit-idl/orbit-idl-backend.h
+include/orbit-2.0/orbit/dynamic/dynamic-defs.h
+include/orbit-2.0/orbit/dynamic/dynamic.h
+include/orbit-2.0/orbit/orb-core/allocators.h
+include/orbit-2.0/orbit/orb-core/corba-any-type.h
+include/orbit-2.0/orbit/orb-core/corba-any.h
+include/orbit-2.0/orbit/orb-core/corba-context-type.h
+include/orbit-2.0/orbit/orb-core/corba-context.h
+include/orbit-2.0/orbit/orb-core/corba-defs.h
+include/orbit-2.0/orbit/orb-core/corba-environment-type.h
+include/orbit-2.0/orbit/orb-core/corba-environment.h
+include/orbit-2.0/orbit/orb-core/corba-nvlist.h
+include/orbit-2.0/orbit/orb-core/corba-object-type.h
+include/orbit-2.0/orbit/orb-core/corba-object.h
+include/orbit-2.0/orbit/orb-core/corba-orb-type.h
+include/orbit-2.0/orbit/orb-core/corba-orb.h
+include/orbit-2.0/orbit/orb-core/corba-pobj.h
+include/orbit-2.0/orbit/orb-core/corba-policy-type.h
+include/orbit-2.0/orbit/orb-core/corba-string.h
+include/orbit-2.0/orbit/orb-core/corba-typecode-type.h
+include/orbit-2.0/orbit/orb-core/corba-typecode.h
+include/orbit-2.0/orbit/orb-core/iop-defs.h
+include/orbit-2.0/orbit/orb-core/orb-core-types.h
+include/orbit-2.0/orbit/orb-core/orb-core.h
+include/orbit-2.0/orbit/orb-core/orb-types.h
+include/orbit-2.0/orbit/orb-core/orbit-interface.h
+include/orbit-2.0/orbit/orb-core/orbit-object.h
+include/orbit-2.0/orbit/orb-core/orbit-small.h
+include/orbit-2.0/orbit/orbit-config.h
+include/orbit-2.0/orbit/orbit-types.h
+include/orbit-2.0/orbit/orbit.h
+include/orbit-2.0/orbit/poa/orbit-adaptor.h
+include/orbit-2.0/orbit/poa/poa-basics.h
+include/orbit-2.0/orbit/poa/poa-defs.h
+include/orbit-2.0/orbit/poa/poa-policy.h
+include/orbit-2.0/orbit/poa/poa-types.h
+include/orbit-2.0/orbit/poa/poa.h
+include/orbit-2.0/orbit/poa/portableserver-current-type.h
+include/orbit-2.0/orbit/poa/portableserver-poa-type.h
+include/orbit-2.0/orbit/util/basic_types.h
+include/orbit-2.0/orbit/util/orbit-genrand.h
+include/orbit-2.0/orbit/util/orbit-util.h
+lib/libORBit-2.a
+lib/libORBit-2.la
+lib/libORBit-2.so
+lib/libORBit-2.so.0
+lib/libORBit-imodule-2.a
+lib/libORBit-imodule-2.la
+lib/libORBit-imodule-2.so
+lib/libORBit-imodule-2.so.0
+lib/libORBitCosNaming-2.a
+lib/libORBitCosNaming-2.la
+lib/libORBitCosNaming-2.so
+lib/libORBitCosNaming-2.so.0
+lib/libname-server-2.a
+libdata/pkgconfig/ORBit-2.0.pc
+libdata/pkgconfig/ORBit-CosNaming-2.0.pc
+libdata/pkgconfig/ORBit-idl-2.0.pc
+libdata/pkgconfig/ORBit-imodule-2.0.pc
+share/aclocal/ORBit2.m4
+share/idl/orbit-2.0/CosNaming.idl
+@dirrm share/idl/orbit-2.0
+@exec /bin/mkdir -p %D/lib/orbit-2.0/idl-backends
+@dirrmtry share/idl
+@dirrmtry lib/orbit-2.0/idl-backends
+@dirrmtry lib/orbit-2.0
+@dirrm include/orbit-2.0/orbit/util
+@dirrm include/orbit-2.0/orbit/poa
+@dirrm include/orbit-2.0/orbit/orb-core
+@dirrm include/orbit-2.0/orbit/dynamic
+@dirrm include/orbit-2.0/orbit-idl
+@dirrm include/orbit-2.0/orbit
+@dirrm include/orbit-2.0/ORBitservices
+@dirrm include/orbit-2.0
diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
new file mode 100644
index 000000000..07a5a2a63
--- /dev/null
+++ b/mail/gmime24/Makefile
@@ -0,0 +1,54 @@
+# Created by: Kirill Ponomarew <ponomarew@oberon.net>
+# $FreeBSD: head/mail/gmime24/Makefile 307986 2012-11-30 02:44:55Z wxs $
+
+PORTNAME=	gmime
+PORTVERSION=	2.4.33
+PORTREVISION?=	0
+CATEGORIES?=	mail
+MASTER_SITES=	GNOME
+PKGNAMESUFFIX?=	-24
+
+MAINTAINER?=	ahicks@p-o.co.uk
+COMMENT?=	Library (written in C) for parsing and creating messages using MIME
+
+LICENSE=	LGPL21
+
+CONFLICTS=	gmime-1.0.*
+
+SLAVEDIRS=	mail/gmime2-sharp
+
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}24
+USE_ICONV=	yes
+USE_GMAKE=	yes
+USES=		pathfix
+USE_GNOME?=	glib20
+USE_PKGCONFIG=	build
+USE_LDCONFIG=	yes
+USE_XZ=		yes
+GNU_CONFIGURE=	yes
+# www.freebsd.org/cgi/query-pr.cgi?pr=118092
+# Rename uudecode and uuencode to gmime-* to not conflict with userland
+# fix kept in case issue returns
+CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \
+		--enable-mono=no \
+		--program-transform-name="s/uuencode/gmime-uuencode/;s/uudecode/gmime-uudecode/;"
+CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+
+LATEST_LINK?=	${PORTNAME}24
+
+PORTDOCS=	*
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/*/Makefile.in
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in docs/reference/html/*
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/mail/gmime24/distinfo b/mail/gmime24/distinfo
new file mode 100644
index 000000000..ef22c4481
--- /dev/null
+++ b/mail/gmime24/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gmime-2.4.33.tar.xz) = 27dfa99967c19d2e8707b2670bd084dd514167925cca92cbd474298fc515d391
+SIZE (gmime-2.4.33.tar.xz) = 692336
diff --git a/mail/gmime24/files/patch-docs_Makefile.in b/mail/gmime24/files/patch-docs_Makefile.in
new file mode 100644
index 000000000..2ced1d521
--- /dev/null
+++ b/mail/gmime24/files/patch-docs_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD: head/mail/gmime24/files/patch-docs_Makefile.in 300896 2012-07-14 13:54:48Z beat $
+
+--- docs/Makefile.in.orig
++++ docs/Makefile.in
+@@ -201,7 +201,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = reference tutorial
++SUBDIRS = 
+ EXTRA_DIST = gtkdocs_fix
+ all: all-recursive
+ 
diff --git a/mail/gmime24/files/patch-gmime-2.4.pc.in b/mail/gmime24/files/patch-gmime-2.4.pc.in
new file mode 100644
index 000000000..1192ad41e
--- /dev/null
+++ b/mail/gmime24/files/patch-gmime-2.4.pc.in
@@ -0,0 +1,10 @@
+--- gmime-2.4.pc.in.orig	Tue May  3 19:34:20 2005
++++ gmime-2.4.pc.in	Wed Feb  1 00:51:53 2006
+@@ -7,6 +7,6 @@
+ Name: GMime
+ Version: @VERSION@
+ Description: MIME parser and utility library
+-Requires: glib-2.0,gobject-2.0
++Requires: glib-2.0,gobject-2.0,gthread-2.0
+ Libs: -L${libdir} @GMIME_LIBS@ @LIBS@
+ Cflags: -I${includedir}/gmime-2.0 @GMIME_CFLAGS@
diff --git a/mail/gmime24/files/patch-mono_gmime-sharp.dll.config.in b/mail/gmime24/files/patch-mono_gmime-sharp.dll.config.in
new file mode 100644
index 000000000..3b19a8cc3
--- /dev/null
+++ b/mail/gmime24/files/patch-mono_gmime-sharp.dll.config.in
@@ -0,0 +1,10 @@
+
+$FreeBSD: head/mail/gmime24/files/patch-mono_gmime-sharp.dll.config.in 300896 2012-07-14 13:54:48Z beat $
+
+--- mono/gmime-sharp.dll.config.in.orig
++++ mono/gmime-sharp.dll.config.in
+@@ -1,3 +1,3 @@
+ <configuration>
+-  <dllmap dll="gmime" target="libgmime-@GMIME_API_VERSION@.so.@GMIME_MAJOR_VERSION@"/>
++  <dllmap dll="gmime" target="libgmime-@GMIME_API_VERSION@.so"/>
+ </configuration>
diff --git a/mail/gmime24/files/patch-tests__test-mbox.c b/mail/gmime24/files/patch-tests__test-mbox.c
new file mode 100644
index 000000000..bba860483
--- /dev/null
+++ b/mail/gmime24/files/patch-tests__test-mbox.c
@@ -0,0 +1,10 @@
+--- tests/test-mbox.c.orig	Mon Feb 12 15:48:22 2007
++++ tests/test-mbox.c	Mon Feb 12 15:48:54 2007
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ 
++#include <config.h>
+ #include <gmime/gmime.h>
+ 
+ #ifndef G_OS_WIN32
diff --git a/mail/gmime24/files/patch-tests__test-mime.c b/mail/gmime24/files/patch-tests__test-mime.c
new file mode 100644
index 000000000..35067da0a
--- /dev/null
+++ b/mail/gmime24/files/patch-tests__test-mime.c
@@ -0,0 +1,10 @@
+--- tests/test-mime.c.orig	Mon Feb 12 15:48:32 2007
++++ tests/test-mime.c	Mon Feb 12 15:49:04 2007
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
++#include <config.h>
+ #include <gmime/gmime.h>
+ 
+ #ifndef G_OS_WIN32
diff --git a/mail/gmime24/files/patch-tests__test-parser.c b/mail/gmime24/files/patch-tests__test-parser.c
new file mode 100644
index 000000000..a408ff684
--- /dev/null
+++ b/mail/gmime24/files/patch-tests__test-parser.c
@@ -0,0 +1,10 @@
+--- tests/test-parser.c.orig	Mon Feb 12 15:48:38 2007
++++ tests/test-parser.c	Mon Feb 12 15:49:14 2007
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ 
++#include <config.h>
+ #include <gmime/gmime.h>
+ 
+ #ifndef G_OS_WIN32
diff --git a/mail/gmime24/pkg-descr b/mail/gmime24/pkg-descr
new file mode 100644
index 000000000..ebf3e2ce1
--- /dev/null
+++ b/mail/gmime24/pkg-descr
@@ -0,0 +1,19 @@
+GMime is a set of utilities for parsing and creating messages using
+the Multipurpose Internet Mail Extension (MIME) as defined by the 
+following RFCs:
+ 
+ * 0822: Standard for the Format of Arpa Internet Text Messages
+ * 2045: Multipurpose Internet Mail Extensions (MIME) Part One:
+         Format of Internet Message Bodies
+ * 2046: Multipurpose Internet Mail Extensions (MIME) Part Two:
+         Media Types
+ * 2047: Multipurpose Internet Mail Extensions (MIME) Part Three:
+         Message Header Extensions for Non-ASCII Text
+ * 2048: Multipurpose Internet Mail Extensions (MIME) Part Four:
+         Registration Procedures
+ * 2049: Multipurpose Internet Mail Extensions (MIME) Part Five:
+         Conformance Criteria and Examples
+ * 2183: Communicating Presentation Information in Internet Messages:
+         The Content-Disposition Header Field
+
+WWW: http://spruce.sourceforge.net/gmime/
diff --git a/mail/gmime24/pkg-plist b/mail/gmime24/pkg-plist
new file mode 100644
index 000000000..16f068596
--- /dev/null
+++ b/mail/gmime24/pkg-plist
@@ -0,0 +1,56 @@
+include/gmime-2.4/gmime/gmime-charset.h
+include/gmime-2.4/gmime/gmime-cipher-context.h
+include/gmime-2.4/gmime/gmime-content-type.h
+include/gmime-2.4/gmime/gmime-data-wrapper.h
+include/gmime-2.4/gmime/gmime-disposition.h
+include/gmime-2.4/gmime/gmime-encodings.h
+include/gmime-2.4/gmime/gmime-error.h
+include/gmime-2.4/gmime/gmime-filter-basic.h
+include/gmime-2.4/gmime/gmime-filter-best.h
+include/gmime-2.4/gmime/gmime-filter-charset.h
+include/gmime-2.4/gmime/gmime-filter-crlf.h
+include/gmime-2.4/gmime/gmime-filter-enriched.h
+include/gmime-2.4/gmime/gmime-filter-from.h
+include/gmime-2.4/gmime/gmime-filter-gzip.h
+include/gmime-2.4/gmime/gmime-filter-html.h
+include/gmime-2.4/gmime/gmime-filter-md5.h
+include/gmime-2.4/gmime/gmime-filter-strip.h
+include/gmime-2.4/gmime/gmime-filter-windows.h
+include/gmime-2.4/gmime/gmime-filter-yenc.h
+include/gmime-2.4/gmime/gmime-filter.h
+include/gmime-2.4/gmime/gmime-gpg-context.h
+include/gmime-2.4/gmime/gmime-header.h
+include/gmime-2.4/gmime/gmime-iconv-utils.h
+include/gmime-2.4/gmime/gmime-iconv.h
+include/gmime-2.4/gmime/gmime-message-part.h
+include/gmime-2.4/gmime/gmime-message-partial.h
+include/gmime-2.4/gmime/gmime-message.h
+include/gmime-2.4/gmime/gmime-multipart-encrypted.h
+include/gmime-2.4/gmime/gmime-multipart-signed.h
+include/gmime-2.4/gmime/gmime-multipart.h
+include/gmime-2.4/gmime/gmime-object.h
+include/gmime-2.4/gmime/gmime-param.h
+include/gmime-2.4/gmime/gmime-parse-utils.h
+include/gmime-2.4/gmime/gmime-parser.h
+include/gmime-2.4/gmime/gmime-part.h
+include/gmime-2.4/gmime/gmime-session-simple.h
+include/gmime-2.4/gmime/gmime-session.h
+include/gmime-2.4/gmime/gmime-stream-buffer.h
+include/gmime-2.4/gmime/gmime-stream-cat.h
+include/gmime-2.4/gmime/gmime-stream-file.h
+include/gmime-2.4/gmime/gmime-stream-filter.h
+include/gmime-2.4/gmime/gmime-stream-fs.h
+include/gmime-2.4/gmime/gmime-stream-mem.h
+include/gmime-2.4/gmime/gmime-stream-mmap.h
+include/gmime-2.4/gmime/gmime-stream-null.h
+include/gmime-2.4/gmime/gmime-stream.h
+include/gmime-2.4/gmime/gmime-utils.h
+include/gmime-2.4/gmime/gmime.h
+include/gmime-2.4/gmime/internet-address.h
+lib/libgmime-2.4.a
+lib/libgmime-2.4.la
+lib/libgmime-2.4.so
+lib/libgmime-2.4.so.6
+libdata/pkgconfig/gmime-2.4.pc
+@dirrm include/gmime-2.4/gmime
+@dirrm include/gmime-2.4
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index a29eb650b..237f157ab 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-menus
-# Date created:				30 November 2004
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.118 2011/10/23 10:23:05 kwm Exp $
-#
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.119 2012/09/03 16:28:28 mezz Exp $
 
 PORTNAME=	gnome-menus
 PORTVERSION=	2.30.5
@@ -23,7 +19,9 @@ CONFLICTS=	gnome-menus-3.[0-9]*
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack glib20 ltverhack
+USES=		pathfix
+USE_GNOME=	gnomehier gnomeprefix intlhack glib20 ltverhack
+USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/gnome-menus3/Makefile b/x11/gnome-menus3/Makefile
index 4acb453b4..df56497db 100644
--- a/x11/gnome-menus3/Makefile
+++ b/x11/gnome-menus3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnome-menus
-# Date created:				30 November 2004
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus3/Makefile,v 1.6 2012/05/25 10:29:43 kwm Exp $
-#
+#   $MCom: ports/x11/gnome-menus3/Makefile,v 1.7 2012/09/18 22:26:57 kwm Exp $
 
 PORTNAME=	gnome-menus
 PORTVERSION=	3.4.2
@@ -23,7 +19,8 @@ LATEST_LINK=	gnome-menus3
 USE_GETTEXT=	yes
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack glib20 ltverhack
+USES=		pathfix
+USE_GNOME=	gnomehier gnomeprefix intlhack glib20 ltverhack
 USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes