Fixed perl detection and some pkglint warnings.

4 files changed, 57 insertions, 7 deletions

diff --git a/textproc/kdoc/Makefile b/textproc/kdoc/Makefile
index 270c913f2eb..96282f29667 100644
--- a/textproc/kdoc/Makefile
+++ b/textproc/kdoc/Makefile
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:11:03 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/11/12 01:44:57 rillig Exp $
 
 DISTNAME=	kdoc-2.0a54
 PKGNAME=	kdoc-3.0
 PKGREVISION=	2
 CATEGORIES=	textproc kde
 
-MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/3.0/src/ \
-		ftp://ftp.us.kde.org/pub/kde/stable/3.0/src/ \
-		ftp://ftp.uk.kde.org/pub/kde/stable/3.0/src/ \
-		ftp://ftp.de.kde.org/pub/kde/stable/3.0/src/
-
+MASTER_SITES=	${MASTER_SITE_KDE:=3.0/src/}
 MAINTAINER=	wulf@NetBSD.org
 COMMENT=	C++ and IDL Class Documentation Tool
 
diff --git a/textproc/kdoc/distinfo b/textproc/kdoc/distinfo
index f265061c9c1..dc4052a56f1 100644
--- a/textproc/kdoc/distinfo
+++ b/textproc/kdoc/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/05/25 13:42:45 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/11/12 01:44:57 rillig Exp $
 
 SHA1 (kdoc-2.0a54.tar.bz2) = f11e9a30c4c5757833c7633f1e7b907e9cf76ef6
 RMD160 (kdoc-2.0a54.tar.bz2) = 2806c84677da05a60437ceb4ab608adfc0996264
 Size (kdoc-2.0a54.tar.bz2) = 92430 bytes
+SHA1 (patch-aa) = f370a5bc76cca9944c8ceb82195d3b72a3b23c27
+SHA1 (patch-ab) = 4e69374440de0a14330baf62b17ba5ee6f1dadb0
diff --git a/textproc/kdoc/patches/patch-aa b/textproc/kdoc/patches/patch-aa
new file mode 100644
index 00000000000..3ebadaece08
--- /dev/null
+++ b/textproc/kdoc/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.3 2006/11/12 01:44:57 rillig Exp $
+
+--- configure.orig	2006-11-12 02:33:24.000000000 +0100
++++ configure	2006-11-12 02:42:24.000000000 +0100
+@@ -988,15 +988,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-echo "$as_me:991: checking for perl 5.6 or greater" >&5
+-echo $ECHO_N "checking for perl 5.6 or greater... $ECHO_C" >&6
+-if $srcdir/findperl; then
+-	perl=`cat perlbin`
+-	echo $perl
+-else
+-	echo "Couldn't find perl 5.6 or later. kdoc will not run."
+-	exit 1
+-fi
++perl=$PERL
+ 
+ echo "$as_me:1001: checking kdoc version" >&5
+ echo $ECHO_N "checking kdoc version... $ECHO_C" >&6
diff --git a/textproc/kdoc/patches/patch-ab b/textproc/kdoc/patches/patch-ab
new file mode 100644
index 00000000000..cff72e8ebdd
--- /dev/null
+++ b/textproc/kdoc/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2006/11/12 01:44:57 rillig Exp $
+
+--- configure.in.orig	2001-02-19 22:24:37.000000000 +0100
++++ configure.in	2006-11-12 02:41:33.000000000 +0100
+@@ -1,16 +1,6 @@
+ AC_INIT(src/qt2kdoc)
+ 
+-AC_DEFUN(AC_FIND_PERL,
+-[
+-AC_MSG_CHECKING(for perl 5.6 or greater)
+-if $srcdir/findperl; then
+-	$1=`cat perlbin`
+-	echo $$1
+-else
+-	echo "Couldn't find perl 5.6 or later. kdoc will not run."
+-	exit 1
+-fi	
+-])
++AC_PATH_PROG(PERL, perl)
+ 
+ AC_DEFUN(AC_KDOC_VERSION,
+ [
+@@ -34,7 +24,7 @@ AC_SUBST(htmldir)
+   
+ 
+ AC_PROG_INSTALL
+-AC_FIND_PERL(perl)
++perl=$PERL
+ AC_SUBST(perl)
+ AC_KDOC_VERSION(Version)
+ AC_SUBST(Version)