Tell configure to use preinstalled gettext and libiconv under

LOCALBASE instead of those bundled, and remove ugly hacks completely.

Make portlint happy.

PR:		58517
Submitted by:	Simon Barner <barner@in.tum.de>

4 files changed, 9 insertions, 77 deletions

diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 9145dc69aa0..bb30ef77d51 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -7,21 +7,22 @@
 
 PORTNAME=	namazu
 PORTVERSION=	2.0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	databases www textproc
 MASTER_SITES=	http://www.namazu.org/stable/
 PKGNAMESUFFIX=	2
 
-MAINTAINER=	knu@FreeBSD.org
-COMMENT=	Full-text search system intended for easy use
-
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	${DISTNAME}-de.diff
 PATCH_DIST_STRIP=	-p1
 
-LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext
+MAINTAINER=	knu@FreeBSD.org
+COMMENT=	Full-text search system intended for easy use
+
 BUILD_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
 RUN_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
+LIB_DEPENDS=	intl.5:${PORTSDIR}/devel/gettext \
+		iconv.3:${PORTSDIR}/converters/libiconv
 #		xlHtml:${PORTSDIR}/textproc/xlhtml \
 #		wvHtml:${PORTSDIR}/textproc/wv
 
@@ -29,19 +30,13 @@ PM_BASE=	${SITE_PERL}
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-perl5="${PERL}"
+CONFIGURE_ARGS=	--with-perl5="${PERL}" \
+		--with-libintl-prefix=${LOCALBASE} \
+		--with-libiconv-prefix=${LOCALBASE}
 
 MAN1=		namazu.1 mknmz.1
 INSTALLS_SHLIB=	yes
 
-post-configure:
-	${PERL} -i~ -pe 's,^(LIBS *= *)(.*),$$1 -L${LOCALBASE}/lib -lintl $$2\n,' ${WRKSRC}/nmz/Makefile
-
-pre-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
-
-post-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
 .if defined(NOPORTDOCS)
 	${RM} -rf ${PREFIX}/share/namazu/doc
 .endif
diff --git a/databases/namazu2/pkg-deinstall b/databases/namazu2/pkg-deinstall
deleted file mode 100644
index fae5a47c6f5..00000000000
--- a/databases/namazu2/pkg-deinstall
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-PATH=/bin:/usr/bin
-
-files="${PKG_PREFIX}/lib/charset.alias ${PKG_PREFIX}/share/locale/locale.alias"
-sfx=.namazu2.backup
-
-case $2 in
-    DEINSTALL)
-	for f in $files; do
-	    [ -f $f$sfx ] || continue
-	    if [ $f -nt $f$sfx ]; then
-		cp -p $f $f$sfx
-	    fi
-	done
-	;;
-
-    POST-DEINSTALL)
-	for f in $files; do
-	    if [ -f $f$sfx ]; then
-		mv -f $f$sfx $f
-	    fi
-	done
-	;;
-esac
-
-exit 0
diff --git a/databases/namazu2/pkg-install b/databases/namazu2/pkg-install
deleted file mode 100644
index 86ceb619d75..00000000000
--- a/databases/namazu2/pkg-install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-PATH=/bin:/usr/bin
-
-files="${PKG_PREFIX}/lib/charset.alias ${PKG_PREFIX}/share/locale/locale.alias"
-sfx=.namazu2.backup
-
-case $2 in
-    PRE-INSTALL)
-	for f in $files; do
-	    if [ -f $f ]; then
-		cp $f $f$sfx
-	    fi
-	done
-	;;
-
-    POST-INSTALL)
-	for f in $files; do
-	    if [ -f $f$sfx ]; then
-		touch $f$sfx
-	    else
-		cp $f $f$sfx
-	    fi
-	done
-	;;
-esac
-
-exit 0
diff --git a/databases/namazu2/pkg-plist b/databases/namazu2/pkg-plist
index 62497786f31..7cc94341539 100644
--- a/databases/namazu2/pkg-plist
+++ b/databases/namazu2/pkg-plist
@@ -31,15 +31,11 @@ include/namazu/util.h
 include/namazu/var.h
 include/namazu/wakati.h
 @dirrm include/namazu
-@comment see pkg-{install,deinstall} for this file
-lib/charset.alias
 lib/libnmz.a
 lib/libnmz.la
 lib/libnmz.so
 lib/libnmz.so.6
 libexec/namazu.cgi
-@comment see pkg-{install,deinstall} for this file
-share/locale/locale.alias
 share/locale/es/LC_MESSAGES/namazu.mo
 share/locale/fr/LC_MESSAGES/namazu.mo
 share/locale/ja/LC_MESSAGES/namazu.mo