Here is the revised diff file.
One problem: I am still not sure : use "REVISION-main=0" replace
"REVISION-main=1" or just remove line "REVISION-main=1", or the same ?
wen
2011/5/27 Giovanni Bechis <giova...@openbsd.org>:
> Il 27/05/2011 15.58, wen heping ha scritto:
>> 2011/5/27 Giovanni Bechis <giova...@openbsd.org>:
>>> On 05/27/11 15:02, wen heping wrote:
>>>> Hi,
>>>>
>>>> Here is an update of geo/mapserver to 6.0.0.
>>>>
>>>> Tested OK on i386.
>>>>
>>>> Comments ? OK ?
>>>>
>>> +REVISION-main=0
>>
>> Thanks.
>>
>> Or should this line and next line "REVISION-util" removed ?
>>
> When a port is upgraded to a new release REVISION.* lines should go away.
> Cheers
> Giovanni Bechis
>
Index: mapserver/Makefile
===================================================================
RCS file: /cvs/ports/geo/mapserver/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- mapserver/Makefile 11 Jan 2011 09:47:55 -0000 1.9
+++ mapserver/Makefile 27 May 2011 23:40:19 -0000
@@ -8,13 +8,13 @@
COMMENT-php= PHP Mapscript extension
COMMENT-perl= Perl Mapscript binding
-V = 5.6.5
+V = 6.0.0
DISTNAME= mapserver-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= mapserver-utils-${V}
PKGNAME-php= php5-mapscript-${V}
PKGNAME-perl= p5-mapscript-${V}
-REVISION-main= 1
+REVISION-main= 0
REVISION-utils= 0
CATEGORIES= geo www
@@ -76,7 +76,7 @@
MAKE_ENV= CFLAGS+=-fPIC
-UTILS= shp2img shp2pdf legend shptree shptreevis shptreetst scalebar \
+UTILS= shp2img legend shptree shptreevis shptreetst scalebar \
sortshp tile4ms msencrypt
PREFIX-main= /var/www
@@ -95,7 +95,7 @@
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mapserver/perl
${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${WRKINST}/${PREFIX-main}/cgi-bin
- ${INSTALL_DATA} ${WRKSRC}/mapscript/php3/php_mapscript.so \
+ ${INSTALL_DATA} ${WRKSRC}/mapscript/php/php_mapscript.so \
${WRKINST}/${PREFIX-php}/lib/php/modules/mapscript.so
echo "; Enable Mapscript extension module\nextension=mapscript.so" \
> ${WRKINST}/${PREFIX-php}/conf/php5.sample/mapscript.ini
@@ -103,7 +103,7 @@
${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/
.endfor
${INSTALL_SCRIPT} ${WRKSRC}/mapserver-config ${PREFIX}/bin/
- ${INSTALL_DATA} ${WRKSRC}/mapscript/php3/examples/* \
+ ${INSTALL_DATA} ${WRKSRC}/mapscript/php/examples/* \
${PREFIX}/share/examples/mapserver/php
${INSTALL_DATA} ${WRKSRC}/mapscript/perl/examples/* \
${PREFIX}/share/examples/mapserver/perl
Index: mapserver/distinfo
===================================================================
RCS file: /cvs/ports/geo/mapserver/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- mapserver/distinfo 27 Jul 2010 08:57:38 -0000 1.6
+++ mapserver/distinfo 27 May 2011 23:40:19 -0000
@@ -1,5 +1,5 @@
-MD5 (mapserver-5.6.5.tar.gz) = M6u/J/qOO/LFMlfCGIpnsw==
-RMD160 (mapserver-5.6.5.tar.gz) = D+83rfqk9xzsBrrkG7xJSQR4YXQ=
-SHA1 (mapserver-5.6.5.tar.gz) = yz23CTzu+exa9kucKmY4LQlCmXI=
-SHA256 (mapserver-5.6.5.tar.gz) = rKyv5hArHxhQlO/8RbWwpdO6ayGk2+IJyoSks9hXmMU=
-SIZE (mapserver-5.6.5.tar.gz) = 2314003
+MD5 (mapserver-6.0.0.tar.gz) = W8sab7SnQ+nwaUZvvfSrdg==
+RMD160 (mapserver-6.0.0.tar.gz) = syTfAYHiPPWvRvdor1n2WswT/54=
+SHA1 (mapserver-6.0.0.tar.gz) = S72O9WqhOJ3kyAtHduANtThSk2c=
+SHA256 (mapserver-6.0.0.tar.gz) = knCTM2ZcR4T2mxjRqOeN2A+HpmtdSQ/Q5J7yumFr2a8=
+SIZE (mapserver-6.0.0.tar.gz) = 2435310
Index: mapserver/patches/patch-configure
===================================================================
RCS file: /cvs/ports/geo/mapserver/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- mapserver/patches/patch-configure 21 Nov 2010 09:32:57 -0000 1.3
+++ mapserver/patches/patch-configure 27 May 2011 23:40:19 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.3 2010/11/21 09:32:57 landry Exp $
---- configure.orig Thu Jul 8 22:07:15 2010
-+++ configure Wed Nov 17 22:14:47 2010
-@@ -3360,7 +3360,7 @@ if test $ac_cv_lib_m_exp = yes; then
+--- configure.orig Wed Apr 27 09:06:17 2011
++++ configure Thu May 26 19:59:16 2011
+@@ -3361,7 +3361,7 @@ if test $ac_cv_lib_m_exp = yes; then
XTRALIBS="$XTRALIBS -lm"
fi
@@ -10,12 +10,12 @@
echo "$as_me:$LINENO: checking for __gxx_personality_v0 in -lstdc++" >&5
-@@ -9790,7 +9790,7 @@ fi
-
- RGBA_PNG_ENABLED=$RGBA_PNG_ENABLED
-
--PNG_INC=$PNG_INC
-+PNG_INC=-I$PNG_DIR/include/libpng
-
- PNG_LIB=$PNG_LIB
+@@ -5363,7 +5363,7 @@ if test -n "$PNG_DIR" ; then
+ test -f $PNG_DIR/lib/libpng.a -o -f $PNG_DIR/lib/libpng.so -o -f
$PNG_DIR/lib/libpng.sl -o -f $PNG_DIR/lib/libpng.dylib &&
PNG_LIBDIR="$PNG_DIR/lib"
+ test -f $PNG_DIR/lib64/libpng.a -o -f $PNG_DIR/lib64/libpng.so -o -f
$PNG_DIR/lib64/libpng.sl -o -f $PNG_DIR/libpng.dylib &&
PNG_LIBDIR="$PNG_DIR/lib64"
+ test -f $PNG_DIR/libpng.a -o -f $PNG_DIR/libpng.so -o -f
$PNG_DIR/libpng.sl -o -f $PNG_DIR/libpng.dylib && PNG_LIBDIR="$PNG_DIR"
+- test -f $PNG_DIR/include/png.h && PNG_INCLUDE="$PNG_DIR/include"
++ test -f $PNG_DIR/include/libpng/png.h &&
PNG_INCLUDE="$PNG_DIR/include/libpng"
+ test -f $PNG_DIR/lib/png.h && PNG_INCLUDE="$PNG_DIR/lib"
+ test -f $PNG_DIR/png.h && PNG_INCLUDE="$PNG_DIR"
Index: mapserver/pkg/PLIST-utils
===================================================================
RCS file: /cvs/ports/geo/mapserver/pkg/PLIST-utils,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST-utils
--- mapserver/pkg/PLIST-utils 4 Jun 2009 17:55:39 -0000 1.1.1.1
+++ mapserver/pkg/PLIST-utils 27 May 2011 23:40:19 -0000
@@ -4,7 +4,6 @@
@bin bin/msencrypt
@bin bin/scalebar
@bin bin/shp2img
-@bin bin/shp2pdf
@bin bin/shptree
@bin bin/shptreetst
@bin bin/shptreevis
