Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11-wm
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22341/10.3/unstable/main/finkinfo/x11-wm

Modified Files:
        ion.info ion.patch 
Log Message:
update to ion2

Index: ion.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11-wm/ion.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ion.patch   14 Dec 2003 21:47:31 -0000      1.1
+++ ion.patch   22 Sep 2006 19:34:57 -0000      1.2
@@ -1,70 +1,12 @@
-diff -ru ion-20011109/src/complete_file.c 
ion-20011109-patched/src/complete_file.c
---- ion-20011109/src/complete_file.c   Fri Feb 16 18:39:42 2001
-+++ ion-20011109-patched/src/complete_file.c   Sat Nov 17 16:54:14 2001
-@@ -48,6 +48,7 @@
-  * Tuomo Valkonen <[EMAIL PROTECTED]>, 2000-08-23.
-  */
- 
-+#include <sys/types.h>
- #include <dirent.h>
- #include <string.h>
- #include <unistd.h>
-Only in ion-20011109-patched/src: ion
-diff -ru ion-20011109/system.mk ion-20011109-patched/system.mk
---- ion-20011109/system.mk     Fri Nov  9 18:12:41 2001
-+++ ion-20011109-patched/system.mk     Sat Nov 17 17:08:33 2001
-@@ -7,13 +7,13 @@
- ## Installation paths
- ##
- 
--PREFIX=/usr/local
[EMAIL PROTECTED]@
- 
- # No need to modify these usually
- BINDIR=$(PREFIX)/bin
- ETCDIR=$(PREFIX)/etc
--MANDIR=$(PREFIX)/man
--DOCDIR=$(PREFIX)/doc
-+MANDIR=$(PREFIX)/share/man
-+DOCDIR=$(PREFIX)/share/doc
- # Not used
- INCDIR=$(PREFIX)/include
- LIBDIR=$(PREFIX)/lib
-@@ -24,7 +24,7 @@
- ##
- 
- #MODULE_SUPPORT=-DCF_NO_MODULE_SUPPORT
--MODULE_SUPPORT_LDFLAGS=-export-dynamic -ldl
-+MODULE_SUPPORT_LDFLAGS=-ldl
- 
- 
- ##
-@@ -40,8 +40,8 @@
- X11_INCLUDES=-I$(X11_PREFIX)/include
- X11_DEFINES=
- 
--#EXTRA_INCLUDES = -I$(PREFIX)/include
--#EXTRA_LIBS = -L$(PREFIX)/lib
-+EXTRA_INCLUDES = -I$(PREFIX)/include
-+EXTRA_LIBS = -L$(PREFIX)/lib
- 
- 
- ##
-@@ -59,7 +59,7 @@
- ## C compiler
- ##
- 
--CC=gcc
-+CC=cc
- 
- # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
- # they're mainly for development use. So, if they cause trouble (not
-@@ -83,7 +83,7 @@
- # have unused variables.
- WARN= -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
-       -Wtrigraphs -Wformat -Wchar-subscripts \
--      -Wparentheses -pedantic-errors -Wuninitialized
-+      -Wparentheses -Wuninitialized
- 
- 
- CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+diff -uNr ion-2-20040729/configure.ac ion-2-20040729-new/configure.ac
+--- ion-2-20040729/configure.ac        2004-07-28 23:10:26.000000000 -0400
++++ ion-2-20040729-new/configure.ac    2006-09-22 15:11:54.000000000 -0400
+@@ -114,7 +114,7 @@
+ else
+     libtool_path="$PATH"
+ fi
+-AC_PATH_PROG([LIBTOOL], [libtool], [], [$libtool_path])
++AC_PATH_PROG([LIBTOOL], [glibtool], [], [$libtool_path])
+ test "x$LIBTOOL" = x && exit 1
+ AC_MSG_CHECKING([for libtool version >= 1.4.3])
+ libtool_version=$($LIBTOOL --version | head -n 1 | cut -d' ' -f4)

Index: ion.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/x11-wm/ion.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ion.info    31 Dec 2003 16:54:36 -0000      1.2
+++ ion.info    22 Sep 2006 19:34:57 -0000      1.3
@@ -1,16 +1,46 @@
 Package: ion
-Version: 20020207
-Revision: 11
-Maintainer: None <fink-devel@lists.sourceforge.net>
-BuildDepends: x11-dev
-Depends: x11
-Source: http://modeemi.cs.tut.fi/~tuomov/dl/%n-%v.tar.gz
-#Source: 
ftp://ftp.ibiblio.org/pub/Linux/distributions/gentoo/gentoo-sources/%n-%v.tar.gz
-Source-MD5: 2e909abb45efefb08b1ceb886bf34cfe
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
-CompileScript: make depend && make
-InstallScript: make install PREFIX=%i
-ConfFiles: %p/etc/ion/ion.conf
+Version: 20040729
+Revision: 1
+Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+BuildDepends: autoconf (>= 2.60-1), automake1.9, libtool14 (>= 1.5.0-1), lua 
(>= 5.0.2-1), x11-dev
+Depends: libtool14-shlibs, lua (>= 5.0.2-1), x11
+Source: http://iki.fi/tuomov/dl/%n-2-%v.tar.gz
+Source-MD5: d7d98baa41635c1989e423adf76eb2ac
+Patch: %n.patch
+ConfigureParams: --with-lua-prefix=%p --mandir=%p/share/man 
--infodir=%p/share/info --libexecdir=%p/sbin --with-libtool=%p
+CompileScript: <<
+#!/bin/sh -ex
+
+       autoreconf -fvi
+       export lt_cv_sys_max_cmd_len=65536
+       ./configure %c
+       make
+<<
+ConfFiles: <<
+       %p/etc/ion/dock-draw.lua
+       %p/etc/ion/dock.lua
+       %p/etc/ion/floatws.lua
+       %p/etc/ion/ion-bindings.lua
+       %p/etc/ion/ion-menus.lua
+       %p/etc/ion/ion.lua
+       %p/etc/ion/ionws.lua
+       %p/etc/ion/kludges.lua
+       %p/etc/ion/look-brownsteel.lua
+       %p/etc/ion/look-clean.lua
+       %p/etc/ion/look-cleanios.lua
+       %p/etc/ion/look-cleanviolet.lua
+       %p/etc/ion/look-dusky.lua
+       %p/etc/ion/look-greyviolet.lua
+       %p/etc/ion/look-ios.lua
+       %p/etc/ion/look-simpleblue.lua
+       %p/etc/ion/look-wheat2.lua
+       %p/etc/ion/menu.lua
+       %p/etc/ion/pwm-bindings.lua
+       %p/etc/ion/pwm-menus.lua
+       %p/etc/ion/pwm.lua
+       %p/etc/ion/query.lua
+<<
+DocFiles: ChangeLog LICENSE README*
 Description: Unusual X11 window manager
 DescDetail: <<
 Ion (based on PWM) is an unusual kind of X11 window manager that brings a
@@ -18,9 +48,5 @@
 
 For a longer description please see the Ion homepage.
 <<
-DescPort: <<
-Doesn't use autoconf, so the patch patches the system.mk file quite
-heavily.
-<<
 License: Artistic
-Homepage: http://modeemi.cs.tut.fi/~tuomov/ion/
+Homepage: http://modeemi.fi/~tuomov/ion/


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to