- Rename to graphics/agave

- Update to 0.4.2

Approved by:	maintainer
Repocopied by:	marcus

9 files changed, 60 insertions, 112 deletions

diff --git a/MOVED b/MOVED
index bb8df3c2bf7e..b3cbf94c0c57 100644
--- a/MOVED
+++ b/MOVED
@@ -2873,3 +2873,4 @@ www/jakarta-tomcat41|www/tomcat41|2007-03-17|Renamed (no longer a Jakarta projec
 multimedia/totem-gstreamer|multimedia/totem|2007-03-19|multimedia/totem now uses gstreamer by default
 x11-wm/fluxbox-devel|x11-wm/fluxbox|2007-03-19|Merged into x11-wm/fluxbox
 lang/xotcl-thread||2007-03-21|Not longer needed
+graphics/gnome-colorscheme|graphics/agave|2007-03-21|Project renamed
diff --git a/graphics/Makefile b/graphics/Makefile
index dcfac5c6cf63..4eb7105ee636 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -16,6 +16,7 @@
     SUBDIR += a2png
     SUBDIR += aalib
     SUBDIR += acidwarp
+    SUBDIR += agave
     SUBDIR += agg
     SUBDIR += ale
     SUBDIR += allegrogl
@@ -206,7 +207,6 @@
     SUBDIR += gmt
     SUBDIR += gnash
     SUBDIR += gnofract4d
-    SUBDIR += gnome-colorscheme
     SUBDIR += gnomecanvas
     SUBDIR += gnomeiconedit
     SUBDIR += gnustep-slideshow
diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index 60db3e752576..fc6acd403c91 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -5,34 +5,38 @@
 # $FreeBSD$
 #
 
-PORTNAME=	colorscheme
-PORTVERSION=	0.3.91
+PORTNAME=	agave
+PORTVERSION=	0.4.2
 CATEGORIES=	graphics gnome
-MASTER_SITES=	http://download.gna.org/${PORTNAME}/releases/
-PKGNAMEPREFIX=	gnome-
+MASTER_SITES=	http://download.gna.org/colorscheme/releases/
 
 MAINTAINER=	smyru@heron.pl
 COMMENT=	A color scheme builder for the GNOME desktop
 
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
+LIB_DEPENDS=	glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \
 		boost_thread.3:${PORTSDIR}/devel/boost
 
-OPTIONS=	GNOME	"Adds GNOME support"	on
+# --disable-gnome option is broken in 0.4.2
+#OPTIONS=	GNOME	"Adds GNOME support"	on
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
+USE_GNOME=	gnomeprefix gnomehack gnomedocutils intlhack
+GCONF_SCHEMAS=	agave.schemas
+INSTALLS_ICONS=	yes
+INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-USE_GCC=	3.4+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=	--disable-gnome --disable-gconf
-.endif
+#.if defined(WITHOUT_GNOME)
+#CONFIGURE_ARGS+=	--disable-gnome --disable-gconf
+#.else
+USE_GNOME+=	libgnomeui
+LIB_DEPENDS+=	gconfmm-2.6:${PORTSDIR}/devel/gconfmm26
+#.endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/agave/distinfo b/graphics/agave/distinfo
index c700437c51e2..1499b064310c 100644
--- a/graphics/agave/distinfo
+++ b/graphics/agave/distinfo
@@ -1,3 +1,3 @@
-MD5 (colorscheme-0.3.91.tar.bz2) = 6474ecbc372b5bfaf15b0083a48102e3
-SHA256 (colorscheme-0.3.91.tar.bz2) = bf1b257c359ec536d827603a445b739213e1783cd7a642f5a7ba0251819540da
-SIZE (colorscheme-0.3.91.tar.bz2) = 181007
+MD5 (agave-0.4.2.tar.bz2) = eb0801cc951c93f5a8fefb4b1c8afb09
+SHA256 (agave-0.4.2.tar.bz2) = d34aaca056b3b2f097bb38e90dce7d2b6b9aab3ebe05dea9368fd5f48c7d2bde
+SIZE (agave-0.4.2.tar.bz2) = 306607
diff --git a/graphics/agave/pkg-plist b/graphics/agave/pkg-plist
index 72d993521f6f..78739bd59847 100644
--- a/graphics/agave/pkg-plist
+++ b/graphics/agave/pkg-plist
@@ -1,23 +1,39 @@
-bin/colorscheme
-share/gnome/applications/colorscheme.desktop
-share/gnome/colorscheme/palettes/Tango-Palette.gpl
-share/gnome/colorscheme/palettes/Visibone.gpl
-share/gnome/colorscheme/palettes/Web.gpl
-share/gnome/colorscheme/palettes/Ximian-Palette.gpl
-share/gnome/colorscheme/ui/colorscheme.ui
-share/gnome/pixmaps/colorscheme-icon.png
-share/gnome/pixmaps/colorscheme-logo.png
-share/gnome/pixmaps/darken.png
-share/gnome/pixmaps/desaturate.png
-share/gnome/pixmaps/lighten.png
-share/gnome/pixmaps/saturate.png
-share/locale/bg/LC_MESSAGES/colorscheme.mo
-share/locale/cs/LC_MESSAGES/colorscheme.mo
-share/locale/de/LC_MESSAGES/colorscheme.mo
-share/locale/es_ES/LC_MESSAGES/colorscheme.mo
-share/locale/nl/LC_MESSAGES/colorscheme.mo
-share/locale/pt_BR/LC_MESSAGES/colorscheme.mo
-share/locale/ru/LC_MESSAGES/colorscheme.mo
-@dirrm share/gnome/colorscheme/ui
-@dirrm share/gnome/colorscheme/palettes
-@dirrm share/gnome/colorscheme
+bin/agave
+share/gnome/applications/agave.desktop
+share/gnome/agave/palettes/Gnome-Palette.gpl
+share/gnome/agave/palettes/Tango-Palette.gpl
+share/gnome/agave/palettes/Visibone.gpl
+share/gnome/agave/palettes/Web.gpl
+share/gnome/agave/pixmaps/darken.png
+share/gnome/agave/pixmaps/desaturate.png
+share/gnome/agave/pixmaps/lighten.png
+share/gnome/agave/pixmaps/saturate.png
+share/gnome/agave/ui/agave.glade
+share/gnome/agave/ui/agave.ui
+share/gnome/agave/ui/bookmarkspopup.ui
+share/gnome/help/agave/C/agave.xml
+share/gnome/help/agave/C/figures/gtk-color-selector.png
+share/gnome/help/agave/C/figures/main-window.png
+share/gnome/help/agave/C/legal.xml
+share/gnome/omf/agave/agave-C.omf
+share/icons/hicolor/48x48/apps/agave-icon.png
+share/icons/hicolor/scalable/apps/agave-icon.svg
+share/locale/bg/LC_MESSAGES/agave.mo
+share/locale/ca/LC_MESSAGES/agave.mo
+share/locale/cs/LC_MESSAGES/agave.mo
+share/locale/de/LC_MESSAGES/agave.mo
+share/locale/es_ES/LC_MESSAGES/agave.mo
+share/locale/it/LC_MESSAGES/agave.mo
+share/locale/nl/LC_MESSAGES/agave.mo
+share/locale/pt_BR/LC_MESSAGES/agave.mo
+share/locale/ru/LC_MESSAGES/agave.mo
+share/locale/sv/LC_MESSAGES/agave.mo
+share/locale/zh_TW/LC_MESSAGES/agave.mo
+@dirrm share/gnome/omf/agave
+@dirrm share/gnome/help/agave/C/figures
+@dirrm share/gnome/help/agave/C
+@dirrm share/gnome/help/agave
+@dirrm share/gnome/agave/ui
+@dirrm share/gnome/agave/pixmaps
+@dirrm share/gnome/agave/palettes
+@dirrm share/gnome/agave
diff --git a/graphics/gnome-colorscheme/Makefile b/graphics/gnome-colorscheme/Makefile
deleted file mode 100644
index 60db3e752576..000000000000
--- a/graphics/gnome-colorscheme/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:	gnome-colorscheme
-# Date created:				30 August 2005
-# Whom:					Piotr Smyrak <smyru@heron.pl>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	colorscheme
-PORTVERSION=	0.3.91
-CATEGORIES=	graphics gnome
-MASTER_SITES=	http://download.gna.org/${PORTNAME}/releases/
-PKGNAMEPREFIX=	gnome-
-
-MAINTAINER=	smyru@heron.pl
-COMMENT=	A color scheme builder for the GNOME desktop
-
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
-		gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \
-		boost_thread.3:${PORTSDIR}/devel/boost
-
-OPTIONS=	GNOME	"Adds GNOME support"	on
-
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-GNU_CONFIGURE=	yes
-USE_GCC=	3.4+
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=	--disable-gnome --disable-gconf
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/gnome-colorscheme/distinfo b/graphics/gnome-colorscheme/distinfo
deleted file mode 100644
index c700437c51e2..000000000000
--- a/graphics/gnome-colorscheme/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (colorscheme-0.3.91.tar.bz2) = 6474ecbc372b5bfaf15b0083a48102e3
-SHA256 (colorscheme-0.3.91.tar.bz2) = bf1b257c359ec536d827603a445b739213e1783cd7a642f5a7ba0251819540da
-SIZE (colorscheme-0.3.91.tar.bz2) = 181007
diff --git a/graphics/gnome-colorscheme/pkg-descr b/graphics/gnome-colorscheme/pkg-descr
deleted file mode 100644
index c6b349ea11fe..000000000000
--- a/graphics/gnome-colorscheme/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-GNOME Colorscheme is a color scheme builder for the GNOME desktop. It is
-useful for web creation as well as room painting. It supports 6 various types
-of color schemes: Complements, Split Complements, Triads, Tetrads, Analogous,
-and Monochromatic.
-
-The user can lighten/darken the whole colorscheme or increase/decrease its
-saturation.
-
-WWW: http://home.gna.org/colorscheme/
diff --git a/graphics/gnome-colorscheme/pkg-plist b/graphics/gnome-colorscheme/pkg-plist
deleted file mode 100644
index 72d993521f6f..000000000000
--- a/graphics/gnome-colorscheme/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-bin/colorscheme
-share/gnome/applications/colorscheme.desktop
-share/gnome/colorscheme/palettes/Tango-Palette.gpl
-share/gnome/colorscheme/palettes/Visibone.gpl
-share/gnome/colorscheme/palettes/Web.gpl
-share/gnome/colorscheme/palettes/Ximian-Palette.gpl
-share/gnome/colorscheme/ui/colorscheme.ui
-share/gnome/pixmaps/colorscheme-icon.png
-share/gnome/pixmaps/colorscheme-logo.png
-share/gnome/pixmaps/darken.png
-share/gnome/pixmaps/desaturate.png
-share/gnome/pixmaps/lighten.png
-share/gnome/pixmaps/saturate.png
-share/locale/bg/LC_MESSAGES/colorscheme.mo
-share/locale/cs/LC_MESSAGES/colorscheme.mo
-share/locale/de/LC_MESSAGES/colorscheme.mo
-share/locale/es_ES/LC_MESSAGES/colorscheme.mo
-share/locale/nl/LC_MESSAGES/colorscheme.mo
-share/locale/pt_BR/LC_MESSAGES/colorscheme.mo
-share/locale/ru/LC_MESSAGES/colorscheme.mo
-@dirrm share/gnome/colorscheme/ui
-@dirrm share/gnome/colorscheme/palettes
-@dirrm share/gnome/colorscheme