aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorsem <sem@FreeBSD.org>2006-06-02 13:36:06 +0800
committersem <sem@FreeBSD.org>2006-06-02 13:36:06 +0800
commit7b4965028744b461fc997600b7ac8aa7de5d6418 (patch)
treeae7a444a224f34f821cd7c264eed854a2d637b9b /sysutils
parent9bb9a05121c32ca75e4aa418e088b8b0d4dda7da (diff)
downloadfreebsd-ports-gnome-7b4965028744b461fc997600b7ac8aa7de5d6418.tar.gz
freebsd-ports-gnome-7b4965028744b461fc997600b7ac8aa7de5d6418.tar.zst
freebsd-ports-gnome-7b4965028744b461fc997600b7ac8aa7de5d6418.zip
- Take the port
- Update to 2.1.0 o rewrite version checking. Now it's compliant with pkg_version(1) algorythm o fix shebangs in test/* o add test in test_pkgversion.rb from test-pkg_version.sh o fix test_pkgdb.rb o fix pointyhat URL in pkgtools.conf and pkgtools.rb o make comparisons when updates from packages. It compared package names instead versions. It gives a weird results when port was renamed (eg. mozilla-firebird -> firefox) [1] o don't show a warning about origin changing when origins are the same. [2] It rids us from messages like: Package origin of 'pan' has been changed: 'news/pan' -> 'news/pan' PR: ports/62990 [1], ports/98153 [2] Submitted by: Leland Wang <llwang at infor.org> [1] tobez [2] Approved by: maintainer (silence for a month, no activity seen for 4 monthes) daichi (blessed) ports (silence) a number open PRs from 2003 year Inspired by: az
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/portupgrade-devel/Makefile8
-rw-r--r--sysutils/portupgrade-devel/distinfo6
-rw-r--r--sysutils/portupgrade-devel/files/patch-etc_Makefile19
-rw-r--r--sysutils/portupgrade-devel/files/patch-lib-portsdb.rb13
-rw-r--r--sysutils/portupgrade/Makefile8
-rw-r--r--sysutils/portupgrade/distinfo6
-rw-r--r--sysutils/portupgrade/files/patch-etc_Makefile19
-rw-r--r--sysutils/portupgrade/files/patch-lib-portsdb.rb13
8 files changed, 14 insertions, 78 deletions
diff --git a/sysutils/portupgrade-devel/Makefile b/sysutils/portupgrade-devel/Makefile
index 6fdba0333e18..24d026b5ab46 100644
--- a/sysutils/portupgrade-devel/Makefile
+++ b/sysutils/portupgrade-devel/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= portupgrade
-PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTVERSION= 2.1.0
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= sem
DISTNAME= pkgtools-${DISTVERSION}
-MAINTAINER= koma2@lovepeers.org
+MAINTAINER= sem@FreeBSD.org
COMMENT= FreeBSD ports/packages administration and management tool suite
DISTVERSION= ${PORTVERSION}
diff --git a/sysutils/portupgrade-devel/distinfo b/sysutils/portupgrade-devel/distinfo
index f75a9934a097..23a96dbc67b2 100644
--- a/sysutils/portupgrade-devel/distinfo
+++ b/sysutils/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.0.1.tar.bz2) = 807d87a5512b91951a10689e856da055
-SHA256 (pkgtools-2.0.1.tar.bz2) = 5a4c1cb1c3b2cea0bee48faa4a25f0ae4ebe3a597384294ef2f1bdb9e27e5882
-SIZE (pkgtools-2.0.1.tar.bz2) = 107654
+MD5 (pkgtools-2.1.0.tar.bz2) = 952045c8659eded82cce4181f1502811
+SHA256 (pkgtools-2.1.0.tar.bz2) = 777eeae3a906e3af1014a7291180332cfd10a8e0fb9a57393149c733eb2bfa5f
+SIZE (pkgtools-2.1.0.tar.bz2) = 108129
diff --git a/sysutils/portupgrade-devel/files/patch-etc_Makefile b/sysutils/portupgrade-devel/files/patch-etc_Makefile
deleted file mode 100644
index 0bdce56bc29c..000000000000
--- a/sysutils/portupgrade-devel/files/patch-etc_Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- etc/Makefile.orig Sat Feb 11 16:39:34 2006
-+++ etc/Makefile Sat Feb 11 16:39:49 2006
-@@ -2,15 +2,9 @@
-
- ETCDIR?= ${PREFIX}/etc
-
--SCRIPTSDIR?= ${ETCDIR}/rc.d
--
- BUILDDIR= .build
-
--SCRIPTS= ${BUILDDIR}/pkgtools.sh \
-- ${BUILDDIR}/status-pkg.sh
--
--SCRIPTSDIR_pkgtools.sh= ${ETCDIR}/rc.d
--SCRIPTSNAME_pkgtools.sh= 000.pkgtools.sh
-+SCRIPTS= ${BUILDDIR}/status-pkg.sh
-
- #SCRIPTSDIR_status-pkg.sh= /etc/periodic/weekly
- #SCRIPTSNAME_status-pkg.sh= 400.status-pkg.sh
diff --git a/sysutils/portupgrade-devel/files/patch-lib-portsdb.rb b/sysutils/portupgrade-devel/files/patch-lib-portsdb.rb
deleted file mode 100644
index 3d3278148e18..000000000000
--- a/sysutils/portupgrade-devel/files/patch-lib-portsdb.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/portsdb.rb
-===================================================================
---- lib/portsdb.rb (revision 74)
-+++ lib/portsdb.rb (revision 75)
-@@ -91,7 +91,7 @@
- while true
- if moved = @moved[me]
- t << moved if t.empty? or t.last.seq < moved.seq
-- if me.nil? or me == moved.to
-+ if me.nil? or t.map{|p| p.to}.include?(me)
- break
- else
- me = moved.to
diff --git a/sysutils/portupgrade/Makefile b/sysutils/portupgrade/Makefile
index 6fdba0333e18..24d026b5ab46 100644
--- a/sysutils/portupgrade/Makefile
+++ b/sysutils/portupgrade/Makefile
@@ -6,14 +6,14 @@
#
PORTNAME= portupgrade
-PORTVERSION= 2.0.1
-PORTREVISION= 2
+PORTVERSION= 2.1.0
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= http://dists.lovepeers.org/distfiles/portupgrade/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= sem
DISTNAME= pkgtools-${DISTVERSION}
-MAINTAINER= koma2@lovepeers.org
+MAINTAINER= sem@FreeBSD.org
COMMENT= FreeBSD ports/packages administration and management tool suite
DISTVERSION= ${PORTVERSION}
diff --git a/sysutils/portupgrade/distinfo b/sysutils/portupgrade/distinfo
index f75a9934a097..23a96dbc67b2 100644
--- a/sysutils/portupgrade/distinfo
+++ b/sysutils/portupgrade/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.0.1.tar.bz2) = 807d87a5512b91951a10689e856da055
-SHA256 (pkgtools-2.0.1.tar.bz2) = 5a4c1cb1c3b2cea0bee48faa4a25f0ae4ebe3a597384294ef2f1bdb9e27e5882
-SIZE (pkgtools-2.0.1.tar.bz2) = 107654
+MD5 (pkgtools-2.1.0.tar.bz2) = 952045c8659eded82cce4181f1502811
+SHA256 (pkgtools-2.1.0.tar.bz2) = 777eeae3a906e3af1014a7291180332cfd10a8e0fb9a57393149c733eb2bfa5f
+SIZE (pkgtools-2.1.0.tar.bz2) = 108129
diff --git a/sysutils/portupgrade/files/patch-etc_Makefile b/sysutils/portupgrade/files/patch-etc_Makefile
deleted file mode 100644
index 0bdce56bc29c..000000000000
--- a/sysutils/portupgrade/files/patch-etc_Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- etc/Makefile.orig Sat Feb 11 16:39:34 2006
-+++ etc/Makefile Sat Feb 11 16:39:49 2006
-@@ -2,15 +2,9 @@
-
- ETCDIR?= ${PREFIX}/etc
-
--SCRIPTSDIR?= ${ETCDIR}/rc.d
--
- BUILDDIR= .build
-
--SCRIPTS= ${BUILDDIR}/pkgtools.sh \
-- ${BUILDDIR}/status-pkg.sh
--
--SCRIPTSDIR_pkgtools.sh= ${ETCDIR}/rc.d
--SCRIPTSNAME_pkgtools.sh= 000.pkgtools.sh
-+SCRIPTS= ${BUILDDIR}/status-pkg.sh
-
- #SCRIPTSDIR_status-pkg.sh= /etc/periodic/weekly
- #SCRIPTSNAME_status-pkg.sh= 400.status-pkg.sh
diff --git a/sysutils/portupgrade/files/patch-lib-portsdb.rb b/sysutils/portupgrade/files/patch-lib-portsdb.rb
deleted file mode 100644
index 3d3278148e18..000000000000
--- a/sysutils/portupgrade/files/patch-lib-portsdb.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/portsdb.rb
-===================================================================
---- lib/portsdb.rb (revision 74)
-+++ lib/portsdb.rb (revision 75)
-@@ -91,7 +91,7 @@
- while true
- if moved = @moved[me]
- t << moved if t.empty? or t.last.seq < moved.seq
-- if me.nil? or me == moved.to
-+ if me.nil? or t.map{|p| p.to}.include?(me)
- break
- else
- me = moved.to