dists/10.3/unstable/main/finkinfo/sci pari-gp.patch,1.3,1.4

2005-10-08 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28035

Modified Files:
pari-gp.patch 
Log Message:
enable building even with fink's textutils package present


Index: pari-gp.patch
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/pari-gp.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pari-gp.patch   7 Oct 2005 14:11:25 -   1.3
+++ pari-gp.patch   8 Oct 2005 19:06:35 -   1.4
@@ -121,3 +121,15 @@
/usr/local/include/readline\
/usr/include/readline\
/opt/include/readline\
+diff -ruN pari-2.1.7/config/locatelib pari-2.1.7-patched/config/locatelib
+--- pari-2.1.7/config/locatelib2002-06-22 06:18:29.0 -0700
 pari-2.1.7-patched/config/locatelib2005-10-08 08:24:33.0 
-0700
+@@ -3,7 +3,7 @@
+ os2)
+   try=`ls $dir/$lib.a 2 /dev/null`;;
+ *)
+-  ok=`(ls $dir/lib$lib.* | head -1) 2 /dev/null`
++  ok=`(ls $dir/lib$lib.* | head -n 1) 2 /dev/null`
+   if test -n $ok; then
+ # for .so and .sl
+ try=`ls $dir/lib$lib.s? 2 /dev/null` 



---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.4-transitional/unstable/main/finkinfo/sci pari-gp.patch,1.3,1.4

2005-10-08 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28243

Modified Files:
pari-gp.patch 
Log Message:
enable building even with fink's textutils package present


Index: pari-gp.patch
===
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/pari-gp.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pari-gp.patch   30 Sep 2005 06:21:30 -  1.3
+++ pari-gp.patch   8 Oct 2005 19:07:11 -   1.4
@@ -121,3 +121,15 @@
/usr/local/include/readline\
/usr/include/readline\
/opt/include/readline\
+diff -ruN pari-2.1.7/config/locatelib pari-2.1.7-patched/config/locatelib
+--- pari-2.1.7/config/locatelib2002-06-22 06:18:29.0 -0700
 pari-2.1.7-patched/config/locatelib2005-10-08 08:24:33.0 
-0700
+@@ -3,7 +3,7 @@
+ os2)
+   try=`ls $dir/$lib.a 2 /dev/null`;;
+ *)
+-  ok=`(ls $dir/lib$lib.* | head -1) 2 /dev/null`
++  ok=`(ls $dir/lib$lib.* | head -n 1) 2 /dev/null`
+   if test -n $ok; then
+ # for .so and .sl
+ try=`ls $dir/lib$lib.s? 2 /dev/null` 



---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.4-transitional/unstable/main/finkinfo/text textutils.info,NONE,1.1 textutils-2.1-2.info,1.1,NONE

2005-10-08 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv504

Added Files:
textutils.info 
Removed Files:
textutils-2.1-2.info 
Log Message:
increase the revision number for textutils under 10.4, since it builds
differently (thanks to Martin Costabel for noticing this)


--- NEW FILE: textutils.info ---
Package: textutils
Version: 2.1
Revision: 102
Source: gnu
BuildDepends: gettext-dev, gettext-bin, gettext-tools, libiconv-dev
UpdateConfigGuess: true
ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
InstallScript: 
 make install DESTDIR=%d
 rm -f %i/bin/md5sum %i/share/man/man1/md5sum.1
 mv %i/bin/tsort %i/bin/tsort.gnu
 mv %i/share/man/man1/tsort.1 %i/share/man/man1/tsort.gnu.1
 rm -f %i/lib/charset.alias

DocFiles: README COPYING AUTHORS NEWS THANKS
PostInstScript: 
if [ -L %p/etc/alternatives/charset.alias ]; then
  update-alternatives --remove charset.alias %p/lib/charset.alias.gettext
fi

InfoDocs: coreutils.info
#
Description: Text file processing utilities
DescPackaging: 
md5sum is removed, it is already contained in the dpkg package.

tsort (topological sort) is renamed to tsort.gnu because it breaks
other packages. The GNU version of tsort doesn't output files that are
part of a cycle, while the BSD tsort that ships with Darwin does.

charset.alias is deleted because it is empty on Darwin anyway and
causes unnecessary conflicts between packages.

License: GPL
Homepage: http://www.gnu.org/software/textutils/textutils.html
Maintainer: Max Horn [EMAIL PROTECTED]
Source-MD5: 2e5d1f614f0b6dbea9a14460a908ef9c

--- textutils-2.1-2.info DELETED ---



---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


dists/10.4-transitional/stable/main/finkinfo/text textutils.info,NONE,1.1 textutils-2.1-2.info,1.1,NONE

2005-10-08 Thread David R. Morrison
Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv717

Added Files:
textutils.info 
Removed Files:
textutils-2.1-2.info 
Log Message:
increase the revision number for textutils under 10.4, since it builds
differently (thanks to Martin Costabel for noticing this)


--- NEW FILE: textutils.info ---
Package: textutils
Version: 2.1
Revision: 102
Source: gnu
BuildDepends: gettext-dev, gettext-bin, gettext-tools, libiconv-dev
UpdateConfigGuess: true
ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info
InstallScript: 
 make install DESTDIR=%d
 rm -f %i/bin/md5sum %i/share/man/man1/md5sum.1
 mv %i/bin/tsort %i/bin/tsort.gnu
 mv %i/share/man/man1/tsort.1 %i/share/man/man1/tsort.gnu.1
 rm -f %i/lib/charset.alias

DocFiles: README COPYING AUTHORS NEWS THANKS
PostInstScript: 
if [ -L %p/etc/alternatives/charset.alias ]; then
  update-alternatives --remove charset.alias %p/lib/charset.alias.gettext
fi

InfoDocs: coreutils.info
#
Description: Text file processing utilities
DescPackaging: 
md5sum is removed, it is already contained in the dpkg package.

tsort (topological sort) is renamed to tsort.gnu because it breaks
other packages. The GNU version of tsort doesn't output files that are
part of a cycle, while the BSD tsort that ships with Darwin does.

charset.alias is deleted because it is empty on Darwin anyway and
causes unnecessary conflicts between packages.

License: GPL
Homepage: http://www.gnu.org/software/textutils/textutils.html
Maintainer: Max Horn [EMAIL PROTECTED]
Source-MD5: 2e5d1f614f0b6dbea9a14460a908ef9c

--- textutils-2.1-2.info DELETED ---



---
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits


experimental/babayoshihiko/finkinfo libgeos2.info,NONE,1.1 libogdi3.info,NONE,1.1 grass60.patch,NONE,1.1 libogdi3.patch,NONE,1.1 grass60.info,1.5,1.6 qgis.info,1.5,1.6 qgis.patch,1.1,1.2

2005-10-08 Thread BABA Yoshihiko
Update of /cvsroot/fink/experimental/babayoshihiko/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23583

Modified Files:
grass60.info qgis.info qgis.patch 
Added Files:
libgeos2.info libogdi3.info grass60.patch libogdi3.patch 
Log Message:
fixed and validated .info files

--- NEW FILE: grass60.patch ---
--- grass-6.0.0/Makefile2005-03-09 23:08:59.0 +0900
+++ grass-6.0.0-patched/Makefile2005-06-23 04:36:12.0 +0900
@@ -219,7 +219,7 @@
test -d ${INST_DIR} || ${MAKE_DIR_CMD} ${INST_DIR}
@# test -d ${INST_DIR}/dev || ${MAKE_DIR_CMD} ${INST_DIR}/dev
test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
-   -sed -e s#^GISBASE.*#GISBASE=${INST_DIR}# 
${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}  
${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
+   -sed -e [EMAIL PROTECTED]@# 
${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}  
${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 
2/dev/null
-cd ${GISBASE} ; tar cBf - bwidget | (cd ${INST_DIR} ; tar xBf - ) 
2/dev/null

--- NEW FILE: libogdi3.patch ---
diff -urN ogdi-3.1.4-orig/config/common.mak ogdi-3.1.4/config/common.mak
--- ogdi-3.1.4-orig/config/common.mak   2001-06-26 10:14:46.0 +0900
+++ ogdi-3.1.4/config/common.mak2005-08-15 08:02:49.0 +0900
@@ -55,7 +55,7 @@
 #
 #  Final OS installation location.
 #
-prefix = /usr/local
+prefix = @PREFIX@
 exec_prefix= ${prefix}
 INST_INCLUDE   = ${prefix}/include
 INST_LIB   = ${exec_prefix}/lib
diff -urN ogdi-3.1.4-orig/config/darwin.mak ogdi-3.1.4/config/darwin.mak
--- ogdi-3.1.4-orig/config/darwin.mak   2003-12-16 03:08:00.0 +0900
+++ ogdi-3.1.4/config/darwin.mak2005-08-15 08:04:20.0 +0900
@@ -33,7 +33,7 @@
 SHLIB_CFLAGS   = -fno-common
 COMMON_CFLAGS  = $(OPTIMIZATION) -fno-common
 
-SHLIB_LDFLAGS  = -dynamiclib
+SHLIB_LDFLAGS  = -dynamiclib -compatibility_version 3.1.0 -current_version 
3.1.5
 COMMON_LDFLAGS  = $(OPTIMIZATION)
 
 
@@ -50,6 +50,16 @@
 
 BIG_ENDIAN  = 1
 
+RPC_LINKLIB=   -ldl 
+PROJ_SETTING=external
+PROJ_INCLUDE :=[EMAIL PROTECTED]@/include
+PROJ_STATICLIB := [EMAIL PROTECTED]@/lib -lproj
+ZLIB_SETTING=external
+ZLIB_INCLUDE :=
+ZLIB_LINKLIB := -lz
+EXPAT_SETTING=external
+EXPAT_INCLUDE := [EMAIL PROTECTED]@/include
+EXPAT_LINKLIB := [EMAIL PROTECTED]@/lib -lexpat
 
 #
 # make rules
@@ -62,5 +72,5 @@

 $(DYNAGEN): $(OBJECTS)
@echo Making shared library: $@
-   $(SHLIB_LD) $(SHLIB_LDFLAGS) $(COMMON_LDFLAGS) -o $@ $^ $(LINK_LIBS) 
+   $(SHLIB_LD) $(SHLIB_LDFLAGS) -install_name $(INST_LIB)/$(notdir $@) 
$(COMMON_LDFLAGS) -o $@ $^ $(LINK_LIBS) 
@echo $@ made successfully ...
diff -urN ogdi-3.1.4-orig/ogdi/c-api/ecs_dyna.c ogdi-3.1.4/ogdi/c-api/ecs_dyna.c
--- ogdi-3.1.4-orig/ogdi/c-api/ecs_dyna.c   2004-02-19 06:50:21.0 
+0900
+++ ogdi-3.1.4/ogdi/c-api/ecs_dyna.c2005-08-15 08:02:05.0 +0900
@@ -82,11 +82,11 @@
   if (handle == NULL) {
 /* Try with the .so extension */
 
-if ((temp = (char *) malloc(strlen(libname)+7)) == NULL)
+if ((temp = (char *) malloc(strlen(libname)+10)) == NULL)
   return NULL;
 strcpy(temp,lib);
 strcat(temp,libname);
-strcat(temp,.so);
+strcat(temp,.dylib);
 
 handle = dlopen(temp,RTLD_LAZY);
 #ifdef notdef

Index: qgis.info
===
RCS file: /cvsroot/fink/experimental/babayoshihiko/finkinfo/qgis.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qgis.info   22 May 2005 23:25:15 -  1.5
+++ qgis.info   9 Oct 2005 02:38:10 -   1.6
@@ -1,8 +1,8 @@
 Info2: 
 Package: qgis%type_pkg[-nopgsql]%type_pkg[-nograss]
 Type: -nopgsql (boolean), -nograss (boolean)
-Version: 0.6.0
-Revision: 2
+Version: 0.7.0
+Revision: 1
 Description: Qt/X11-based GIS
 License: GPL
 Homepage: http://www.qgis.org
@@ -32,19 +32,19 @@
libgeos2-shlibs (=2.0), gdal-shlibs (=1.2.3) | gdal-nopgsql-shlibs 
(=1.2.3), proj (=4),
(%type_raw[-nopgsql] = .) postgresql80 (=8.0.2-13) | 
(%type_raw[-nopgsql] = .) postgresql80-ssl (=8.0.2-13), 
(%type_raw[-nopgsql] = .) postgresql80-shlibs (=8.0.2-13) | 
(%type_raw[-nopgsql] = .) postgresql80-ssl-shlibs (=8.0.2-13),
-   (%type_raw[-nograss] = .) grass60 | (%type_raw[-nograss] = .) 
grass60-nopgsql | (%type_raw[-nograss] = .) grass60-nogdal | 
(%type_raw[-nograss] = .) grass60-nopgsql-nogdal, 
-   (%type_raw[-nograss] = .) grass60-shlibs | (%type_raw[-nograss] = .) 
grass60-nopgsql-shlibs | (%type_raw[-nograss] = .) grass60-nogdal-shlibs | 
(%type_raw[-nograss] = .) grass60-nopgsql-nogdal-shlibs
+   (%type_raw[-nograss] = .) grass60 (=6.0.0-4)