Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6604/10.4/unstable/main/finkinfo/devel

Modified Files:
        doxygen.info doxygen.patch doxygen1.3.info 
Log Message:
I think I fixed doxygen.  Maybe.  (cross your fingers)

Index: doxygen1.3.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/doxygen1.3.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- doxygen1.3.info     31 Jan 2006 18:44:27 -0000      1.1
+++ doxygen1.3.info     1 Feb 2006 04:37:16 -0000       1.2
@@ -25,7 +25,7 @@
 NoSetCPPFLAGS: true
 NoSetMAKEFLAGS: true
 CompileScript: <<
-./configure --prefix %p --docdir %p/share/doc/%N --release  --install 
/usr/bin/install
+./configure --prefix %p/lib/doxygen1.3 --docdir %p/share/doc/%N --release  
--install /usr/bin/install
 make INSTALL=%p/lib/doxygen1.3 DOCDIR=%p/share/doc/%N
 <<
 

Index: doxygen.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/doxygen.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- doxygen.info        28 Jan 2006 13:40:15 -0000      1.1
+++ doxygen.info        1 Feb 2006 04:37:16 -0000       1.2
@@ -1,6 +1,6 @@
 Package: doxygen
 Version: 1.4.6
-Revision: 1001
+Revision: 1002
 GCC: 4.0
 Source: ftp://ftp.stack.nl/pub/users/dimitri/%n-%v.src.tar.gz
 SourceDirectory: %n-%v
@@ -8,6 +8,8 @@
 Depends: libpng3-shlibs, graphviz, tetex-base (>= 2.0-1) | tetex-nox | 
system-tetex, tetex-texmf (>= 2.0-1) | system-tetex
 BuildDepends: libpng3, ghostscript | ghostscript-nox, tetex-base (>= 2.0-1) | 
tetex-nox | system-tetex
 SetCPPFLAGS: -no-cpp-precomp
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
 PatchScript: <<
   ##mv doc/doxygen_manual.tex tmp
   ##sed 's|setlength|renewcommand|g' < tmp > doc/doxygen_manual.tex
@@ -17,12 +19,13 @@
   sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
 <<
 CompileScript: <<
-./configure --prefix %i --docdir %i/share/doc --release --install 
/usr/bin/install
-make
+./configure --prefix %p --docdir %p/share/doc/%N --release  --install 
/usr/bin/install
+make INSTALL=%p DOCDIR=%p/share/doc/%N
 <<
+
 InstallScript: <<
-make install
-make install_docs
+make install INSTALL=%i DOCDIR=%i/share/doc/%N
+make install_docs INSTALL=%i DOCDIR=%i/share/doc/%N
 <<
 DocFiles: INSTALL LANGUAGE.HOWTO LICENSE PLATFORMS README VERSION
 Description: Documentation system for C++, Java, IDL and C

Index: doxygen.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/doxygen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- doxygen.patch       28 Jan 2006 13:40:15 -0000      1.1
+++ doxygen.patch       1 Feb 2006 04:37:16 -0000       1.2
@@ -1,21 +1,32 @@
---- doxygen-1.4.3/src/libdoxygen.pro.in        2005-05-02 20:24:10.000000000 
+0200
-+++ doxygen-1.4.3/src/libdoxygen.pro-patched.in        2005-05-31 
07:48:11.000000000 +0200
-@@ -193,6 +193,7 @@
- win32:TMAKE_CXXFLAGS       += -DQT_NODLL 
- win32-msvc:TMAKE_CXXFLAGS  += -Zm200
- win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
-+INCLUDEPATH                += @PREFIX@/include
- INCLUDEPATH                += ../qtools
- INCLUDEPATH                += ../libpng
- INCLUDEPATH                += ../libmd5
---- doxygen-1.4.3/src/doxygen.pro.in   2005-01-03 20:17:55.000000000 +0100
-+++ doxygen-1.4.3/src/doxygen.pro-patched.in   2005-05-31 07:50:38.000000000 
+0200
+diff -uNr doxygen-1.4.6/src/doxygen.pro.in doxygen-1.4.6-new/src/doxygen.pro.in
+--- doxygen-1.4.6/src/doxygen.pro.in   2005-01-03 14:17:55.000000000 -0500
++++ doxygen-1.4.6-new/src/doxygen.pro.in       2006-01-31 16:55:32.000000000 
-0500
+@@ -18,7 +18,7 @@
+ CONFIG       =        console warn_on $extraopts
+ HEADERS      =        doxygen.h 
+ SOURCES      =        main.cpp 
+-unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng 
-lmd5
++unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng 
-lmd5 [EMAIL PROTECTED]@/lib
+ win32:INCLUDEPATH          += .
+ win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lpng 
-lmd5
+ win32-msvc:LIBS            += qtools.lib png.lib md5.lib doxygen.lib 
doxycfg.lib shell32.lib 
 @@ -28,7 +28,7 @@
  win32:TMAKE_CXXFLAGS       += -DQT_NODLL
  win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
  win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
 -INCLUDEPATH                += ../qtools ../libpng ../libmd5 .
-+INCLUDEPATH                += @PREFIX@/include ../qtools ../libpng ../libmd5 .
++INCLUDEPATH                += ../qtools ../libpng ../libmd5 . @PREFIX@/include
  #win32-g++:INCLUDEPATH      -= ../libpng
  DESTDIR                    =  ../bin
  TARGET                     =  doxygen
+diff -uNr doxygen-1.4.6/src/libdoxygen.pro.in 
doxygen-1.4.6-new/src/libdoxygen.pro.in
+--- doxygen-1.4.6/src/libdoxygen.pro.in        2005-08-08 14:17:10.000000000 
-0400
++++ doxygen-1.4.6-new/src/libdoxygen.pro.in    2006-01-31 16:55:58.000000000 
-0500
+@@ -201,6 +201,7 @@
+ INCLUDEPATH                += ../qtools
+ INCLUDEPATH                += ../libpng
+ INCLUDEPATH                += ../libmd5
++INCLUDEPATH                += @PREFIX@/include
+ win32:INCLUDEPATH          += .
+ win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
+ DESTDIR                    =  ../lib



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to