[Midnightbsd-cvs] mports: ports-mgmt/portupgrade: first pass at 2.4.6.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Sep 10 15:09:58 EDT 2008
Log Message:
-----------
first pass at 2.4.6. Report bugs! This is a big jump
Modified Files:
--------------
mports/ports-mgmt/portupgrade:
Makefile (r1.7 -> r1.8)
distinfo (r1.3 -> r1.4)
pkg-plist (r1.1 -> r1.2)
Removed Files:
-------------
mports/ports-mgmt/portupgrade/files:
patch-etc-pkgtools.conf
patch-lib-pkgtools.rb
patch-lib-portsdb.rb
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/ports-mgmt/portupgrade/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L ports-mgmt/portupgrade/pkg-plist -L ports-mgmt/portupgrade/pkg-plist -u -r1.1 -r1.2
--- ports-mgmt/portupgrade/pkg-plist
+++ ports-mgmt/portupgrade/pkg-plist
@@ -1,11 +1,13 @@
@exec /bin/mkdir -p %D/lib/compat/pkg
- at unexec /bin/rmdir %D/lib/compat/pkg 2>/dev/null || true
+ at dirrmtry lib/compat/pkg
+ at dirrmtry lib/compat
sbin/pkg_deinstall
sbin/pkg_fetch
sbin/pkg_glob
sbin/pkg_sort
sbin/pkg_which
sbin/pkgdb
+sbin/pkgdu
sbin/portcvsweb
sbin/portinstall
sbin/ports_glob
@@ -15,6 +17,7 @@
sbin/portversion
%%RUBY_SITELIBDIR%%/pkg.rb
%%RUBY_SITELIBDIR%%/pkgdb.rb
+%%RUBY_SITELIBDIR%%/pkgdbtools.rb
%%RUBY_SITELIBDIR%%/pkginfo.rb
%%RUBY_SITELIBDIR%%/pkgmisc.rb
%%RUBY_SITELIBDIR%%/pkgtools.rb
@@ -30,12 +33,12 @@
share/zsh/site-functions/_pkgtools
@unexec [ -f %D/bin/zsh ] || rmdir %D/share/zsh/site-functions 2>/dev/null || true
@dirrmtry share/zsh
-%%PORTDOCS%%share/examples/pkgtools/bash/complete.sample
-%%PORTDOCS%%@dirrm share/examples/pkgtools/bash
-%%PORTDOCS%%share/examples/pkgtools/tcsh/complete.sample
-%%PORTDOCS%%@dirrm share/examples/pkgtools/tcsh
-%%PORTDOCS%%@dirrm share/examples/pkgtools
-%%PORTDOCS%%share/doc/pkgtools/ChangeLog
-%%PORTDOCS%%share/doc/pkgtools/NEWS
-%%PORTDOCS%%share/doc/pkgtools/README
-%%PORTDOCS%%@dirrm share/doc/pkgtools
+%%EXAMPLESDIR%%/bash/complete.sample
+%%EXAMPLESDIR%%/tcsh/complete.sample
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+ at dirrm %%EXAMPLESDIR%%/bash
+ at dirrm %%EXAMPLESDIR%%/tcsh
+ at dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/ports-mgmt/portupgrade/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L ports-mgmt/portupgrade/Makefile -L ports-mgmt/portupgrade/Makefile -u -r1.7 -r1.8
--- ports-mgmt/portupgrade/Makefile
+++ ports-mgmt/portupgrade/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= portupgrade
-PORTVERSION= 2.1.5
-PORTREVISION= 1
+PORTVERSION= 2.4.6
PORTEPOCH= 2
CATEGORIES= ports-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
@@ -19,9 +18,6 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= BSD ports/packages administration and management tool suite
-##OPTIONS= BDB4 "Use Berkeley DB >=2 as backend" on \
-## BDB1 "Use Berkeley DB 1.85 as backend" off
-
USE_BZIP2= yes
USE_RUBY= yes
USE_RUBY_FEATURES= optparse ruby18
@@ -33,10 +29,10 @@
MAKE_ARGS= PREFIX="${PREFIX}" RUBY="${RUBY}"
MAN1= pkg_deinstall.1 \
- pkg_fetch.1 \
pkg_glob.1 \
pkg_sort.1 \
pkgdb.1 \
+ pkgdu.1 \
portcvsweb.1 \
portsclean.1 \
portsdb.1 \
@@ -46,7 +42,11 @@
MLINKS= pkgdb.1 pkg_which.1 \
portupgrade.1 portinstall.1 \
portsdb.1 ports_glob.1
-MANCOMPRESSED= maybe
+
+EXAMPLESDIR= ${PREFIX}/share/examples/pkgtools
+DOCSDIR= ${PREFIX}/share/doc/pkgtools
+
+MANCOMPRESSED= yes
INSTALL_TARGET= install
.if !defined(NOPORTDOCS)
@@ -56,41 +56,18 @@
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
-##.if defined(WITH_BDB4)
-### For PKG_DBDRIVER={bdb_btree,bdb_hash}
RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
-##.endif
-##.if defined(WITH_BDB1) && !defined(WITH_BDB4)
-### For PKG_DBDRIVER={bdb1_btree,bdb1_hash}
-##RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bdb1.so:${PORTSDIR}/databases/ruby-bdb1
-##.endif
-
-#pre-extract:
-#.if !defined(WITH_BDB4) && !defined(WITH_BDB1)
-# @${ECHO_MSG} "================================================================="
-# @${ECHO_MSG} "Neither WITH_BDB4 nor WITH_BDB1 are defined. Will use DBD driver."
-# @${ECHO_MSG} "================================================================="
-#.endif
-#.if defined(WITH_BDB4) && defined(WITH_BDB1)
-# @${ECHO_MSG} "================================================================="
-# @${ECHO_MSG} "Both WITH_BDB4 and WITH_BDB1 are defined. Will use BDB4 driver."
-# @${ECHO_MSG} "================================================================="
-#.elif defined(WITH_BDB1) && exists(${RUBY_SITEARCHLIBDIR}/bdb.so)
-# @${ECHO_MSG} "================================================================="
-# @${ECHO_MSG} "WITH_BDB1 is defined but ruby-bdb port installed."
-# @${ECHO_MSG} "Remove ruby-bdb or redefine options."
-# @${ECHO_MSG} "================================================================="
-# @exit 1
-#.endif
post-patch:
-.for i in bin/pkg_fetch bin/pkg_fetch.1 bin/pkgdb bin/pkgdb.1 bin/portsclean bin/portsdb bin/portsdb.1 bin/portupgrade bin/portupgrade.1 bin/portversion bin/portversion.1 etc/pkgtools.conf Makefile lib/portsdb.rb misc/bash/complete.sample misc/zsh/_pkgtools tests/test_portinfo.rb tests/test_portsdb.rb
+.for i in bin/pkgdu bin/pkg_fetch bin/pkgdb bin/portsclean bin/portsdb bin/portupgrade bin/portversion etc/pkgtools.conf Makefile lib/portsdb.rb misc/bash/complete.sample misc/zsh/_pkgtools tests/test_portinfo.rb tests/test_portsdb.rb
@cd ${WRKSRC}; \
${SED} 's/\/usr\/ports/\/usr\/mports/' < $i > convert.txt; \
${MV} convert.txt $i ; \
${SED} 's/sysutils\/portupgrade/\/ports-mgmt\/portupgrade/' < $i > convert2.txt; \
${MV} convert2.txt $i
.endfor
+ ${REINPLACE_CMD} -e 's|ftp.FreeBSD.org|ftp.midnightbsd.org|g;' \
+ ${WRKSRC}/lib/pkgtools.rb
pre-install:
${MKDIR} -p ${RUBY_SITELIBDIR}
@@ -100,5 +77,6 @@
if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
fi
+ ${MKDIR} ${PREFIX}/lib/compat/pkg
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/ports-mgmt/portupgrade/distinfo,v
retrieving revision 1.3
retrieving revision 1.4
diff -L ports-mgmt/portupgrade/distinfo -L ports-mgmt/portupgrade/distinfo -u -r1.3 -r1.4
--- ports-mgmt/portupgrade/distinfo
+++ ports-mgmt/portupgrade/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.1.5.tar.bz2) = 9e541be2d6bebdeab83348fb135693a8
-SHA256 (pkgtools-2.1.5.tar.bz2) = 78466bdcdc85f0342e388081fca56b9403b8702c254e2c5696f1e8649f528cae
-SIZE (pkgtools-2.1.5.tar.bz2) = 110908
+MD5 (pkgtools-2.4.6.tar.bz2) = 27212bb588eee60c39219ea740d4a4e0
+SHA256 (pkgtools-2.4.6.tar.bz2) = facf4423595df81e8647c179a61d1a4e2caff29e8b334cf680afcdf710dbd5eb
+SIZE (pkgtools-2.4.6.tar.bz2) = 114708
--- ports-mgmt/portupgrade/files/patch-lib-portsdb.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/portsdb.rb.orig Wed Mar 14 21:04:44 2007
-+++ lib/portsdb.rb Wed Mar 14 21:05:03 2007
-@@ -27,7 +27,7 @@
- "vietnamese" => "vi-",
- }
-
-- MY_PORT = 'sysutils/portupgrade'
-+ MY_PORT = 'ports-mgmt/portupgrade'
-
- attr_accessor :ignore_categories, :extra_categories, :moved
-
--- ports-mgmt/portupgrade/files/patch-etc-pkgtools.conf
+++ /dev/null
@@ -1,59 +0,0 @@
---- etc/pkgtools.conf.orig Tue Jun 13 16:59:00 2006
-+++ etc/pkgtools.conf Fri Aug 25 16:35:18 2006
-@@ -30,22 +30,25 @@
- # x11base()
- # Returns X11BASE.
- #
--# pkg_site_builder([latest])
--# Returns a URI of the packages directory on the package builder site;
-+# pkg_site_builder(true|false)
-+# Returns an URI of the packages directory on the package builder site;
-+# if an argument is true, a 'latest' directory is used for path,
-+# 'full' is used otherwise.
- # Equivalent to:
- # on i386:
--# sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-%s/',
-+# sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-packages-%s/',
- # OS_PLATFORM, OS_MAJOR, latest ? 'latest' : 'full')
- #
--# pkg_site_mirror([root])
--# Returns a URI of the packages directory on the preferred mirror site;
-+# pkg_site_mirror(root)
-+# Returns an URI of the packages directory on the preferred mirror site;
-+# where <root> is any quoted string.
- # Equivalent to:
- # sprintf('%s/pub/FreeBSD/ports/%s/packages-%s/',
- # root || ENV['PACKAGEROOT'] || 'ftp://ftp.FreeBSD.org',
- # OS_PLATFORM, OS_PKGBRANCH)
- #
- # pkg_site_primary()
--# Returns a URI of the packages directory on the primary FTP site;
-+# Returns an URI of the packages directory on the primary FTP site;
- # Equivalent to:
- # pkg_site_mirror('ftp://ftp.FreeBSD.org')
- #
-@@ -94,7 +97,9 @@
- # Include and evaluate the file. The file is looked inside PREFIX.
- #
- # include_hash(glob)
--# Read file(s) and convert them to hash. (path is inside PREFIX).
-+# Read file(s) and convert them to hash. Files should contain lines
-+# in a format: 'key' => 'value'
-+# (Glob path is inside PREFIX).
- # E.g. ALT_PKGDEP = include_hash('etc/pkgtools/alt_pkgdep/*')
- #
-
-@@ -120,6 +125,13 @@
- # ENV['PKG_TMPDIR'] ||= '/var/tmp'
- #
- # ENV['PACKAGES'] ||= ENV['PORTSDIR'] + '/packages'
-+ #
-+ # ENV['PKG_DBDRIVER'] ||= 'bdb_btree' and if it's failed to load
-+ # the driver it will fall to bdb1_btree driver. If the driver
-+ # failed too, it will fall to 'dbm_hash' that require no external
-+ # modules.
-+ # Possible values for ENV['PKG_DBDRIVER'] are bdb_btree, bdb_hash,
-+ # bdb1_btree, bdb1_hash and dbm_hash.
- #
- # e.g.:
- # ENV['PORTSDIR'] ||= '/export/freebsd/ports'
--- ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/pkgtools.rb.orig Fri Aug 25 16:38:16 2006
-+++ lib/pkgtools.rb Fri Aug 25 16:38:48 2006
-@@ -1022,7 +1022,7 @@
-
- case OS_PLATFORM
- when 'i386', 'sparc64', 'amd64', 'ia64'
-- sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-%s/',
-+ sprintf('http://pointyhat.FreeBSD.org/errorlogs/%s-%s-packages-%s/',
- OS_PLATFORM, OS_MAJOR, run)
- else
- raise sprintf('There is no official package builder site yet for the %s platform.',
More information about the Midnightbsd-cvs
mailing list