Date: Thu, 10 Jun 2004 20:09:35 -0500 (CDT) From: "Douglas K. Rand" <rand@meridian-enviro.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: "Carlos F. A. Paniago" <pan@cnpm.embrapa.br> Subject: ports/67817: graphics/mapserver - Fix some dependancies Message-ID: <200406110109.i5B19Z8h037770@sheliak.meridian-enviro.com> Resent-Message-ID: <200406110110.i5B1ANnx026827@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67817
>Category: ports
>Synopsis: graphics/mapserver - Fix some dependancies
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Jun 11 01:10:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Douglas K. Rand
>Release: FreeBSD 4.9-RELEASE-p7 i386
>Organization:
Meridian Environmental Technology, Inc.
>Environment:
System: FreeBSD sheliak.meridian-enviro.com 4.9-RELEASE-p7 FreeBSD 4.9-RELEASE-p7 #0: Mon May 10 17:40:45 CDT 2004 root@blah.meridian-enviro.com:/usr/obj/usr/src/sys/SHELIAK i386
>Description:
There were some dependancy problems with my original
port, as pointed out by Carlos F. A. Paniago"<pan@cnpm.embrapa.br>.
The problems were:
o Broken TIFF support if GDAL support is enabled
o Wrong depend location for pdflib
o Broken WITH_WMS configure arguments
o Wrong argument to --with-gdal to configure
o I didn't know that GDAL also provides OGR support
o Problem with gdal library
o Problems with MING
This patch solves those problems, and adds a few enhancements:
o Use of OPTIONS in Makefile for easier configuration
o Use of WITH_CURL to prevent duplicate LIB_DEPENDS
o Enable WFS support knob
A note about GDAL, I switched the dependancy to BUILD_DEPENDS from
LIB_DEPENDS because the GDAL port installs the library as
libgdal.1.1.so not libgdal.so.1.1, and a LIB_DEPENDS+=gdal.1.1:${PORTSDIR}/graphics/gdal
won't ever find the library.
>How-To-Repeat:
WITH_PDF=YES just didn't work, WITH_GDAL=YES didn't either.
WITH_MING didn't work either.
>Fix:
Apply these patchs, which modify Makefile and add two patch files
to the files/ directory.
--- Makefile Thu Jun 3 17:41:37 2004
+++ Makefile.new Mon Jun 7 15:55:32 2004
@@ -7,7 +7,7 @@
PORTNAME= mapserver
PORTVERSION= 4.0.2
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= graphics www misc
MASTER_SITES= http://cvs.gis.umn.edu/dist/
@@ -22,9 +22,23 @@
--with-gd=${LOCALBASE} \
--with-proj=${LOCALBASE}
+OPTIONS= TIFF "Support for TIFF (but not GeoTIFF) files" off \
+ MING "Support for Macromedia Flash output" off \
+ PDF "Support for PDF output via pdflib" off \
+ GDAL "Support for a number of input raster formats" off \
+ POSTGRESQL "Support for PostgreSQL" off \
+ PHP "Support for MapScript/PHP" off \
+ WMS "Support for web map service server and client" off \
+ WFS "Support for web feature service" off \
+ DEBUG "Enable debugging output" off
+
+.include <bsd.port.pre.mk>
+
.if defined(WITH_TIFF)
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff
CONFIGURE_ARGS+= --with-tiff=${LOCALBASE}
+.else
+CONFIGURE_ARGS+= --without-tiff
.endif
.if defined(WITH_MING)
@@ -33,18 +47,25 @@
.endif
.if defined(WITH_PDF)
-LIB_DEPENDS+= pdf.6:${PORTSDIR}/graphics/pdflib
+LIB_DEPENDS+= pdf.6:${PORTSDIR}/print/pdflib
CONFIGURE_ARGS+= --with-pdf=${LOCALBASE}
.endif
.if defined(WITH_WMS)
-LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+= --wmsclient
+WITH_CURL= YES
+CONFIGURE_ARGS+= --with-wms --with-wmsclient
+.endif
+
+.if defined(WITH_WFS)
+WITH_CURL= YES
+WITH_GDAL= YES
+CONFIGURE_ARGS+= --with-wfs --with-wfsclient
.endif
.if defined(WITH_GDAL)
-LIB_DEPENDS+= gdal.1.1:${PORTSDIR}/graphics/gdal
-CONFIGURE_ARGS+= --with-gdal=${LOCALBASE}
+BUILD_DEPENDS+= gdal-config:${PORTSDIR}/graphics/gdal
+CONFIGURE_ARGS+= --with-gdal=${LOCALBASE}/bin/gdal-config \
+ --with-ogr=${LOCALBASE}/bin/gdal-config
.endif
.if defined(WITH_POSTGRESQL)
@@ -58,6 +79,11 @@
CONFIGURE_ARGS+= --with-php=${LOCALBASE}
.endif
+.if defined(WITH_CURL)
+LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+= --with-curl=${LOCALBASE}
+.endif
+
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
.endif
@@ -70,4 +96,4 @@
.endfor
${INSTALL_SCRIPT} ${WRKSRC}/shp2mysql.pl ${LOCALBASE}/bin/shp2mysql
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- /dev/null Thu Jun 10 03:01:20 2004
+++ files/patch-configure Mon Jun 7 16:08:13 2004
@@ -0,0 +1,11 @@
+--- configure.orig Mon Jun 7 16:05:35 2004
++++ configure Mon Jun 7 16:05:50 2004
+@@ -8346,7 +8346,7 @@
+ echo "$as_me:$LINENO: result: yes, user supplied MING directory" >&5
+ echo "${ECHO_T}yes, user supplied MING directory" >&6
+ MING_ENABLED=-DUSE_MING_FLASH
+- MING_LIB=-L$with_ming -lming
++ MING_LIB="-L$with_ming -lming"
+ MING_INC=-I$with_ming
+ fi
+
--- /dev/null Thu Jun 10 03:01:20 2004
+++ files/patch-map.h Mon Jun 7 16:12:21 2004
@@ -0,0 +1,11 @@
+--- map.h.orig Mon Jun 7 16:12:02 2004
++++ map.h Mon Jun 7 16:11:50 2004
+@@ -39,7 +39,7 @@
+ #endif
+
+ #ifdef USE_MING_FLASH
+-#include "ming.h"
++#include "ming/ming.h"
+ #endif
+
+ #include <sys/types.h> /* regular expression support */
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406110109.i5B19Z8h037770>