Add portupgrade-devel. It's a developing version of portupgrade.

Version 2.1.5 is mostly bugfix of 2.1.4.

5 files changed, 65 insertions, 24 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index f8985a3f7cec..45ad0dfd56ff 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	portupgrade
-PORTVERSION=	2.1.1
-PORTEPOCH=	2
+PORTNAME=	portupgrade-devel
+PORTVERSION=	2.1.5
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://sunner.elcomnet.ru/~sem/
-MASTER_SITE_SUBDIR=	sem
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	pkgtools-${DISTVERSION}
 
 MAINTAINER=	sem@FreeBSD.org
-COMMENT=	FreeBSD ports/packages administration and management tool suite
+COMMENT=	FreeBSD ports/packages administration and management tool suite (devel vevresion)
 
-OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend. (Use BDB 1.85 if off)" off
+OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend" on \
+		BDB1 "Use Berkeley DB 1.85 as backend" off
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
@@ -55,12 +55,32 @@ INSTALL_TARGET+=	install-doc
 .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
 .if defined(WITH_BDB4)
-# For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb}
+# For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
-.else
+.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_DBD4 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_DBD4 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-install: install-ldconfig-file
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index 96b8f1d92784..a57176fcafb6 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.1.1.tar.bz2) = a3848cf5cffedf196a28b4c3b20746cb
-SHA256 (pkgtools-2.1.1.tar.bz2) = 6b6369fe18a9a2fdb1062361d4211a2e31e49999a0c037f963c7e781af7c1d4c
-SIZE (pkgtools-2.1.1.tar.bz2) = 108685
+MD5 (pkgtools-2.1.5.tar.bz2) = 9e541be2d6bebdeab83348fb135693a8
+SHA256 (pkgtools-2.1.5.tar.bz2) = 78466bdcdc85f0342e388081fca56b9403b8702c254e2c5696f1e8649f528cae
+SIZE (pkgtools-2.1.5.tar.bz2) = 110908
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 8e0f29fef5ec..e079975493e0 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -456,6 +456,7 @@
     SUBDIR += portsman
     SUBDIR += portsnap
     SUBDIR += portupgrade
+    SUBDIR += portupgrade-devel
     SUBDIR += powerman
     SUBDIR += prips
     SUBDIR += procmap
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index f8985a3f7cec..45ad0dfd56ff 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=	portupgrade
-PORTVERSION=	2.1.1
-PORTEPOCH=	2
+PORTNAME=	portupgrade-devel
+PORTVERSION=	2.1.5
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://sunner.elcomnet.ru/~sem/
-MASTER_SITE_SUBDIR=	sem
+MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	pkgtools-${DISTVERSION}
 
 MAINTAINER=	sem@FreeBSD.org
-COMMENT=	FreeBSD ports/packages administration and management tool suite
+COMMENT=	FreeBSD ports/packages administration and management tool suite (devel vevresion)
 
-OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend. (Use BDB 1.85 if off)" off
+OPTIONS=	BDB4 "Use Berkeley DB >=2 as backend" on \
+		BDB1 "Use Berkeley DB 1.85 as backend" off
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
@@ -55,12 +55,32 @@ INSTALL_TARGET+=	install-doc
 .include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
 
 .if defined(WITH_BDB4)
-# For PKG_DBDRIVER={bdb_btree,bdb_hash,bdb}
+# For PKG_DBDRIVER={bdb_btree,bdb_hash}
 RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/bdb.so:${PORTSDIR}/databases/ruby-bdb
-.else
+.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_DBD4 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_DBD4 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-install: install-ldconfig-file
 	if [ ! -f ${PREFIX}/etc/pkgtools.conf ]; then \
 		${CP} -p ${PREFIX}/etc/pkgtools.conf.sample ${PREFIX}/etc/pkgtools.conf; \
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index 96b8f1d92784..a57176fcafb6 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.1.1.tar.bz2) = a3848cf5cffedf196a28b4c3b20746cb
-SHA256 (pkgtools-2.1.1.tar.bz2) = 6b6369fe18a9a2fdb1062361d4211a2e31e49999a0c037f963c7e781af7c1d4c
-SIZE (pkgtools-2.1.1.tar.bz2) = 108685
+MD5 (pkgtools-2.1.5.tar.bz2) = 9e541be2d6bebdeab83348fb135693a8
+SHA256 (pkgtools-2.1.5.tar.bz2) = 78466bdcdc85f0342e388081fca56b9403b8702c254e2c5696f1e8649f528cae
+SIZE (pkgtools-2.1.5.tar.bz2) = 110908