3 files changed, 68 insertions, 11 deletions

diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index 9500cc1213ac..73eff86cd9d7 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fhist
-PORTVERSION=	1.19
+PORTVERSION=	1.20
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
@@ -17,7 +17,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	explain.45:${PORTSDIR}/devel/libexplain
 
-OPTIONS=	NLS "Native language support" on
+OPTIONS_DEFINE=	NLS
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all-bin
@@ -31,7 +31,7 @@ PLIST_FILES=	bin/fcomp bin/fhist bin/fmerge
 
 .include <bsd.port.options.mk>
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ENV+=	ac_cv_lib_intl_main=no
 .else
 USE_GETTEXT=	yes
@@ -40,13 +40,9 @@ PLIST_FILES+=	share/locale/en/LC_MESSAGES/${file}.mo
 .endfor
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|.a $$(LIBS)|.a $$(LDFLAGS) $$(LIBS)|' ${WRKSRC}/Makefile.in
-
 post-build:
 .for file in fcomp fhist fmerge
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	@(cd ${WRKSRC}/lib/en/LC_MESSAGES && ${LOCALBASE}/bin/msgfmt -o \
 		${file}.mo ${file}.po)
 .endif
@@ -56,7 +52,7 @@ do-install:
 .for file in fcomp fhist fmerge
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/lib/en/man1/${file}.1 ${MANPREFIX}/man/man1
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 	@${MKDIR} ${PREFIX}/share/locale/en/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/lib/en/LC_MESSAGES/${file}.mo \
 		${PREFIX}/share/locale/en/LC_MESSAGES
diff --git a/devel/fhist/distinfo b/devel/fhist/distinfo
index b5fb13ea5510..f135b93180cc 100644
--- a/devel/fhist/distinfo
+++ b/devel/fhist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fhist-1.19.tar.gz) = f1bffa44b4252d88c70e208a813aad8fac2d668b43e8e1cb6e823d89a4f4e265
-SIZE (fhist-1.19.tar.gz) = 409075
+SHA256 (fhist-1.20.tar.gz) = c7d2cbbb269fe016af94a8657ecbd6d5fda818f48a2c52f72f30edbc91e76d91
+SIZE (fhist-1.20.tar.gz) = 410711
diff --git a/devel/fhist/files/patch-Makefile.in b/devel/fhist/files/patch-Makefile.in
new file mode 100644
index 000000000000..7107dbd38161
--- /dev/null
+++ b/devel/fhist/files/patch-Makefile.in
@@ -0,0 +1,61 @@
+--- Makefile.in.orig	2012-05-21 08:32:42.000000000 +0900
++++ Makefile.in	2012-05-22 22:50:06.000000000 +0900
+@@ -8,10 +8,8 @@
+ #    W W W  A   A  R  R   N   N    I   N   N   I   N   N  G   G
+ #     W W   A   A  R   R  N   N   III  N   N  III  N   N   GGG
+ #
+-# Warning: DO NOT send patches which fix this file. IT IS NOT the \
+-		original
+-# source file. This file is GENERATED from the Aegis repository file \
+-		manifest.
++# Warning: DO NOT send patches which fix this file. IT IS NOT the original
++# source file. This file is GENERATED from the Aegis repository file manifest.
+ # If you find a bug in this file, it could well be an Aegis bug.
+ #
+ # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+@@ -21,14 +19,11 @@
+ # The configure script generates 2 files:
+ #	1. This Makefile
+ #	2. common/config.h
+-# If you change this Makefile, you may also need to change these files. \
+-		To see
+-# what is configured by the configure script, search for @ in the \
+-		Makefile.in
++# If you change this Makefile, you may also need to change these files. To see
++# what is configured by the configure script, search for @ in the Makefile.in
+ # file.
+ #
+-# If you wish to reconfigure the installations directories it is \
+-		RECOMMENDED
++# If you wish to reconfigure the installations directories it is RECOMMENDED
+ # that you re-run the configure script.
+ #
+ # Use ``./configure --help'' for a list of options.
+@@ -86,8 +81,7 @@
+ #
+ # Where to put the manuals.
+ #
+-# On a network, this would be shared between all machines on the \
+-		network. It can
++# On a network, this would be shared between all machines on the network. It can
+ # be read-only.
+ #
+ # The $(DESTDIR) is for packaging.
+@@ -144,15 +138,13 @@
+ EXEEXT = @EXEEXT@
+ 
+ #
+-# Set GROFF to the name of the roff command on your system, usually \
+-		"groff" or
++# Set GROFF to the name of the roff command on your system, usually "groff" or
+ # "troff" or "nroff"
+ #
+ GROFF = @GROFF@
+ 
+ #
+-# Set SOELIM to the name of the roff proprocessor command on your \
+-		system,
++# Set SOELIM to the name of the roff proprocessor command on your system,
+ # usually "soelim" or "gsoelim"
+ #
+ SOELIM = @SOELIM@
\ No newline at end of file