- Change my maintainer address.

- Use gnomehack for pkgconfig libdir.

Approved by: marcus (mentor)

7 files changed, 11 insertions, 35 deletions

diff --git a/x11-toolkits/gnomemm/Makefile b/x11-toolkits/gnomemm/Makefile
index d930dcaaa9cd..90f00a322938 100644
--- a/x11-toolkits/gnomemm/Makefile
+++ b/x11-toolkits/gnomemm/Makefile
@@ -13,7 +13,7 @@ DISTFILES=      # empty
 EXTRACT_ONLY=   # empty
 
 
-MAINTAINER=	bland@mail.ru
+MAINTAINER=	bland@FreeBSD.org
 COMMENT=	The "meta-port" for the powerful C++ bindings to the GNOME2 libraries
 
 LIB_DEPENDS=	bonobomm_servers-1.3:${PORTSDIR}/devel/libbonobomm \
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index 6f3a7f081b80..d948e8591b2f 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/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 libbonoboui
 
 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=	libbonoboui
+USE_GNOME=	gnomehack libbonoboui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/x11-toolkits/libbonobouimm/files/patch-Makefile.in b/x11-toolkits/libbonobouimm/files/patch-Makefile.in
index 4f28104a28f9..f77ad3762720 100644
--- a/x11-toolkits/libbonobouimm/files/patch-Makefile.in
+++ b/x11-toolkits/libbonobouimm/files/patch-Makefile.in
@@ -1,12 +1,10 @@
---- Makefile.in.orig	Wed May 21 17:58:30 2003
-+++ Makefile.in	Wed May 21 17:59:05 2003
-@@ -100,8 +100,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 11:55:52 2003
++++ Makefile.in	Sun Aug 17 11:56:43 2003
+@@ -101,7 +101,7 @@
  
  
--pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
 -pkgconfig_DATA = libbonobouimm-2.0.pc libbonobouimm-2.0-uninstalled.pc
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
 +pkgconfig_DATA = libbonobouimm-2.0.pc
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 1ac2cc8ab847..82e369448d1a 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -13,7 +13,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 libgnomeui library
 
 LIB_DEPENDS=	gnomemm-1.3:${PORTSDIR}/x11/libgnomemm \
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	libgnomeui
+USE_GNOME=	gnomehack libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/x11-toolkits/libgnomeuimm/files/patch-libgnome::Makefile.in b/x11-toolkits/libgnomeuimm/files/patch-libgnome::Makefile.in
deleted file mode 100644
index 950e02ccf14d..000000000000
--- a/x11-toolkits/libgnomeuimm/files/patch-libgnome::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomeui/Makefile.in.orig	Wed May 21 17:35:20 2003
-+++ libgnomeui/Makefile.in	Wed May 21 17:35:40 2003
-@@ -158,7 +158,7 @@
- libgnomeuimm_configdir = $(libdir)/libgnomeuimm-2.0/include
- libgnomeuimm_config_DATA = libgnomeuimmconfig.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libgnomeuimm-2.0.pc
- subdir = libgnomeui
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 1ac2cc8ab847..82e369448d1a 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -13,7 +13,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 libgnomeui library
 
 LIB_DEPENDS=	gnomemm-1.3:${PORTSDIR}/x11/libgnomemm \
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	libgnomeui
+USE_GNOME=	gnomehack libgnomeui
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--enable-static
diff --git a/x11-toolkits/libgnomeuimm26/files/patch-libgnome::Makefile.in b/x11-toolkits/libgnomeuimm26/files/patch-libgnome::Makefile.in
deleted file mode 100644
index 950e02ccf14d..000000000000
--- a/x11-toolkits/libgnomeuimm26/files/patch-libgnome::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomeui/Makefile.in.orig	Wed May 21 17:35:20 2003
-+++ libgnomeui/Makefile.in	Wed May 21 17:35:40 2003
-@@ -158,7 +158,7 @@
- libgnomeuimm_configdir = $(libdir)/libgnomeuimm-2.0/include
- libgnomeuimm_config_DATA = libgnomeuimmconfig.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libgnomeuimm-2.0.pc
- subdir = libgnomeui
- mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs