Re: PATCH: a few changes to archivers/lzip

2013-11-07 Thread Juan Francisco Cantero Hurtado 
On Thu, Nov 07, 2013 at 12:57:25AM -0500, Brad Smith wrote:
 On Thu, Nov 07, 2013 at 03:11:28AM +0100, Juan Francisco Cantero Hurtado 
 wrote:
  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?
 
 Here is an updated diff to fix some mistakes with library port. Most
 of the patching there was wrong. There was some confusion between
 the libraries project revision number and the shared libraries ABI
 versioning. Have the various lzip binaries installed stripped as
 appropriate.

Thanks a lot for the help!. FYI, the changes to the lib were suggested
by upstream because I'm pretty useless when work with the library
versioning of any package. I'll take a look later today.


 
 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 -  1.1.1.1
 +++ Makefile.inc  7 Nov 2013 05:46:06 -
 @@ -10,11 +10,13 @@ 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} \
   CPPFLAGS=-I${LOCALBASE}/include \
 @@ -23,5 +25,9 @@ CONFIGURE_ARGS +=   CC=${CC} CXX=${CXX}
   --prefix=${PREFIX} \
   --infodir=${PREFIX}/info \
   --mandir=${PREFIX}/man
 +
 +.ifndef DEBUG
 +INSTALL_TARGET ?=install-strip
 +.endif
  
  TEST_TARGET =check
 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/Makefile14 Oct 2013 21:23:32 -  1.1.1.1
 +++ clzip/Makefile7 Nov 2013 05:46:06 -
 @@ -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/distinfo14 Oct 2013 21:23:32 -  1.1.1.1
 +++ clzip/distinfo7 Nov 2013 05:46:06 -
 @@ -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 -  1.1.1.1
 +++ lunzip/Makefile   7 Nov 2013 05:46:06 -
 @@ -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 -  1.1.1.1
 +++ lzip/Makefile 7 Nov 2013 05:46:06 -
 @@ -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 -  1.1.1.1
 +++ lzip/distinfo 7 Nov 2013 05:46:06

Re: PATCH: a few changes to archivers/lzip

2013-11-07 Thread Stuart Henderson 
 Index: lzlib/Makefile
 ===

 +# The Makkefile tries to strip a shared lib with the install target.
 +INSTALL_TARGET = install

The Makefile tries to strip a shared lib with the install-strip target. ?

otherwise, that looks better

Re: PATCH: a few changes to archivers/lzip

2013-11-07 Thread Brad Smith 

On 07/11/13 6:51 AM, Stuart Henderson wrote:

Index: lzlib/Makefile
===



+# The Makkefile tries to strip a shared lib with the install target.
+INSTALL_TARGET =   install


The Makefile tries to strip a shared lib with the install-strip target. ?

otherwise, that looks better


Well it wasn't meant to refer to the actual name of the install target, 
but I could see how there might be some confusion.



--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

PATCH: a few changes to archivers/lzip

2013-11-06 Thread Juan Francisco Cantero Hurtado 
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.inc14 Oct 2013 21:23:32 -  1.1.1.1
+++ Makefile.inc7 Nov 2013 01:56:19 -
@@ -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 -  1.1.1.1
+++ clzip/Makefile  7 Nov 2013 01:56:19 -
@@ -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 -  1.1.1.1
+++ clzip/distinfo  7 Nov 2013 01:56:19 -
@@ -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 -  1.1.1.1
+++ lunzip/Makefile 7 Nov 2013 01:56:19 -
@@ -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 -  1.1.1.1
+++ lzip/Makefile   7 Nov 2013 01:56:19 -
@@ -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 -  1.1.1.1
+++ lzip/distinfo   7 Nov 2013 01:56:19 -
@@ -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/Makefile14 Oct 2013 21:23:33 -  1.1.1.1
+++ lziprecover/Makefile7 Nov 2013 01:56:19 -
@@ -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/distinfo14

Re: PATCH: a few changes to archivers/lzip

2013-11-06 Thread Brad Smith 
On Thu, Nov 07, 2013 at 03:11:28AM +0100, Juan Francisco Cantero Hurtado wrote:
 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?

Here is an updated diff to fix some mistakes with library port. Most
of the patching there was wrong. There was some confusion between
the libraries project revision number and the shared libraries ABI
versioning. Have the various lzip binaries installed stripped as
appropriate.

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.inc14 Oct 2013 21:23:32 -  1.1.1.1
+++ Makefile.inc7 Nov 2013 05:46:06 -
@@ -10,11 +10,13 @@ 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} \
CPPFLAGS=-I${LOCALBASE}/include \
@@ -23,5 +25,9 @@ CONFIGURE_ARGS += CC=${CC} CXX=${CXX}
--prefix=${PREFIX} \
--infodir=${PREFIX}/info \
--mandir=${PREFIX}/man
+
+.ifndef DEBUG
+INSTALL_TARGET ?=  install-strip
+.endif
 
 TEST_TARGET =  check
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 -  1.1.1.1
+++ clzip/Makefile  7 Nov 2013 05:46:06 -
@@ -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 -  1.1.1.1
+++ clzip/distinfo  7 Nov 2013 05:46:06 -
@@ -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 -  1.1.1.1
+++ lunzip/Makefile 7 Nov 2013 05:46:06 -
@@ -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 -  1.1.1.1
+++ lzip/Makefile   7 Nov 2013 05:46:06 -
@@ -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 -  1.1.1.1
+++ lzip/distinfo   7 Nov 2013 05:46:06 -
@@ -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