Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14176

Modified Files:
        gnokii.info gnokii.patch 
Removed Files:
        gnokii2.info gnokii2.patch 
Log Message:
new upstream gnokii, remove old obsoleted gnokii2

Index: gnokii.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/gnokii.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gnokii.info 15 Jul 2008 01:41:22 -0000      1.5
+++ gnokii.info 23 Jul 2008 14:14:46 -0000      1.6
@@ -1,7 +1,7 @@
 Package: gnokii
-Version: 0.6.20
-Revision: 2
-Description: Gnokii mobile phone tools and driver
+Version: 0.6.26
+Revision: 1
+Description: Mobile phone tools and driver
 License: GPL
 #
 Depends: <<
@@ -36,7 +36,8 @@
        pixman (>= 0.10.0-1),
        pkgconfig (>= 0.21-1),
        x11-dev,
-       xft2-dev
+       xft2-dev,
+       xmkmf
 <<
 #
 CustomMirror: <<
@@ -47,22 +48,39 @@
 Conflicts: gnokii2
 Replaces: gnokii2
 Source: mirror:custom:gnokii-%v.tar.bz2
-Source-MD5: 8e90b0f56d13735fd35620a8738c31aa
+Source-MD5: 60f817d8ce748fea0ec9a05b3537e08d
 PatchFile: %n.patch
-PatchFile-MD5: 1d0621d5a84e31e9490b775bdcc1a552
+PatchFile-MD5: c37f2cad8540b91abf6deb7e064f5a41
 SetCPPFLAGS: -I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
 SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
 #
 ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info 
--libexecdir=%p/lib --disable-dependency-tracking
 #
-InstallScript: make -j1 install-devel DESTDIR=%d xmandir=%p/share/man/man1
-DocFiles: ChangeLog COPYING COPYRIGHT INSTALL MAINTAINERS TODO VERSION
+CompileScript: <<
+#!/bin/sh -ex
+       export PATH=%p/lib/xmkmf/bin:$PATH \
+               
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 \
+               FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config \
+               ac_cv_path_PGCONFIG=no \
+               ac_cv_path_MYSQLCONFIG=no
+       ./configure %c
+       make
+<<
+InstallScript: <<
+       make install DESTDIR=%d xmandir=%p/share/man/man1
+       rm %i/lib/smsd/*.a
+<<
+DocFiles: AUTHORS COPYING COPYRIGHT ChangeLog INSTALL MAINTAINERS NEWS README 
TODO
 #
 SplitOff: <<
        Package: %N3-shlibs 
        Description: Gnokii shared libraries
        Replaces: gnokii2-shlibs
-       Files: lib/libgnokii.3*.dylib
+       Files: <<
+               lib/libgnokii.3*.dylib
+       <<
        Depends: <<
                fontconfig2-shlibs (>= 2.4.1-1),
                freetype219-shlibs (>= 2.3.5-1),
@@ -73,7 +91,7 @@
                x11-shlibs
        <<
        Shlibs: <<
-               %p/lib/libgnokii.3.dylib 8.0.0 %n (>= 0.6.20-1)
+               %p/lib/libgnokii.3.dylib 13.0.0 %n (>= 0.6.26-1)
        <<
        DocFiles: COPYING COPYRIGHT
 <<
@@ -86,7 +104,7 @@
        Depends: %N3-shlibs (= %v-%r)
        BuildDependsOnly: True
        Files: include lib/libgnokii.dylib lib/*.a lib/*.la lib/pkgconfig
-       DocFiles: ChangeLog COPYING COPYRIGHT INSTALL MAINTAINERS TODO VERSION
+       DocFiles: COPYING COPYRIGHT
 <<
 DescDetail: <<
 Gnokii provides tools and a user space driver for use with Nokia and
@@ -96,8 +114,5 @@
 have. For a complete list of supported makes and models take a look at
 our FAQ pages.
 <<
-DescPort: <<
-Uses automake.
-<<
 Homepage: http://www.gnokii.org/
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>

--- gnokii2.patch DELETED ---

Index: gnokii.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/gnokii.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnokii.patch        27 Oct 2007 18:26:25 -0000      1.2
+++ gnokii.patch        23 Jul 2008 14:14:46 -0000      1.3
@@ -1,18 +1,30 @@
-diff -uNr gnokii-0.6.20/configure gnokii-0.6.20-new/configure
---- gnokii-0.6.20/configure    2007-10-27 10:22:21.000000000 -0400
-+++ gnokii-0.6.20-new/configure        2007-10-27 14:11:55.000000000 -0400
-@@ -28439,7 +28439,7 @@
+diff -Nurd gnokii-0.6.26/common/Makefile.in 
gnokii-0.6.26-new/common/Makefile.in
+--- gnokii-0.6.26/common/Makefile.in   2008-05-30 15:45:56.000000000 -0400
++++ gnokii-0.6.26-new/common/Makefile.in       2008-07-23 09:41:00.000000000 
-0400
+@@ -357,6 +357,8 @@
+       $(top_builddir)/common/phones/libPHONES.la \
+       $(top_builddir)/common/links/libLINKS.la \
+       $(top_builddir)/common/devices/libDEVICES.la \
++      $(BLUETOOTH_LIBS) \
++      $(INTLLIBS) \
+       $(XPM_LIBS)
+ 
+ libgnokii_la_LDFLAGS = \
+diff -Nurd gnokii-0.6.26/configure gnokii-0.6.26-new/configure
+--- gnokii-0.6.26/configure    2008-05-30 15:46:08.000000000 -0400
++++ gnokii-0.6.26-new/configure        2008-07-23 08:04:25.000000000 -0400
+@@ -25313,7 +25313,7 @@
  _ACEOF
  
                USE_BLUETOOTH="yes"
--              LIBS="$LIBS $PTHREAD_LIBS -framework CoreFoundation -framework 
IOBluetooth -framework Foundation"
-+              LIBS="$LIBS $PTHREAD_LIBS -Wl,-framework,CoreFoundation 
-Wl,-framework,IOBluetooth -Wl,-framework,Foundation"
+-              BLUETOOTH_LIBS="$PTHREAD_LIBS -framework CoreFoundation 
-framework IOBluetooth -framework Foundation"
++              BLUETOOTH_LIBS="$PTHREAD_LIBS -Wl,-framework,CoreFoundation 
-Wl,-framework,IOBluetooth -Wl,-framework,Foundation"
+ 
        fi
  fi
- 
-diff -uNr gnokii-0.6.20/gnokii/gnokii-utils.c 
gnokii-0.6.20-new/gnokii/gnokii-utils.c
---- gnokii-0.6.20/gnokii/gnokii-utils.c        2007-10-27 10:22:01.000000000 
-0400
-+++ gnokii-0.6.20-new/gnokii/gnokii-utils.c    2007-10-27 14:12:08.000000000 
-0400
+diff -Nurd gnokii-0.6.26/gnokii/gnokii-utils.c 
gnokii-0.6.26-new/gnokii/gnokii-utils.c
+--- gnokii-0.6.26/gnokii/gnokii-utils.c        2008-03-20 13:49:01.000000000 
-0400
++++ gnokii-0.6.26-new/gnokii/gnokii-utils.c    2008-07-23 08:03:55.000000000 
-0400
 @@ -43,6 +43,7 @@
  
  #include <stdio.h>
@@ -21,10 +33,31 @@
  
  #include "gnokii-app.h"
  #include "gnokii.h"
-diff -uNr gnokii-0.6.20/xgnokii/xgnokii_data.c 
gnokii-0.6.20-new/xgnokii/xgnokii_data.c
---- gnokii-0.6.20/xgnokii/xgnokii_data.c       2007-10-27 10:22:02.000000000 
-0400
-+++ gnokii-0.6.20-new/xgnokii/xgnokii_data.c   2007-10-27 14:20:19.000000000 
-0400
-@@ -65,7 +65,7 @@
+diff -Nurd gnokii-0.6.26/smsd/Makefile.in gnokii-0.6.26-new/smsd/Makefile.in
+--- gnokii-0.6.26/smsd/Makefile.in     2008-05-30 15:46:01.000000000 -0400
++++ gnokii-0.6.26-new/smsd/Makefile.in 2008-07-23 09:56:36.000000000 -0400
+@@ -58,7 +58,7 @@
+       "$(DESTDIR)$(man8dir)"
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+-libsmsd_file_la_LIBADD =
++libsmsd_file_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/common/libgnokii.la
+ am_libsmsd_file_la_OBJECTS = file.lo utils.lo
+ libsmsd_file_la_OBJECTS = $(am_libsmsd_file_la_OBJECTS)
+ libsmsd_file_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+@@ -319,7 +319,7 @@
+ top_srcdir = @top_srcdir@
+ plugindir = $(libdir)/smsd
+ plugin_LTLIBRARIES = libsmsd_file.la $(am__append_1) $(am__append_2)
+-modules_flags = -avoid-version -module -no-undefined
++modules_flags = -avoid-version -module
+ @[EMAIL PROTECTED] = pq.c db.h utils.h utils.c
+ @[EMAIL PROTECTED] = $(modules_flags)
+ @[EMAIL PROTECTED] = $(POSTGRES_LIBS)
+diff -Nurd gnokii-0.6.26/xgnokii/xgnokii_data.c 
gnokii-0.6.26-new/xgnokii/xgnokii_data.c
+--- gnokii-0.6.26/xgnokii/xgnokii_data.c       2008-03-20 13:49:03.000000000 
-0400
++++ gnokii-0.6.26-new/xgnokii/xgnokii_data.c   2008-07-23 08:03:55.000000000 
-0400
+@@ -67,7 +67,7 @@
  }
  
  
@@ -33,9 +66,9 @@
  {
        if (!phoneMonitor.supported & PM_DATA)
                return;
-diff -uNr gnokii-0.6.20/xgnokii/xgnokii_data.h 
gnokii-0.6.20-new/xgnokii/xgnokii_data.h
---- gnokii-0.6.20/xgnokii/xgnokii_data.h       2007-10-27 10:22:02.000000000 
-0400
-+++ gnokii-0.6.20-new/xgnokii/xgnokii_data.h   2007-10-27 14:20:19.000000000 
-0400
+diff -Nurd gnokii-0.6.26/xgnokii/xgnokii_data.h 
gnokii-0.6.26-new/xgnokii/xgnokii_data.h
+--- gnokii-0.6.26/xgnokii/xgnokii_data.h       2007-05-07 14:05:53.000000000 
-0400
++++ gnokii-0.6.26-new/xgnokii/xgnokii_data.h   2008-07-23 08:03:55.000000000 
-0400
 @@ -31,7 +31,7 @@
  #define XGNOKII_DATA_H
  
@@ -45,10 +78,10 @@
  inline void GUI_HideData(void);
  
  #endif
-diff -uNr gnokii-0.6.20/xgnokii/xgnokii_lowlevel.h 
gnokii-0.6.20-new/xgnokii/xgnokii_lowlevel.h
---- gnokii-0.6.20/xgnokii/xgnokii_lowlevel.h   2007-10-27 10:22:02.000000000 
-0400
-+++ gnokii-0.6.20-new/xgnokii/xgnokii_lowlevel.h       2007-10-27 
14:11:55.000000000 -0400
-@@ -230,6 +230,6 @@
+diff -Nurd gnokii-0.6.26/xgnokii/xgnokii_lowlevel.h 
gnokii-0.6.26-new/xgnokii/xgnokii_lowlevel.h
+--- gnokii-0.6.26/xgnokii/xgnokii_lowlevel.h   2008-03-20 13:49:03.000000000 
-0400
++++ gnokii-0.6.26-new/xgnokii/xgnokii_lowlevel.h       2008-07-23 
08:03:55.000000000 -0400
+@@ -231,6 +231,6 @@
  extern void GUI_InsertEvent(PhoneEvent * event);
  extern gn_error GUI_InitSMSFolders(void);
  extern int isSMSactivated;

--- gnokii2.info DELETED ---


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to