From owner-freebsd-ports  Thu Nov 16  7:10:16 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 40F2937B65E
	for <freebsd-ports@FreeBSD.org>; Thu, 16 Nov 2000 07:10:02 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id HAA86297;
	Thu, 16 Nov 2000 07:10:02 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F34DF37B4C5; Thu, 16 Nov 2000 07:05:25 -0800 (PST)
Message-Id: <20001116150525.F34DF37B4C5@hub.freebsd.org>
Date: Thu, 16 Nov 2000 07:05:25 -0800 (PST)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/22891: Update port: misc/pinfo
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         22891
>Category:       ports
>Synopsis:       Update port: misc/pinfo
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 16 07:10:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD-4.1.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support libintl library properly
- Use LOCALBASE to refer external dependancy files

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/misc/pinfo/Makefile misc/pinfo/Makefile
--- /usr/ports/misc/pinfo/Makefile	Fri Nov 17 00:01:20 2000
+++ misc/pinfo/Makefile	Fri Nov 17 00:02:12 2000
@@ -15,17 +15,21 @@
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-included-gettext --with-readline
-CONFIGURE_ENV=	LIBS="-lgnuregex -L${PREFIX}/lib -lintl" \
-		CFLAGS="${CFLAGS} -I${PREFIX}/include"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CONFIGURE_ARGS=	--with-readline
 
 MAN1=	pinfo.1
 
+pre-patch:
+	@${PERL} -pi -e \
+		's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400010
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
-CONFIGURE_ARGS+=	--with-ncurses=${PREFIX}
+CONFIGURE_ARGS+=	--with-ncurses=${LOCALBASE}
 .endif
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/misc/pinfo/pkg-plist misc/pinfo/pkg-plist
--- /usr/ports/misc/pinfo/pkg-plist	Fri Nov 17 00:01:21 2000
+++ misc/pinfo/pkg-plist	Thu Nov 16 21:16:17 2000
@@ -1,21 +1,10 @@
 bin/pinfo
 etc/pinforc
-@unexec install-info --delete --info-dir=%D/info %D/info/pinfo.info
+@unexec install-info --delete %D/info/pinfo.info %D/info/dir
 info/pinfo.info
-@exec install-info --info-dir=%D/info %D/info/pinfo.info
+@exec install-info %D/info/pinfo.info %D/info/dir
 share/locale/cs/LC_MESSAGES/pinfo.mo
 share/locale/de/LC_MESSAGES/pinfo.mo
 share/locale/pl/LC_MESSAGES/pinfo.mo
 share/locale/ru/LC_MESSAGES/pinfo.mo
 share/locale/sv/LC_MESSAGES/pinfo.mo
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message