diff options
author | Michael Haro <mharo@FreeBSD.org> | 2004-12-13 20:25:34 +0000 |
---|---|---|
committer | Michael Haro <mharo@FreeBSD.org> | 2004-12-13 20:25:34 +0000 |
commit | 626c205db9296702afa9ec414e4b07a5477d0339 (patch) | |
tree | 8b7a32317387a97be13355d80b9143807b0c9fbf /graphics | |
parent | Update to KDE 3.3.2 (diff) |
upgrade to 4.4.0
Notes
Notes:
svn path=/head/; revision=123953
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/mapserver/Makefile | 21 | ||||
-rw-r--r-- | graphics/mapserver/distinfo | 4 | ||||
-rw-r--r-- | graphics/mapserver/files/patch-configure | 11 | ||||
-rw-r--r-- | graphics/mapserver/files/patch-map.h | 6 | ||||
-rw-r--r-- | graphics/mapserver/pkg-plist | 2 |
5 files changed, 21 insertions, 23 deletions
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index 1bfb6c8911c4..a68b0a714cf3 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -6,8 +6,8 @@ # PORTNAME= mapserver -PORTVERSION= 4.2.3 -PORTREVISION= 1 +PORTVERSION= 4.4.0 +PORTREVISION= 0 CATEGORIES= graphics www misc MASTER_SITES= http://cvs.gis.umn.edu/dist/ @@ -17,8 +17,6 @@ COMMENT= System for developing web-based GIS applications LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ proj.5:${PORTSDIR}/graphics/proj -BROKEN= "Does not install" - USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-runpath \ @@ -33,7 +31,8 @@ OPTIONS= TIFF "Support for TIFF (but not GeoTIFF) files" off \ PHP "Support for MapScript/PHP" off \ PERL "Support for MapScript/PERL" off \ WMS "Support for web map service server and client" off \ - WFS "Support for web feature service" off \ + WFS "Support for web feature service (req: GDAL)" off \ + MAPSERV "Install mapserv cgi interface" on \ DEBUG "Enable debugging output" off .include <bsd.port.pre.mk> @@ -111,6 +110,13 @@ LIB_DEPENDS+= curl.3:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-curl=${LOCALBASE} .endif +.if defined(WITH_MAPSERV) +USE_APACHE= YES +PLIST_SUB+= WITH_MAPSERV="" +.else +PLIST_SUB+= WITH_MAPSERV="@comment " +.endif + .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif @@ -126,8 +132,11 @@ do-install: .for f in ${PROG_FILES} ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${LOCALBASE}/www/cgi-bin/mapserv ${INSTALL_SCRIPT} ${WRKSRC}/shp2mysql.pl ${PREFIX}/bin/shp2mysql +.if defined(WITH_MAPSERV) + ${MKDIR} ${LOCALBASE}/www/cgi-bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${LOCALBASE}/www/cgi-bin/mapserv +.endif .if defined(WITH_PHP) @${MKDIR} ${LOCALBASE}/${PHP_EXTENSION_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/mapscript/php3/php_mapscript.so ${LOCALBASE}/${PHP_EXTENSION_DIR}/ diff --git a/graphics/mapserver/distinfo b/graphics/mapserver/distinfo index 10219fd1ce94..c6a140fd25e3 100644 --- a/graphics/mapserver/distinfo +++ b/graphics/mapserver/distinfo @@ -1,2 +1,2 @@ -MD5 (mapserver-4.2.3.tar.gz) = 5d83358cf1147114a4033e98923c0169 -SIZE (mapserver-4.2.3.tar.gz) = 1044240 +MD5 (mapserver-4.4.0.tar.gz) = cd15561442dbfd41b8cf82a230b2dc80 +SIZE (mapserver-4.4.0.tar.gz) = 1402659 diff --git a/graphics/mapserver/files/patch-configure b/graphics/mapserver/files/patch-configure deleted file mode 100644 index 0ba3b15d3add..000000000000 --- a/graphics/mapserver/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - diff --git a/graphics/mapserver/files/patch-map.h b/graphics/mapserver/files/patch-map.h index 7164617819eb..da93de7457c9 100644 --- a/graphics/mapserver/files/patch-map.h +++ b/graphics/mapserver/files/patch-map.h @@ -1,6 +1,6 @@ ---- map.h.orig Mon Jun 7 16:12:02 2004 -+++ map.h Mon Jun 7 16:11:50 2004 -@@ -39,7 +39,7 @@ +--- map.h.orig Mon Nov 29 16:33:53 2004 ++++ map.h Sun Dec 5 21:14:18 2004 +@@ -171,7 +171,7 @@ #endif #ifdef USE_MING_FLASH diff --git a/graphics/mapserver/pkg-plist b/graphics/mapserver/pkg-plist index 15b4a393eea9..845a889d4b90 100644 --- a/graphics/mapserver/pkg-plist +++ b/graphics/mapserver/pkg-plist @@ -7,7 +7,7 @@ bin/shptree bin/shptreetst bin/shptreevis bin/sortshp -www/cgi-bin/mapserv +%%WITH_MAPSERV%%www/cgi-bin/mapserv %%WITH_PERL%%%%SITE_PERL%%/mach/auto/mapscript/mapscript.so %%WITH_PERL%%%%SITE_PERL%%/mach/auto/mapscript/mapscript.bs %%WITH_PERL%%%%SITE_PERL%%/mach/auto/mapscript/.packlist |