Backport a change from 1.5.22 to 1.5.18 that fixes some issues withtv_libtool_1_5_18_tmpdirfix

temp dir creation when using relink-based finalization.

13 files changed, 0 insertions, 357 deletions

diff --git a/www/htdig/DESCR b/www/htdig/DESCR
deleted file mode 100644
index aedb7500b8a..00000000000
--- a/www/htdig/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The ht://Dig system is a complete world wide web indexing and searching
-system for a small domain or intranet.
diff --git a/www/htdig/INSTALL b/www/htdig/INSTALL
deleted file mode 100644
index 13332b528bc..00000000000
--- a/www/htdig/INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-#!@SH@
-#
-# $NetBSD: INSTALL,v 1.1 2003/12/18 04:05:28 grant Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
-	${PREFIX}/bin/htfuzzy -v synonyms
-	${PREFIX}/bin/htfuzzy -v endings
-	;;
-esac
diff --git a/www/htdig/MESSAGE b/www/htdig/MESSAGE
deleted file mode 100644
index 67d41825feb..00000000000
--- a/www/htdig/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/12/18 04:05:28 grant Exp $
-
-The sample ${PREFIX}/bin/rundig script may be run to create a database
-in the newly created empty directory, ${DBDIR}. A sample search
-form, which may be used to search that database, has been installed to
-${PREFIX}/share/examples/htdig/search.html.
-
-For an example of how to set up ht://Dig and integrate it with your web
-site, you may wish to examine the scripts installed into
-/var/wwwoffle/html/htdig/scripts by the www/wwwoffle package.
-
-===========================================================================
diff --git a/www/htdig/Makefile b/www/htdig/Makefile
deleted file mode 100644
index 446bfc98de6..00000000000
--- a/www/htdig/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2005/05/17 22:00:13 jlam Exp $
-
-DISTNAME=	htdig-3.1.6
-PKGREVISION=	3
-CATEGORIES=	www databases
-MASTER_SITES=	http://www.htdig.org/files/ \
-		ftp://ftp.htdig.org/ \
-		${MASTER_SITE_SOURCEFORGE:=files/} \
-		${MASTER_SITE_SOURCEFORGE:=pub/sourceforge/htdig/} \
-		http://htdig.europeanservers.net/files/ \
-		http://www.it.htdig.org/files/ \
-		ftp://www.it.htdig.org/pub/htdig/ \
-		http://www.opdenbrouw.nl/htdig/maindocs/files/
-EXTRACT_SUFX=	.tar.gz
-
-MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://htdig.sourceforge.net/
-COMMENT=	WWW indexing and searching system
-
-USE_PKGINSTALL=	YES
-USE_LANGUAGES=	c c++
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \
-		--with-common-dir=${PREFIX}/share/htdig/common \
-		--with-config-dir=${PKG_SYSCONFDIR} \
-		--with-database-dir=${DBDIR} \
-		--with-image-dir=${PREFIX}/share/examples/htdig \
-		--with-search-dir=${PREFIX}/share/examples/htdig
-CONFIGURE_ENV+=	PDF_PARSER="${LOCALBASE}/bin/acroread"
-CXXFLAGS+=	-Wno-deprecated
-CPPFLAGS+=	${CXXFLAGS}
-
-INSTALL_EXTRA_TMPL=     ${PKGDIR}/INSTALL
-PKG_SYSCONFSUBDIR=	htdig
-
-DBDIR?=		${VARBASE}/db/htdig
-MESSAGE_SUBST+=	DBDIR=${DBDIR}
-OWN_DIRS+=	${DBDIR}
-
-CONF_FILES+=	${PREFIX}/share/examples/htdig/htdig.conf \
-		${PKG_SYSCONFDIR}/htdig.conf
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(EXTRACT_USING:M*tar)
-EXTRACT_CMD_OPTS${EXTRACT_SUFX}=	--exclude ${DISTNAME}/db*
-.elif !empty(EXTRACT_USING:Mpax)
-EXTRACT_CMD_OPTS${EXTRACT_SUFX}=	-c ${DISTNAME}/db*
-.endif
-
-.include "../../databases/db/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-
-post-patch:
-	${TOUCH} ${WRKSRC}/configure
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/htdig/PLIST b/www/htdig/PLIST
deleted file mode 100644
index 23dcf7ed9fc..00000000000
--- a/www/htdig/PLIST
+++ /dev/null
@@ -1,58 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2005/04/19 00:28:31 wiz Exp $
-bin/htfuzzy
-bin/htdig
-bin/htdump
-bin/htload
-bin/htmerge
-bin/htnotify
-bin/rundig
-libexec/cgi-bin/htsearch
-share/examples/htdig/htdig.conf
-share/examples/htdig/search.html
-share/examples/htdig/button1.gif
-share/examples/htdig/button2.gif
-share/examples/htdig/button3.gif
-share/examples/htdig/button4.gif
-share/examples/htdig/button5.gif
-share/examples/htdig/button6.gif
-share/examples/htdig/button7.gif
-share/examples/htdig/button8.gif
-share/examples/htdig/button9.gif
-share/examples/htdig/buttonl.gif
-share/examples/htdig/buttonr.gif
-share/examples/htdig/button10.gif
-share/examples/htdig/htdig.gif
-share/examples/htdig/star.gif
-share/examples/htdig/star_blank.gif
-share/examples/htdig/button1.png
-share/examples/htdig/button2.png
-share/examples/htdig/button3.png
-share/examples/htdig/button4.png
-share/examples/htdig/button5.png
-share/examples/htdig/button6.png
-share/examples/htdig/button7.png
-share/examples/htdig/button8.png
-share/examples/htdig/button9.png
-share/examples/htdig/buttonl.png
-share/examples/htdig/buttonr.png
-share/examples/htdig/button10.png
-share/examples/htdig/htdig.png
-share/examples/htdig/star.png
-share/examples/htdig/star_blank.png
-share/htdig/common/header.html
-share/htdig/common/footer.html
-share/htdig/common/wrapper.html
-share/htdig/common/nomatch.html
-share/htdig/common/syntax.html
-share/htdig/common/long.html
-share/htdig/common/short.html
-share/htdig/common/bad_words
-share/htdig/common/english.0
-share/htdig/common/english.aff
-share/htdig/common/synonyms
-share/htdig/common/synonyms.db
-@unexec ${RM} %D/share/htdig/common/root2word.db
-@unexec ${RM} %D/share/htdig/common/word2root.db
-@dirrm share/htdig/common
-@dirrm share/htdig
-@dirrm share/examples/htdig
diff --git a/www/htdig/distinfo b/www/htdig/distinfo
deleted file mode 100644
index 660af3c4893..00000000000
--- a/www/htdig/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/03/20 20:34:27 salo Exp $
-
-SHA1 (htdig-3.1.6.tar.gz) = 603fc244ba59ee1efcbe8f2ba087567cb14468d0
-RMD160 (htdig-3.1.6.tar.gz) = 1414943255f16cd278a31b8014a5bfe6c4400ead
-Size (htdig-3.1.6.tar.gz) = 2068675 bytes
-SHA1 (patch-ab) = 504136ce6ac0a2beed574c88ee6d9b8ef90d6564
-SHA1 (patch-ac) = d1f6ef3c4c7a2995217f391a4bf9d544e10f5a00
-SHA1 (patch-ad) = a727a2c3afdd697f0e2e46355f1e89bc70775bbf
-SHA1 (patch-ae) = 1be8e82b97bb9b16dcc301f3f02e642a41945878
-SHA1 (patch-af) = f9c83efb788cb735f42df606ee451324795140d6
-SHA1 (patch-ag) = d3c0c1b043e27706834aecf7ac0b07651ed5b438
-SHA1 (patch-ah) = e4df51f19717527c3a368cdcaffb4f3c8e7be521
diff --git a/www/htdig/patches/patch-ab b/www/htdig/patches/patch-ab
deleted file mode 100644
index b871778e45b..00000000000
--- a/www/htdig/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/03/09 21:48:12 fredb Exp $
-
---- Makefile.in.orig	Thu Jan 31 17:47:14 2002
-+++ Makefile.in
-@@ -26,8 +26,7 @@
- top_builddir= .
- include Makefile.config
- 
--DIRS=		db/dist \
--		htlib htcommon htfuzzy htdig \
-+DIRS=		htlib htcommon htfuzzy htdig \
- 		htsearch htmerge htnotify
- INSTALLDIRS=	htfuzzy htdig \
- 		htsearch htmerge htnotify
-@@ -93,7 +92,7 @@
- 	done && test -z "$$fail"
- 	@echo ""
- 	@echo "Installing default configuration files..."
--	@if [ ! -f $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE) ]; then sed -e s%\@DATABASE_DIR\@%$(DATABASE_DIR)% -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE); echo $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE);fi
-+	@if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf ]; then sed -e s%\@DATABASE_DIR\@%$(DATABASE_DIR)% -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf; echo $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE);fi
- 	@if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM) ]; then sed -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/search.html >$(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM); echo $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM);fi
- 	@for i in $(COMMONHTML); do \
- 		if [ ! -f $(INSTALL_ROOT)$(COMMON_DIR)/$$i ]; then sed -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/$$i >$(INSTALL_ROOT)$(COMMON_DIR)/$$i; echo $(INSTALL_ROOT)$(COMMON_DIR)/$$i;fi; \
diff --git a/www/htdig/patches/patch-ac b/www/htdig/patches/patch-ac
deleted file mode 100644
index 6141fd2bbd0..00000000000
--- a/www/htdig/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/09/23 01:33:30 fredb Exp $
-
---- Makefile.config.in.orig	Wed Apr 21 21:47:53 1999
-+++ Makefile.config.in	Wed Sep 22 06:18:03 1999
-@@ -24,12 +24,11 @@
- SENDMAIL=	@SENDMAIL@
- 
- DEFINES=	-DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
--LIBDIRS=	-L../htlib -L../htcommon -L../db/dist -L/usr/lib
-+LIBDIRS=	-L../htlib -L../htcommon
- INCS=		-I$(top_srcdir)/htlib -I$(top_srcdir)/htcommon \
--		-I../db/dist -I../include
-+		-I$(prefix)/include/db2 -I../include
- HTLIBS=		../htcommon/libcommon.a \
--		../htlib/libht.a \
--		../db/dist/libdb.a
-+		../htlib/libht.a
- LIBS=		$(HTLIBS) @LIBS@
- 
- DIST=		@PACKAGE@-@VERSION@
diff --git a/www/htdig/patches/patch-ad b/www/htdig/patches/patch-ad
deleted file mode 100644
index 4460913f04b..00000000000
--- a/www/htdig/patches/patch-ad
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/03/09 21:48:12 fredb Exp $
-
-Note to Porters
-===============
-
-This patch isn't actually used by the package, rather it's included for
-the convenience of the packagers. If the subsequent patch to configure
-fails, the patched configure.in can be used to regenerate configure.
-
---- configure.in.orig	Wed Apr 21 21:47:53 1999
-+++ configure.in	Tue Sep 21 15:43:57 1999
-@@ -64,6 +64,7 @@
- AC_AIX
- 
- dnl Checks for libraries.
-+AC_CHECK_LIB(db2, db_appinit)
- AC_CHECK_LIB(socket, socket)
- AC_CHECK_LIB(nsl, t_accept)
- if test $WITH_ZLIB = yes; then
-@@ -140,7 +141,7 @@
- if test ! -d "./db"; then
-   mkdir db
- fi
--AC_CONFIG_SUBDIRS(db/dist)
-+dnl AC_CONFIG_SUBDIRS(db/dist)
- 
- AC_OUTPUT(CONFIG Makefile Makefile.config htcommon/Makefile htlib/Makefile htdig/Makefile htmerge/Makefile htnotify/Makefile htfuzzy/Makefile htsearch/Makefile makedp, chmod +x makedp, echo timestamp > stamp-h)
- 
diff --git a/www/htdig/patches/patch-ae b/www/htdig/patches/patch-ae
deleted file mode 100644
index 1453bfad23e..00000000000
--- a/www/htdig/patches/patch-ae
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/03/09 21:48:12 fredb Exp $
-
---- configure.orig	Thu Jan 31 17:47:14 2002
-+++ configure
-@@ -1761,6 +1761,53 @@
- 
- 
- 
-+echo $ac_n "checking for db_appinit in -ldb2""... $ac_c" 1>&6
-+echo "configure:1766: checking for db_appinit in -ldb2" >&5
-+ac_lib_var=`echo db2'_'db_appinit | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-ldb2  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1774 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char db_appinit();
-+
-+int main() {
-+db_appinit()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_lib=HAVE_LIB`echo db2 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_lib 1
-+EOF
-+
-+  LIBS="-ldb2 $LIBS"
-+
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
- echo "configure:1766: checking for socket in -lsocket" >&5
- ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
-@@ -2633,10 +2680,10 @@
- cross_compiling=$ac_cv_prog_cc_cross
- 
- 
--if test ! -d "./db"; then
--  mkdir db
--fi
--subdirs="db/dist"
-+#if test ! -d "./db"; then
-+#  mkdir db
-+#fi
-+#subdirs="db/dist"
- 
- 
- trap '' 1 2 15
-@@ -2807,7 +2854,7 @@
- s%@CPP@%$CPP%g
- s%@CXXCPP@%$CXXCPP%g
- s%@LIBOBJS@%$LIBOBJS%g
--s%@subdirs@%$subdirs%g
-+#s%@subdirs@%$subdirs%g
- 
- CEOF
- EOF
-@@ -3027,7 +3074,7 @@
- rm -fr confdefs* $ac_clean_files
- test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
- 
--if test "$no_recursion" != yes; then
-+if false; then
- 
-   # Remove --cache-file and --srcdir arguments so they do not pile up.
-   ac_sub_configure_args=
diff --git a/www/htdig/patches/patch-af b/www/htdig/patches/patch-af
deleted file mode 100644
index 366ae85780e..00000000000
--- a/www/htdig/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/03/20 20:34:27 salo Exp $
-
---- htsearch/htsearch.cc.orig	2002-02-01 00:47:18.000000000 +0100
-+++ htsearch/htsearch.cc	2005-03-20 21:15:02.000000000 +0100
-@@ -145,8 +145,7 @@
-     if (access(configFile, R_OK) < 0)
-     {
- 	if (filenameok) filenamemsg << " '" << configFile.get() << "'";
--	reportError(form("Unable to read configuration file%s",
--			 filenamemsg.get()));
-+	reportError(form("Unable to read configuration file."));
-     }
-     config.Read(configFile);
- 
diff --git a/www/htdig/patches/patch-ag b/www/htdig/patches/patch-ag
deleted file mode 100644
index 475841a3c97..00000000000
--- a/www/htdig/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/03/20 20:34:27 salo Exp $
-
---- htfuzzy/htfuzzy.cc.orig	2002-02-01 00:47:17.000000000 +0100
-+++ htfuzzy/htfuzzy.cc	2005-03-20 21:16:14.000000000 +0100
-@@ -148,8 +148,7 @@
-     config.Defaults(&defaults[0]);
-     if (access(configFile, R_OK) < 0)
-     {
--	reportError(form("Unable to find configuration file '%s'",
--			 configFile.get()));
-+	reportError(form("Unable to find configuration file."));
-     }
-     config.Read(configFile);
- 
diff --git a/www/htdig/patches/patch-ah b/www/htdig/patches/patch-ah
deleted file mode 100644
index 6aceb28ffd7..00000000000
--- a/www/htdig/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/03/20 20:34:27 salo Exp $
-
---- htmerge/htmerge.cc.orig	2002-02-01 00:47:18.000000000 +0100
-+++ htmerge/htmerge.cc	2005-03-20 21:24:02.000000000 +0100
-@@ -116,8 +116,7 @@
- 
-     if (access(configfile, R_OK) < 0)
-     {
--	reportError(form("Unable to find configuration file '%s'",
--			 configfile.get()));
-+	reportError(form("Unable to find configuration file."));
-     }
- 	
-     config.Read(configfile);