- Fix MASTER_SITES

- Remove CONFIGURE_ARGS that are already the default
- Support CFLAGS properly
- Add a file missing from PLISt
- Remove two unneeded patches (for libtool stuff)

PR:		14901
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 88 insertions, 6 deletions

diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index 91088f28f8de..77b8b2121b04 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -9,14 +9,13 @@
 DISTNAME=	lzo-1.04
 CATEGORIES=	archivers devel
 MASTER_SITES= 	${MASTER_SITE_SUNSITE} \
-		ftp://wildsau.idv.uni-linz.ac.at/pub/mfx/lzo/
+		http://wildsau.idv.uni-linz.ac.at/mfx/lzo-download/
 MASTER_SITE_SUBDIR=	libs/compression
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS+= 	--enable-shared=yes \
-  			--enable-asm=yes
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/lzo
diff --git a/archivers/lzo/files/patch-ac b/archivers/lzo/files/patch-ac
new file mode 100644
index 000000000000..95a451e6ccf5
--- /dev/null
+++ b/archivers/lzo/files/patch-ac
@@ -0,0 +1,41 @@
+--- configure.orig	Sat Nov 13 11:17:25 1999
++++ configure	Sat Nov 13 11:23:32 1999
+@@ -1141,9 +1141,9 @@
+   if test "$ac_test_CFLAGS" = set; then
+     CFLAGS="$ac_save_CFLAGS"
+   elif test $ac_cv_prog_cc_g = yes; then
+-    CFLAGS="-g -O2"
++    CFLAGS="-g"
+   else
+-    CFLAGS="-O2"
++    CFLAGS=""
+   fi
+ else
+   GCC=
+@@ -3036,7 +3036,7 @@
+ 
+ if test "$ac_cv_prog_gcc" = yes; then
+ mfx_save_cflags="$CFLAGS"
+-CFLAGS="$CFLAGS -O2 -fschedule-insns -fschedule-insns2"
++CFLAGS="$CFLAGS -fschedule-insns -fschedule-insns2"
+ echo $ac_n "checking whether ${CC-cc} suffers the -fschedule-insns bug""... $ac_c" 1>&6
+ echo "configure:3042: checking whether ${CC-cc} suffers the -fschedule-insns bug" >&5
+ if eval "test \"`echo '$''{'mfx_cv_prog_gcc_bug_schedule_insns'+set}'`\" = set"; then
+@@ -3079,7 +3079,7 @@
+ 
+ if test "$ac_cv_prog_gcc" = yes; then
+ mfx_save_cflags="$CFLAGS"
+-CFLAGS="$CFLAGS -O2 -fstrength-reduce"
++CFLAGS="$CFLAGS -fstrength-reduce"
+ echo $ac_n "checking whether ${CC-cc} suffers the -fstrength-reduce bug""... $ac_c" 1>&6
+ echo "configure:3085: checking whether ${CC-cc} suffers the -fstrength-reduce bug" >&5
+ if eval "test \"`echo '$''{'mfx_cv_prog_gcc_bug_strength_reduce'+set}'`\" = set"; then
+@@ -3167,7 +3167,7 @@
+ 
+ if test "$GCC" = yes; then
+   M_CC="GCC"
+-  CFLAGS_O="-O2"
++  CFLAGS_O=""
+   CFLAGS_W="-Wall -Wcast-align -Wwrite-strings"
+   case $host in
+     i[34567]86-*)
diff --git a/archivers/lzo/pkg-plist b/archivers/lzo/pkg-plist
index 4732d1559c89..ddcf9d4e328b 100644
--- a/archivers/lzo/pkg-plist
+++ b/archivers/lzo/pkg-plist
@@ -9,6 +9,7 @@ include/lzo1y.h
 include/lzo1z.h
 include/lzo2a.h
 include/lzoconf.h
+include/lzoutil.h
 lib/liblzo.a
 lib/liblzo.so
 lib/liblzo.so.1
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 91088f28f8de..77b8b2121b04 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -9,14 +9,13 @@
 DISTNAME=	lzo-1.04
 CATEGORIES=	archivers devel
 MASTER_SITES= 	${MASTER_SITE_SUNSITE} \
-		ftp://wildsau.idv.uni-linz.ac.at/pub/mfx/lzo/
+		http://wildsau.idv.uni-linz.ac.at/mfx/lzo-download/
 MASTER_SITE_SUBDIR=	libs/compression
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS+= 	--enable-shared=yes \
-  			--enable-asm=yes
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/lzo
diff --git a/archivers/lzo2/files/patch-ac b/archivers/lzo2/files/patch-ac
new file mode 100644
index 000000000000..95a451e6ccf5
--- /dev/null
+++ b/archivers/lzo2/files/patch-ac
@@ -0,0 +1,41 @@
+--- configure.orig	Sat Nov 13 11:17:25 1999
++++ configure	Sat Nov 13 11:23:32 1999
+@@ -1141,9 +1141,9 @@
+   if test "$ac_test_CFLAGS" = set; then
+     CFLAGS="$ac_save_CFLAGS"
+   elif test $ac_cv_prog_cc_g = yes; then
+-    CFLAGS="-g -O2"
++    CFLAGS="-g"
+   else
+-    CFLAGS="-O2"
++    CFLAGS=""
+   fi
+ else
+   GCC=
+@@ -3036,7 +3036,7 @@
+ 
+ if test "$ac_cv_prog_gcc" = yes; then
+ mfx_save_cflags="$CFLAGS"
+-CFLAGS="$CFLAGS -O2 -fschedule-insns -fschedule-insns2"
++CFLAGS="$CFLAGS -fschedule-insns -fschedule-insns2"
+ echo $ac_n "checking whether ${CC-cc} suffers the -fschedule-insns bug""... $ac_c" 1>&6
+ echo "configure:3042: checking whether ${CC-cc} suffers the -fschedule-insns bug" >&5
+ if eval "test \"`echo '$''{'mfx_cv_prog_gcc_bug_schedule_insns'+set}'`\" = set"; then
+@@ -3079,7 +3079,7 @@
+ 
+ if test "$ac_cv_prog_gcc" = yes; then
+ mfx_save_cflags="$CFLAGS"
+-CFLAGS="$CFLAGS -O2 -fstrength-reduce"
++CFLAGS="$CFLAGS -fstrength-reduce"
+ echo $ac_n "checking whether ${CC-cc} suffers the -fstrength-reduce bug""... $ac_c" 1>&6
+ echo "configure:3085: checking whether ${CC-cc} suffers the -fstrength-reduce bug" >&5
+ if eval "test \"`echo '$''{'mfx_cv_prog_gcc_bug_strength_reduce'+set}'`\" = set"; then
+@@ -3167,7 +3167,7 @@
+ 
+ if test "$GCC" = yes; then
+   M_CC="GCC"
+-  CFLAGS_O="-O2"
++  CFLAGS_O=""
+   CFLAGS_W="-Wall -Wcast-align -Wwrite-strings"
+   case $host in
+     i[34567]86-*)
diff --git a/archivers/lzo2/pkg-plist b/archivers/lzo2/pkg-plist
index 4732d1559c89..ddcf9d4e328b 100644
--- a/archivers/lzo2/pkg-plist
+++ b/archivers/lzo2/pkg-plist
@@ -9,6 +9,7 @@ include/lzo1y.h
 include/lzo1z.h
 include/lzo2a.h
 include/lzoconf.h
+include/lzoutil.h
 lib/liblzo.a
 lib/liblzo.so
 lib/liblzo.so.1