- sync buildlink2.mk with reality

- DESCR has 80 culumns, no need for saying about license here
- style nits

3 files changed, 30 insertions, 31 deletions

diff --git a/archivers/liblzo/DESCR b/archivers/liblzo/DESCR
index f6dfa5d3f38..eca5695c19e 100644
--- a/archivers/liblzo/DESCR
+++ b/archivers/liblzo/DESCR
@@ -1,11 +1,5 @@
-    LZO is a portable lossless data compression library written in ANSI C.
-It offers pretty fast compression and *very* fast decompression.
-Decompression requires no memory.
-
-    In addition, there are slower compression levels achieving a quite
-competitive compression ratio while still decompressing at this very high
-speed.
-
-    LZO is distributed under the terms of the GNU General Public License (GPL)
-Special licenses for commercial and other applications are available by
-contacting the author.
+LZO is a portable lossless data compression library written in ANSI C.  It
+offers pretty fast compression and *very* fast decompression.  Decompression
+requires no memory.  In addition, there are slower compression levels
+achieving a quite competitive compression ratio while still decompressing at
+this very high speed.
diff --git a/archivers/liblzo/Makefile b/archivers/liblzo/Makefile
index e73fbbff9c3..22e3fcde1a3 100644
--- a/archivers/liblzo/Makefile
+++ b/archivers/liblzo/Makefile
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile,v 1.11 2003/05/08 09:41:29 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/05/14 02:11:25 salo Exp $
 #
 
-VERS=			1.08
-DISTNAME=		lzo-${VERS}
-PKGNAME=		liblzo-${VERS}
-CATEGORIES=		archivers
-MASTER_SITES=		http://www.oberhumer.com/opensource/lzo/download/ \
-			ftp://ftp.elf.stuba.sk/pub/pc/pack/
+DISTNAME=	lzo-1.08
+PKGNAME=	lib${DISTNAME}
+CATEGORIES=	archivers
+MASTER_SITES=	http://www.oberhumer.com/opensource/lzo/download/ \
+		ftp://ftp.elf.stuba.sk/pub/pc/pack/
 
-MAINTAINER=		rh@netbsd.org
-HOMEPAGE=		http://www.oberhumer.com/opensource/lzo/
-COMMENT=		Portable lossless data compression library written in ANSI C
+MAINTAINER=	rh@netbsd.org
+HOMEPAGE=	http://www.oberhumer.com/opensource/lzo/
+COMMENT=	Portable lossless data compression library written in ANSI C
+
+USE_BUILDLINK2=	YES
+GNU_CONFIGURE=	YES
+USE_LIBTOOL=	YES
 
-USE_BUILDLINK2=		# defined
-GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 # Don't spuriously detect zlib, as it's not needed for the library.
-CONFIGURE_ENV+=		ac_cv_lib_z_gzputs=no
+CONFIGURE_ENV+=	ac_cv_lib_z_gzputs=no
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/liblzo/buildlink2.mk b/archivers/liblzo/buildlink2.mk
index c2d9808fb42..b8c5b4ec6d4 100644
--- a/archivers/liblzo/buildlink2.mk
+++ b/archivers/liblzo/buildlink2.mk
@@ -1,15 +1,20 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 21:49:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/05/14 02:11:25 salo Exp $
+#
+# This Makefile fragment is included by packages that use liblzo.
+#
+# This file was created automatically using createbuildlink 2.6.
+#
 
 .if !defined(LIBLZO_BUILDLINK2_MK)
 LIBLZO_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		liblzo
-BUILDLINK_DEPENDS.liblzo?=	liblzo>=1.06
-BUILDLINK_PKGSRCDIR.liblzo?=	../../archivers/liblzo
+BUILDLINK_PACKAGES+=			liblzo
+BUILDLINK_DEPENDS.liblzo?=		liblzo>=1.08
+BUILDLINK_PKGSRCDIR.liblzo?=		../../archivers/liblzo
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.liblzo=liblzo
 BUILDLINK_PREFIX.liblzo_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.liblzo=		include/lzo1.h
+BUILDLINK_FILES.liblzo+=	include/lzo1.h
 BUILDLINK_FILES.liblzo+=	include/lzo16bit.h
 BUILDLINK_FILES.liblzo+=	include/lzo1a.h
 BUILDLINK_FILES.liblzo+=	include/lzo1b.h
@@ -23,7 +28,7 @@ BUILDLINK_FILES.liblzo+=	include/lzoconf.h
 BUILDLINK_FILES.liblzo+=	include/lzoutil.h
 BUILDLINK_FILES.liblzo+=	lib/liblzo.*
 
-BUILDLINK_TARGETS+=		liblzo-buildlink
+BUILDLINK_TARGETS+=	liblzo-buildlink
 
 liblzo-buildlink: _BUILDLINK_USE