- GNU_CONFIGURE -> USE_LIBTOOL

- add missing files
- add more master site by using MASTER_SITE_GNU
- add WWW

PR:		41177
Submitted by:	Ports Fury

5 files changed, 81 insertions, 62 deletions

diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index d409fc09986e..5ea4ff321c79 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -7,19 +7,20 @@
 
 PORTNAME=	mifluz
 PORTVERSION=	0.23.0
+PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.gnu.org/pub/gnu/mifluz/
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libiconv.so:${PORTSDIR}/converters/libiconv
-
-CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
-
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
+		--without-unac
 INSTALLS_SHLIB= yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib
 
 MAN1=	htdb_dump.1 htdb_stat.1 htdb_load.1 mifluzdump.1 mifluzload.1 \
 	mifluzsearch.1 mifluzdict.1
@@ -30,6 +31,14 @@ MAN3=	WordContext.3 WordList.3 WordDict.3 WordListOne.3 WordKey.3 \
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+post-patch:
+	@${REINPLACE_CMD} 's|-D_THREAD_SAFE -pthread|${PTHREAD_CFLAGS}|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+
+pre-build:
+	@cd ${WRKSRC}/doc \
+		&& makeinfo --no-split --force mifluz.texinfo || ${TRUE}
+
 post-install:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${PKGDIR}/pkg-message > \
 	${PKGMESSAGE}
diff --git a/textproc/mifluz/files/patch-configure b/textproc/mifluz/files/patch-configure
index d3c59962518b..23cb43a29ff9 100644
--- a/textproc/mifluz/files/patch-configure
+++ b/textproc/mifluz/files/patch-configure
@@ -1,10 +1,10 @@
---- configure.orig	Mon Jul 23 14:55:39 2001
-+++ configure	Fri Jun  7 10:27:58 2002
-@@ -9336,6 +9336,7 @@
-   LIBICONV=
-   if test "$am_cv_lib_iconv" = yes; then
-     LIBICONV="-liconv"
-+    LIBS="$LIBICONV $LIBS"
-   fi
-   
+--- configure.orig	Mon Jul 23 21:55:39 2001
++++ configure	Mon Jul 29 22:29:47 2002
+@@ -5982,6 +5982,7 @@
  
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/mifluz/files/patch-mifluz::Makefile.in b/textproc/mifluz/files/patch-mifluz::Makefile.in
new file mode 100644
index 000000000000..5d048bf4abf9
--- /dev/null
+++ b/textproc/mifluz/files/patch-mifluz::Makefile.in
@@ -0,0 +1,11 @@
+--- mifluz/Makefile.in.orig	Mon Jul 23 22:12:14 2001
++++ mifluz/Makefile.in	Tue Jul 30 00:26:00 2002
+@@ -147,7 +147,7 @@
+ 
+ 
+ libmifluz_la_LDFLAGS = -version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
+-libmifluz_la_LIBADD = ../db/libdb.la ../clib/libclib.la
++libmifluz_la_LIBADD = ../db/libdb.la ../clib/libclib.la @LIBICONV@
+ 
+ include_HEADERS =  	mifluz.h
+ 
diff --git a/textproc/mifluz/pkg-descr b/textproc/mifluz/pkg-descr
index ee61b85a5710..d4061eca07c8 100644
--- a/textproc/mifluz/pkg-descr
+++ b/textproc/mifluz/pkg-descr
@@ -12,3 +12,5 @@ is that it is fully dynamic (update, delete, insert), uses only a
 controled amount of memory while resolving a query, has higher upper 
 limits and has a simple storage scheme. Consuming more disk space 
 allows all this. 
+
+WWW: http://www.gnu.org/software/mifluz/
diff --git a/textproc/mifluz/pkg-plist b/textproc/mifluz/pkg-plist
index 34cda0fc1f9d..1ecccba277a2 100644
--- a/textproc/mifluz/pkg-plist
+++ b/textproc/mifluz/pkg-plist
@@ -1,17 +1,48 @@
-bin/htdb_load
 bin/htdb_dump
+bin/htdb_load
 bin/htdb_stat
-bin/mifluzdump
 bin/mifluzdict
+bin/mifluzdump
 bin/mifluzload
 bin/mifluzsearch
 etc/mifluz.conf.sample
-include/mifluz/myqsort.h
-include/mifluz/clib.h
+include/mifluz.h
+include/mifluz/Configuration.h
+include/mifluz/Dictionary.h
+include/mifluz/HtMaxMin.h
+include/mifluz/HtTime.h
+include/mifluz/List.h
+include/mifluz/Object.h
+include/mifluz/ParsedString.h
+include/mifluz/StringList.h
+include/mifluz/WordBitCompress.h
+include/mifluz/WordContext.h
+include/mifluz/WordCursor.h
+include/mifluz/WordCursorOne.h
+include/mifluz/WordDB.h
+include/mifluz/WordDBCache.h
+include/mifluz/WordDBCompress.h
+include/mifluz/WordDBInfo.h
+include/mifluz/WordDead.h
+include/mifluz/WordDict.h
+include/mifluz/WordKey.h
+include/mifluz/WordKeyInfo.h
+include/mifluz/WordList.h
+include/mifluz/WordListMulti.h
+include/mifluz/WordListOne.h
+include/mifluz/WordMeta.h
+include/mifluz/WordMonitor.h
+include/mifluz/WordRecord.h
+include/mifluz/WordRecordInfo.h
+include/mifluz/WordReference.h
+include/mifluz/WordType.h
+include/mifluz/ber.h
 include/mifluz/btree.h
 include/mifluz/btree_auto.h
 include/mifluz/btree_ext.h
+include/mifluz/clib.h
 include/mifluz/common_ext.h
+include/mifluz/config.h
 include/mifluz/crdel_auto.h
 include/mifluz/db.h
 include/mifluz/db_am.h
@@ -30,6 +61,8 @@ include/mifluz/env_ext.h
 include/mifluz/hash.h
 include/mifluz/hash_auto.h
 include/mifluz/hash_ext.h
+include/mifluz/htString.h
+include/mifluz/lib.h
 include/mifluz/lock.h
 include/mifluz/lock_ext.h
 include/mifluz/log.h
@@ -39,6 +72,7 @@ include/mifluz/mp.h
 include/mifluz/mp_ext.h
 include/mifluz/mutex.h
 include/mifluz/mutex_ext.h
+include/mifluz/myqsort.h
 include/mifluz/os.h
 include/mifluz/os_ext.h
 include/mifluz/os_jump.h
@@ -51,52 +85,15 @@ include/mifluz/shqueue.h
 include/mifluz/txn.h
 include/mifluz/txn_auto.h
 include/mifluz/txn_ext.h
+include/mifluz/unac.h
 include/mifluz/xa.h
 include/mifluz/xa_ext.h
-include/mifluz/unac.h
-include/mifluz/Configuration.h
-include/mifluz/Dictionary.h
-include/mifluz/HtMaxMin.h
-include/mifluz/HtTime.h
-include/mifluz/List.h
-include/mifluz/Object.h
-include/mifluz/ParsedString.h
-include/mifluz/StringList.h
-include/mifluz/WordBitCompress.h
-include/mifluz/WordContext.h
-include/mifluz/WordCursor.h
-include/mifluz/WordCursorOne.h
-include/mifluz/WordDB.h
-include/mifluz/WordDBCache.h
-include/mifluz/WordDBCompress.h
-include/mifluz/WordDBInfo.h
-include/mifluz/WordDead.h
-include/mifluz/WordDict.h
-include/mifluz/WordKey.h
-include/mifluz/WordKeyInfo.h
-include/mifluz/WordList.h
-include/mifluz/WordListOne.h
-include/mifluz/WordListMulti.h
-include/mifluz/WordMeta.h
-include/mifluz/WordMonitor.h
-include/mifluz/ber.h
-include/mifluz/WordRecord.h
-include/mifluz/WordRecordInfo.h
-include/mifluz/WordReference.h
-include/mifluz/WordType.h
-include/mifluz/htString.h
-include/mifluz/lib.h
-include/mifluz/config.h
-include/mifluz.h
 @unexec install-info --delete %D/info/mifluz.info %D/info/dir
 info/mifluz.info
-info/mifluz.info-1
-info/mifluz.info-2
-info/mifluz.info-3
 @exec install-info %D/info/mifluz.info %D/info/dir
-lib/libmifluz.so.0
-lib/libmifluz.so
-lib/libmifluz.la
 lib/libmifluz.a
+lib/libmifluz.so
+lib/libmifluz.so.0
 @dirrm include/mifluz
-@dirrm var/cache/mifluz
+@exec mkdir -p %D/var/cache/mifluz
+@unexec rmdir %D/var/cache/mifluz 2>/dev/null || true