tech-pkg archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
moved or renamed packages with diff (was Re: up2date - something for NetBSD?)
On Sat, 11 Apr 2009, Dieter Baron wrote:
> In article <Pine.NEB.4.64.0904091430580.6135%tx.reedmedia.net@localhost>
> Jeremy wrote:
> : I will add simple support for pkg_summary(5) to record changed
> : PKGNAME (or changed PKGPATH).
>
> That would be good. How do you propose to do that?
>
> Currently, pkg_summary is created by running pkg_info -X on all
> binary paackges, and that should not change (as it allows to easily
> (re)create the summary).
>
> So, I would suggest recording the neccessary information in the
> relevant binary package and have pkg_info -X output it.
Understood. I had discussed it a few times on the list already but never
got around to doing it. Here are some various threads:
http://mail-index.netbsd.org/tech-pkg/2008/02/15/msg000366.html
http://mail-index.netbsd.org/tech-pkg/2008/02/16/msg000371.html
http://mail-index.netbsd.org/tech-pkg/2007/11/07/0018.html
http://mail-index.netbsd.org/tech-pkg/2007/10/29/0022.html
http://mail-index.netbsd.org/tech-pkg/2007/09/21/0020.html
(I see you were part of these conversations.)
The following is a patch for mk, pkg_install, and various packages.
p5-CGI-Lite PKGNAME had changed in 2001, so added it too. But I for rest I
only did 2008 and 2009.
A CHANGES entry was wrong as said Renamed when should have said
Moved (lua-OSBF) because PKGBASE stayed the same.
Not sure what to do with packages that split into multiple
packages and original package path is gone. But hasn't happened
since devel/netbsd-iscsi in 2007 I think. I guess it depends on what
package best provides the needed functionality.
Maybe the PKGPATH part is not needed for binary upgrades. But may be
interesting at least. It can be useful for upgrades using pkgsrc source,
but that is now redundant with CHANGES* entries (assuming that is
correct).
Note that moving or renaming packages is not good, but hopefully this
patch helps...
(Pkgsrc Guide not updated for this yet.)
Index: audio/mserv-irman/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/mserv-irman/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- audio/mserv-irman/Makefile 10 Feb 2009 11:51:26 -0000 1.1.1.1
+++ audio/mserv-irman/Makefile 11 Apr 2009 17:05:54 -0000
@@ -10,6 +10,9 @@
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-*
+
DEPENDS+= mserv-[0-9]*:../../audio/mserv
DEPENDS+= libirman>=0.4.1.2nb3:../../sysutils/libirman
DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
Index: devel/libmowgli/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libmowgli/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- devel/libmowgli/Makefile 10 Nov 2008 12:08:17 -0000 1.2
+++ devel/libmowgli/Makefile 11 Apr 2009 17:06:05 -0000
@@ -12,6 +12,8 @@
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= devel/mowgli
+
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
Index: devel/opal/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/opal/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- devel/opal/Makefile 18 Mar 2009 11:58:08 -0000 1.8
+++ devel/opal/Makefile 11 Apr 2009 17:06:05 -0000
@@ -11,6 +11,7 @@
COMMENT= Open Phone Abstraction Library
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= devel/opal-devel
OPALLIBDIR= ${DISTNAME}
Index: graphics/py-clutter/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/py-clutter/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- graphics/py-clutter/Makefile 3 Apr 2009 07:55:23 -0000 1.4
+++ graphics/py-clutter/Makefile 11 Apr 2009 17:06:15 -0000
@@ -13,6 +13,9 @@
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= graphics/py-pyclutter
+SUPERSEDES= ${PYPKGPREFIX}-pyclutter-*
+
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
Index: lang/guile16/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/guile16/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- lang/guile16/Makefile 14 Jul 2008 12:56:07 -0000 1.4
+++ lang/guile16/Makefile 11 Apr 2009 17:06:17 -0000
@@ -10,6 +10,9 @@
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
Index: mail/OSBF-lua/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/OSBF-lua/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- mail/OSBF-lua/Makefile 13 Oct 2008 11:29:53 -0000 1.1.1.1
+++ mail/OSBF-lua/Makefile 11 Apr 2009 17:06:18 -0000
@@ -10,6 +10,8 @@
COMMENT= Lua C module for text classification
#LICENSE= gnu-gpl-v2
+PREV_PKGPATH= mail/lua-OSBF
+
USE_TOOLS+= gmake
INSTALL_TARGET= install install_spamfilter
Index: meta-pkgs/c++-gnome-bindings/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/c++-gnome-bindings/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- meta-pkgs/c++-gnome-bindings/Makefile 22 Mar 2009 12:21:26 -0000
1.6
+++ meta-pkgs/c++-gnome-bindings/Makefile 11 Apr 2009 17:06:21 -0000
@@ -10,6 +10,9 @@
META_PACKAGE= yes
+PREV_PKGPATH= meta-pkgs/gnome-bindings-c++
+SUPERSEDES= gnome-bindings-c++-*
+
# see http://ftp.gnome.org/pub/GNOME/bindings/2.26/2.26.0/sources/c++/
DEPENDS+= gconfmm>=2.24.0:../../devel/gconfmm
Index: meta-pkgs/mono-gnome-bindings/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/meta-pkgs/mono-gnome-bindings/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- meta-pkgs/mono-gnome-bindings/Makefile 22 Mar 2009 10:12:16 -0000
1.4
+++ meta-pkgs/mono-gnome-bindings/Makefile 11 Apr 2009 17:06:21 -0000
@@ -10,6 +10,9 @@
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
Index: mk/flavor/pkg/metadata.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/flavor/pkg/metadata.mk,v
retrieving revision 1.30
diff -u -r1.30 metadata.mk
--- mk/flavor/pkg/metadata.mk 21 May 2008 20:39:52 -0000 1.30
+++ mk/flavor/pkg/metadata.mk 11 Apr 2009 17:06:23 -0000
@@ -47,6 +47,12 @@
.if defined(OWNER)
${RUN}${ECHO} "OWNER=${OWNER}" >> ${.TARGET}.tmp
.endif
+.if defined(PREV_PKGPATH)
+ ${RUN}${ECHO} "PREV_PKGPATH=${PREV_PKGPATH}" >> ${.TARGET}.tmp
+.endif
+.if defined(SUPERSEDES)
+ ${RUN}${ECHO} "SUPERSEDES=${SUPERSEDES}" >> ${.TARGET}.tmp
+.endif
${RUN}${ECHO} "BUILD_DATE=${_BUILD_DATE_cmd:sh}" >> ${.TARGET}.tmp
${RUN}${ECHO} "BUILD_HOST=${_BUILD_HOST_cmd:sh}" >> ${.TARGET}.tmp
.if !empty(CHECK_SHLIBS_SUPPORTED:M[yY][eE][sS])
Index: multimedia/ffmpeg/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- multimedia/ffmpeg/Makefile 7 Apr 2009 19:29:50 -0000 1.48
+++ multimedia/ffmpeg/Makefile 11 Apr 2009 17:06:24 -0000
@@ -13,6 +13,7 @@
DISTVERSION= 2008-07-27
PKG_DESTDIR_SUPPORT= user-destdir
+PREV_PKGPATH= multimedia/ffmpeg-devel
HAS_CONFIGURE= YES
USE_LIBTOOL= YES
Index: multimedia/vlc08/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/vlc08/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- multimedia/vlc08/Makefile 13 Mar 2009 20:11:23 -0000 1.18
+++ multimedia/vlc08/Makefile 11 Apr 2009 17:06:25 -0000
@@ -13,6 +13,9 @@
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]*
Index: net/ekiga/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/ekiga/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- net/ekiga/Makefile 22 Mar 2009 19:01:40 -0000 1.9
+++ net/ekiga/Makefile 11 Apr 2009 17:06:29 -0000
@@ -12,6 +12,7 @@
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
Index: pkgtools/pkg_install/files/info/show.c
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/info/show.c,v
retrieving revision 1.25
diff -u -r1.25 show.c
--- pkgtools/pkg_install/files/info/show.c 2 Mar 2009 17:13:49 -0000
1.25
+++ pkgtools/pkg_install/files/info/show.c 11 Apr 2009 17:06:35 -0000
@@ -340,6 +340,8 @@
"HOMEPAGE",
"PKGTOOLS_VERSION",
"BUILD_DATE",
+ "PREV_PKGPATH",
+ "SUPERSEDES",
NULL
};
Index: pkgtools/pkg_install/files/lib/pkg_summary.5
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/lib/pkg_summary.5,v
retrieving revision 1.8
diff -u -r1.8 pkg_summary.5
--- pkgtools/pkg_install/files/lib/pkg_summary.5 8 Feb 2009 23:12:05
-0000 1.8
+++ pkgtools/pkg_install/files/lib/pkg_summary.5 11 Apr 2009 17:06:35
-0000
@@ -27,7 +27,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd August 29, 2007
+.Dd April 11, 2009
.Dt PKG_SUMMARY 5
.Os
.Sh NAME
@@ -94,6 +94,12 @@
(required) The path of the package directory within pkgsrc.
.It Ev PKGTOOLS_VERSION
(required) The version of the package tools used to create the package.
+.It Ev PREV_PKGPATH
+(optional) The previous path of the package directory within pkgsrc when
+a package was moved.
+(See
+.Ev SUPERSEDES
+below for a renamed package.)
.It Ev PROVIDES
(optional) A list of shared libraries provided by the package,
including major version number, one per line.
@@ -104,6 +110,10 @@
If missing, this package does not require shared libraries.
.It Ev SIZE_PKG
(required) The size of the package when installed, in bytes.
+.It Ev SUPERSEDES
+(optional) A list of dewey patterns of previous packages this
+package replaces.
+This is used for package renaming.
.El
.Pp
The
Index: pkgtools/pkg_install/files/lib/version.h
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_install/files/lib/version.h,v
retrieving revision 1.122
diff -u -r1.122 version.h
--- pkgtools/pkg_install/files/lib/version.h 10 Apr 2009 04:03:11 -0000
1.122
+++ pkgtools/pkg_install/files/lib/version.h 11 Apr 2009 17:06:35 -0000
@@ -27,6 +27,6 @@
#ifndef _INST_LIB_VERSION_H_
#define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20090410"
+#define PKGTOOLS_VERSION "20090411"
#endif /* _INST_LIB_VERSION_H_ */
Index: time/wmCalClock/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/time/wmCalClock/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- time/wmCalClock/Makefile 16 Feb 2009 11:51:46 -0000 1.1.1.1
+++ time/wmCalClock/Makefile 11 Apr 2009 17:06:51 -0000
@@ -10,6 +10,8 @@
# 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
Index: www/p5-CGI-Lite/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/p5-CGI-Lite/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- www/p5-CGI-Lite/Makefile 8 Nov 2008 09:43:57 -0000 1.1.1.1
+++ www/p5-CGI-Lite/Makefile 11 Apr 2009 17:06:58 -0000
@@ -12,6 +12,9 @@
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-*
+
PKG_DESTDIR_SUPPORT= user-destdir
PERL5_PACKLIST= auto/CGI/Lite/.packlist
Index: x11/gtk-sharp/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtk-sharp/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- x11/gtk-sharp/Makefile 25 Mar 2009 22:37:15 -0000 1.11
+++ x11/gtk-sharp/Makefile 11 Apr 2009 17:07:05 -0000
@@ -11,6 +11,8 @@
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
Index: x11/gtksourceview-sharp2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/gtksourceview-sharp2/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- x11/gtksourceview-sharp2/Makefile 25 Mar 2009 22:37:16 -0000 1.9
+++ x11/gtksourceview-sharp2/Makefile 11 Apr 2009 17:07:05 -0000
@@ -11,6 +11,9 @@
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
Home |
Main Index |
Thread Index |
Old Index