- Backout latest commit, it needs a repocopy due to API change.

Noticed by:	Matthias Andree <matthias.andree@gmx.de>

10 files changed, 112 insertions, 72 deletions

diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index 1e80d61..974fded 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	lzo
-PORTVERSION=	2.00
+PORTVERSION=	1.08
+PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	archivers devel
-MASTER_SITES=	http://www.oberhumer.com/opensource/lzo/download/
+MASTER_SITES=	http://www.oberhumer.com/opensource/lzo/download/LZO-v1/
+MASTER_SITE_SUBDIR=	libs/compression
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable speedy, lossless data compression library
diff --git a/archivers/lzo/distinfo b/archivers/lzo/distinfo
index 9e758c3..b3f1eb1 100644
--- a/archivers/lzo/distinfo
+++ b/archivers/lzo/distinfo
@@ -1,2 +1,2 @@
-MD5 (lzo-2.00.tar.gz) = c7b6b2a0aa3b06722afed4bec4f79011
-SIZE (lzo-2.00.tar.gz) = 570678
+MD5 (lzo-1.08.tar.gz) = ab94d3da364c7cbd5b78d76f1875b0f6
+SIZE (lzo-1.08.tar.gz) = 426692
diff --git a/archivers/lzo/files/patch-configure b/archivers/lzo/files/patch-configure
new file mode 100644
index 0000000..a47c801
--- /dev/null
+++ b/archivers/lzo/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	Sat Jul 13 10:31:52 2002
++++ configure	Tue Jul 16 04:08:48 2002
+@@ -7991,6 +7991,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -12064,7 +12065,7 @@
+   if test "X$enable_debug" = Xyes; then
+     CFLAGS="$CFLAGS -O0"
+   else
+-    CFLAGS="$CFLAGS -O2"
++    CFLAGS="$CFLAGS"
+   fi
+   CFLAGS="$CFLAGS -Wall -Wcast-align -Wcast-qual -Wwrite-strings"
+   case $MFX_CPU in
diff --git a/archivers/lzo/pkg-descr b/archivers/lzo/pkg-descr
index 8e1cbb8..ab23165 100644
--- a/archivers/lzo/pkg-descr
+++ b/archivers/lzo/pkg-descr
@@ -1,20 +1,20 @@
-LZO is a data compression library which is suitable for data
-de-/compression in real-time. This means it favours speed over
-compression ratio.
+     LZO is a data compression library which is suitable for data
+     de-/compression in real-time. This means it favours speed over
+     compression ratio.
 
-LZO implements a number of algorithms with the following features:
-   + Decompression is simple and *very* fast.
-   + Requires no memory for decompression.
-   + Compression is pretty fast.
-   + Requires 64 kB of memory for compression.
-   + Allows you to dial up extra compression at a speed cost in the
-     compressor. The speed of the decompressor is not reduced.
-   + Includes compression levels for generating pre-compressed data
-     which achieve a quite competitive compression ratio.
-   + There is also a compression level which needs only 8 kB for
-     compression.
-   + Algorithm is thread safe.
-   + Algorithm is lossless.
+     LZO implements a number of algorithms with the following features:
+        + Decompression is simple and *very* fast.
+        + Requires no memory for decompression.
+        + Compression is pretty fast.
+        + Requires 64 kB of memory for compression.
+        + Allows you to dial up extra compression at a speed cost in the
+          compressor. The speed of the decompressor is not reduced.
+        + Includes compression levels for generating pre-compressed data
+          which achieve a quite competitive compression ratio.
+        + There is also a compression level which needs only 8 kB for
+          compression.
+        + Algorithm is thread safe.
+        + Algorithm is lossless.
 
 Author: Markus Franz Xaver Johannes Oberhumer
         markus.oberhumer@jk.uni-linz.ac.at
diff --git a/archivers/lzo/pkg-plist b/archivers/lzo/pkg-plist
index 799f6b0..9951bb3 100644
--- a/archivers/lzo/pkg-plist
+++ b/archivers/lzo/pkg-plist
@@ -1,22 +1,20 @@
-include/lzo/lzo1.h
-include/lzo/lzo1a.h
-include/lzo/lzo1b.h
-include/lzo/lzo1c.h
-include/lzo/lzo1f.h
-include/lzo/lzo1x.h
-include/lzo/lzo1y.h
-include/lzo/lzo1z.h
-include/lzo/lzo2a.h
-include/lzo/lzo_asm.h
-include/lzo/lzoconf.h
-include/lzo/lzodefs.h
-include/lzo/lzoutil.h
+include/lzo1.h
+include/lzo16bit.h
+include/lzo1a.h
+include/lzo1b.h
+include/lzo1c.h
+include/lzo1f.h
+include/lzo1x.h
+include/lzo1y.h
+include/lzo1z.h
+include/lzo2a.h
+include/lzoconf.h
+include/lzoutil.h
 lib/liblzo.a
 lib/liblzo.so
-lib/liblzo.so.2
+lib/liblzo.so.1
+%%PORTDOCS%%%%DOCSDIR%%/LTEST.TXT
 %%PORTDOCS%%%%DOCSDIR%%/LZO.FAQ
 %%PORTDOCS%%%%DOCSDIR%%/LZO.TXT
 %%PORTDOCS%%%%DOCSDIR%%/LZOAPI.TXT
-%%PORTDOCS%%%%DOCSDIR%%/LZOTEST.TXT
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/lzo
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 1e80d61..974fded 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -6,9 +6,12 @@
 #
 
 PORTNAME=	lzo
-PORTVERSION=	2.00
+PORTVERSION=	1.08
+PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	archivers devel
-MASTER_SITES=	http://www.oberhumer.com/opensource/lzo/download/
+MASTER_SITES=	http://www.oberhumer.com/opensource/lzo/download/LZO-v1/
+MASTER_SITE_SUBDIR=	libs/compression
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable speedy, lossless data compression library
diff --git a/archivers/lzo2/distinfo b/archivers/lzo2/distinfo
index 9e758c3..b3f1eb1 100644
--- a/archivers/lzo2/distinfo
+++ b/archivers/lzo2/distinfo
@@ -1,2 +1,2 @@
-MD5 (lzo-2.00.tar.gz) = c7b6b2a0aa3b06722afed4bec4f79011
-SIZE (lzo-2.00.tar.gz) = 570678
+MD5 (lzo-1.08.tar.gz) = ab94d3da364c7cbd5b78d76f1875b0f6
+SIZE (lzo-1.08.tar.gz) = 426692
diff --git a/archivers/lzo2/files/patch-configure b/archivers/lzo2/files/patch-configure
new file mode 100644
index 0000000..a47c801
--- /dev/null
+++ b/archivers/lzo2/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	Sat Jul 13 10:31:52 2002
++++ configure	Tue Jul 16 04:08:48 2002
+@@ -7991,6 +7991,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -12064,7 +12065,7 @@
+   if test "X$enable_debug" = Xyes; then
+     CFLAGS="$CFLAGS -O0"
+   else
+-    CFLAGS="$CFLAGS -O2"
++    CFLAGS="$CFLAGS"
+   fi
+   CFLAGS="$CFLAGS -Wall -Wcast-align -Wcast-qual -Wwrite-strings"
+   case $MFX_CPU in
diff --git a/archivers/lzo2/pkg-descr b/archivers/lzo2/pkg-descr
index 8e1cbb8..ab23165 100644
--- a/archivers/lzo2/pkg-descr
+++ b/archivers/lzo2/pkg-descr
@@ -1,20 +1,20 @@
-LZO is a data compression library which is suitable for data
-de-/compression in real-time. This means it favours speed over
-compression ratio.
+     LZO is a data compression library which is suitable for data
+     de-/compression in real-time. This means it favours speed over
+     compression ratio.
 
-LZO implements a number of algorithms with the following features:
-   + Decompression is simple and *very* fast.
-   + Requires no memory for decompression.
-   + Compression is pretty fast.
-   + Requires 64 kB of memory for compression.
-   + Allows you to dial up extra compression at a speed cost in the
-     compressor. The speed of the decompressor is not reduced.
-   + Includes compression levels for generating pre-compressed data
-     which achieve a quite competitive compression ratio.
-   + There is also a compression level which needs only 8 kB for
-     compression.
-   + Algorithm is thread safe.
-   + Algorithm is lossless.
+     LZO implements a number of algorithms with the following features:
+        + Decompression is simple and *very* fast.
+        + Requires no memory for decompression.
+        + Compression is pretty fast.
+        + Requires 64 kB of memory for compression.
+        + Allows you to dial up extra compression at a speed cost in the
+          compressor. The speed of the decompressor is not reduced.
+        + Includes compression levels for generating pre-compressed data
+          which achieve a quite competitive compression ratio.
+        + There is also a compression level which needs only 8 kB for
+          compression.
+        + Algorithm is thread safe.
+        + Algorithm is lossless.
 
 Author: Markus Franz Xaver Johannes Oberhumer
         markus.oberhumer@jk.uni-linz.ac.at
diff --git a/archivers/lzo2/pkg-plist b/archivers/lzo2/pkg-plist
index 799f6b0..9951bb3 100644
--- a/archivers/lzo2/pkg-plist
+++ b/archivers/lzo2/pkg-plist
@@ -1,22 +1,20 @@
-include/lzo/lzo1.h
-include/lzo/lzo1a.h
-include/lzo/lzo1b.h
-include/lzo/lzo1c.h
-include/lzo/lzo1f.h
-include/lzo/lzo1x.h
-include/lzo/lzo1y.h
-include/lzo/lzo1z.h
-include/lzo/lzo2a.h
-include/lzo/lzo_asm.h
-include/lzo/lzoconf.h
-include/lzo/lzodefs.h
-include/lzo/lzoutil.h
+include/lzo1.h
+include/lzo16bit.h
+include/lzo1a.h
+include/lzo1b.h
+include/lzo1c.h
+include/lzo1f.h
+include/lzo1x.h
+include/lzo1y.h
+include/lzo1z.h
+include/lzo2a.h
+include/lzoconf.h
+include/lzoutil.h
 lib/liblzo.a
 lib/liblzo.so
-lib/liblzo.so.2
+lib/liblzo.so.1
+%%PORTDOCS%%%%DOCSDIR%%/LTEST.TXT
 %%PORTDOCS%%%%DOCSDIR%%/LZO.FAQ
 %%PORTDOCS%%%%DOCSDIR%%/LZO.TXT
 %%PORTDOCS%%%%DOCSDIR%%/LZOAPI.TXT
-%%PORTDOCS%%%%DOCSDIR%%/LZOTEST.TXT
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/lzo