Uppdate to 1.6.0

Approved by:	krion (mentor) (implicitly)

6 files changed, 54 insertions, 46 deletions

diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index e93ef831a627..f244e6065928 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	libtecla
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.6.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.astro.caltech.edu/~mcs/tecla/
 
@@ -16,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive command line editing facilities
 
 USE_SUBMAKE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOCONF_VER=	253
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	default
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
@@ -32,7 +31,7 @@ PLIST_SUB+=	THREADS=""
 .endif
 
 post-extract:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/genman3list.sh
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/genmanlist.sh
 
 post-clean:
 	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
diff --git a/devel/libtecla/distinfo b/devel/libtecla/distinfo
index aada8ba88d3b..48dbacab2d37 100644
--- a/devel/libtecla/distinfo
+++ b/devel/libtecla/distinfo
@@ -1,2 +1,2 @@
-MD5 (libtecla-1.4.1.tar.gz) = dc0c5cf7fa6130dddf4d3080262c352d
-SIZE (libtecla-1.4.1.tar.gz) = 343126
+MD5 (libtecla-1.6.0.tar.gz) = 4dbfe11c026e20e3e2352ce2b1573363
+SIZE (libtecla-1.6.0.tar.gz) = 513586
diff --git a/devel/libtecla/files/patch-configure.in b/devel/libtecla/files/patch-configure.in
deleted file mode 100644
index d66d71ce5737..000000000000
--- a/devel/libtecla/files/patch-configure.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in.orig	Wed Nov 13 18:46:39 2002
-+++ configure.in	Wed Nov 13 18:43:42 2002
-@@ -365,6 +365,13 @@
- *dec-osf*)
-   AC_DEFINE(_OSF_SOURCE)
-   ;;
-+*freebsd*)
-+  SHARED_EXT=".so.${MAJOR_VER}"
-+  SHARED_ALT=".so"
-+  VERSION_OPT='--version-script=$$(srcdir)/libtecla.map'
-+  LINK_SHARED='ld -o $$@ -soname libtecla$$(SUFFIX).so.'${MAJOR_VER}' -shared '$VERSION_OPT' $$(LIB_OBJECTS) $$(LIBS) -lc'
-+  SHARED_CFLAGS="-fpic"
-+  ;;
- esac
- 
- dnl The following statement checks to see if the GNU C compiler has
diff --git a/devel/libtecla/files/patch-getline.c b/devel/libtecla/files/patch-getline.c
index 59b80ec89c7d..bb05e2e739ea 100644
--- a/devel/libtecla/files/patch-getline.c
+++ b/devel/libtecla/files/patch-getline.c
@@ -1,10 +1,12 @@
---- getline.c.orig	Wed Feb 13 11:36:13 2002
-+++ getline.c	Tue May  6 04:09:17 2003
-@@ -45,6 +45,7 @@
-  */
- #include <sys/ioctl.h>
- #ifdef HAVE_SELECT
-+#include <sys/select.h>
- #include <sys/time.h>
- #include <sys/types.h>
+--- getline.c.orig	Sun Jul 18 13:44:44 2004
++++ getline.c	Sun Jul 18 13:44:49 2004
+@@ -9045,8 +9045,8 @@
+       return 1;
+   };
+   return 0;
+-}
  #endif
++}
+ 
+ #if defined(HAVE_SELECT)
+ /*.......................................................................
diff --git a/devel/libtecla/scripts/genman3list.sh b/devel/libtecla/scripts/genman3list.sh
deleted file mode 100644
index 88263165cafd..000000000000
--- a/devel/libtecla/scripts/genman3list.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
-exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-
-cd ${WRKDIRPREFIX}${REALCURDIR}/work/${PORTNAME}/man3
-echo "MAN3=	\\"
-#echo *.3
-ls *.3 | sed 's,$,\\,'
-echo
diff --git a/devel/libtecla/scripts/genmanlist.sh b/devel/libtecla/scripts/genmanlist.sh
new file mode 100644
index 000000000000..54288e690d15
--- /dev/null
+++ b/devel/libtecla/scripts/genmanlist.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+# $FreeBSD: /tmp/pcvs/ports/devel/libtecla/scripts/genmanlist.sh,v 1.1 2004-07-18 10:06:01 sem Exp $
+
+if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
+	exit
+fi
+
+exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
+
+cd ${WRKDIRPREFIX}${REALCURDIR}/work/${PORTNAME}/man
+echo "MAN3=	\\"
+for n in libr/*.in; do
+	page=`basename "$n" .in`;
+	echo "$page.3 \\"
+done
+for n in func/*.in; do
+	page=`basename "$n" .in`;
+	echo "$page.3 \\"
+done
+echo
+echo "MAN1=	\\"
+for n in prog/*.in; do
+	page=`basename "$n" .in`;
+	echo "$page.1 \\"
+done
+echo
+echo "MAN5=	\\"
+for n in file/*.in; do
+	page=`basename "$n" .in`;
+	echo "$page.5 \\"
+done
+echo
+echo "MAN7=	\\"
+for n in misc/*.in; do
+	page=`basename "$n" .in`;
+	echo "$page.7 \\"
+done
+echo