From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 11 19:20:09 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1C28106564A for ; Thu, 11 Nov 2010 19:20:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6194D8FC17 for ; Thu, 11 Nov 2010 19:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oABJK9Wd088652 for ; Thu, 11 Nov 2010 19:20:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oABJK9bq088651; Thu, 11 Nov 2010 19:20:09 GMT (envelope-from gnats) Resent-Date: Thu, 11 Nov 2010 19:20:09 GMT Resent-Message-Id: <201011111920.oABJK9bq088651@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pawel Pekala" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D5CE5106566C for ; Thu, 11 Nov 2010 19:12:32 +0000 (UTC) (envelope-from c0rn@o2.pl) Received: from mailout1.go2.pl (mailout1.go2.pl [193.17.41.11]) by mx1.freebsd.org (Postfix) with ESMTP id 3A3DC8FC1A for ; Thu, 11 Nov 2010 19:12:31 +0000 (UTC) Received: from mailout1.go2.pl (unknown [10.0.0.105]) by mailout1.go2.pl (Postfix) with ESMTP id E5B455F0002 for ; Thu, 11 Nov 2010 20:12:30 +0100 (CET) Received: from unknown (unknown [10.0.0.74]) by mailout1.go2.pl (Postfix) with SMTP for ; Thu, 11 Nov 2010 20:12:20 +0100 (CET) Received: from eko1.neoplus.adsl.tpnet.pl [83.21.182.1] by poczta.o2.pl with ESMTP id MKdSXd; Thu, 11 Nov 2010 20:12:20 +0100 Message-Id: <1289502781.83197@caprica.slowicza.org> Date: Thu, 11 Nov 2010 20:13:01 +0100 From: "Pawel Pekala" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/152142: [PATCH] net/yaz update X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Nov 2010 19:20:09 -0000 >Number: 152142 >Category: ports >Synopsis: [PATCH] net/yaz update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Nov 11 19:20:08 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Pawel Pekala >Release: FreeBSD 8.1-RELEASE i386 >Organization: >Environment: System: FreeBSD 8.1-RELEASE #2: Sat Aug 21 18:46:54 CEST 2010 corn@caprica.slowicza.org:/usr/obj/usr/src/sys/GENERIC >Description: - udate to version 0.4.12 - add missing dependency on devel/icu - mark MAKE_JOBS_SAFE - add support for NOPORTDOCS >How-To-Repeat: >Fix: --- yaz-4.0.12.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/yaz/Makefile /home/corn/devel/yaz/Makefile --- /usr/ports/net/yaz/Makefile 2010-08-11 17:24:26.000000000 +0200 +++ /home/corn/devel/yaz/Makefile 2010-11-04 18:12:43.000000000 +0100 @@ -6,23 +6,27 @@ # PORTNAME= yaz -PORTVERSION= 4.0.11 +PORTVERSION= 4.0.12 CATEGORIES= net MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/ MAINTAINER= ports@FreeBSD.org COMMENT= Z39.50/SR client and API library -LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ +LIB_DEPENDS= icuuc:${PORTSDIR}/devel/icu \ + xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt USE_ICONV= yes USE_OPENSSL= yes GNU_CONFIGURE= yes +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes + CONFIGURE_ARGS+=--enable-shared --with-openssl=${OPENSSLBASE} \ --with-iconv=${LOCALBASE} --with-xml2=${LOCALBASE} \ - --with-xslt=${LOCALBASE} --enable-tcpd -USE_LDCONFIG= yes + --with-xslt=${LOCALBASE} --with-icu=${LOCALBASE} \ + --enable-tcpd MAN1= yaz-asncomp.1 yaz-client.1 yaz-iconv.1 \ yaz-json-parse.1 yaz-marcdump.1 \ @@ -30,8 +34,15 @@ MAN7= bib1-attr.7 yaz-log.7 yaz.7 MAN8= yaz-config.8 yaz-ztest.8 +post-patch: +.if defined(NOPORTDOCS) + @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/%%DOC%%//' Makefile.in +.else + @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/%%DOC%%/doc/' Makefile.in +.endif + post-configure: - cd ${WRKSRC}/doc && \ + @cd ${WRKSRC}/doc && \ ${REINPLACE_CMD} -e 's,[$$]{datarootdir}/man,${PREFIX}/man,' \ Makefile diff -ruN --exclude=CVS /usr/ports/net/yaz/distinfo /home/corn/devel/yaz/distinfo --- /usr/ports/net/yaz/distinfo 2010-08-11 17:24:26.000000000 +0200 +++ /home/corn/devel/yaz/distinfo 2010-11-02 20:30:35.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (yaz-4.0.11.tar.gz) = 31e4561dacdfb4db2d0a79fd9391c854 -SHA256 (yaz-4.0.11.tar.gz) = 21ef2ab3302ec18060d27bc72006e6517b2290264239312f415a64fd71fe2f0a -SIZE (yaz-4.0.11.tar.gz) = 2248742 +SHA256 (yaz-4.0.12.tar.gz) = cafb74d0323921005dab48cb7c46814c0c17d9d4a5135456b4a90e2f5a96280c +SIZE (yaz-4.0.12.tar.gz) = 2252891 diff -ruN --exclude=CVS /usr/ports/net/yaz/files/patch-Makefile.in /home/corn/devel/yaz/files/patch-Makefile.in --- /usr/ports/net/yaz/files/patch-Makefile.in 2010-08-11 17:24:26.000000000 +0200 +++ /home/corn/devel/yaz/files/patch-Makefile.in 2010-11-04 17:53:03.000000000 +0100 @@ -1,7 +1,11 @@ ---- Makefile.in.bak 2010-07-30 10:41:04.502726505 +0200 -+++ Makefile.in 2010-07-30 10:42:15.531264210 +0200 -@@ -283,7 +283,7 @@ - SUBDIRS = src include util test client ztest zoom doc etc +--- ./Makefile.in.orig 2010-08-17 12:42:04.000000000 +0200 ++++ Makefile.in 2010-11-04 17:52:13.000000000 +0100 +@@ -280,10 +280,10 @@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = src include util test client ztest zoom doc etc ++SUBDIRS = src include util test client ztest zoom %%DOC%% etc aclocaldir = $(datadir)/aclocal aclocal_DATA = m4/yaz.m4 -pkgconfigdir = $(libdir)/pkgconfig diff -ruN --exclude=CVS /usr/ports/net/yaz/pkg-plist /home/corn/devel/yaz/pkg-plist --- /usr/ports/net/yaz/pkg-plist 2010-08-11 17:24:26.000000000 +0200 +++ /home/corn/devel/yaz/pkg-plist 2010-11-04 18:00:52.000000000 +0100 @@ -21,6 +21,7 @@ include/yaz/diagsrw.h include/yaz/dirent.h include/yaz/errno.h +include/yaz/facet.h include/yaz/file_glob.h include/yaz/gettimeofday.h include/yaz/icu.h @@ -125,76 +126,76 @@ lib/libyaz_server.so.4 libdata/pkgconfig/yaz.pc share/aclocal/yaz.m4 -share/doc/yaz/apilayer.png -share/doc/yaz/asn.external.html -share/doc/yaz/asn.html -share/doc/yaz/asn.pdu.html -share/doc/yaz/asn.preparing.html -share/doc/yaz/bib1.html -share/doc/yaz/common/id.png -share/doc/yaz/common/style1.css -share/doc/yaz/comstack.addresses.html -share/doc/yaz/comstack.client.html -share/doc/yaz/comstack.common.html -share/doc/yaz/comstack.diagnostics.html -share/doc/yaz/comstack.html -share/doc/yaz/comstack.introduction.html -share/doc/yaz/comstack.server.html -share/doc/yaz/comstack.ssl.html -share/doc/yaz/comstack.summary.html -share/doc/yaz/credits.html -share/doc/yaz/future.html -share/doc/yaz/index.html -share/doc/yaz/indexdata.html -share/doc/yaz/installation.html -share/doc/yaz/installation.unix.html -share/doc/yaz/installation.win32.html -share/doc/yaz/introduction.api.html -share/doc/yaz/introduction.html -share/doc/yaz/license.html -share/doc/yaz/list-oids.html -share/doc/yaz/marc.html -share/doc/yaz/odr.debugging.html -share/doc/yaz/odr.html -share/doc/yaz/odr.programming.html -share/doc/yaz/odr.use.html -share/doc/yaz/reference.html -share/doc/yaz/server.backend.html -share/doc/yaz/server.backendfunctions.html -share/doc/yaz/server.frontend.html -share/doc/yaz/server.html -share/doc/yaz/server.invocation.html -share/doc/yaz/server.main.html -share/doc/yaz/server.vhosts.html -share/doc/yaz/soap.html -share/doc/yaz/soap.http.html -share/doc/yaz/soap.srw.html -share/doc/yaz/soap.xml.html -share/doc/yaz/tools.html -share/doc/yaz/tools.log.html -share/doc/yaz/tools.nmem.html -share/doc/yaz/tools.oid.html -share/doc/yaz/tools.retrieval.html -share/doc/yaz/yaz-asncomp.html -share/doc/yaz/yaz-client.html -share/doc/yaz/yaz-config.html -share/doc/yaz/yaz-iconv.html -share/doc/yaz/yaz-icu.html -share/doc/yaz/yaz-illclient.html -share/doc/yaz/yaz-json-parse.html -share/doc/yaz/yaz-log.html -share/doc/yaz/yaz-marcdump.html -share/doc/yaz/yaz-ztest.html -share/doc/yaz/yaz.html -share/doc/yaz/zoom.events.html -share/doc/yaz/zoom.extendedservices.html -share/doc/yaz/zoom.html -share/doc/yaz/zoom.options.html -share/doc/yaz/zoom.query.html -share/doc/yaz/zoom.records.html -share/doc/yaz/zoom.resultsets.html -share/doc/yaz/zoom.scan.html -share/doc/yaz/zoomsh.html +%%PORTDOCS%%%%DOCSDIR%%/apilayer.png +%%PORTDOCS%%%%DOCSDIR%%/asn.external.html +%%PORTDOCS%%%%DOCSDIR%%/asn.html +%%PORTDOCS%%%%DOCSDIR%%/asn.pdu.html +%%PORTDOCS%%%%DOCSDIR%%/asn.preparing.html +%%PORTDOCS%%%%DOCSDIR%%/bib1.html +%%PORTDOCS%%%%DOCSDIR%%/common/id.png +%%PORTDOCS%%%%DOCSDIR%%/common/style1.css +%%PORTDOCS%%%%DOCSDIR%%/comstack.addresses.html +%%PORTDOCS%%%%DOCSDIR%%/comstack.client.html +%%PORTDOCS%%%%DOCSDIR%%/comstack.common.html +%%PORTDOCS%%%%DOCSDIR%%/comstack.diagnostics.html +%%PORTDOCS%%%%DOCSDIR%%/comstack.html +%%PORTDOCS%%%%DOCSDIR%%/comstack.introduction.html +%%PORTDOCS%%%%DOCSDIR%%/comstack.server.html +%%PORTDOCS%%%%DOCSDIR%%/comstack.ssl.html +%%PORTDOCS%%%%DOCSDIR%%/comstack.summary.html +%%PORTDOCS%%%%DOCSDIR%%/credits.html +%%PORTDOCS%%%%DOCSDIR%%/future.html +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/indexdata.html +%%PORTDOCS%%%%DOCSDIR%%/installation.html +%%PORTDOCS%%%%DOCSDIR%%/installation.unix.html +%%PORTDOCS%%%%DOCSDIR%%/installation.win32.html +%%PORTDOCS%%%%DOCSDIR%%/introduction.api.html +%%PORTDOCS%%%%DOCSDIR%%/introduction.html +%%PORTDOCS%%%%DOCSDIR%%/license.html +%%PORTDOCS%%%%DOCSDIR%%/list-oids.html +%%PORTDOCS%%%%DOCSDIR%%/marc.html +%%PORTDOCS%%%%DOCSDIR%%/odr.debugging.html +%%PORTDOCS%%%%DOCSDIR%%/odr.html +%%PORTDOCS%%%%DOCSDIR%%/odr.programming.html +%%PORTDOCS%%%%DOCSDIR%%/odr.use.html +%%PORTDOCS%%%%DOCSDIR%%/reference.html +%%PORTDOCS%%%%DOCSDIR%%/server.backend.html +%%PORTDOCS%%%%DOCSDIR%%/server.backendfunctions.html +%%PORTDOCS%%%%DOCSDIR%%/server.frontend.html +%%PORTDOCS%%%%DOCSDIR%%/server.html +%%PORTDOCS%%%%DOCSDIR%%/server.invocation.html +%%PORTDOCS%%%%DOCSDIR%%/server.main.html +%%PORTDOCS%%%%DOCSDIR%%/server.vhosts.html +%%PORTDOCS%%%%DOCSDIR%%/soap.html +%%PORTDOCS%%%%DOCSDIR%%/soap.http.html +%%PORTDOCS%%%%DOCSDIR%%/soap.srw.html +%%PORTDOCS%%%%DOCSDIR%%/soap.xml.html +%%PORTDOCS%%%%DOCSDIR%%/tools.html +%%PORTDOCS%%%%DOCSDIR%%/tools.log.html +%%PORTDOCS%%%%DOCSDIR%%/tools.nmem.html +%%PORTDOCS%%%%DOCSDIR%%/tools.oid.html +%%PORTDOCS%%%%DOCSDIR%%/tools.retrieval.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-asncomp.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-client.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-config.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-iconv.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-icu.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-illclient.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-json-parse.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-log.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-marcdump.html +%%PORTDOCS%%%%DOCSDIR%%/yaz-ztest.html +%%PORTDOCS%%%%DOCSDIR%%/yaz.html +%%PORTDOCS%%%%DOCSDIR%%/zoom.events.html +%%PORTDOCS%%%%DOCSDIR%%/zoom.extendedservices.html +%%PORTDOCS%%%%DOCSDIR%%/zoom.html +%%PORTDOCS%%%%DOCSDIR%%/zoom.options.html +%%PORTDOCS%%%%DOCSDIR%%/zoom.query.html +%%PORTDOCS%%%%DOCSDIR%%/zoom.records.html +%%PORTDOCS%%%%DOCSDIR%%/zoom.resultsets.html +%%PORTDOCS%%%%DOCSDIR%%/zoom.scan.html +%%PORTDOCS%%%%DOCSDIR%%/zoomsh.html share/yaz/etc/MARC21slim2DC.xsl share/yaz/etc/MARC21slim2MODS.xsl share/yaz/etc/MARC21slim2RDFDC.xsl @@ -223,6 +224,6 @@ @dirrm share/yaz/ill @dirrm share/yaz/etc @dirrm share/yaz -@dirrm share/doc/yaz/common -@dirrm share/doc/yaz +%%PORTDOCS%%@dirrm %%DOCSDIR%%/common +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/yaz --- yaz-4.0.12.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: