Date: Fri, 18 May 2012 02:45:32 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/168026: devel/fhist: Update to version 1.19 Message-ID: <20120518024532.2f38f18d.tkato432@yahoo.com> Resent-Message-ID: <201205171810.q4HIA3si098851@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 168026
>Category: ports
>Synopsis: devel/fhist: Update to version 1.19
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 17 18:10:03 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 1.19
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/fhist/Makefile devel/fhist/Makefile
--- /usr/ports/devel/fhist/Makefile 2011-09-24 07:21:55.000000000 +0900
+++ devel/fhist/Makefile 2012-05-13 23:54:31.000000000 +0900
@@ -6,49 +6,61 @@
#
PORTNAME= fhist
-PORTVERSION= 1.17
-PORTREVISION= 1
+PORTVERSION= 1.19
CATEGORIES= devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Utilities to maintain file history, do file comparisions and merges
-GNU_CONFIGURE= yes
-ALL_TARGET= binaries po
-MAKE_JOBS_UNSAFE= yes
+LICENSE= GPLv3
-MAN1= fcomp.1 fhist.1 fmerge.1
-PLIST_FILES= bin/fcomp bin/fhist bin/fmerge
+LIB_DEPENDS= explain.45:${PORTSDIR}/devel/libexplain
+
+OPTIONS= NLS "Native language support" on
+
+GNU_CONFIGURE= yes
+ALL_TARGET= all-bin
+MAKE_JOBS_UNSAFE=yes
-CFLAGS+= -I${LOCALBASE}/include
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.include <bsd.port.pre.mk>
+MAN1= fcomp.1 fhist.1 fmerge.1
+PLIST_FILES= bin/fcomp bin/fhist bin/fmerge
+
+.include <bsd.port.options.mk>
.if defined(WITHOUT_NLS)
-CONFIGURE_ARGS+= ac_cv_lib_intl_main=no
+CONFIGURE_ENV+= 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
+.for file in fcomp fhist fmerge
+PLIST_FILES+= share/locale/en/LC_MESSAGES/${file}.mo
+.endfor
.endif
-post-extract:
- cd ${WRKSRC}/lib/en/man1 && ${LN} -s ${WRKSRC}/etc/*.so .
+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)
+ @(cd ${WRKSRC}/lib/en/LC_MESSAGES && ${LOCALBASE}/bin/msgfmt -o \
+ ${file}.mo ${file}.po)
+.endif
+.endfor
do-install:
-.for file in fhist fcomp fmerge
- ${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)
+.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)
@${MKDIR} ${PREFIX}/share/locale/en/LC_MESSAGES
${INSTALL_DATA} ${WRKSRC}/lib/en/LC_MESSAGES/${file}.mo \
- ${PREFIX}/share/locale/en/LC_MESSAGES/${file}.mo
+ ${PREFIX}/share/locale/en/LC_MESSAGES
.endif
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/devel/fhist/distinfo devel/fhist/distinfo
--- /usr/ports/devel/fhist/distinfo 2011-07-03 23:55:41.000000000 +0900
+++ devel/fhist/distinfo 2012-05-13 05:45:56.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (fhist-1.17.tar.gz) = e1e06a095913e9d9afc2deb89f646d96dd03d2d832669018f3cc519fffb98e1e
-SIZE (fhist-1.17.tar.gz) = 401116
+SHA256 (fhist-1.19.tar.gz) = f1bffa44b4252d88c70e208a813aad8fac2d668b43e8e1cb6e823d89a4f4e265
+SIZE (fhist-1.19.tar.gz) = 409075
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120518024532.2f38f18d.tkato432>