4 files changed, 31 insertions, 73 deletions

diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index a9ffe347613f..4c15097ac7ba 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -6,31 +6,49 @@
 #
 
 PORTNAME=	fhist
-PORTVERSION=	1.16
+PORTVERSION=	1.17
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities to maintain file history, do file comparisions and merges
 
-.include <bsd.port.pre.mk>
+USE_GNOME=	gnometarget
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+ALL_TARGET=	binaries po
 
 MAN1=		fcomp.1 fhist.1 fmerge.1
-ALL_TARGET=	binaries
-INSTALL_TARGET=	install-bin
+PLIST_FILES=	bin/fcomp bin/fhist bin/fmerge
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --includedir=${PREFIX}/include
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	ac_cv_lib_intl_main=no
+.else
+USE_GETTEXT=	yes
+PLIST_FILES+=	share/locale/en/LC_MESSAGES/fcomp.mo \
+		share/locale/en/LC_MESSAGES/fhist.mo \
+		share/locale/en/LC_MESSAGES/fmerge.mo
+.endif
 
 post-extract:
 	cd ${WRKSRC}/lib/en/man1 && ${LN} -s ${WRKSRC}/etc/*.so .
 
-post-install:
+do-install:
 .for file in fhist fcomp fmerge
-	${STRIP_CMD} ${PREFIX}/bin/${file}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/bin/${file}
 	(cd ${WRKSRC}/lib/en/man1; soelim ${file}.1 > tmp; \
 	${INSTALL_MAN} tmp ${PREFIX}/man/man1/${file}.1)
+.if !defined(WITHOUT_NLS)
+	@${MKDIR} ${PREFIX}/share/locale/en/LC_MESSAGES
+	${INSTALL_DATA} ${WRKSRC}/lib/en/LC_MESSAGES/${file}.mo \
+		 ${PREFIX}/share/locale/en/LC_MESSAGES/${file}.mo
+.endif
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/fhist/distinfo b/devel/fhist/distinfo
index 039e82045a30..1db52d590b8f 100644
--- a/devel/fhist/distinfo
+++ b/devel/fhist/distinfo
@@ -1,3 +1,3 @@
-MD5 (fhist-1.16.tar.gz) = b9ab632eace455b440e83910f62fea62
-SHA256 (fhist-1.16.tar.gz) = 57c8056fa347d5b9a545253ed0b10d5e8429cd829a9dac9bd8709a43fd523413
-SIZE (fhist-1.16.tar.gz) = 273203
+MD5 (fhist-1.17.tar.gz) = 4a28cd28cdecdba0ba28ae2c03e3eebf
+SHA256 (fhist-1.17.tar.gz) = e1e06a095913e9d9afc2deb89f646d96dd03d2d832669018f3cc519fffb98e1e
+SIZE (fhist-1.17.tar.gz) = 401116
diff --git a/devel/fhist/files/patch-aa b/devel/fhist/files/patch-aa
deleted file mode 100644
index 637e9b0cc544..000000000000
--- a/devel/fhist/files/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
---- Makefile.in--	Wed Jan  5 21:12:04 2000
-+++ Makefile.in	Wed Jan  5 21:13:41 2000
-@@ -715,46 +715,46 @@
- 	$(INSTALL_DATA) lib/en/building.txt $@
- 
- $(datadir)/en/man1/fcomp.1: lib/en/man1/fcomp.1 lib/en/man1/.datadir
--	$(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fcomp.1 > tmp
-+	$(SOELIM) lib/en/man1/fcomp.1 > tmp
- 	$(INSTALL_DATA) tmp $@
- 	@rm -f tmp
- 
- $(mandir)/man1/fcomp.1: lib/$(MANLANG)/man1/fcomp.1  lib/en/man1/.mandir
--	$(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc lib/$(MANLANG)/man1/fcomp.1 > tmp
-+	$(SOELIM) lib/$(MANLANG)/man1/fcomp.1 > tmp
- 	$(INSTALL_DATA) tmp $@
- 	@rm -f tmp
- 
- $(datadir)/en/man1/fhist.1: lib/en/man1/fhist.1 lib/en/man1/.datadir
--	$(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fhist.1 > tmp
-+	$(SOELIM) lib/en/man1/fhist.1 > tmp
- 	$(INSTALL_DATA) tmp $@
- 	@rm -f tmp
- 
- $(mandir)/man1/fhist.1: lib/$(MANLANG)/man1/fhist.1  lib/en/man1/.mandir
--	$(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc lib/$(MANLANG)/man1/fhist.1 > tmp
-+	$(SOELIM) lib/$(MANLANG)/man1/fhist.1 > tmp
- 	$(INSTALL_DATA) tmp $@
- 	@rm -f tmp
- 
- $(datadir)/en/man1/fhist_lic.1: lib/en/man1/fhist_lic.1 \
- 		lib/en/man1/.datadir
--	$(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fhist_lic.1 > tmp
-+	$(SOELIM) lib/en/man1/fhist_lic.1 > tmp
- 	$(INSTALL_DATA) tmp $@
- 	@rm -f tmp
- 
- $(mandir)/man1/fhist_lic.1: lib/$(MANLANG)/man1/fhist_lic.1 \
- 		lib/en/man1/.mandir
--	$(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc \
-+	$(SOELIM) \
- 		lib/$(MANLANG)/man1/fhist_lic.1 > tmp
- 	$(INSTALL_DATA) tmp $@
- 	@rm -f tmp
- 
- $(datadir)/en/man1/fmerge.1: lib/en/man1/fmerge.1 lib/en/man1/.datadir
--	$(SOELIM) -Ilib/en/man1 -Ietc lib/en/man1/fmerge.1 > tmp
-+	$(SOELIM) lib/en/man1/fmerge.1 > tmp
- 	$(INSTALL_DATA) tmp $@
- 	@rm -f tmp
- 
- $(mandir)/man1/fmerge.1: lib/$(MANLANG)/man1/fmerge.1 \
- 		lib/en/man1/.mandir
--	$(SOELIM) -Ilib/$(MANLANG)/man1 -Ietc \
-+	$(SOELIM) \
- 		lib/$(MANLANG)/man1/fmerge.1 > tmp
- 	$(INSTALL_DATA) tmp $@
- 	@rm -f tmp
diff --git a/devel/fhist/pkg-plist b/devel/fhist/pkg-plist
deleted file mode 100644
index ea96f2086827..000000000000
--- a/devel/fhist/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/fcomp
-bin/fhist
-bin/fmerge