Fixed some pkglint warnings.

4 files changed, 19 insertions, 26 deletions

diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index b744f74e98e..5c4349d57c3 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/06/17 21:36:01 rillig Exp $
 #
 
 DISTNAME=	tla-1.3.3
@@ -18,29 +18,22 @@ DEPENDS+=	gtar-base-[0-9]*:../../archivers/gtar-base
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/=build
 USE_TOOLS+=	gmake
 
 HAS_CONFIGURE=		yes
+OVERRIDE_GNU_CONFIG_SCRIPTS=	yes
+CONFIGURE_DIRS=		src/=build
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+= --with-gnu-diff=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff
-CONFIGURE_ARGS+= --with-gnu-diff3=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff3
-CONFIGURE_ARGS+= --with-gnu-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
-CONFIGURE_ARGS+= --with-gnu-tar=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--with-gnu-diff=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff
+CONFIGURE_ARGS+=	--with-gnu-diff3=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff3
+CONFIGURE_ARGS+=	--with-gnu-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
+CONFIGURE_ARGS+=	--with-gnu-tar=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}tar
 
-DOCDIR=	${PREFIX}/share/doc/tla
+DOCDIR=			${PREFIX}/share/doc/tla
 
 post-extract:
-	${MKDIR} ${WRKSRC}
-
-pre-configure:
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/../build-tools/gnu/
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/../build-tools/gnu/
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/../expat/conftools/
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/../expat/conftools/
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/../libneon/
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/../libneon/
+	cd ${WRKSRC} && ${MKDIR} ${CONFIGURE_DIRS}
 
 post-install:
 	# Install arch documentation.
diff --git a/devel/tla/distinfo b/devel/tla/distinfo
index 6be76231c5c..8f276047fbb 100644
--- a/devel/tla/distinfo
+++ b/devel/tla/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2005/06/26 14:57:31 recht Exp $
+$NetBSD: distinfo,v 1.12 2006/06/17 21:36:01 rillig Exp $
 
 SHA1 (tla-1.3.3.tar.gz) = 1da1148ba91682bcb8da5a535bef29efced3d1bd
 RMD160 (tla-1.3.3.tar.gz) = 4fa4b95b8704a8996c91e3dcce85bc01bf8e815f
 Size (tla-1.3.3.tar.gz) = 4202834 bytes
-SHA1 (patch-aa) = f41250fbe00b1a88da78d88ca4d81df241d45f28
-SHA1 (patch-ab) = 36c006d072d350d729dc29dd8d6159c8463eed9a
+SHA1 (patch-aa) = 8ecbf408a7c6dd3389d5746c3667f356fe77a724
+SHA1 (patch-ab) = 9dc02ebba8ca0fad49f3ada43ec319233676962a
diff --git a/devel/tla/patches/patch-aa b/devel/tla/patches/patch-aa
index 4c94e5932fa..c359260b706 100644
--- a/devel/tla/patches/patch-aa
+++ b/devel/tla/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2005/05/10 21:10:24 recht Exp $
+$NetBSD: patch-aa,v 1.2 2006/06/17 21:36:01 rillig Exp $
 
---- ../libneon/Makefile.in.orig	2005-05-03 01:46:50.000000000 +0200
-+++ ../libneon/Makefile.in	2005-05-08 12:31:16.000000000 +0200
+--- src/libneon/Makefile.in.orig	2005-05-03 01:46:50.000000000 +0200
++++ src/libneon/Makefile.in	2005-05-08 12:31:16.000000000 +0200
 @@ -33,7 +33,7 @@
  
  @SET_MAKE@
diff --git a/devel/tla/patches/patch-ab b/devel/tla/patches/patch-ab
index 3e153a52371..855b997b01d 100644
--- a/devel/tla/patches/patch-ab
+++ b/devel/tla/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2005/05/10 21:10:24 recht Exp $
+$NetBSD: patch-ab,v 1.2 2006/06/17 21:36:01 rillig Exp $
 
---- ../libneon/src/Makefile.in.orig	2005-05-03 01:46:54.000000000 +0200
-+++ ../libneon/src/Makefile.in	2005-05-08 12:31:18.000000000 +0200
+--- src/libneon/src/Makefile.in.orig	2005-05-03 01:46:54.000000000 +0200
++++ src/libneon/src/Makefile.in	2005-05-08 12:31:18.000000000 +0200
 @@ -26,7 +26,7 @@
  # Flags
  CPPFLAGS = @DEFS@ @CPPFLAGS@