From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 5 21:50:05 2009 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 1905B106566C for ; Sat, 5 Sep 2009 21:50:05 +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 E512F8FC0A for ; Sat, 5 Sep 2009 21:50:04 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n85Lo4Sw080241 for ; Sat, 5 Sep 2009 21:50:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n85Lo4jl080240; Sat, 5 Sep 2009 21:50:04 GMT (envelope-from gnats) Resent-Date: Sat, 5 Sep 2009 21:50:04 GMT Resent-Message-Id: <200909052150.n85Lo4jl080240@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, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82AFA106566B for ; Sat, 5 Sep 2009 21:46:11 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-yx0-f172.google.com (mail-yx0-f172.google.com [209.85.210.172]) by mx1.freebsd.org (Postfix) with ESMTP id 443898FC12 for ; Sat, 5 Sep 2009 21:46:10 +0000 (UTC) Received: by yxe2 with SMTP id 2so3971616yxe.3 for ; Sat, 05 Sep 2009 14:46:10 -0700 (PDT) Received: by 10.101.45.20 with SMTP id x20mr14054191anj.26.1252187168634; Sat, 05 Sep 2009 14:46:08 -0700 (PDT) Received: from sunpoet.net ([123.204.184.216]) by mx.google.com with ESMTPS id c37sm4849529ana.16.2009.09.05.14.46.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 05 Sep 2009 14:46:08 -0700 (PDT) Received: by sunpoet.net (Postfix, from userid 1000) id 58B772AEC631; Sun, 6 Sep 2009 05:45:38 +0800 (CST) Message-Id: <20090905214538.58B772AEC631@sunpoet.net> Date: Sun, 6 Sep 2009 05:45:38 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/138558: [MAINTAINER] devel/shapelib: update to 1.3.0a2 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: Sat, 05 Sep 2009 21:50:05 -0000 >Number: 138558 >Category: ports >Synopsis: [MAINTAINER] devel/shapelib: update to 1.3.0a2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Sep 05 21:50:04 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 7.2-STABLE amd64 >Organization: SUNPOET.net >Environment: System: FreeBSD bonjour.sunpoet.net 7.2-STABLE FreeBSD 7.2-STABLE #0: Fri Jul 31 10:03:28 CST 2009 >Description: - Update to 1.3.0a2 Removed file(s): - files/patch-contrib-shpgeo.c - files/patch-shputils.c Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- shapelib-1.3.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/devel/shapelib/Makefile /usr/ports/sunpoet/shapelib/Makefile --- /usr/ports/devel/shapelib/Makefile 2009-08-03 09:17:00.000000000 +0800 +++ /usr/ports/sunpoet/shapelib/Makefile 2009-09-06 05:43:55.000000000 +0800 @@ -6,20 +6,23 @@ # PORTNAME= shapelib -PORTVERSION= 1.2.10 -PORTREVISION= 2 +PORTVERSION= 1.3.0 CATEGORIES= devel -MASTER_SITES= http://dl.maptools.org/dl/shapelib/ \ +MASTER_SITES= http://download.osgeo.org/shapelib/ \ http://sunpoet.net/distfiles/ +DISTNAME= ${PORTNAME}-${SHAPELIB_VER} MAINTAINER= sunpoet@sunpoet.net COMMENT= C API for reading and writing ArcView Shapefiles USE_AUTOTOOLS= libtool:22:env USE_LDCONFIG= yes +WRKSRC= ${WRKDIR}/${PORTNAME}-${SHAPELIB_VER} OPTIONS= PROJ4 "Cartographic Projections library" off +SHAPELIB_VER= ${PORTVERSION}a2 + .include .if defined(WITH_PROJ4) diff -ruN --exclude=CVS /usr/ports/devel/shapelib/distinfo /usr/ports/sunpoet/shapelib/distinfo --- /usr/ports/devel/shapelib/distinfo 2005-11-24 23:40:00.000000000 +0800 +++ /usr/ports/sunpoet/shapelib/distinfo 2009-09-05 01:35:55.000000000 +0800 @@ -1,3 +1,3 @@ -MD5 (shapelib-1.2.10.tar.gz) = 4d96bd926167193d27bf14d56e2d484e -SHA256 (shapelib-1.2.10.tar.gz) = afa54d60369e49a3d2ebcd1ffca75104bdc85d7f539b81aec8a6e2d311ca6b78 -SIZE (shapelib-1.2.10.tar.gz) = 167219 +MD5 (shapelib-1.3.0a2.tar.gz) = fb6e252a0aba3de6870b79ee664d5862 +SHA256 (shapelib-1.3.0a2.tar.gz) = bfc4aa0a164f5f2ee6533d15a5667b7686805ecd80cbedca7d6d4b8ff91b6293 +SIZE (shapelib-1.3.0a2.tar.gz) = 177688 diff -ruN --exclude=CVS /usr/ports/devel/shapelib/files/patch-Makefile /usr/ports/sunpoet/shapelib/files/patch-Makefile --- /usr/ports/devel/shapelib/files/patch-Makefile 2008-02-25 17:36:32.000000000 +0800 +++ /usr/ports/sunpoet/shapelib/files/patch-Makefile 2009-09-06 05:41:04.000000000 +0800 @@ -1,11 +1,17 @@ ---- Makefile.orig 2003-04-07 21:03:22.000000000 +0800 -+++ Makefile 2008-02-25 13:53:10.000000000 +0800 -@@ -1,10 +1,35 @@ -- --#LINKOPT = /usr/local/lib/libdbmalloc.a --CFLAGS = -g +--- Makefile.orig 2007-12-14 04:27:13.000000000 +0800 ++++ Makefile 2009-09-06 05:40:38.000000000 +0800 +@@ -1,7 +1,7 @@ + +-#LINKOPT = /usr/local/lib/libdbmalloc.a +-#LINKOPT = /usr/local/lib/cpl.a +-CFLAGS = -g -Wall +#LINKOPT = %%PREFIX%%/lib/libdbmalloc.a -+CFLAGS += -g ++#LINKOPT = %%PREFIX%%/lib/cpl.a ++CFLAGS += -g -Wall + #CFLAGS = -g -DUSE_CPL + INSTALL = /usr/bin/install + LD = /usr/bin/ld +@@ -9,7 +9,33 @@ default: all @@ -40,14 +46,14 @@ shpopen.o: shpopen.c shapefil.h $(CC) $(CFLAGS) -c shpopen.c -@@ -92,51 +117,18 @@ +@@ -100,51 +126,19 @@ # ----------------------------------------------------------------------------- -# The following is contributed by Jan-Oliver Wagner, and should allow for -# creating shared libraries on most platforms with gcc, and libtool installed. +# A truly insane amount of hackery to make things actually work with -+# libtool-1.5.x -- you'd not believe the garbage that was here before. ++# libtool-2.2.x -- you'd not believe the garbage that was here before. -SHPLIB_VERSION=1.2.9 -LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry @@ -73,7 +79,7 @@ - rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.* - rm -fr .libs/libshp.lax - mkdir .libs/libshp.lax -- /usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc +- $(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc - - (cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) - (cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) @@ -84,21 +90,22 @@ + %%LIBTOOL%% --mode=compile --tag=CXX $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I%%PREFIX%%/include $(CFLAGS) -c shpopen.c + %%LIBTOOL%% --mode=compile --tag=CXX $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I%%PREFIX%%/include $(CFLAGS) -c shptree.c + %%LIBTOOL%% --mode=compile --tag=CXX $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I%%PREFIX%%/include $(CFLAGS) -c dbfopen.c -+ %%LIBTOOL%% --mode=link --tag=CXX $(CC) $(CFLAGS) -o libshp.la -rpath %%PREFIX%%/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo ++ %%LIBTOOL%% --mode=compile --tag=CXX $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I%%PREFIX%%/include $(CFLAGS) -c safileio.c ++ %%LIBTOOL%% --mode=link --tag=CXX $(CC) $(CFLAGS) -o libshp.la -rpath %%PREFIX%%/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo safileio.lo lib_install: - cp .libs/libshp.la .libs/libshp.lai - /bin/sh ./mkinstalldirs /usr/local/lib -- /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la -- /usr/bin/install -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION) +- /bin/sh ./libtool --mode=install $(INSTALL) -c libshp.la /usr/local/lib/libshp.la +- $(INSTALL) -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION) - (cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) - (cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) - chmod +x /usr/local/lib/libshp.so.$(LIBSHP_VERSION) -- /usr/bin/install -c .libs/libshp.la /usr/local/lib/libshp.la -- /usr/bin/install -c .libs/libshp.a /usr/local/lib/libshp.a +- $(INSTALL) -c .libs/libshp.la /usr/local/lib/libshp.la +- $(INSTALL) -c .libs/libshp.a /usr/local/lib/libshp.a - ranlib /usr/local/lib/libshp.a - chmod 644 /usr/local/lib/libshp.a - /bin/sh ./mkinstalldirs /usr/local/include/libshp -- /usr/bin/install -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h +- $(INSTALL) -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h + %%LIBTOOL%% --mode=install %%INSTALL%% -c libshp.la %%PREFIX%%/lib/libshp.la + %%INSTALL%% -c -m 644 shapefil.h %%PREFIX%%/include/shapefil.h diff -ruN --exclude=CVS /usr/ports/devel/shapelib/files/patch-contrib-Makefile /usr/ports/sunpoet/shapelib/files/patch-contrib-Makefile --- /usr/ports/devel/shapelib/files/patch-contrib-Makefile 2008-02-25 17:36:32.000000000 +0800 +++ /usr/ports/sunpoet/shapelib/files/patch-contrib-Makefile 2009-09-06 05:35:33.000000000 +0800 @@ -1,6 +1,6 @@ ---- contrib/Makefile.orig 2003-04-07 21:03:22.000000000 +0800 -+++ contrib/Makefile 2008-02-25 13:54:58.000000000 +0800 -@@ -3,9 +3,9 @@ +--- contrib/Makefile.orig 2004-06-24 08:55:52.000000000 +0800 ++++ contrib/Makefile 2009-09-06 05:35:24.000000000 +0800 +@@ -3,19 +3,44 @@ #CFLAGS = -g # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN @@ -10,14 +10,18 @@ -CFLAGS = -g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 +CFLAGS += -g -I.. -DDEBUG -DDEBUG2 %%ENDIAN%% %%PROJ4%% -I%%PREFIX%%/include -L%%PREFIX%%/lib - SHPOBJ = ../shpopen.o ../dbfopen.o +-SHPOBJ = ../shpopen.o ../dbfopen.o ++SHPOBJ = ../shpopen.o ../dbfopen.o ../safileio.o -@@ -15,7 +15,32 @@ +-SHPGOBJ = ../shpopen.o ../dbfopen.o shpgeo.o ++SHPGOBJ = ../shpopen.o ../dbfopen.o ../safileio.o shpgeo.o + + GEOOBJ = ./shpgeo.o -lm -lproj default: all --all: shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat -+#all: shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat +-all: shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort ++#all: shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort + +.if defined(PROJ4) +all: allprog allproj @@ -27,20 +31,20 @@ +install: allprog_install +.endif + -+ALLPROG= dbfcat dbfinfo shpcat shpdxf shpfix -+ALLPROJ= shpcentrd shpdata shpinfo shpproj shpwkb ++ALLPROG= dbfcat dbfinfo shpcat shpdxf shpfix Shape_PointInPoly ++ALLPROJ= shpcentrd shpdata shpinfo shpproj shpwkb shpsort + +allprog: $(ALLPROG) + +allprog_install: $(ALLPROG) -+.for _ALLPROG in ${ALLPROG} ++.for _ALLPROG in $(ALLPROG) + %%INSTALL%% -c -m 755 ${_ALLPROG} %%PREFIX%%/bin/${_ALLPROG} +.endfor + +allproj: $(ALLPROJ) + +allproj_install: $(ALLPROJ) -+.for _ALLPROJ in ${ALLPROJ} ++.for _ALLPROJ in $(ALLPROJ) + %%INSTALL%% -c -m 755 ${_ALLPROJ} %%PREFIX%%/bin/${_ALLPROJ} +.endfor diff -ruN --exclude=CVS /usr/ports/devel/shapelib/files/patch-shapefil.h /usr/ports/sunpoet/shapelib/files/patch-shapefil.h --- /usr/ports/devel/shapelib/files/patch-shapefil.h 2008-02-25 17:36:32.000000000 +0800 +++ /usr/ports/sunpoet/shapelib/files/patch-shapefil.h 2009-09-05 05:34:10.000000000 +0800 @@ -1,6 +1,6 @@ ---- shapefil.h.orig Mon Apr 7 21:03:22 2003 -+++ shapefil.h Fri Jan 12 01:46:29 2007 -@@ -115,6 +115,8 @@ +--- shapefil.h.orig 2008-11-12 22:28:15.000000000 +0800 ++++ shapefil.h 2009-09-05 05:33:07.000000000 +0800 +@@ -123,6 +123,8 @@ */ #include diff -ruN --exclude=CVS /usr/ports/devel/shapelib/files/patch-shputils.c /usr/ports/sunpoet/shapelib/files/patch-shputils.c --- /usr/ports/devel/shapelib/files/patch-shputils.c 2008-02-25 17:36:32.000000000 +0800 +++ /usr/ports/sunpoet/shapelib/files/patch-shputils.c 1970-01-01 08:00:00.000000000 +0800 @@ -1,20 +0,0 @@ ---- shputils.c.orig Mon Apr 7 21:03:22 2003 -+++ shputils.c Tue Dec 12 21:28:33 2006 -@@ -274,7 +274,7 @@ - if (factor == 0) - { - if (infactor ==0) -- { puts("ERROR: Input unit must be defined before output unit"); exit(); } -+ { puts("ERROR: Input unit must be defined before output unit"); exit( 1 ); } - factor=infactor/outfactor; - } - printf("Output file coordinate values will be factored by %lg\n",factor); -@@ -319,7 +319,7 @@ - { - ti = DBFGetFieldCount( hDBF ); - showitems(); -- exit(0); -+ exit( 0 ); - } - - if (iclip) check_theme_bnd(); --- shapelib-1.3.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: