2011/5/28 Jasper Lievisse Adriaanse <[email protected]>:
> On Sat, May 28, 2011 at 08:02:44AM +0800, wen heping wrote:
>> This one maybe better.
>>
>> wen
> What makes you think a REVISION line should stay when bumping the distname's
> version? It's wrong. Just zap all REVISION lines when doing an update, but
Here "better" has nothing about REVISION, here "better" I mean I add
the missing new patch patch-mapscript_php_Makefile_in which I missed
in previous diff file.
As the REVISION, in my previous email I state I am not sure whether
set REVISION=0 or remove that line, because some openbsd committer
told me I should set REVISION=0, while some others told me it should
be removed.
Now I believe REVISION line should be removed when update. I hope this
is the last answer.
wen
> keep any EPOCH lines.
>
>> Index: mapserver/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/geo/mapserver/Makefile,v
>> retrieving revision 1.9
>> diff -u -p -u -r1.9 Makefile
>> --- mapserver/Makefile 11 Jan 2011 09:47:55 -0000 1.9
>> +++ mapserver/Makefile 27 May 2011 23:51:45 -0000
>> @@ -8,13 +8,13 @@ COMMENT-utils= mapserver utilities
>> 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 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
>>
>> 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 @@ do-install:
>> ${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 @@ do-install:
>> ${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 -p -u -r1.6 distinfo
>> --- mapserver/distinfo 27 Jul 2010 08:57:38 -0000 1.6
>> +++ mapserver/distinfo 27 May 2011 23:51:45 -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 -p -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:51:45 -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 @@ $OpenBSD: patch-configure,v 1.3 2010/11/
>>
>>
>> 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/patches/patch-mapscript_php_Makefile_in
>> ===================================================================
>> RCS file: mapserver/patches/patch-mapscript_php_Makefile_in
>> diff -N mapserver/patches/patch-mapscript_php_Makefile_in
>> --- /dev/null 1 Jan 1970 00:00:00 -0000
>> +++ mapserver/patches/patch-mapscript_php_Makefile_in 27 May 2011 23:51:45
>> -0000
>> @@ -0,0 +1,12 @@
>> +$OpenBSD$
>> +--- mapscript/php/Makefile.in.orig Thu May 26 17:36:35 2011
>> ++++ mapscript/php/Makefile.in Thu May 26 17:37:22 2011
>> +@@ -86,7 +86,7 @@ PHPPROJ_OBJS = php_mapscript_util.o php_proj.o $(PHP_R
>> +
>> +
>> + php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
>> +- $(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
>> ++ $(LD) -fPIC -o $@ $(PHPMS_OBJS) $(MS_LIBS)
>> +
>> + php_proj.so: $(PHPPROJ_OBJS)
>> + $(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
>> Index: mapserver/pkg/PLIST-utils
>> ===================================================================
>> RCS file: /cvs/ports/geo/mapserver/pkg/PLIST-utils,v
>> retrieving revision 1.1.1.1
>> diff -u -p -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:51:45 -0000
>> @@ -4,7 +4,6 @@ bin/mapserver-config
>> @bin bin/msencrypt
>> @bin bin/scalebar
>> @bin bin/shp2img
>> -@bin bin/shp2pdf
>> @bin bin/shptree
>> @bin bin/shptreetst
>> @bin bin/shptreevis
>
>
> --
> Cheers,
> Jasper
>
> "Capable, generous men do not create victims, they nurture them."
>
