Changes:
- Only use gmake for lzlib.
- Change the tarballs from .gz to .lz, except for lunzip (read the
comment in Makefile.inc).
- Bump everything.
- Add a little change to the patch of lzlib.
Steps to test the changes:
- pkg_delete clzip lunzip lzip lziprecover lzlib pdlzip plzip
- cd /usr/port/archivers/lzip
- apply the patch
- make clean=all
- make test
OK?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/archivers/lzip/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.inc
--- Makefile.inc 14 Oct 2013 21:23:32 -0000 1.1.1.1
+++ Makefile.inc 7 Nov 2013 01:56:19 -0000
@@ -10,10 +10,12 @@ MAINTAINER = Juan Francisco Cantero Hur
MASTER_SITES ?= ${MASTER_SITE_SAVANNAH:=lzip/} \
${MASTER_SITE_SAVANNAH:=lzip/old/}
+# Upstream also releases the tarballs compressed with gz but to use the
+# lz version of the tarballs for the lzip project give us a quick and simple
+# test to detect problems with the lzip format on every OpenBSD platform.
+EXTRACT_SUFX ?= .tar.lz
DIST_SUBDIR = lzip
-
-USE_GMAKE = Yes
CONFIGURE_STYLE = simple
CONFIGURE_ARGS += CC="${CC}" CXX="${CXX}" \
Index: clzip/Makefile
===================================================================
RCS file: /cvs/ports/archivers/lzip/clzip/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- clzip/Makefile 14 Oct 2013 21:23:32 -0000 1.1.1.1
+++ clzip/Makefile 7 Nov 2013 01:56:19 -0000
@@ -3,6 +3,7 @@
COMMENT = C implementation of lzip
DISTNAME = clzip-1.5
+REVISION = 0
HOMEPAGE = http://lzip.nongnu.org/clzip.html
Index: clzip/distinfo
===================================================================
RCS file: /cvs/ports/archivers/lzip/clzip/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- clzip/distinfo 14 Oct 2013 21:23:32 -0000 1.1.1.1
+++ clzip/distinfo 7 Nov 2013 01:56:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (lzip/clzip-1.5.tar.gz) = zqC6xx59Hi6VwtA+mAkNz3M47bzYB37/M1A3pUuH0N4=
-SIZE (lzip/clzip-1.5.tar.gz) = 79947
+SHA256 (lzip/clzip-1.5.tar.lz) = 6LPH6jPUXOJYU/EIjNqzJb3hxOd11n9SbSVZMhfvxGk=
+SIZE (lzip/clzip-1.5.tar.lz) = 59899
Index: lunzip/Makefile
===================================================================
RCS file: /cvs/ports/archivers/lzip/lunzip/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- lunzip/Makefile 14 Oct 2013 21:23:32 -0000 1.1.1.1
+++ lunzip/Makefile 7 Nov 2013 01:56:19 -0000
@@ -3,6 +3,7 @@
COMMENT = decompressor written in C for lzip files
DISTNAME = lunzip-1.4
+REVISION = 0
HOMEPAGE = http://lzip.nongnu.org/lunzip.html
@@ -10,5 +11,8 @@ HOMEPAGE = http://lzip.nongnu.org/lunzi
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c
+
+# All other lzip ports use .tar.lz by default.
+EXTRACT_SUFX = .tar.gz
.include <bsd.port.mk>
Index: lzip/Makefile
===================================================================
RCS file: /cvs/ports/archivers/lzip/lzip/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- lzip/Makefile 14 Oct 2013 21:23:33 -0000 1.1.1.1
+++ lzip/Makefile 7 Nov 2013 01:56:19 -0000
@@ -3,6 +3,7 @@
COMMENT = lossless data compressor
DISTNAME = lzip-1.15
+REVISION = 0
HOMEPAGE = http://lzip.nongnu.org/lzip.html
Index: lzip/distinfo
===================================================================
RCS file: /cvs/ports/archivers/lzip/lzip/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- lzip/distinfo 14 Oct 2013 21:23:33 -0000 1.1.1.1
+++ lzip/distinfo 7 Nov 2013 01:56:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (lzip/lzip-1.15.tar.gz) = fNP82mj8mQDvz3eEMT473RMD/vGgVG25cj9eVWTdBbY=
-SIZE (lzip/lzip-1.15.tar.gz) = 97409
+SHA256 (lzip/lzip-1.15.tar.lz) = FFdiv9avWvlSJXJsbd3RFjSKvtwCrn5o+0O/2dLpLP0=
+SIZE (lzip/lzip-1.15.tar.lz) = 66164
Index: lziprecover/Makefile
===================================================================
RCS file: /cvs/ports/archivers/lzip/lziprecover/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- lziprecover/Makefile 14 Oct 2013 21:23:33 -0000 1.1.1.1
+++ lziprecover/Makefile 7 Nov 2013 01:56:19 -0000
@@ -3,6 +3,7 @@
COMMENT = data recovery tool and decompressor for lzip files
DISTNAME = lziprecover-1.15
+REVISION = 0
HOMEPAGE = http://lzip.nongnu.org/lziprecover.html
Index: lziprecover/distinfo
===================================================================
RCS file: /cvs/ports/archivers/lzip/lziprecover/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- lziprecover/distinfo 14 Oct 2013 21:23:33 -0000 1.1.1.1
+++ lziprecover/distinfo 7 Nov 2013 01:56:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (lzip/lziprecover-1.15.tar.gz) =
Kt8N/HegsvkyV9nz8RcfwREhtD2lX6U3FUWbf6k/FmE=
-SIZE (lzip/lziprecover-1.15.tar.gz) = 82763
+SHA256 (lzip/lziprecover-1.15.tar.lz) =
xJqUTZzHJ5E51ACfw8CehIzAYU1jmfZa8O15CUnUCnw=
+SIZE (lzip/lziprecover-1.15.tar.lz) = 61153
Index: lzlib/Makefile
===================================================================
RCS file: /cvs/ports/archivers/lzip/lzlib/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- lzlib/Makefile 14 Oct 2013 21:23:34 -0000 1.1.1.1
+++ lzlib/Makefile 7 Nov 2013 01:56:19 -0000
@@ -3,6 +3,7 @@
COMMENT = lzip compression library
DISTNAME = lzlib-1.5
+REVISION = 0
SHARED_LIBS += lz 0.0 # 1.5
@@ -10,6 +11,8 @@ HOMEPAGE = http://lzip.nongnu.org/lzlib
# GPLv3+ with special exception
PERMIT_PACKAGE_CDROM = Yes
+
+USE_GMAKE = Yes
CONFIGURE_ENV += LIBlz_VERSION=${LIBlz_VERSION}
Index: lzlib/distinfo
===================================================================
RCS file: /cvs/ports/archivers/lzip/lzlib/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- lzlib/distinfo 14 Oct 2013 21:23:34 -0000 1.1.1.1
+++ lzlib/distinfo 7 Nov 2013 01:56:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (lzip/lzlib-1.5.tar.gz) = 3eSBLEDCEOH9DJulQgilEgzAAwwB0S/4XTLetKC6B8g=
-SIZE (lzip/lzlib-1.5.tar.gz) = 105488
+SHA256 (lzip/lzlib-1.5.tar.lz) = m5YU6uFEgQfsChbDx3qxcrgV0sB1MscjEVVnmUdBmhw=
+SIZE (lzip/lzlib-1.5.tar.lz) = 80651
Index: lzlib/patches/patch-configure
===================================================================
RCS file: /cvs/ports/archivers/lzip/lzlib/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- lzlib/patches/patch-configure 14 Oct 2013 21:23:34 -0000 1.1.1.1
+++ lzlib/patches/patch-configure 7 Nov 2013 01:56:19 -0000
@@ -1,12 +1,18 @@
$OpenBSD: patch-configure,v 1.1.1.1 2013/10/14 21:23:34 juanfra Exp $
---- configure.orig Tue Oct 8 01:32:24 2013
-+++ configure Tue Oct 8 01:32:41 2013
-@@ -6,7 +6,7 @@
+
+The "soversion" change is needed by the testsuite of plzip. Bump with each
+major version of lz.
+
+--- configure.orig Sun Sep 15 01:36:19 2013
++++ configure Wed Nov 6 20:54:25 2013
+@@ -6,8 +6,8 @@
# to copy, distribute and modify it.
pkgname=lzlib
-pkgversion=1.5
+-soversion=1
+pkgversion=${LIBlz_VERSION}
- soversion=1
++soversion=0
progname=minilzip
progname_shared=
+ libname=lz
Index: pdlzip/Makefile
===================================================================
RCS file: /cvs/ports/archivers/lzip/pdlzip/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- pdlzip/Makefile 14 Oct 2013 21:23:34 -0000 1.1.1.1
+++ pdlzip/Makefile 7 Nov 2013 01:56:19 -0000
@@ -3,6 +3,7 @@
COMMENT = public domain implementation of the lzip data compressor
DISTNAME = pdlzip-1.5
+REVISION = 0
HOMEPAGE = http://lzip.nongnu.org/pdlzip.html
Index: pdlzip/distinfo
===================================================================
RCS file: /cvs/ports/archivers/lzip/pdlzip/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- pdlzip/distinfo 14 Oct 2013 21:23:34 -0000 1.1.1.1
+++ pdlzip/distinfo 7 Nov 2013 01:56:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (lzip/pdlzip-1.5.tar.gz) = DC41TP5i80qy4SrGn0UkLYvvz9vcpkWmLwOaZtPmM2c=
-SIZE (lzip/pdlzip-1.5.tar.gz) = 64443
+SHA256 (lzip/pdlzip-1.5.tar.lz) = muRK2bFilx1oDQdrfPZMrldTIgTThhPj3IWEgNE1W1Y=
+SIZE (lzip/pdlzip-1.5.tar.lz) = 56335
Index: plzip/Makefile
===================================================================
RCS file: /cvs/ports/archivers/lzip/plzip/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- plzip/Makefile 14 Oct 2013 21:23:34 -0000 1.1.1.1
+++ plzip/Makefile 7 Nov 2013 01:56:19 -0000
@@ -3,6 +3,7 @@
COMMENT = multi-threaded data compressor based on lzlib
DISTNAME = plzip-1.1
+REVISION = 0
HOMEPAGE = http://lzip.nongnu.org/plzip.html
Index: plzip/distinfo
===================================================================
RCS file: /cvs/ports/archivers/lzip/plzip/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- plzip/distinfo 14 Oct 2013 21:23:34 -0000 1.1.1.1
+++ plzip/distinfo 7 Nov 2013 01:56:19 -0000
@@ -1,2 +1,2 @@
-SHA256 (lzip/plzip-1.1.tar.gz) = d9k1/IP/5qPmie3WdEEpGpTb/EaGU+ujNSSQnvXHH2M=
-SIZE (lzip/plzip-1.1.tar.gz) = 71881
+SHA256 (lzip/plzip-1.1.tar.lz) = tcUEAgLfY9Zhwjv+/I6qtNyLbhYGtnURbuW1YEEDn60=
+SIZE (lzip/plzip-1.1.tar.lz) = 53672
