Date: Wed, 22 Jan 2014 15:22:00 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340716 - in head/net/whois: . files Message-ID: <201401221522.s0MFM0LA093154@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Wed Jan 22 15:21:59 2014 New Revision: 340716 URL: http://svnweb.freebsd.org/changeset/ports/340716 QAT: https://qat.redports.org/buildarchive/r340716/ Log: - Update to 5.0.23 - Convert to staging - Support NLS option - Remove uneeded file - Rename patch files according to standard PR: ports/185929 Submitted by: Lapo Luchini <lapo@lapo.it> (maintainer) Added: head/net/whois/files/patch-Makefile (contents, props changed) - copied, changed from r340714, head/net/whois/files/patch-aa head/net/whois/files/patch-po_Makefile (contents, props changed) - copied, changed from r340402, head/net/whois/files/patch-ac head/net/whois/pkg-plist (contents, props changed) Deleted: head/net/whois/files/have_nls-patch head/net/whois/files/patch-aa head/net/whois/files/patch-ac Modified: head/net/whois/Makefile head/net/whois/distinfo (contents, props changed) Modified: head/net/whois/Makefile ============================================================================== --- head/net/whois/Makefile Wed Jan 22 15:19:21 2014 (r340715) +++ head/net/whois/Makefile Wed Jan 22 15:21:59 2014 (r340716) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= whois -PORTVERSION= 5.0.11 +PORTVERSION= 5.0.23 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -14,20 +14,24 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= iconv gmake perl5 +USE_XZ= yes USE_PERL5= build +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +MAKE_ARGS= BASEDIR="${STAGEDIR}" -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +OPTIONS_DEFINE= NLS -MAKE_ARGS= OPTS="" +OPTIONS_SUB= yes +NLS_USES= gettext -MAN1= mwhois.1 mkpasswd.1 +.include <bsd.port.options.mk> -PLIST_FILES= bin/mwhois bin/mkpasswd - -NO_STAGE= yes post-patch: - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e "s|/usr/share|${PREFIX}/share|g" ${WRKSRC}/po/Makefile + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/Makefile +.if ! ${PORT_OPTIONS:MNLS} + @${REINPLACE_CMD} -e "s| pos||" -e "s| install-pos||" \ + -e "s|-lintl||" ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e "s|# define ENABLE_NLS||" ${WRKSRC}/config.h +.endif .include <bsd.port.mk> Modified: head/net/whois/distinfo ============================================================================== --- head/net/whois/distinfo Wed Jan 22 15:19:21 2014 (r340715) +++ head/net/whois/distinfo Wed Jan 22 15:21:59 2014 (r340716) @@ -1,2 +1,2 @@ -SHA256 (whois_5.0.11.tar.gz) = 7f257a3104b14b7fe17f31a7b873e50c590df10e46cbab9942f9ad0a4a49c7ce -SIZE (whois_5.0.11.tar.gz) = 81195 +SHA256 (whois_5.0.23.tar.xz) = 6b486a42a4aa83b5f921083d518176726b6d2d903bc8dab5c6126ebe2bea1bf1 +SIZE (whois_5.0.23.tar.xz) = 70116 Copied and modified: head/net/whois/files/patch-Makefile (from r340714, head/net/whois/files/patch-aa) ============================================================================== --- head/net/whois/files/patch-aa Wed Jan 22 15:16:56 2014 (r340714, copy source) +++ head/net/whois/files/patch-Makefile Wed Jan 22 15:21:59 2014 (r340716) @@ -1,52 +1,33 @@ ---- Makefile.orgi 2008-12-24 19:32:32.000000000 +0100 -+++ Makefile 2008-12-24 19:33:58.000000000 +0100 -@@ -1,6 +1,9 @@ +--- Makefile.orig 2013-03-30 02:31:42.000000000 +0100 ++++ Makefile 2014-01-20 18:16:15.000000000 +0100 +@@ -1,6 +1,8 @@ -prefix = /usr -+prefix = %%PREFIX%% ++prefix = ${PREFIX} --CFLAGS = -g -O2 -+LDFLAGS+=-L%%LOCALBASE%%/lib -lintl -+CFLAGS+=-I%%LOCALBASE%%/include -+ -+CFLAGS += -g -O2 + CFLAGS ?= -g -O2 ++LDFLAGS += -L/usr/local/lib -lintl ++CFLAGS += -I/usr/local/include PERL = perl INSTALL = install -@@ -21,7 +24,7 @@ - endif - - ifdef LOCALEDIR --DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\" -+DEFS += -DLOCALEDIR=\"$(prefix)/share/locale\" - endif - - ifdef HAVE_LIBIDN -@@ -68,19 +71,19 @@ - $(PERL) -w make_tld_serv.pl < tld_serv_list > $@ - - ############################################################################## --install: install-whois install-mkpasswd #install-pos -+install: install-whois install-mkpasswd +@@ -92,15 +94,15 @@ install-whois: whois -- $(INSTALL) -d $(BASEDIR)$(prefix)/bin/ + $(INSTALL) -d $(BASEDIR)$(prefix)/bin/ - $(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/ - $(INSTALL) -m 0755 whois $(BASEDIR)$(prefix)/bin/ - $(INSTALL) -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/ -+ $(INSTALL) -d $(prefix)/bin/ -+ $(INSTALL) -d $(prefix)/man/man1/ -+ $(INSTALL) -m 0755 whois $(prefix)/bin/mwhois -+ $(INSTALL) -m 0644 whois.1 $(prefix)/man/man1/mwhois.1 ++ $(INSTALL) -d $(BASEDIR)$(prefix)/man/man1/ ++ $(INSTALL) -m 0755 whois $(BASEDIR)$(prefix)/bin/mwhois ++ $(INSTALL) -m 0644 whois.1 $(BASEDIR)$(prefix)/man/man1/mwhois.1 install-mkpasswd: mkpasswd -- $(INSTALL) -d $(BASEDIR)$(prefix)/bin/ + $(INSTALL) -d $(BASEDIR)$(prefix)/bin/ - $(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/ -- $(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/ ++ $(INSTALL) -d $(BASEDIR)$(prefix)/man/man1/ + $(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/ - $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/ -+ $(INSTALL) -d $(prefix)/bin/ -+ $(INSTALL) -d $(prefix)/man/man1/ -+ $(INSTALL) -m 0755 mkpasswd $(prefix)/bin/ -+ $(INSTALL) -m 0644 mkpasswd.1 $(prefix)/man/man1/ ++ $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/man/man1/ install-pos: cd po && $(MAKE) install Copied and modified: head/net/whois/files/patch-po_Makefile (from r340402, head/net/whois/files/patch-ac) ============================================================================== --- head/net/whois/files/patch-ac Mon Jan 20 14:35:09 2014 (r340402, copy source) +++ head/net/whois/files/patch-po_Makefile Wed Jan 22 15:21:59 2014 (r340716) @@ -1,30 +1,26 @@ -*** work/whois-4.6.13/po/Makefile Thu Apr 15 15:58:17 2004 ---- po/Makefile Thu Apr 15 15:58:47 2004 -*************** -*** 7,12 **** ---- 7,14 ---- - - POTFILES=../whois.c ../mkpasswd.c - -+ .SUFFIXES: .po .mo -+ - all: $(PACKAGE).pot $(CATALOGS) - - $(PACKAGE).pot: $(POTFILES) -*************** -*** 31,37 **** - fi; \ - done - -! %.mo: %.po - msgfmt --statistics --check --verbose --output-file=$@ $< - - clean: ---- 33,39 ---- - fi; \ - done - -! .po.mo: - msgfmt --statistics --check --verbose --output-file=$@ $< - - clean: +--- po/Makefile.orig 2013-03-30 02:31:41.000000000 +0100 ++++ po/Makefile 2014-01-20 17:52:17.051238058 +0100 +@@ -1,4 +1,4 @@ +-prefix = /usr ++prefix = ${PREFIX} + + INSTALL= install + +@@ -10,6 +10,8 @@ + + POTFILES=../whois.c ../mkpasswd.c + ++.SUFFIXES: .po .mo ++ + all: $(PACKAGE).pot $(CATALOGS) + + $(PACKAGE).pot: $(POTFILES) +@@ -34,7 +36,7 @@ + fi; \ + done + +-%.mo: %.po ++.po.mo: + msgfmt --statistics --check --verbose --output-file=$@ $< + + clean: Added: head/net/whois/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/whois/pkg-plist Wed Jan 22 15:21:59 2014 (r340716) @@ -0,0 +1,19 @@ +bin/mkpasswd +bin/mwhois +man/man1/mkpasswd.1.gz +man/man1/mwhois.1.gz +%%NLS%%share/locale/cs/LC_MESSAGES/whois.mo +%%NLS%%share/locale/da/LC_MESSAGES/whois.mo +%%NLS%%share/locale/de/LC_MESSAGES/whois.mo +%%NLS%%share/locale/el/LC_MESSAGES/whois.mo +%%NLS%%share/locale/es/LC_MESSAGES/whois.mo +%%NLS%%share/locale/eu/LC_MESSAGES/whois.mo +%%NLS%%share/locale/fi/LC_MESSAGES/whois.mo +%%NLS%%share/locale/fr/LC_MESSAGES/whois.mo +%%NLS%%share/locale/it/LC_MESSAGES/whois.mo +%%NLS%%share/locale/ja/LC_MESSAGES/whois.mo +%%NLS%%share/locale/no/LC_MESSAGES/whois.mo +%%NLS%%share/locale/pl/LC_MESSAGES/whois.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/whois.mo +%%NLS%%share/locale/ru/LC_MESSAGES/whois.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/whois.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401221522.s0MFM0LA093154>