From owner-freebsd-ports Tue Jun 25 11:30:20 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DD90A37B403 for ; Tue, 25 Jun 2002 11:30:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5PIU2d68521; Tue, 25 Jun 2002 11:30:02 -0700 (PDT) (envelope-from gnats) Received: from main.labs.v2project.com (cliente-217216111238.cm128.senpc.supercable.es [217.216.111.238]) by hub.freebsd.org (Postfix) with ESMTP id 05E1837B417 for ; Tue, 25 Jun 2002 11:24:47 -0700 (PDT) Received: (from root@localhost) by main.labs.v2project.com (8.12.3/8.11.6) id g5PIQtDV051945; Tue, 25 Jun 2002 20:26:55 +0200 (CEST) (envelope-from king) Message-Id: <200206251826.g5PIQtDV051945@main.labs.v2project.com> Date: Tue, 25 Jun 2002 20:26:55 +0200 (CEST) From: Joseph King To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/39851: Update Port: (ports/graphics/gdal) to 1.1.6 follow up ports/36989 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 39851 >Category: ports >Synopsis: Update Port: (ports/graphics/gdal) to 1.1.6 follow up ports/36989 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jun 25 11:30:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Joseph King >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD main.v2project.com 4.5-STABLE FreeBSD 4.5-STABLE #1: Fri Apr 5 02:33:49 CEST 2002 king@main.v2project.com:/usr/src/sys-altq/compile/MAIN i386 >Description: >How-To-Repeat: >Fix: --- gdal-1.1.6.diff begins here --- diff -ruN gdal.orig/Makefile gdal/Makefile --- gdal.orig/Makefile Sat May 18 04:39:08 2002 +++ gdal/Makefile Tue Jun 25 20:05:17 2002 @@ -2,21 +2,20 @@ # Date created: 27 Aug 2001 # Whom: Randall Hopper # -# $FreeBSD: ports/graphics/gdal/Makefile,v 1.2 2002/05/18 02:39:08 kris Exp $ +# $FreeBSD: ports/graphics/gdal/Makefile,v 1.1 2001/10/17 19:02:21 ijliao Exp $ # PORTNAME= gdal -PORTVERSION= 1.1.5 +PORTVERSION= 1.1.6 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/gdal/ MAINTAINER= aa8vb@nc.rr.com -BROKEN= "Incorrect checksum" - -LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff +BUILD_DEPENDS= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen USE_PYTHON= yes GNU_CONFIGURE= yes diff -ruN gdal.orig/distinfo gdal/distinfo --- gdal.orig/distinfo Wed Oct 17 21:02:21 2001 +++ gdal/distinfo Tue Jun 25 20:05:17 2002 @@ -1 +1 @@ -MD5 (gdal-1.1.5.tar.gz) = ec8014270a7202b5584970ccd6dbab98 +MD5 (gdal-1.1.6.tar.gz) = c1b04a35c15d85ca9bef3a20ab6f534e diff -ruN gdal.orig/files/patch-aa gdal/files/patch-aa --- gdal.orig/files/patch-aa Wed Oct 17 21:02:21 2001 +++ gdal/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,33 +0,0 @@ ---- frmts/ORIG/GNUmakefile Tue Jul 17 09:51:13 2001 -+++ frmts/GNUmakefile Mon Aug 27 18:09:37 2001 -@@ -12,7 +12,7 @@ - sub-libs: - @for dir in $(GDAL_FORMATS) ; do \ - if test -d $$dir ; then \ -- if (cd $$dir; $(MAKE) install-obj) ; then \ -+ if (cd $$dir; $(MAKE) install-obj) || exit 1 ; then \ - echo; \ - else \ - break; \ -@@ -26,7 +26,7 @@ - rm -f *.o o/*.o o/*.a - @for dir in $(GDAL_FORMATS) ; do \ - if test -d $$dir ; then \ -- if (cd $$dir; $(MAKE) clean) ; then \ -+ if (cd $$dir; $(MAKE) clean) || exit 1 ; then \ - echo; \ - else \ - break; \ ---- ORIG/GDALmake.opt.in Fri Jul 20 00:13:54 2001 -+++ GDALmake.opt.in Tue Aug 28 16:34:12 2001 -@@ -67,8 +67,8 @@ - - GDAL_VER = 1.1 - GDAL_LIB = $(GDAL_ROOT)/gdal.a --GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(GDAL_VER).$(SO_EXT) --GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal.$(GDAL_VER) -+GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT).$(GDAL_VER) -+GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal - - OGR_LIB = $(GDAL_ROOT)/ogr/ogr.a - CPL_LIB = $(GDAL_ROOT)/port/cpl.a diff -ruN gdal.orig/pkg-plist gdal/pkg-plist --- gdal.orig/pkg-plist Wed Oct 17 21:02:21 2001 +++ gdal/pkg-plist Tue Jun 25 20:05:17 2002 @@ -8,6 +8,7 @@ include/cpl_conv.h include/cpl_csv.h include/cpl_error.h +include/cpl_minixml.h include/cpl_port.h include/cpl_string.h include/cpl_vsi.h @@ -22,16 +23,6 @@ include/ogr_srs_api.h include/ogrsf_frmts.h include/ogr_featurestyle.h -lib/%%PYTHON_VERSION%%/site-packages/epsg_tr.py -lib/%%PYTHON_VERSION%%/site-packages/esri2wkt.py -lib/%%PYTHON_VERSION%%/site-packages/gdal.py -lib/%%PYTHON_VERSION%%/site-packages/gdal_merge.py -lib/%%PYTHON_VERSION%%/site-packages/gdalconst.py -lib/%%PYTHON_VERSION%%/site-packages/gdalimport.py -lib/%%PYTHON_VERSION%%/site-packages/gdalnumeric.py -lib/%%PYTHON_VERSION%%/site-packages/osr.py -lib/%%PYTHON_VERSION%%/site-packages/rgb2pct.py -lib/%%PYTHON_VERSION%%/site-packages/_gdalmodule.so lib/cpl.a lib/ogrsf_frmts.a lib/ogr.a @@ -60,4 +51,5 @@ share/gdal/vert_cs.csv share/gdal/vert_datum.csv share/gdal/vert_offset.csv -@dirrm share/gdal +share/gdal/stateplane.txt +@dirrm share/gdal/ --- gdal-1.1.6.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message