1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00

- 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)
This commit is contained in:
Guido Falsi 2014-01-22 15:21:59 +00:00
parent e44bd42785
commit 35ad8cc0ea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=340716
8 changed files with 94 additions and 104 deletions

View File

@ -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>

View File

@ -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

View File

@ -1,10 +0,0 @@
--- config.h.orgi 2008-12-24 19:41:30.000000000 +0100
+++ config.h 2008-12-24 19:42:35.000000000 +0100
@@ -24,7 +24,6 @@
/* which versions? */
# define HAVE_GETOPT_LONG
# define HAVE_GETADDRINFO
-# define ENABLE_NLS
# ifndef LOCALEDIR
# define LOCALEDIR "/usr/local/share/locale"
# endif

View File

@ -0,0 +1,33 @@
--- 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}
CFLAGS ?= -g -O2
+LDFLAGS += -L/usr/local/lib -lintl
+CFLAGS += -I/usr/local/include
PERL = perl
INSTALL = install
@@ -92,15 +94,15 @@
install-whois: whois
$(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 $(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)/share/man/man1/
+ $(INSTALL) -d $(BASEDIR)$(prefix)/man/man1/
$(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/
- $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/
+ $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/man/man1/
install-pos:
cd po && $(MAKE) install

View File

@ -1,52 +0,0 @@
--- Makefile.orgi 2008-12-24 19:32:32.000000000 +0100
+++ Makefile 2008-12-24 19:33:58.000000000 +0100
@@ -1,6 +1,9 @@
-prefix = /usr
+prefix = %%PREFIX%%
-CFLAGS = -g -O2
+LDFLAGS+=-L%%LOCALBASE%%/lib -lintl
+CFLAGS+=-I%%LOCALBASE%%/include
+
+CFLAGS += -g -O2
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
install-whois: whois
- $(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-mkpasswd: mkpasswd
- $(INSTALL) -d $(BASEDIR)$(prefix)/bin/
- $(INSTALL) -d $(BASEDIR)$(prefix)/share/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-pos:
cd po && $(MAKE) install

View File

@ -1,30 +0,0 @@
*** 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:

View File

@ -0,0 +1,26 @@
--- 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:

19
net/whois/pkg-plist Normal file
View File

@ -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