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

Modified Files:
      Tag: pangocairo-branch
        deborphan.info fdclone.info fdclone.patch gawk.info gawk.patch 
        jless.info 
Added Files:
      Tag: pangocairo-branch
        most.info treeline.info 
Removed Files:
      Tag: pangocairo-branch
        deborphan.patch 
Log Message:
merged from head

Index: fdclone.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/fdclone.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- fdclone.patch       20 Jan 2006 20:32:32 -0000      1.1
+++ fdclone.patch       15 May 2007 02:42:02 -0000      1.1.2.1
@@ -1,90 +1,73 @@
-diff -Naur FD-2.07a.orig/Makefile FD-2.07a/Makefile
---- FD-2.07a.orig/Makefile     2005-06-21 11:00:00.000000000 -0400
-+++ FD-2.07a/Makefile  2005-12-12 21:50:39.000000000 -0500
-@@ -12,9 +12,9 @@
- HOSTCC        = $(CC)
- SED   = sed
- 
--GETVER        = HEAD="`tail -1 version.h`"; \
-+GETVER        = HEAD="`tail -n 1 version.h`"; \
-       VER=`expr "$$HEAD" : '.*\([0-9][0-9]*\.[0-9a-z\-]*\).*'`
--GETDIST       = HEAD=`tail -2 version.h | head -1`; \
-+GETDIST       = HEAD=`tail -n 2 version.h | head -n 1`; \
-       DIST=`expr "$$HEAD" : '.*"\(.*\)".*'`
- DEFCFLAGS = -DVER='"'$$VER'"' \
-       -DDIST='"'$$DIST'"' \
-diff -Naur FD-2.07a.orig/Makefile.in FD-2.07a/Makefile.in
---- FD-2.07a.orig/Makefile.in  Wed Jun 22 00:00:00 2005
-+++ FD-2.07a/Makefile.in       Fri Jul  1 03:18:24 2005
-@@ -3,6 +3,7 @@
- #
- 
- TITLE = FD-
-+PKGNAME       = fdclone
- VERSION       = __VERSION__
- VER   = __VER__
- PREFIX        = __PREFIX__
-@@ -12,9 +13,9 @@
- TOPDIR        = $(BUILD)$(PREFIX)
- BINDIR        = $(TOPDIR)/bin
- DATADIR       = $(TOPDIR)/share
--MANDIR        = $(TOPDIR)/man/man$(MANSEC)
-+MANDIR        = $(DATADIR)/man/man$(MANSEC)
- CATDIR        = $(TOPDIR)/man/cat$(MANSEC)
--JMANDIR       = $(TOPDIR)/man__LANGDIR__/man$(MANSEC)
-+JMANDIR       = $(DATADIR)/man/ja/man$(MANSEC)
- JCATDIR       = $(TOPDIR)/man__LANGDIR__/cat$(MANSEC)
+diff -Naur FD-2.09d.orig/Makefile.in FD-2.09d/Makefile.in
+--- FD-2.09d.orig/Makefile.in  2007-04-26 00:00:00.000000000 +0900
++++ FD-2.09d/Makefile.in       2007-05-06 08:09:21.000000000 +0900
+@@ -13,10 +14,10 @@
+ BINDIR        = $(BUILD)$(BINTOP)
+ DATATOP       = $(PREFIX)/share
+ DATADIR       = $(BUILD)$(DATATOP)/fd
+-MANTOP        = $(PREFIX)/man
++MANTOP        = $(DATATOP)/man
+ MANDIR        = $(BUILD)$(MANTOP)/man$(MANSEC)
+ CATDIR        = $(BUILD)$(MANTOP)/cat$(MANSEC)
+-JMANDIR       = $(BUILD)$(MANTOP)__LANGDIR__/man$(MANSEC)
++JMANDIR       = $(BUILD)$(MANTOP)/ja/man$(MANSEC)
+ JCATDIR       = $(BUILD)$(MANTOP)__LANGDIR__/cat$(MANSEC)
  IPKWDIR       = ./ipk.work
  IPKTDIR       = ./ipk.tmp
-@@ -213,28 +214,33 @@
+@@ -256,34 +257,36 @@
  # to install all
  
- install: $(PROGRAM)__EXE__ $(PROGRAM).$(MANSEC) __UNITBL__
-+      [ -d $(BINDIR) ] || install -d $(BINDIR)
+ install: $(PROGRAM)__EXE__ $(PROGRAM).$(MANSEC) __UNITBL__ __DICTTBL__
++      [ -d $(BINDIR) ] || mkdir -p $(BINDIR)
        $(INSTALL) __INSTSTRIP__ $(PROGRAM)$(EXE) $(BINDIR)
        $(CHMOD) a+rx $(BINDIR)/$(PROGRAM)$(EXE)
        -$(RM) $(BINDIR)/$(ALIAS)$(EXE)
        $(LN) $(BINDIR)/$(PROGRAM)$(EXE) $(BINDIR)/$(ALIAS)$(EXE)
        $(CHMOD) a+rx $(BINDIR)/$(ALIAS)$(EXE)
-+      [ -d $(JMANDIR) ] || install -d $(JMANDIR)
+-      [ -d $(JMANDIR) ] || mkdir $(JMANDIR)
++      [ -d $(JMANDIR) ] || mkdir -p $(JMANDIR)
        $(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)/$(PROGRAM).$(MANSEC)
        $(CHMOD) a+r-x $(JMANDIR)/$(PROGRAM).$(MANSEC)
        -$(RM) $(JMANDIR)/$(ALIAS).$(MANSEC)
        $(LN) $(JMANDIR)/$(PROGRAM).$(MANSEC) $(JMANDIR)/$(ALIAS).$(MANSEC)
        $(CHMOD) a+r-x $(JMANDIR)/$(ALIAS).$(MANSEC)
-+      [ -d $(MANDIR) ] || install -d $(MANDIR)
+-      [ -d $(MANDIR) ] || mkdir $(MANDIR)
++      [ -d $(MANDIR) ] || mkdir -p $(MANDIR)
        $(INSTALL) $(MANSRC) $(MANDIR)/$(PROGRAM).$(MANSEC)
        $(CHMOD) a+r-x $(MANDIR)/$(PROGRAM).$(MANSEC)
        -$(RM) $(MANDIR)/$(ALIAS).$(MANSEC)
        $(LN) $(MANDIR)/$(PROGRAM).$(MANSEC) $(MANDIR)/$(ALIAS).$(MANSEC)
        $(CHMOD) a+r-x $(MANDIR)/$(ALIAS).$(MANSEC)
        -if [ -f $(RUNCOM) ]; then \
-+              [ -d $(BUILD)/$(CONFDIR) ] || install -d $(BUILD)/$(CONFDIR); \
++              [ -d $(BUILD)/$(CONFDIR) ] || mkdir -p $(BUILD)/$(CONFDIR); \
                $(INSTALL) $(RUNCOM) $(BLDRC); \
                $(CHMOD) a+r-x $(BLDRC); \
        fi
        -if [ -f $(UNITBL) ]; then \
--              $(INSTALL) $(UNITBL) __DATADIR__; \
--              $(CHMOD) a+r-x __DATADIR__/$(UNITBL); \
-+              [ -d $(DATADIR)/$(PKGNAME) ] || install -d 
$(DATADIR)/$(PKGNAME); \
-+              $(INSTALL) $(UNITBL) $(DATADIR)/$(PKGNAME); \
-+              $(CHMOD) a+r-x $(DATADIR)/$(PKGNAME)/$(UNITBL); \
+-              [ -d __DATADIR__ ] || mkdir __DATADIR__; \
++              [ -d __DATADIR__ ] || mkdir -p __DATADIR__; \
+               $(INSTALL) $(UNITBL) __DATADIR__; \
+               $(CHMOD) a+r-x __DATADIR__/$(UNITBL); \
        fi
- 
- catman: $(MANCAT)
-diff -Naur FD-2.07a.orig/_fdrc FD-2.07a/_fdrc
---- FD-2.07a.orig/_fdrc        Wed Jun 22 00:00:00 2005
-+++ FD-2.07a/_fdrc     Fri Jul  1 03:28:55 2005
-@@ -10,7 +10,7 @@
- #     5: length       13: length (reversal)
+       -if [ -f $(DICTTBL) ]; then \
+-              [ -d __DATADIR__ ] || mkdir __DATADIR__; \
++              [ -d __DATADIR__ ] || mkdir -p __DATADIR__; \
+               $(INSTALL) $(DICTTBL) __DATADIR__; \
+               $(CHMOD) a+r-x __DATADIR__/$(DICTTBL); \
+       fi
+diff -Naur FD-2.09d.orig/_fdrc FD-2.09d/_fdrc
+--- FD-2.09d.orig/_fdrc        2007-04-26 00:00:00.000000000 +0900
++++ FD-2.09d/_fdrc     2007-05-06 08:17:43.000000000 +0900
+@@ -16,7 +16,7 @@
  #     100-113: preserve previous sort type
+ #     200-213: preserve previous sort type also in the archive browser
  #             (the least 2 digits are effective just after initialize)
 -#SORTTYPE=0
 +SORTTYPE=1
  
  # default display mode
  #     0: normal (Default)
-@@ -21,12 +21,12 @@
+@@ -27,12 +27,12 @@
  #     5: sym-link status &                            invisible dot file
  #     6:                      file type symbol &      invisible dot file
  #     7: sym-link status &    file type symbol &      invisible dot file
@@ -99,7 +82,7 @@
  
  # behavior about writing over directory on file system
  #     0: confirm to write or not, after directory arranged (Default)
-@@ -47,7 +47,7 @@
+@@ -63,7 +63,7 @@
  # whether if adjust tty or not when exiting
  #     0: not adjust (Default)
  #     >= 1: adjust
@@ -108,7 +91,7 @@
  
  # whether if prioritize VT100 escape sequence or not for getting terminal size
  #     0: not prioritize (Default)
-@@ -151,11 +151,11 @@
+@@ -192,11 +192,11 @@
  
  # temporary directory where archive file is unpacked
  #     Default: /tmp
@@ -122,33 +105,69 @@
  
  # mount point of CD-ROM with iso-9660 rock ridge format
  #     Default: none
-@@ -209,7 +209,7 @@
- #     utf8, UTF8: UTF-8
+@@ -269,7 +269,7 @@
+ # whether if hold the UNICODE translation table on memory
+ #     0: not hold (Default)
+ #     >= 1: hold
+-#UNICODEBUFFER=0
++UNICODEBUFFER=1
+ 
+ # language code to be displayed
+ #     Default: No convert
+@@ -285,7 +285,7 @@
  #     utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
- #     eng, ENG, C: English
+ #     utf8-iconv, UTF8-ICONV: UTF-8 for iconv
+ #     en, EN, C: English
 -#LANGUAGE=""
 +LANGUAGE="$LANG"
  
  # system default Kanji code
  #     Default: No convert
-@@ -233,7 +233,7 @@
- #     sjis, SJIS: Shift JIS
+@@ -302,7 +302,7 @@
+ #     utf8, UTF8: UTF-8
+ #     utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
+ #     utf8-iconv, UTF8-ICONV: UTF-8 for iconv
+-#DEFKCODE=""
++DEFKCODE="$LANG"
+ 
+ # Kanji code to be inputted
+ #     Default: No convert
+@@ -311,7 +311,7 @@
  #     utf8, UTF8: UTF-8
  #     utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
+ #     utf8-iconv, UTF8-ICONV: UTF-8 for iconv
 -#INPUTKCODE=""
 +INPUTKCODE="$LANG"
  
+ # Kanji code to be inputted to the pseudo terminal
+ #     Default: No convert
+@@ -320,7 +320,7 @@
+ #     utf8, UTF8: UTF-8
+ #     utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
+ #     utf8-iconv, UTF8-ICONV: UTF-8 for iconv
+-#PTYINKCODE=""
++PTYINKCODE="$LANG"
+ 
+ # Kanji code to be outputted from the pseudo terminal
+ #     Default: No convert
+@@ -329,7 +329,7 @@
+ #     utf8, UTF8: UTF-8
+ #     utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
+ #     utf8-iconv, UTF8-ICONV: UTF-8 for iconv
+-#PTYOUTKCODE=""
++PTYOUTKCODE="$LANG"
+ 
  # Kanji code in filename
  #     Default: No convert
-@@ -249,7 +249,7 @@
- #     cap, CAP: CAP
+@@ -346,7 +346,7 @@
  #     utf8, UTF8: UTF-8
  #     utf8-mac, UTF8-MAC: UTF-8 for Mac OS X
+ #     utf8-iconv, UTF8-ICONV: UTF-8 for iconv
 -#FNAMEKCODE=""
 +FNAMEKCODE="utf8-mac"
  
- # directories on which language code type in filename is SJIS
- #     Default: none
+ # language code to be displayed
+ #     Default: No convert
 diff -Naur FD-2.07a.orig/machine.h FD-2.07a/machine.h
 --- FD-2.07a.orig/machine.h    Wed Jun 22 00:00:00 2005
 +++ FD-2.07a/machine.h Fri Jul  1 03:18:35 2005

Index: jless.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/jless.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- jless.info  30 Apr 2007 02:48:29 -0000      1.1.2.1
+++ jless.info  15 May 2007 02:42:02 -0000      1.1.2.2
@@ -1,6 +1,6 @@
 Package: jless
 Version: 382-iso258
-Revision: 1
+Revision: 1001
 Source: mirror:gnu:less/less-382.tar.gz
 Source2: http://www25.big.jp/~jam/less/less-%v.patch.gz
 Source-MD5: 103fe4aef6297b93f0f73f38cc3b1bd7

Index: gawk.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/gawk.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- gawk.patch  28 Dec 2006 17:50:22 -0000      1.1.2.2
+++ gawk.patch  15 May 2007 02:42:02 -0000      1.1.2.3
@@ -1,3 +1,17 @@
+--- gawk-3.1.5.orig/builtin.c  2005-07-26 18:07:43.000000000 +0000
++++ gawk-3.1.5/builtin.c       2007-05-02 15:03:56.000000000 +0000
+@@ -2089,9 +2089,9 @@
+                       }
+ 
+                       free(buf);
+-                      if (wc_indices != NULL)
+-                              free(wc_indices);
+               }
++              if (wc_indices != NULL)
++                      free(wc_indices);
+       } else {                /* match failed */
+               rstart = 0;
+               rlength = -1;
 diff -ru gawk-3.1.5/dfa.c gawk-3.1.5-patched/dfa.c
 --- gawk-3.1.5/dfa.c   2005-07-26 20:07:43.000000000 +0200
 +++ gawk-3.1.5-patched/dfa.c   2006-12-24 18:18:51.000000000 +0100

--- NEW FILE: most.info ---
Package: most
Version: 4.10.2
Revision: 1
Source: ftp://space.mit.edu/pub/davis/%n/%n-%v.tar.bz2
Source-MD5: 99a24b6989ac81f436791b957b2e171a
Maintainer: Remko Troncon <[EMAIL PROTECTED]>
HomePage: http://www.jedsoft.org/most
License: GPL
Description: Powerful paging program
Depends: slang-shlibs
BuildDepends: slang
ConfigureParams: --without-x
InstallScript: <<
        make install prefix=%i MAN_DIR=%i/share/man DOC_DIR=%i/share/doc/%n
<<
DocFiles: COPYING COPYRIGHT changes.txt

--- NEW FILE: treeline.info ---
Package: treeline
Version: 1.0.1
Revision: 1
Architecture: powerpc
Description: Tree-based organization tool
DescDetail: <<
(from the homepage)
Do you have lots of sticky notes lying around with various useful 
information jotted down? Or many lists of books, movies, website 
logins, personal contacts, or things to do? Can you find them when
you need them? Well, I often couldn't. So here's my answer.
Some would call TreeLine an Outliner, others would call it a PIM. 
Basically, it just stores almost any kind of information. A tree 
structure makes it easy to keep things organized. And each node 
in the tree can contain several fields, forming a mini-database. 
The output format for each node can be defined, and the output can 
be shown on the screen, printed, or exported to html.
<<
DescPackaging: <<
Only uses python2.4 because some of the dependenencies don't have
-py25 variants.
Tagged as powerpc until we come up with a pyqt that builds with gcc4.
<<
Homepage: http://www.bellz.org/treeline/
License: GPL
Maintainer: Alexander K. Hansen <[EMAIL PROTECTED]>
Depends: qt3-shlibs, python24-shlibs, pyqt-py24, pyxml-py24, aspell
BuildDepends: qt3, python24
Source: http://www.bellz.org/%n/%n-%v.tar.gz
Source-MD5: ea6fb711d17eecabba5373e49cbea81e
SourceDirectory: TreeLine
CompileScript: true
InstallScript: <<
  %p/bin/python2.4  install.py -p %p -b %d
<<
DocFiles: doc/LICENSE doc/README_raw.html doc/README.html doc/INSTALL

--- deborphan.patch DELETED ---

Index: fdclone.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/fdclone.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- fdclone.info        20 Jan 2006 20:32:32 -0000      1.1
+++ fdclone.info        15 May 2007 02:42:02 -0000      1.1.2.1
@@ -1,11 +1,11 @@
 Package: fdclone
-Version: 2.07a
-Revision: 3
+Version: 2.09d
+Revision: 1
 Description: File & Directory Maintenance Tool
 License: Restrictive/Distributable
 Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
 Source: ftp://ftp.unixusers.net/src/%n/FD-%v.tar.gz
-Source-MD5: 6b98fd5a37c21a72eb72bc29ba707bf9
+Source-MD5: f9a5a5455181dd838c9c37608889d3d9
 PatchScript: <<
  patch -p1 < %a/%n.patch
  cp _fdrc fdrc
@@ -26,6 +26,10 @@
    TMPDIR=$HOME        (for security reasons)
    TMPUMASK=077        (same above)
    LANGUAGE=$LANG
+   DEFKCODE=$LANG
    INPUTKCODE=$LANG
+   PTYINKCODE=$LANG
+   PTYOUTKCODE=$LANG
    FNAMEKCODE=utf8-mac (for Mac OS X filesystem)
+   UNICODEBUFFER=1
 <<

Index: deborphan.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/deborphan.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- deborphan.info      20 Jan 2006 20:32:32 -0000      1.1
+++ deborphan.info      15 May 2007 02:42:02 -0000      1.1.2.1
@@ -1,18 +1,20 @@
 Package: deborphan
-Version: 1.0
-Revision: 11
-BuildDepends: gengetopt, gettext-dev, gettext-bin, gettext-tools
-Source: http://www.tribe.eu.org/%n/src/%n-%v.tar.gz
-Source-MD5: 184f167184a03bd9f5b9405d56dfcaa7
-Patch: %n.patch
+Version: 1.7.23
+Revision: 2
+BuildDepends: gettext-bin, gettext-tools, libgettext3-dev
+Depends: dialog, libgettext3-shlibs
+Source: http://ftp.debian.org/debian/pool/main/d/%n/%n_%v.tar.gz
+Source-MD5: 665d5f4971cdcee86c75d83d99dfb148
+SourceDirectory: %n-%v
 PatchScript: <<
- cp -f %p/share/gengetopt/*.[ch] src
- ln -s gnugetopt.h src/getopt.h
+ perl -pi -e 's,/var/(lib|state),%p/var/lib,' configure include/deborphan.h 
src/Makefile.in
+ perl -pi -e 's, include <stdio\.h>,$&\n#  if !defined (__APPLE__),; s,fileno 
.*,$&\n#endif,' include/deborphan.h
+ perl -pi -e 's,deb \*dfkeep,dep \*dfkeep,' src/deborphan.c
+ perl -pi -e 's,if \[ -r %p/var/lib/debfoster/keepers \],if true,' configure
 <<
 UpdatePoMakefile: true
-SetCFLAGS: -O3
+SetCFLAGS: -Os
 SetLIBS: -lintl
-ConfigureParams: --mandir=%i/share/man
 DocFiles: COPYING NEWS README THANKS
 Description: Orphaned package finder
 DescDetail: <<
@@ -23,6 +25,9 @@
 License: Artistic
 Maintainer: None <[EMAIL PROTECTED]>
 DescPackaging: <<
+ Patched to work with debfoster and to include debfoster support
+ even if debfoster isn't installed (will still work without it).
+ 
  Originally packaged by Masanori Sekino.
 <<
-Homepage: http://www.tribe.eu.org/deborphan/
+Homepage: http://freshmeat.net/projects/%n/

Index: gawk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/gawk.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- gawk.info   28 Dec 2006 17:50:22 -0000      1.1.2.1
+++ gawk.info   15 May 2007 02:42:02 -0000      1.1.2.2
@@ -16,7 +16,7 @@
 
 Package: gawk
 Version: 3.1.5
-Revision: 11
+Revision: 12
 Maintainer: Max Horn <[EMAIL PROTECTED]>
 BuildDepends: libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev
 Depends: libgettext3-shlibs, libiconv
@@ -34,5 +34,10 @@
 scripts. Note that many people actually prefer mawk over gawk because
 of speed.
 <<
+DescPackaging: <<
+* Patch a bug in builtin.c (also in Debian).
+* Another patch works around a compile problem related to
+  gawk's xmalloc
+<<
 License: GPL
 Homepage: http://www.gnu.org/software/gawk/


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to