summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2009-05-02 16:21:43 +0000
committerreed <reed@pkgsrc.org>2009-05-02 16:21:43 +0000
commit676e059275db9203cafa0fa4492108671a29dc8d (patch)
tree2319be5aa37823896621deeeb9dfec36069a9eca
parentd547799b004296fcbd3fbfa69fb52c9b7aea87b1 (diff)
downloadpkgsrc-676e059275db9203cafa0fa4492108671a29dc8d.tar.gz
Add PREV_PKGPATH and/or SUPERSEDES for various packages that
were moved or renamed. This was for some from 2008 and 2009 and one from 2001. Also I noticed that a CHANGES entry was wrong as said "Renamed" when should have said "Moved" (lua-OSBF) because PKGBASE stayed the same.
-rw-r--r--audio/mserv-irman/Makefile5
-rw-r--r--devel/libmowgli/Makefile4
-rw-r--r--devel/opal/Makefile3
-rw-r--r--devel/p5-IO-Compress/Makefile6
-rw-r--r--games/gnome-games/Makefile3
-rw-r--r--graphics/py-clutter/Makefile5
-rw-r--r--lang/guile16/Makefile5
-rw-r--r--mail/OSBF-lua/Makefile4
-rw-r--r--mail/sylpheed/Makefile4
-rw-r--r--meta-pkgs/c++-gnome-bindings/Makefile5
-rw-r--r--meta-pkgs/mono-gnome-bindings/Makefile5
-rw-r--r--multimedia/ffmpeg/Makefile3
-rw-r--r--multimedia/swfdec/Makefile4
-rw-r--r--multimedia/vlc08/Makefile5
-rw-r--r--net/ekiga/Makefile3
-rw-r--r--net/p5-IO-Socket-INET6/Makefile4
-rw-r--r--pkgtools/compat_headers/Makefile5
-rw-r--r--print/gutenprint-lib/Makefile4
-rw-r--r--textproc/p5-XML-SAX/Makefile4
-rw-r--r--time/wmCalClock/Makefile4
-rw-r--r--www/p5-CGI-Lite/Makefile5
-rw-r--r--www/py-django/Makefile4
-rw-r--r--x11/gtk-sharp/Makefile4
-rw-r--r--x11/gtk2/Makefile4
-rw-r--r--x11/gtksourceview-sharp2/Makefile5
25 files changed, 82 insertions, 25 deletions
diff --git a/audio/mserv-irman/Makefile b/audio/mserv-irman/Makefile
index 01b69a48116..e3a68c0f10b 100644
--- a/audio/mserv-irman/Makefile
+++ b/audio/mserv-irman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/02/10 11:51:26 abs Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/02 16:21:43 reed Exp $
#
DISTNAME= mserv-irman-0.21
@@ -10,6 +10,9 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://code.google.com/p/mserv-irman/
COMMENT= Control mserv mp3 jukebox program via infra-red remote
+PREV_PKGPATH= audio/mserv_irman
+SUPERSEDES= mserv_irman-[0-9]*
+
DEPENDS+= mserv-[0-9]*:../../audio/mserv
DEPENDS+= libirman>=0.4.1.2nb3:../../sysutils/libirman
DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
diff --git a/devel/libmowgli/Makefile b/devel/libmowgli/Makefile
index 248366605e0..0be98c23791 100644
--- a/devel/libmowgli/Makefile
+++ b/devel/libmowgli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/11/10 12:08:17 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/02 16:21:43 reed Exp $
#
DISTNAME= libmowgli-0.7.0
@@ -12,6 +12,8 @@ COMMENT= Development framework for C (like GLib)
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= devel/mowgli
+
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
diff --git a/devel/opal/Makefile b/devel/opal/Makefile
index 3283b717615..4de6fd5e802 100644
--- a/devel/opal/Makefile
+++ b/devel/opal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/03/18 11:58:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.9 2009/05/02 16:21:43 reed Exp $
#
DISTNAME= opal-3.6.1
@@ -11,6 +11,7 @@ HOMEPAGE= http://www.opalvoip.org/
COMMENT= Open Phone Abstraction Library
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= devel/opal-devel
OPALLIBDIR= ${DISTNAME}
diff --git a/devel/p5-IO-Compress/Makefile b/devel/p5-IO-Compress/Makefile
index 072a83ec3a9..22ba9a37177 100644
--- a/devel/p5-IO-Compress/Makefile
+++ b/devel/p5-IO-Compress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/04/11 22:42:33 sno Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/02 16:21:43 reed Exp $
DISTNAME= IO-Compress-2.017
PKGNAME= p5-${DISTNAME}
@@ -18,6 +18,10 @@ CONFLICTS+= p5-Compress-Zlib-[0-9]*
DEPENDS+= p5-Compress-Raw-Zlib>=2.017:../../devel/p5-Compress-Raw-Zlib
DEPENDS+= p5-Compress-Raw-Bzip2>=2.017:../../devel/p5-Compress-Raw-Bzip2
+SUPERSEDES= p5-IO-Compress-Base<2.017
+SUPERSEDES+= p5-IO-Compress-Bzip2<2.017
+SUPERSEDES+= p5-IO-Compress-Zlib<2.017
+
USE_LANGUAGES= # empty
PERL5_PACKLIST= auto/IO/Compress/.packlist
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 6af68b4354e..0ae88c2da1d 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2009/03/22 19:01:38 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2009/05/02 16:21:44 reed Exp $
DISTNAME= gnome-games-2.26.0
CATEGORIES= games gnome
@@ -12,6 +12,7 @@ COMMENT= GNOME2 games collection
PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= xbill-[0-9]*
+SUPERSEDES= glchess-[0-9]*
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile
index a2f868e76b3..505a51a194f 100644
--- a/graphics/py-clutter/Makefile
+++ b/graphics/py-clutter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/03 07:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/02 16:21:44 reed Exp $
#
DISTNAME= pyclutter-0.8.2
@@ -13,6 +13,9 @@ COMMENT= Python modules for Clutter toolkit
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= graphics/py-pyclutter
+SUPERSEDES= ${PYPKGPREFIX}-pyclutter-[0-9]*
+
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
diff --git a/lang/guile16/Makefile b/lang/guile16/Makefile
index 20fb7f99745..3bbc8d1049a 100644
--- a/lang/guile16/Makefile
+++ b/lang/guile16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/07/14 12:56:07 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/02 16:21:44 reed Exp $
DISTNAME= guile-1.6.8
PKGREVISION= 2
@@ -10,6 +10,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/guile/guile.html
COMMENT= GNU's Ubiquitous Intelligent Language for Extension (1.6.x series)
+# Purposely not defining PREV_PKGPATH
+SUPERSEDES= guile-1.6.*
+
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= YES
diff --git a/mail/OSBF-lua/Makefile b/mail/OSBF-lua/Makefile
index 1f11f9e5b58..1e0596ae4d1 100644
--- a/mail/OSBF-lua/Makefile
+++ b/mail/OSBF-lua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/10/13 11:29:53 shannonjr Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/02 16:21:44 reed Exp $
#
DISTNAME= osbf-lua-2.0.4
@@ -10,6 +10,8 @@ HOMEPAGE= http://osbf-lua.luaforge.net/
COMMENT= Lua C module for text classification
#LICENSE= gnu-gpl-v2
+PREV_PKGPATH= mail/lua-OSBF
+
USE_TOOLS+= gmake
INSTALL_TARGET= install install_spamfilter
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index f818638dc9d..79233a6c4b5 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2008/12/23 22:45:00 ahoka Exp $
+# $NetBSD: Makefile,v 1.115 2009/05/02 16:21:44 reed Exp $
DISTNAME= sylpheed-2.6.0
CATEGORIES= mail news x11
@@ -12,6 +12,8 @@ COMMENT= X based e-mail and netnews client
PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= sylpheed-claws-[0-9]*
+PREV_PKGPATH= mail/sylpheed-devel
+
USE_DIRS+= xdg-1.4
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/meta-pkgs/c++-gnome-bindings/Makefile b/meta-pkgs/c++-gnome-bindings/Makefile
index 04201ae808a..7992d4cae3e 100644
--- a/meta-pkgs/c++-gnome-bindings/Makefile
+++ b/meta-pkgs/c++-gnome-bindings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/03/22 12:21:26 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/02 16:21:44 reed Exp $
DISTNAME= c++-gnome-bindings-2.26.0
CATEGORIES= meta-pkgs x11 gnome
@@ -10,6 +10,9 @@ COMMENT= Meta-package for C++ bindings for the GNOME desktop
META_PACKAGE= yes
+PREV_PKGPATH= meta-pkgs/gnome-bindings-c++
+SUPERSEDES= gnome-bindings-c++-[0-9]*
+
# see http://ftp.gnome.org/pub/GNOME/bindings/2.26/2.26.0/sources/c++/
DEPENDS+= gconfmm>=2.24.0:../../devel/gconfmm
diff --git a/meta-pkgs/mono-gnome-bindings/Makefile b/meta-pkgs/mono-gnome-bindings/Makefile
index a0750c34463..68878bfc9cf 100644
--- a/meta-pkgs/mono-gnome-bindings/Makefile
+++ b/meta-pkgs/mono-gnome-bindings/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/03/22 10:12:16 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/02 16:21:44 reed Exp $
DISTNAME= mono-gnome-bindings-2.26.0
CATEGORIES= meta-pkgs x11 gnome
@@ -10,6 +10,9 @@ COMMENT= Meta-package for Mono (C#) bindings for the GNOME desktop
META_PACKAGE= yes
+PREV_PKGPATH= meta-pkgs/gnome-bindings-mono
+SUPERSEDES= gnome-bindings-mono-*
+
# see http://ftp.gnome.org/pub/GNOME/bindings/2.26/2.26.0/sources/mono/
DEPENDS+= gtk-sharp>=2.12.8:../../x11/gtk-sharp
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 264afea6674..60a4fe9972d 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2009/04/07 19:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2009/05/02 16:21:44 reed Exp $
DISTNAME= ffmpeg-${DISTVERSION}
PKGNAME= ffmpeg-${DISTVERSION:S/-//g}
@@ -13,6 +13,7 @@ COMMENT= MPEG decoding, encoding and streaming software
DISTVERSION= 2008-07-27
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= multimedia/ffmpeg-devel
HAS_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile
index f7088992e40..191e6e4d5c3 100644
--- a/multimedia/swfdec/Makefile
+++ b/multimedia/swfdec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/03/11 12:49:54 abs Exp $
+# $NetBSD: Makefile,v 1.13 2009/05/02 16:21:45 reed Exp $
#
DISTNAME= swfdec-0.8.4
@@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://swfdec.freedesktop.org/
COMMENT= Library for rendering Flash(R) animations and games
+SUPERSEDES= swfdec-gtk2-[0-9]*
+
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= pkg-config
diff --git a/multimedia/vlc08/Makefile b/multimedia/vlc08/Makefile
index d9d0d8f37d5..8a46409bbac 100644
--- a/multimedia/vlc08/Makefile
+++ b/multimedia/vlc08/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2009/03/13 20:11:23 kefren Exp $
+# $NetBSD: Makefile,v 1.19 2009/05/02 16:21:45 reed Exp $
#
DISTNAME= vlc-${VLC_VER}
@@ -13,6 +13,9 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.videolan.org/
COMMENT= VideoLAN Client
+# Purposely not setting PREV_PKGPATH
+SUPERSEDES= vlc-0.8.*
+
PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= vlc-[0-9]* vlc07-[0-9]*
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index a85562d12e5..791dfd8673c 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/03/22 19:01:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/02 16:21:45 reed Exp $
#
DISTNAME= ekiga-3.2.0
@@ -12,6 +12,7 @@ HOMEPAGE= http://www.ekiga.org/
COMMENT= VoIP and video conferencing application for GNOME
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= net/ekiga-devel
USE_DIRS+= gnome2-1.5
USE_TOOLS+= gmake intltool msgfmt pkg-config
diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile
index dad58e3f0d0..8df3f370117 100644
--- a/net/p5-IO-Socket-INET6/Makefile
+++ b/net/p5-IO-Socket-INET6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/03/07 15:54:51 seb Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/02 16:21:45 reed Exp $
#
DISTNAME= IO-Socket-INET6-2.56
@@ -12,6 +12,8 @@ COMMENT= Perl object interface for AF_INET|AF_INET6 domain sockets
DEPENDS+= p5-Socket6-[0-9]*:../../net/p5-Socket6
+SUPERSEDES= p5-INET6-[0-9]*
+
PKG_DESTDIR_SUPPORT= user-destdir
PERL5_PACKLIST= auto/IO/Socket/INET6/.packlist
diff --git a/pkgtools/compat_headers/Makefile b/pkgtools/compat_headers/Makefile
index f02246908fc..d3b666e3572 100644
--- a/pkgtools/compat_headers/Makefile
+++ b/pkgtools/compat_headers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/09 00:48:11 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/02 16:21:45 reed Exp $
DISTNAME= compat_headers-0.2
CATEGORIES= pkgtools
@@ -9,6 +9,9 @@ MAINTAINER= tnn@NetBSD.org
HOMEPAGE= http://www.pkgsrc.org/
COMMENT= compatibility headers
+PREV_PKGPATH= pkgtools/posix_headers
+SUPERSEDES= posix_headers-[0-9]*
+
CHECK_PERMS= no
GNU_CONFIGURE= yes
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/print/gutenprint-lib/Makefile b/print/gutenprint-lib/Makefile
index 2fc7e523a49..4d763fbacce 100644
--- a/print/gutenprint-lib/Makefile
+++ b/print/gutenprint-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/12/24 00:53:14 gdt Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/02 16:21:45 reed Exp $
VERSION= 5.2.3
DISTNAME= gutenprint-${VERSION}
@@ -11,6 +11,8 @@ MAINTAINER= gdt@NetBSD.org
COMMENT= Drivers for Canon, Epson, Lexmark, and PCL printers
HOMEPAGE= http://gutenprint.sourceforge.net/
+PREV_PKGPATH= print/gutenprint51-lib
+
INSTALLVERSION= 5.2
PLIST_SUBST+= INSTALLVERSION=${INSTALLVERSION}
diff --git a/textproc/p5-XML-SAX/Makefile b/textproc/p5-XML-SAX/Makefile
index 0f6397707d1..c5fbff99fc0 100644
--- a/textproc/p5-XML-SAX/Makefile
+++ b/textproc/p5-XML-SAX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/03/08 13:30:47 seb Exp $
+# $NetBSD: Makefile,v 1.25 2009/05/02 16:21:45 reed Exp $
DISTNAME= XML-SAX-0.96
PKGNAME= p5-${DISTNAME}
@@ -19,6 +19,8 @@ DEPENDS+= p5-XML-NamespaceSupport>=0.03:../../textproc/p5-XML-NamespaceSupport
# included in perl>=5.6.1
#DEPENDS+= p5-File-Temp-[0-9]*:../../devel/p5-File-Temp
+SUPERSEDES= p5-XML-SAX-Base-[0-9]*
+
MAKE_ENV= SKIP_SAX_INSTALL=yes
EGSUBDIR= share/examples/p5-XML-SAX
CONF_FILES= ${EGSUBDIR}/ParserDetails.ini \
diff --git a/time/wmCalClock/Makefile b/time/wmCalClock/Makefile
index 4d1c5ad835c..cd011b9f895 100644
--- a/time/wmCalClock/Makefile
+++ b/time/wmCalClock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/02/16 11:51:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/02 16:21:45 reed Exp $
#
DISTNAME= wmCalClock-1.25
@@ -10,6 +10,8 @@ MAINTAINER= wiz@NetBSD.org
# HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
COMMENT= Another WindowMaker calendar/clock dockapp
+PREV_PKGPATH= time/wmcalclock
+
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
USE_TOOLS+= gmake
diff --git a/www/p5-CGI-Lite/Makefile b/www/p5-CGI-Lite/Makefile
index 3844df8264c..45844c91079 100644
--- a/www/p5-CGI-Lite/Makefile
+++ b/www/p5-CGI-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/11/08 09:43:57 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/05/02 16:21:45 reed Exp $
#
DISTNAME= CGI-Lite-2.02
@@ -12,6 +12,9 @@ MAINTAINER= bad@NetBSD.org
HOMEPAGE= http://search.cpan.org/dist/CGI-Lite/
COMMENT= Simple perl5 module for writing forms-based CGI programs
+PREV_PKGPATH= www/p5-CGI_Lite
+SUPERSEDES= p5-CGI_Lite-[0-9]*
+
PKG_DESTDIR_SUPPORT= user-destdir
PERL5_PACKLIST= auto/CGI/Lite/.packlist
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index 18579f4340a..24ac2331886 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/14 09:14:24 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2009/05/02 16:21:46 reed Exp $
DJANGOVERS= 1.0.2
DISTNAME= Django-${DJANGOVERS}-final
@@ -11,6 +11,8 @@ MAINTAINER= joerg@NetBSD.org
HOMEPAGE= http://www.djangoproject.com/
COMMENT= Django, a high-level Python Web framework
+PREV_PKGPATH= www/py-django-devel
+
PYDISTUTILSPKG= # yes
PYTHON_VERSIONS_ACCEPTED= 25 24
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
diff --git a/x11/gtk-sharp/Makefile b/x11/gtk-sharp/Makefile
index 73d87efd468..aedb3f74ddd 100644
--- a/x11/gtk-sharp/Makefile
+++ b/x11/gtk-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/03/25 22:37:15 he Exp $
+# $NetBSD: Makefile,v 1.12 2009/05/02 16:21:46 reed Exp $
#
DISTNAME= gtk-sharp-2.12.8
@@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.mono-project.com/GtkSharp
COMMENT= C\# bindings for GTK
+PREV_PKGPATH= x11/gtk2-sharp
+
PKG_DESTDIR_SUPPORT= user-destdir
USE_PKGLOCALEDIR= yes
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 5983d1b1b4d..d50b9e53908 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.172 2009/04/16 18:54:41 drochner Exp $
+# $NetBSD: Makefile,v 1.173 2009/05/02 16:21:46 reed Exp $
DISTNAME= gtk+-2.16.1
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -16,6 +16,8 @@ PKG_DESTDIR_SUPPORT= user-destdir
CONFLICTS= gtk2-engines<2.6.0
CONFLICTS+= gail-[0-9]*
+SUPERSEDES= gail-[0-9]*
+
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake msgfmt perl pkg-config
diff --git a/x11/gtksourceview-sharp2/Makefile b/x11/gtksourceview-sharp2/Makefile
index a1ae36d9e7d..6dfec79bb44 100644
--- a/x11/gtksourceview-sharp2/Makefile
+++ b/x11/gtksourceview-sharp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/03/25 22:37:16 he Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/02 16:21:46 reed Exp $
DISTNAME= gtksourceview-sharp-2.0-0.12
PKGNAME= ${DISTNAME:S/-2.0-/2-/}
@@ -11,6 +11,9 @@ MAINTAINER= kefren@NetBSD.org
HOMEPAGE= http://www.mono-project.com/Gtk
COMMENT= C\# Bindings to the GtkSourceView widget
+PREV_PKGPATH= x11/gtksourceview-sharp
+SUPERSEDES= gtksourceview-sharp-2.0-[0-9]*
+
GNU_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config