Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/whois/Makefile,v retrieving revision 1.50 diff -u -u -r1.50 Makefile --- Makefile 20 Aug 2008 07:38:06 -0000 1.50 +++ Makefile 21 Aug 2008 11:27:11 -0000 @@ -6,13 +6,13 @@ # PORTNAME= whois -PORTVERSION= 4.7.26 +PORTVERSION= 4.7.27 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= miwi@FreeBSD.org -COMMENT= Marco d'Itri whois client +COMMENT= Marco d\'Itri whois client USE_GMAKE= yes USE_ICONV= yes @@ -20,10 +20,13 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +LDFLAGS+= -L/usr/local/lib +CFLAGS+= -I/usr/local/include + MAKE_ENV= LDFLAGS="${LDFLAGS}" MAKE_ARGS= OPTS="" -MAN1= mwhois.1 +MAN1= whois.1 .if !defined(WITHOUT_NLS) USE_GETTEXT= yes @@ -35,9 +38,7 @@ .endif post-patch: - @${REINPLACE_CMD} -e "s|prefix\=/usr/local|prefix\=${PREFIX}|g ; \ - s|/usr/local|${LOCALBASE}|g ; \ - s|share/man/|man/|g ; \ + @${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 @if [ -n "${NO_PO}" ]; \ Index: distinfo =================================================================== RCS file: /home/pcvs/ports/net/whois/distinfo,v retrieving revision 1.38 diff -u -u -r1.38 distinfo --- distinfo 18 Jul 2008 13:32:04 -0000 1.38 +++ distinfo 21 Aug 2008 10:24:55 -0000 @@ -1,3 +1,3 @@ -MD5 (whois_4.7.26.tar.gz) = f069304ae912ff4fdec59f33de405076 -SHA256 (whois_4.7.26.tar.gz) = 515ff7eae37f64f4786ce0fe5d9f7c91790cc64fe73bfda6764d5d4c627d1541 -SIZE (whois_4.7.26.tar.gz) = 67809 +MD5 (whois_4.7.27.tar.gz) = 0937f34c714e3954894d056b4346d69b +SHA256 (whois_4.7.27.tar.gz) = 1a1a3e29302f1941d8c5819311ffd958f2b7cf27eeea03a8d839d3e07d42f3b9 +SIZE (whois_4.7.27.tar.gz) = 67996 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net/whois/pkg-plist,v retrieving revision 1.9 diff -u -u -r1.9 pkg-plist --- pkg-plist 18 Jul 2008 13:32:04 -0000 1.9 +++ pkg-plist 21 Aug 2008 11:27:30 -0000 @@ -1,4 +1,4 @@ -bin/mwhois +bin/whois %%NLS%%share/locale/cs/LC_MESSAGES/whois.mo %%NLS%%share/locale/de/LC_MESSAGES/whois.mo %%NLS%%share/locale/el/LC_MESSAGES/whois.mo Index: files/patch-aa =================================================================== RCS file: /home/pcvs/ports/net/whois/files/patch-aa,v retrieving revision 1.10 diff -u -u -r1.10 patch-aa --- files/patch-aa 18 Jul 2008 13:32:04 -0000 1.10 +++ files/patch-aa 21 Aug 2008 11:25:30 -0000 @@ -1,35 +1,45 @@ ---- Makefile.orig 2008-04-05 15:46:24.000000000 +0200 -+++ Makefile 2008-06-21 14:57:26.965023476 +0200 -@@ -6,8 +6,8 @@ - #whois_LDADD += -lnsl -lsocket - - # FreeBSD --#LDFLAGS=-L/usr/local/lib -lgnugetopt -lintl --#CFLAGS=-I/usr/local/include -+LDFLAGS+=-L/usr/local/lib -+CFLAGS+=-I/usr/local/include - - # OS/2 EMX - #LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp -@@ -57,16 +57,15 @@ +--- Makefile.orig 2008-05-06 11:41:16.000000000 +0200 ++++ Makefile 2008-08-21 13:25:03.000000000 +0200 +@@ -1,6 +1,9 @@ + prefix = %%PREFIX%% + +-CFLAGS = -g -O2 ++LDFLAGS+=-L%%LOCALBASE%%/lib -lintl ++CFLAGS+=-I%%LOCALBASE%%/include ++ ++CFLAGS += -g -O2 + + PERL = perl + +@@ -63,22 +66,22 @@ + $(PERL) -w make_tld_serv.pl < tld_serv_list > $@ + ############################################################################## - install: whois +-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/ -- cd po && $(MAKE) $@ -+ install -d $(BASEDIR)$(prefix)/man/man1/ -+ install -m 0755 whois ${PREFIX}/bin/mwhois -+ install -m 0644 whois.1 ${PREFIX}/man/man1/mwhois.1 ++ install -d $(prefix)/man/man1/ ++ install -m 0755 whois $(prefix)/bin/ ++ install -m 0644 whois.1 $(prefix)/man/man1/ 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 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 -d $(BASEDIR)$(prefix)/man/man1/ ++ install -m 0755 mkpasswd $(prefix)/bin/ ++ install -m 0644 mkpasswd.1 $(prefix)/man/man1/ + +-install-pos: +- cd po && $(MAKE) $@ ++#install-pos: ++# cd po && $(MAKE) $@ distclean: clean rm -f po/whois.pot