Rename the package to galeon, so that it behaves as an update of the old

galeon.  This way we get implicit conflicts between them.

4 files changed, 13 insertions, 12 deletions

diff --git a/www/galeon-devel/Makefile b/www/galeon-devel/Makefile
index 053191ac397..c525a6ab907 100644
--- a/www/galeon-devel/Makefile
+++ b/www/galeon-devel/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2004/04/03 11:18:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/03 13:26:32 jmmv Exp $
 #
 
 DISTNAME=	galeon-1.3.14a
-PKGNAME=	${DISTNAME:S/galeon/galeon-devel/}
 PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
@@ -15,6 +14,8 @@ COMMENT=	GNOME2 Web browser based on gecko
 DEPENDS=		gnome2-dirs>=1.5:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
+CONFLICTS+=		galeon-devel-[0-9]*
+
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
@@ -31,7 +32,7 @@ GCONF2_SCHEMAS=		galeon.schemas
 CONFIGURE_ARGS+=	--with-mozilla-snapshot=1.6
 CONFIGURE_ARGS+=	--enable-nautilus-view=yes
 
-EGDIR=			${PREFIX}/share/examples/galeon-devel
+EGDIR=			${PREFIX}/share/examples/galeon
 CONF_FILES=		${EGDIR}/sound/events/galeon.soundlist \
 			${PKG_SYSCONFDIR}/sound/events/galeon.soundlist
 
diff --git a/www/galeon-devel/PLIST b/www/galeon-devel/PLIST
index f0e4773881c..ae7622d6162 100644
--- a/www/galeon-devel/PLIST
+++ b/www/galeon-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/03 11:18:00 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/03 13:26:32 jmmv Exp $
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
@@ -9,7 +9,7 @@ lib/galeon/components/libgaleon-xpcom.la
 lib/galeon/components/libgaleon-xpcom.so
 man/man1/galeon.1
 share/applications/galeon.desktop
-share/examples/galeon-devel/sound/events/galeon.soundlist
+share/examples/galeon/sound/events/galeon.soundlist
 share/galeon/FAQ.html
 share/galeon/about_logo.png
 share/galeon/autoscroll.xpm
@@ -236,9 +236,9 @@ share/sounds/galeon/clicked.wav
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/galeon
-@dirrm share/examples/galeon-devel/sound/events
-@dirrm share/examples/galeon-devel/sound
-@dirrm share/examples/galeon-devel
+@dirrm share/examples/galeon/sound/events
+@dirrm share/examples/galeon/sound
+@dirrm share/examples/galeon
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/galeon/components
 @dirrm lib/galeon
diff --git a/www/galeon-devel/distinfo b/www/galeon-devel/distinfo
index cff0f2677d8..9eca12c776b 100644
--- a/www/galeon-devel/distinfo
+++ b/www/galeon-devel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/04/03 11:18:00 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/04/03 13:26:32 jmmv Exp $
 
 SHA1 (galeon-1.3.14a.tar.bz2) = fc3f0931bf0ca4b5fe2435bd711e5f85b8162a00
 Size (galeon-1.3.14a.tar.bz2) = 3708208 bytes
-SHA1 (patch-aa) = fa8259918ed06291a41ffd871edebe79e750380f
+SHA1 (patch-aa) = 14672031558514fa4c19147cfacf496a3b0c4ad4
 SHA1 (patch-ab) = 6f18be168729d4b1531f009a4d5715ee14bc5d54
diff --git a/www/galeon-devel/patches/patch-aa b/www/galeon-devel/patches/patch-aa
index e2d4ebfaad3..d848aa1e5ff 100644
--- a/www/galeon-devel/patches/patch-aa
+++ b/www/galeon-devel/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/30 23:40:54 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/03 13:26:32 jmmv Exp $
 
 --- sounds/Makefile.in.orig	2004-03-22 01:34:35.000000000 +0100
 +++ sounds/Makefile.in	2004-03-22 01:35:17.000000000 +0100
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/30 23:40:54 xtraeme Exp $
  galeon_SOUNDS = clicked.wav
  
 -soundlistdir = $(sysconfdir)/sound/events
-+examplesdir = $(prefix)/share/examples/galeon-devel
++examplesdir = $(prefix)/share/examples/galeon
 +soundlistdir = $(examplesdir)/sound/events
  soundlist_in_files = galeon.soundlist.in
  soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)