gnome: general cleanup

Use base make where applicable, drop .la files
Remove now useless referencehack
Convert to USES=localbase where applicable

13 files changed, 17 insertions, 39 deletions

diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index e316b148a6e1..930b453dde1e 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -20,14 +20,12 @@ CPE_VENDOR=	gnome
 LIBGDA5_SLAVE?=	no
 SHEBANG_FILES=	libgda-report/RML/*/*.py
 
-.if !defined(REFERENCE_PORT)
-
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
 
 USES+=		gettext gmake gnome libtool localbase pathfix pkgconfig
-USE_GNOME=	glib20 libxslt intlhack introspection:build referencehack
+USE_GNOME=	glib20 libxslt intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -152,4 +150,3 @@ post-install:
 .endif
 
 .include <bsd.port.mk>
-.endif
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 962631a2e305..808c09c40fb9 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Library for creating trees of CORBA IDL files
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		bison:alias gettext gmake gnome libtool:keepla localbase \
+USES=		bison:alias gettext gnome libtool localbase \
 		pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20
 INSTALL_TARGET=	install-strip
diff --git a/devel/libIDL/pkg-plist b/devel/libIDL/pkg-plist
index 9fdea995c8d0..3359aa46e53e 100644
--- a/devel/libIDL/pkg-plist
+++ b/devel/libIDL/pkg-plist
@@ -1,7 +1,6 @@
 bin/libIDL-config-2
 include/libIDL-2.0/libIDL/IDL.h
 lib/libIDL-2.a
-lib/libIDL-2.la
 lib/libIDL-2.so
 lib/libIDL-2.so.0
 lib/libIDL-2.so.0.0.0
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index c557d353e52f..e2513a4ca1dd 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -18,20 +18,16 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 
 USES=		tar:bzip2
 
-.if !defined(REFERENCE_PORT)
-
 RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
 
-USES+=		gmake gnome libtool:keepla pathfix pkgconfig
-USE_GNOME=	cairo gdkpixbuf2 libxml2 gtk20 referencehack
+USES+=		gmake gnome libtool pathfix pkgconfig localbase
+USE_GNOME=	cairo gdkpixbuf2 libxml2 gtk20
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
 		--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \
 		CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports"
@@ -41,10 +37,9 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -E 's/in (python.*)+ none/in none/' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s/ doc / /g" ${WRKSRC}/Makefile.in
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/libglade/2.0
 
 .include <bsd.port.mk>
-
-.endif
diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist
index e82fcc456c4f..9a873f787127 100644
--- a/devel/libglade2/pkg-plist
+++ b/devel/libglade2/pkg-plist
@@ -4,7 +4,6 @@ include/libglade-2.0/glade/glade-parser.h
 include/libglade-2.0/glade/glade-xml.h
 include/libglade-2.0/glade/glade.h
 lib/libglade-2.0.a
-lib/libglade-2.0.la
 lib/libglade-2.0.so
 lib/libglade-2.0.so.0
 lib/libglade-2.0.so.0.0.7
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 3fc2409ead21..9fedb6189202 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -13,15 +13,13 @@ COMMENT=	Graphics library for GNOME
 
 USES+=		tar:bzip2
 
-USES+=		gettext gmake gnome libtool:keepla pathfix pkgconfig
+USES+=		gettext gmake gnome libtool localbase pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	intltool libglade2 libartlgpl2 referencehack
+USE_GNOME=	intltool libglade2 libartlgpl2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--enable-glade \
 		--disable-gtk-doc
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 5c3cc104da80..f37ef9ec95a1 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -13,10 +13,8 @@ include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-widget.h
 include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas.h
 include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h
 lib/libglade/2.0/libcanvas.a
-lib/libglade/2.0/libcanvas.la
 lib/libglade/2.0/libcanvas.so
 lib/libgnomecanvas-2.a
-lib/libgnomecanvas-2.la
 lib/libgnomecanvas-2.so
 lib/libgnomecanvas-2.so.0
 lib/libgnomecanvas-2.so.0.3000.3
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index cbec8fbe42fb..388a838ca589 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -16,13 +16,11 @@ USES=		tar:bzip2
 
 PORTSCOUT=	ignore:1
 
-USES+=		gettext gmake gnome libtool:keepla pathfix pkgconfig
+USES+=		gettext gmake gnome libtool localbase pathfix pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomeprefix gtk20 gconf2 libxml2 intlhack referencehack
+USE_GNOME=	gnomeprefix gtk20 gconf2 libxml2 intlhack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-compile-warnings=no --enable-glade-catalog=no
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtksourceview2/pkg-plist b/x11-toolkits/gtksourceview2/pkg-plist
index 0504299ac8ca..75bf801d0479 100644
--- a/x11-toolkits/gtksourceview2/pkg-plist
+++ b/x11-toolkits/gtksourceview2/pkg-plist
@@ -18,7 +18,6 @@ include/gtksourceview-2.0/gtksourceview/gtksourcestyleschememanager.h
 include/gtksourceview-2.0/gtksourceview/gtksourceundomanager.h
 include/gtksourceview-2.0/gtksourceview/gtksourceview-typebuiltins.h
 include/gtksourceview-2.0/gtksourceview/gtksourceview.h
-lib/libgtksourceview-2.0.la
 lib/libgtksourceview-2.0.so
 lib/libgtksourceview-2.0.so.0
 lib/libgtksourceview-2.0.so.0.0.0
diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile
index 8bd5b3b6797d..2c5c3ddbf3db 100644
--- a/x11-toolkits/gtksourceview3/Makefile
+++ b/x11-toolkits/gtksourceview3/Makefile
@@ -20,18 +20,16 @@ PORTSCOUT=	limitw:1,even
 BUILD_DEPENDS=	vala:lang/vala
 LIB_DEPENDS=	libfribidi.so:converters/fribidi
 
-USES+=		gettext gmake gnome libtool pathfix pkgconfig
+USES+=		gettext gmake gnome libtool localbase pathfix pkgconfig
 USE_CSTD=	c11
-USE_GNOME=	cairo gdkpixbuf2 gnomeprefix gtk30 intlhack \
-		introspection:build libxml2 referencehack
+USE_GNOME=	cairo gdkpixbuf2 gnomeprefix gtk30 \
+		introspection:build libxml2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-compile-warnings=no \
 		--enable-glade-catalog=no \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--enable-introspection
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 640e17bfe74b..74c2bbbea8a1 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libwnck
 PORTVERSION=	2.30.7
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,10 +18,10 @@ PORTSCOUT=	ignore:1
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES+=		bison gettext gmake gnome libtool:keepla localbase:ldflags \
+USES+=		bison gettext gmake gnome libtool localbase:ldflags \
 		pathfix pkgconfig xorg
 USE_XORG=	xres x11
-USE_GNOME=	gtk20 referencehack intlhack introspection
+USE_GNOME=	gtk20 intlhack introspection
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist
index 959ed0d4da6a..72cf38d9411e 100644
--- a/x11-toolkits/libwnck/pkg-plist
+++ b/x11-toolkits/libwnck/pkg-plist
@@ -13,7 +13,6 @@ include/libwnck-1.0/libwnck/window.h
 include/libwnck-1.0/libwnck/wnck-enum-types.h
 include/libwnck-1.0/libwnck/workspace.h
 lib/libwnck-1.a
-lib/libwnck-1.la
 lib/libwnck-1.so
 lib/libwnck-1.so.22
 lib/libwnck-1.so.22.3.31
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 5e7a92306a51..842c90428588 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -16,12 +16,10 @@ PORTSCOUT=	ignore:1
 
 RUN_DEPENDS+=	${LOCALBASE}/libexec/gnome-pty-helper:x11-toolkits/gnome-pty-helper
 
-USES+=		cpe gettext gmake gnome libtool pathfix pkgconfig
+USES+=		cpe gettext gmake gnome libtool localbase pathfix pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME?=	gnomeprefix gtk20 intltool introspection:build referencehack
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_GNOME?=	gnomeprefix gtk20 intltool introspection:build
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS?=--disable-python \
 		--disable-Bsymbolic \