Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/text
In directory vz-cvs-3.sog:/tmp/cvs-serv5613
Modified Files:
detex.info detex.patch djvulibre.info djvulibre.patch
Log Message:
new upstream; patched for clang by Jack Howarth.
Index: detex.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/detex.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- detex.info 23 Nov 2011 05:15:48 -0000 1.2
+++ detex.info 9 Mar 2012 19:18:53 -0000 1.3
@@ -1,16 +1,12 @@
Package: detex
-Version: 2.7
-Revision: 1003
-Source: ftp://ftp.cs.purdue.edu/pub/trinkle/%n-%v.tar.orig
+Version: 2.8
+Revision: 1000
+Source: ftp://ftp.cs.purdue.edu/pub/trinkle/%n-%v.tar
SourceRename: %n-%v.tar
-Source-MD5: df837b1adb40503f40b94b8169f0e154
-NoSourceDirectory: True
+Source-MD5: 7a96b647f43bb077323cde92faa1e893
PatchFile: %n.patch
-PatchFile-MD5: 7b462b99b8637a502123531960eb34a7
-PatchScript: patch <%{PatchFile}
+PatchFile-MD5: 537c51bd969b49d27d201eaf8f8586e0
BuildDepends: fink (>= 0.24.12), flex
-SetCC: llvm-gcc-4.2
-SetCXX: llvm-g++-4.2
CompileScript: make DESTDIR=%p/bin
InstallScript: <<
mkdir -p %i/bin
@@ -23,7 +19,8 @@
License: OSI-Approved
Description: Filter to strip TeX commands from a .tex file
DescPort: <<
- Patched Makefile to take care of malloc() problem.
+ Patched Makefile to take care of malloc() problem and to
+ pass -std=c89 as well as -Wno-return-type for clang. (Jack Howarth)
<<
DescPackaging: Patched Makefile to install delatex as well as detex.
Homepage: ftp://ftp.cs.purdue.edu/pub/trinkle/README
Index: djvulibre.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/djvulibre.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- djvulibre.patch 23 Jul 2011 18:02:35 -0000 1.1
+++ djvulibre.patch 9 Mar 2012 19:18:53 -0000 1.2
@@ -1,28 +1,22 @@
-diff -Nurd -x'*~' djvulibre-3.5.21.orig/configure djvulibre-3.5.21/configure
---- djvulibre-3.5.21.orig/configure 2008-07-02 18:43:52.000000000 -0400
-+++ djvulibre-3.5.21/configure 2008-11-12 09:30:17.000000000 -0500
-@@ -27343,12 +27343,8 @@
- if test x$ac_enable_djview != xno
- then
- NSDEJAVU_CFLAGS=${X_CFLAGS}
-- case "$host" in
-- *-cygwin* | *-mingw*)
- NSDEJAVU_LIBS="`echo ${X_LIBS} | sed -e 's/-lXext/-lXt -lXext/'`"
- NSDEJAVU_LIBS="-no-undefined $NSDEJAVU_LIBS"
-- ;;
-- esac
- fi
-
+--- djvulibre-3.5.24/configure.orig 2011-03-06 12:43:17.000000000 -0500
++++ djvulibre-3.5.24/configure 2012-03-02 19:47:30.000000000 -0500
+@@ -18820,7 +18820,7 @@
-diff -Nurd -x'*~' djvulibre-3.5.21.orig/gui/nsdejavu/Makefile.in
djvulibre-3.5.21/gui/nsdejavu/Makefile.in
---- djvulibre-3.5.21.orig/gui/nsdejavu/Makefile.in 2007-04-20
12:44:23.000000000 -0400
-+++ djvulibre-3.5.21/gui/nsdejavu/Makefile.in 2008-11-12 09:09:27.000000000
-0500
-@@ -51,7 +51,7 @@
+ NSDEJAVU_CFLAGS=${X_CFLAGS}
+ case "$host" in
+- *-cygwin* | *-mingw*)
++ *-cygwin* | *-mingw* | *-darwin*)
+ NSDEJAVU_LIBS="`echo ${X_LIBS} | sed -e 's/-lXext/-lXt -lXext/'`"
+ NSDEJAVU_LIBS="-no-undefined $NSDEJAVU_LIBS"
+ ;;
+--- djvulibre-3.5.24/gui/nsdejavu/Makefile.in.orig 2011-03-06
12:43:17.000000000 -0500
++++ djvulibre-3.5.24/gui/nsdejavu/Makefile.in 2012-03-02 19:49:20.000000000
-0500
+@@ -52,7 +52,7 @@
-I${top_srcdir}/gui/shared/res \
-I${top_srcdir}/gui/npsdk
--CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS}
-+CFLAGS = ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} @CPPFLAGS@
+-CFLAGS = @CPPFLAGS@ ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} ${GLIB_CFLAGS}
++CFLAGS = ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} @CPPFLAGS@ ${GLIB_CFLAGS}
LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
@@ -40,3 +34,56 @@
OBJS = classify.o cuts.o frames.o patterns.o
+--- djvulibre-3.5.24/gui/indep/utils/execdir.cpp.orig 2012-03-02
20:13:00.000000000 -0500
++++ djvulibre-3.5.24/gui/indep/utils/execdir.cpp 2012-03-02
20:14:34.000000000 -0500
+@@ -141,22 +141,22 @@
+ {
+ GURL url = GURL(file, paths[pos]);
+ GUTF8String urls = (const char*)url;
+- int pos = urls.search(osi);
+- if (pos >= 0)
++ int ipos = urls.search(osi);
++ if (ipos >= 0)
+ {
+ GUTF8String urlx;
+- urlx += urls.substr(0, pos);
++ urlx += urls.substr(0, ipos);
+ urlx += djview3;
+- urlx += urls.substr(pos+strlen(osi), -1);
++ urlx += urls.substr(ipos+strlen(osi), -1);
+ GURL url = GURL::UTF8(urlx);
+ if (url.is_file())
+ return url;
+ }
+ }
+ // end hack alert
+- for (GPosition pos=paths; pos; ++pos)
++ for (GPosition ipos=paths; ipos; ++ipos)
+ {
+- GURL url = GURL(file, paths[pos]);
++ GURL url = GURL(file, paths[ipos]);
+ if(url.is_file())
+ return url;
+ }
+--- djvulibre-3.5.24/libdjvu/GContainer.h.orig 2012-03-02 20:24:55.000000000
-0500
++++ djvulibre-3.5.24/libdjvu/GContainer.h 2012-03-02 20:27:59.000000000
-0500
+@@ -962,7 +962,7 @@
+ /** Inserts an element before the first element of the list.
+ The new element is initialized with a copy of argument #elt#. */
+ void prepend(const TYPE &elt)
+- { GListImpl<TI>::prepend(newnode((const TI&)elt)); }
++ { GListImpl<TI>::prepend(this->newnode((const TI&)elt)); }
+ /** Inserts a new element after the list element at position #pos#. When
+ position #pos# is null the element is inserted at the beginning of the
+ list. The new element is initialized with a copy of #elt#. */
+--- djvulibre-3.5.24/gui/nsdejavu/Makefile.in.orig 2012-03-02
20:49:11.000000000 -0500
++++ djvulibre-3.5.24/gui/nsdejavu/Makefile.in 2012-03-02 20:51:34.000000000
-0500
+@@ -54,7 +54,7 @@
+
+ CFLAGS = ${DEFS} ${OPTS} ${INCS} ${NSDEJAVU_CFLAGS} @CPPFLAGS@ ${GLIB_CFLAGS}
+
+-LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS}
++LIBS = @LDFLAGS@ ${NSDEJAVU_LIBS} -lglib-2.0
+
+ all: nsdejavu.la nsdejavu.x nsdejavu.1
+
Index: djvulibre.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/djvulibre.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- djvulibre.info 23 Nov 2011 05:20:15 -0000 1.2
+++ djvulibre.info 9 Mar 2012 19:18:53 -0000 1.3
@@ -1,28 +1,25 @@
Package: djvulibre
-Version: 3.5.21
-Revision: 2003
+Version: 3.5.24
+Revision: 1000
GCC: 4.0
Source: mirror:sourceforge:djvu/%n-%v.tar.gz
-Source-MD5: 4c6f3eb03ffbd067b6d2fe2344b0d9ad
+Source-MD5: af83d27af5083198432a178d22b259c5
BuildDepends: libiconv-dev, qt3 (>= 3.3.5-1023), x11-dev, libjpeg8, libtiff,
freetype219 (>= 2.3.7-7), xmkmf (>= 1.0.2-3), fink(>= 0.24.12-1)
BuildConflicts: djvulibre-dev
Depends: libdjvulibre21-shlibs (>= %v-%r), qt3-shlibs (>= 3.3.5-1023), x11,
libtiff-shlibs, freetype219-shlibs (>= 2.3.7-7)
PatchFile: %n.patch
-PatchFile-MD5: b7f6e31edef4983415956883cba505c7
+PatchFile-MD5: ed9b0be8a65cd54901155545af88e28d
PatchScript: <<
%{default_script}
perl -pi -e 's|/sw|%p|g' configure
perl -pi -e 's|/opt/local|%p|g' configure
perl -pi -e 's/__powerpc__./__powerpc__) || defined(__POWERPC__)/'
gui/npsdk/prcpucfg.h
<<
-ConfigureParams: --mandir='${prefix}/share/man'
-SetLDFLAGS: -Wl,-framework,OpenGL
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+ConfigureParams: --mandir='${prefix}/share/man' -enable-djview
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/include -I/usr/X11R6/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
-SetCC: llvm-gcc-4.2
-SetCXX: llvm-g++-4.2
DocFiles: NEWS README COPYING TODO COPYRIGHT INSTALL
CompileScript: <<
#!/bin/sh -ev
@@ -35,7 +32,7 @@
Package: libdjvulibre21-shlibs
Depends: libjpeg8-shlibs, libiconv
Files: lib/libdjvulibre.*.dylib
- Shlibs: %p/lib/libdjvulibre.21.dylib 22.0.0 %n (>= 3.5.21-1)
+ Shlibs: %p/lib/libdjvulibre.21.dylib 25.0.0 %n (>= 3.5.21-1)
DocFiles: NEWS README COPYING TODO COPYRIGHT INSTALL
<<
SplitOff2: <<
@@ -57,4 +54,6 @@
dmacks: make sure loadable module links against all its dep
libs so that all symbols are defined (good idea even not on
windows)
+
+Patched for clang by Jack Howarth.
<<
Index: detex.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/text/detex.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- detex.patch 23 Jul 2011 17:44:35 -0000 1.1
+++ detex.patch 9 Mar 2012 19:18:53 -0000 1.2
@@ -1,49 +1,14 @@
-diff -c detex-2.7/Makefile detex-2.7.patched/Makefile
-*** detex-2.7/Makefile Wed May 12 17:45:55 1999
---- detex-2.7.patched/Makefile Tue Jul 10 13:50:40 2001
-***************
-*** 35,41 ****
- # Add -DNO_MALLOC_DECL if your system does not like the malloc() declaration
- # in detex.l (reported by pin...@iro.umontreal.ca)
- #
-! #DEFS += ${DEFS} -DNO_MALLOC_DECL
- #
- CFLAGS = -O ${DEFS}
-
---- 35,41 ----
- # Add -DNO_MALLOC_DECL if your system does not like the malloc() declaration
- # in detex.l (reported by pin...@iro.umontreal.ca)
- #
-! DEFS := ${DEFS} -DNO_MALLOC_DECL
- #
- CFLAGS = -O ${DEFS}
-
-***************
-*** 85,93 ****
- # this target
- install: detex
- rm -f ${DESTDIR}/detex
-! install -c -m 775 -o binary -g staff -s detex ${DESTDIR}
-! # rm -f ${DESTDIR}/delatex
-! # ln ${DESTDIR}/detex ${DESTDIR}/delatex
-
- clean:
- -rm -f a.out core *.s *.o ERRS errs .,* .emacs_[0-9]*
---- 85,93 ----
- # this target
- install: detex
- rm -f ${DESTDIR}/detex
-! install -c -m 775 -s detex ${DESTDIR}
-! rm -f ${DESTDIR}/delatex
-! ln ${DESTDIR}/detex ${DESTDIR}/delatex
-
- clean:
- -rm -f a.out core *.s *.o ERRS errs .,* .emacs_[0-9]*
-Common subdirectories: detex-2.7/os2 and detex-2.7.patched/os2
-diff -ruN detex-2.7/Makefile detex-2.7-patched/Makefile
---- detex-2.7/Makefile 1999-05-12 10:45:55.000000000 -0700
-+++ detex-2.7-patched/Makefile 2007-07-18 13:22:26.000000000 -0700
-@@ -41,7 +41,7 @@
+--- detex-2.8/Makefile.orig 2012-03-02 19:08:01.000000000 -0500
++++ detex-2.8/Makefile 2012-03-02 19:11:53.000000000 -0500
+@@ -67,13 +67,13 @@
+ # Add -DNO_MALLOC_DECL if your system does not like the malloc() declaration
+ # in detex.l (reported by pin...@iro.umontreal.ca)
+ #
+-#DEFS += ${DEFS} -DNO_MALLOC_DECL
++DEFS := ${DEFS} -DNO_MALLOC_DECL
+ #
+-CFLAGS = -O ${DEFS}
++CFLAGS = -O -std=c89 -Wno-return-type ${DEFS}
# Use your favorite lexical scanner
#
@@ -52,3 +17,16 @@
#LEX = flex
#LFLAGS = -8 -C
+@@ -122,9 +122,9 @@
+ # this target
+ install: detex
+ rm -f ${DESTDIR}/detex
+- install -c -m 775 -o binary -g staff -s detex ${DESTDIR}
+-# rm -f ${DESTDIR}/delatex
+-# ln ${DESTDIR}/detex ${DESTDIR}/delatex
++ install -c -m 775 -s detex ${DESTDIR}
++ rm -f ${DESTDIR}/delatex
++ ln ${DESTDIR}/detex ${DESTDIR}/delatex
+
+ clean:
+ -rm -f a.out core *.s *.o ERRS errs .,* .emacs_[0-9]*
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
