Update to 0.12. Also merge PLIST and PLIST.nognome into one PLIST.

6 files changed, 32 insertions, 36 deletions

diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index f7441f3dff86..22dac521c30d 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	rep-gtk
-PORTVERSION=	0.10
+PORTVERSION=	0.12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		rep.9:${PORTSDIR}/lang/librep
 .if !defined(NOGNOME)
 LIB_DEPENDS+=	glade.3:${PORTSDIR}/devel/libglade \
 		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
-BUILD_DEPENDS=	rep:${PORTSDIR}/lang/librep
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -29,16 +29,14 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 .if defined(NOGNOME)
 CONFIGURE_ARGS=	--without-libglade --without-gnome
+PLIST_SUB+=	GNOME:="@comment "
 .else
 CONFIGURE_ARGS=	--with-gnome
+PLIST_SUB+=	GNOME:=""
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
-.if defined(NOGNOME)
-PLIST=		${PKGDIR}/PLIST.nognome
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/rep-gtk/distinfo b/x11-toolkits/rep-gtk/distinfo
index eb4b984eac8c..73079bda44b4 100644
--- a/x11-toolkits/rep-gtk/distinfo
+++ b/x11-toolkits/rep-gtk/distinfo
@@ -1 +1 @@
-MD5 (rep-gtk-0.10.tar.gz) = 5d316669a2b856c2338fc58a981ae2d2
+MD5 (rep-gtk-0.12.tar.gz) = ddc670bdb1e9924bb2c4f8209782ec4c
diff --git a/x11-toolkits/rep-gtk/pkg-plist b/x11-toolkits/rep-gtk/pkg-plist
index d57bd7e6441c..84cb0dffe886 100644
--- a/x11-toolkits/rep-gtk/pkg-plist
+++ b/x11-toolkits/rep-gtk/pkg-plist
@@ -1,14 +1,14 @@
-libexec/rep/%%GNUHOST%%/gnome-canvas.la
-libexec/rep/%%GNUHOST%%/gnome-canvas.so
-libexec/rep/%%GNUHOST%%/gnomelib.la
-libexec/rep/%%GNUHOST%%/gnomelib.so
-libexec/rep/%%GNUHOST%%/gnomeui.la
-libexec/rep/%%GNUHOST%%/gnomeui.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomelib.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomelib.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomeui.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomeui.so
 libexec/rep/%%GNUHOST%%/gtk.la
 libexec/rep/%%GNUHOST%%/gtk.so
-libexec/rep/%%GNUHOST%%/libglade-gnome.la
-libexec/rep/%%GNUHOST%%/libglade-gnome.so
-libexec/rep/%%GNUHOST%%/libglade.la
-libexec/rep/%%GNUHOST%%/libglade.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade-gnome.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade-gnome.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade.so
 libexec/rep/%%GNUHOST%%/sgtk-types.la
 libexec/rep/%%GNUHOST%%/sgtk-types.so
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index f7441f3dff86..22dac521c30d 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	rep-gtk
-PORTVERSION=	0.10
+PORTVERSION=	0.12
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nakai@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
+		rep.9:${PORTSDIR}/lang/librep
 .if !defined(NOGNOME)
 LIB_DEPENDS+=	glade.3:${PORTSDIR}/devel/libglade \
 		gnome.4:${PORTSDIR}/x11/gnomelibs
 .endif
-BUILD_DEPENDS=	rep:${PORTSDIR}/lang/librep
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
@@ -29,16 +29,14 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 .if defined(NOGNOME)
 CONFIGURE_ARGS=	--without-libglade --without-gnome
+PLIST_SUB+=	GNOME:="@comment "
 .else
 CONFIGURE_ARGS=	--with-gnome
+PLIST_SUB+=	GNOME:=""
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
-.if defined(NOGNOME)
-PLIST=		${PKGDIR}/PLIST.nognome
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/rep-gtk2/distinfo b/x11-toolkits/rep-gtk2/distinfo
index eb4b984eac8c..73079bda44b4 100644
--- a/x11-toolkits/rep-gtk2/distinfo
+++ b/x11-toolkits/rep-gtk2/distinfo
@@ -1 +1 @@
-MD5 (rep-gtk-0.10.tar.gz) = 5d316669a2b856c2338fc58a981ae2d2
+MD5 (rep-gtk-0.12.tar.gz) = ddc670bdb1e9924bb2c4f8209782ec4c
diff --git a/x11-toolkits/rep-gtk2/pkg-plist b/x11-toolkits/rep-gtk2/pkg-plist
index d57bd7e6441c..84cb0dffe886 100644
--- a/x11-toolkits/rep-gtk2/pkg-plist
+++ b/x11-toolkits/rep-gtk2/pkg-plist
@@ -1,14 +1,14 @@
-libexec/rep/%%GNUHOST%%/gnome-canvas.la
-libexec/rep/%%GNUHOST%%/gnome-canvas.so
-libexec/rep/%%GNUHOST%%/gnomelib.la
-libexec/rep/%%GNUHOST%%/gnomelib.so
-libexec/rep/%%GNUHOST%%/gnomeui.la
-libexec/rep/%%GNUHOST%%/gnomeui.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnome-canvas.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomelib.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomelib.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomeui.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/gnomeui.so
 libexec/rep/%%GNUHOST%%/gtk.la
 libexec/rep/%%GNUHOST%%/gtk.so
-libexec/rep/%%GNUHOST%%/libglade-gnome.la
-libexec/rep/%%GNUHOST%%/libglade-gnome.so
-libexec/rep/%%GNUHOST%%/libglade.la
-libexec/rep/%%GNUHOST%%/libglade.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade-gnome.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade-gnome.so
+%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade.la
+%%GNOME:%%libexec/rep/%%GNUHOST%%/libglade.so
 libexec/rep/%%GNUHOST%%/sgtk-types.la
 libexec/rep/%%GNUHOST%%/sgtk-types.so