- Change my maintainer address.

- Use gnomehack for pkgconfig libdir.

Approved by: marcus (mentor)

10 files changed, 14 insertions, 60 deletions

diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 1cdb27304389..33dc03d165c2 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	bland@mail.ru
+MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for gconf2 API library
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gconf2
+USE_GNOME=	gnomehack gconf2
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/devel/gconfmm/files/patch-gconf::Makefile.in b/devel/gconfmm/files/patch-gconf::Makefile.in
deleted file mode 100644
index 0d51ef534ce3..000000000000
--- a/devel/gconfmm/files/patch-gconf::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gconf/Makefile.in.orig	Wed May 21 12:57:07 2003
-+++ gconf/Makefile.in	Wed May 21 12:57:58 2003
-@@ -153,7 +153,7 @@
- gconfmm_configdir = $(libdir)/gconfmm-2.0/include
- gconfmm_config_DATA = gconfmmconfig.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gconfmm-2.0.pc
- subdir = gconf
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 1cdb27304389..33dc03d165c2 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	bland@mail.ru
+MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for gconf2 API library
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gconf2
+USE_GNOME=	gnomehack gconf2
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/devel/gconfmm26/files/patch-gconf::Makefile.in b/devel/gconfmm26/files/patch-gconf::Makefile.in
deleted file mode 100644
index 0d51ef534ce3..000000000000
--- a/devel/gconfmm26/files/patch-gconf::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gconf/Makefile.in.orig	Wed May 21 12:57:07 2003
-+++ gconf/Makefile.in	Wed May 21 12:57:58 2003
-@@ -153,7 +153,7 @@
- gconfmm_configdir = $(libdir)/gconfmm-2.0/include
- gconfmm_config_DATA = gconfmmconfig.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = gconfmm-2.0.pc
- subdir = gconf
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile
index 6d280bc0973e..ebf5b1c63f4b 100644
--- a/devel/libbonobomm/Makefile
+++ b/devel/libbonobomm/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	bland@mail.ru
+MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ interfaces for libbonobo
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2 \
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	libbonobo
+USE_GNOME=	gnomehack libbonobo
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/devel/libbonobomm/files/patch-Makefile.in b/devel/libbonobomm/files/patch-Makefile.in
index 1f21d2759e58..7bd2bfcc4243 100644
--- a/devel/libbonobomm/files/patch-Makefile.in
+++ b/devel/libbonobomm/files/patch-Makefile.in
@@ -1,12 +1,10 @@
---- Makefile.in.orig	Wed May 21 15:59:49 2003
-+++ Makefile.in	Wed May 21 16:00:16 2003
-@@ -98,8 +98,8 @@
- EXTRA_DIST = build_shared/Makefile_build.am_fragment 		  build_shared/Makefile_build_gensrc.am_fragment 		  build_shared/Makefile_gensrc.am_fragment
+--- Makefile.in.orig	Sun Aug 17 12:06:44 2003
++++ Makefile.in	Sun Aug 17 12:07:02 2003
+@@ -99,7 +99,7 @@
  
  
--pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
 -pkgconfig_DATA = libbonobomm-2.0.pc libbonobomm-2.0-uninstalled.pc
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
 +pkgconfig_DATA = libbonobomm-2.0.pc
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index fd14174ae148..9ae1bc9a3f52 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	bland@mail.ru
+MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for libglade2 library
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	libglade2
+USE_GNOME=	gnomehack libglade2
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/devel/libglademm/files/patch-libglade::Makefile.in b/devel/libglademm/files/patch-libglade::Makefile.in
deleted file mode 100644
index c3c3c1d2c3ea..000000000000
--- a/devel/libglademm/files/patch-libglade::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libglade/Makefile.in.orig	Wed May 21 15:53:51 2003
-+++ libglade/Makefile.in	Wed May 21 15:54:10 2003
-@@ -153,7 +153,7 @@
- libglademm_configdir = $(libdir)/libglademm-2.0/include
- libglademm_config_DATA = libglademmconfig.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libglademm-2.0.pc
- subdir = libglade
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index fd14174ae148..9ae1bc9a3f52 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gtkmm
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	bland@mail.ru
+MAINTAINER=	bland@FreeBSD.org
 COMMENT=	C++ wrapper for libglade2 library
 
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtk--2
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	libglade2
+USE_GNOME=	gnomehack libglade2
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/devel/libglademm24/files/patch-libglade::Makefile.in b/devel/libglademm24/files/patch-libglade::Makefile.in
deleted file mode 100644
index c3c3c1d2c3ea..000000000000
--- a/devel/libglademm24/files/patch-libglade::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libglade/Makefile.in.orig	Wed May 21 15:53:51 2003
-+++ libglade/Makefile.in	Wed May 21 15:54:10 2003
-@@ -153,7 +153,7 @@
- libglademm_configdir = $(libdir)/libglademm-2.0/include
- libglademm_config_DATA = libglademmconfig.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libglademm-2.0.pc
- subdir = libglade
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs