-Remove the --mandir, taken care by gnomeprefix.

-Use MANPREFIX.


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

11 files changed, 20 insertions, 25 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 66487eab4..9842a8e5e 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.117 2007/04/26 18:10:36 ahze Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.118 2007/05/19 21:36:03 marcus Exp $
 #
 
 PORTNAME=	gnome-utils
@@ -41,6 +41,6 @@ GCONF_SCHEMAS=	gnome-dictionary.schemas gnome-screenshot.schemas \
 
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} -n 10 \
-		${REINPLACE_CMD} -e 's|@mandir@|${PREFIX}/man|'
+		${REINPLACE_CMD} -e 's|@mandir@|${MANPREFIX}/man|'
 
 .include <bsd.port.mk>
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index cb3827dad..1f7126d67 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconf2/Makefile,v 1.81 2007/03/06 17:05:38 marcus Exp $
+#   $MCom: ports/devel/gconf2/Makefile,v 1.83 2007/06/23 17:15:07 mezz Exp $
 #
 
 PORTNAME=	gconf2
@@ -31,7 +31,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
-		--mandir=${PREFIX}/man
+		--mandir=${MANPREFIX}/man
 #		--enable-gconf-source=${PREFIX}/etc/gconf/schemas \
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 84cbb30eb..f48e3a8ed 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/gtranslator/Makefile,v 1.11 2007/06/29 23:05:25 mezz Exp $
 #
 
 PORTNAME=	gtranslator
@@ -28,8 +28,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
 CONFIGURE_ARGS=	--disable-debug \
-		--enable-compile-warnings=no \
-		--mandir=${PREFIX}/man
+		--enable-compile-warnings=no
 
 MAN1=		gtranslator.1 pozilla.sh.1
 
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 41b6cb436..65a25326e 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD: ports/devel/libbonobo/Makefile,v 1.55 2007/05/19 20:03:04 flz Exp $
-#    $MCom: ports/devel/libbonobo/Makefile,v 1.58 2007/03/12 17:59:36 marcus Exp $
+#    $MCom: ports/devel/libbonobo/Makefile,v 1.60 2007/06/22 23:48:50 marcus Exp $
 #
 
 PORTNAME=	libbonobo
@@ -32,7 +32,7 @@ USE_PERL5=	yes
 USE_GNOME=	gnomehack intlhack libxml2 orbit2 referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc \
-		--mandir=${PREFIX}/man
+		--mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 02bb75b6d..fac3929d2 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gnumeric/Makefile,v 1.32 2007/05/30 17:59:38 mezz Exp $
+#   $MCom: ports/math/gnumeric/Makefile,v 1.33 2007/06/28 03:43:56 marcus Exp $
 #
 
 PORTNAME=	gnumeric
@@ -31,8 +31,7 @@ USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-guile --with-bonobo \
-		--mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--without-guile --with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
 		python_prog=${PYTHON_VERSION}
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 262bf8188..3713ecdfb 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -3,7 +3,7 @@
 # Whom:                olgeni@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/misc/shared-mime-info/Makefile,v 1.7 2007/05/19 21:54:52 marcus Exp $
+#   $MCom: ports/misc/shared-mime-info/Makefile,v 1.8 2007/05/30 04:26:58 mezz Exp $
 #
 
 PORTNAME=	shared-mime-info
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 libxml2 intltool gnomehack intlhack
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 39d8aa33f..5cf4b6686 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.145 2007/05/19 21:36:25 marcus Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.146 2007/05/30 03:21:44 mezz Exp $
 #
 
 PORTNAME=	epiphany
@@ -33,7 +33,7 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--with-mozilla=${GECKO} --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--with-mozilla=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 2c29c993c..6460c57e4 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.102 2007/06/20 17:23:09 ahze Exp $
+#   $MCom: ports/x11-toolkits/pango/Makefile,v 1.103 2007/07/02 20:50:58 marcus Exp $
 #
 
 PORTNAME=	pango
@@ -34,7 +34,7 @@ USE_GNOME=	gnomehack glib20 ltverhack referencehack
 CONFIGURE_ARGS=	--with-qt=no \
 		--with-html-dir=${PREFIX}/share/doc \
 		--enable-static \
-		--mandir=${PREFIX}/man
+		--mandir=${MANPREFIX}/man
 # Hmm.. tough one.  Found this one when I had graphics/hdf installed
 # (which installs glist.h) which is picked up before the glib-2.0
 # stuff, with Bad Results[tm]
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 97f759777..c1773b78d 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,7 +3,7 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.68 2007/06/13 16:26:44 mezz Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.69 2007/06/18 23:48:55 marcus Exp $
 #
 
 PORTNAME=	gdm
@@ -32,8 +32,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomehier libgnomeui librsvg2 gnomedocutils \
 		gnomeprefix
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man \
-		--with-console-kit=no
+CONFIGURE_ARGS=	--with-console-kit=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTKDOC="false"
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 8fd768f95..6dec1740a 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.117 2007/06/05 11:30:28 ahze Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.118 2007/06/18 12:49:46 ahze Exp $
 #
 
 PORTNAME=	gnome-session
@@ -33,7 +33,6 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 43a722144..c8bb138db 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Franz Klammer <klammer@webonaut.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/zenity/Makefile,v 1.81 2007/05/15 22:29:51 marcus Exp $
+#   $MCom: ports/x11/zenity/Makefile,v 1.82 2007/05/19 21:36:30 marcus Exp $
 #
 
 PORTNAME=	zenity
@@ -27,7 +27,6 @@ USE_BZIP2=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"