Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv24028
Modified Files:
doxygen.info doxygen.patch
Log Message:
prepare for the future
Index: doxygen.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/doxygen.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- doxygen.patch 16 Oct 2011 08:46:28 -0000 1.6
+++ doxygen.patch 2 Jul 2012 19:43:09 -0000 1.7
@@ -1,6 +1,6 @@
-diff -ru doxygen-1.7.4-orig/Makefile.in doxygen-1.7.4/Makefile.in
---- doxygen-1.7.4-orig/Makefile.in 2011-07-25 18:33:47.000000000 +0200
-+++ doxygen-1.7.4/Makefile.in 2011-07-25 18:33:59.000000000 +0200
+diff -ruN doxygen-1.7.4/Makefile.in doxygen-1.7.4-patched/Makefile.in
+--- doxygen-1.7.4/Makefile.in 2009-08-20 13:41:13.000000000 -0600
++++ doxygen-1.7.4-patched/Makefile.in 2012-07-02 13:40:11.000000000 -0600
@@ -44,7 +44,7 @@
DATE=$(shell date "+%B %Y")
@@ -10,10 +10,9 @@
install: doxywizard_install
$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
-Only in doxygen-1.7.4: Makefile.in.orig
-diff -ru doxygen-1.7.4-orig/addon/doxywizard/doxywizard.pro.in
doxygen-1.7.4/addon/doxywizard/doxywizard.pro.in
---- doxygen-1.7.4-orig/addon/doxywizard/doxywizard.pro.in 2011-07-25
18:33:47.000000000 +0200
-+++ doxygen-1.7.4/addon/doxywizard/doxywizard.pro.in 2011-07-25
18:38:01.000000000 +0200
+diff -ruN doxygen-1.7.4/addon/doxywizard/doxywizard.pro.in
doxygen-1.7.4-patched/addon/doxywizard/doxywizard.pro.in
+--- doxygen-1.7.4/addon/doxywizard/doxywizard.pro.in 2011-01-03
13:20:50.000000000 -0700
++++ doxygen-1.7.4-patched/addon/doxywizard/doxywizard.pro.in 2012-07-02
13:40:11.000000000 -0600
@@ -6,7 +6,7 @@
DESTDIR = ../../bin
TARGET =
@@ -34,9 +33,9 @@
# Input
HEADERS += doxywizard.h version.h expert.h config.h helplabel.h \
inputbool.h inputstring.h inputint.h inputstrlist.h wizard.h
-diff -ru doxygen-1.7.4-orig/configure doxygen-1.7.4/configure
---- doxygen-1.7.4-orig/configure 2011-07-25 18:33:47.000000000 +0200
-+++ doxygen-1.7.4/configure 2011-07-25 18:33:59.000000000 +0200
+diff -ruN doxygen-1.7.4/configure doxygen-1.7.4-patched/configure
+--- doxygen-1.7.4/configure 2011-03-28 07:12:47.000000000 -0600
++++ doxygen-1.7.4-patched/configure 2012-07-02 13:40:11.000000000 -0600
@@ -559,7 +559,7 @@
TMAKE_CXXFLAGS += -D_LARGEFILE_SOURCE
EOF
@@ -46,10 +45,10 @@
if test -n "`ls /Developer/SDKs/MacOSX10.*.sdk 2>/dev/null`"; then
mac_sdk=MacOSX10.4u.sdk
fi
-diff -ru doxygen-1.7.4-orig/qtools/qglobal.h doxygen-1.7.4/qtools/qglobal.h
---- doxygen-1.7.4-orig/qtools/qglobal.h 2011-07-25 18:33:47.000000000
+0200
-+++ doxygen-1.7.4/qtools/qglobal.h 2011-07-25 18:43:24.000000000 +0200
-@@ -89,7 +89,10 @@
+diff -ruN doxygen-1.7.4/qtools/qglobal.h doxygen-1.7.4-patched/qtools/qglobal.h
+--- doxygen-1.7.4/qtools/qglobal.h 2010-06-09 03:49:13.000000000 -0600
++++ doxygen-1.7.4-patched/qtools/qglobal.h 2012-07-02 13:42:38.000000000
-0600
+@@ -89,7 +89,13 @@
# if !defined(MAC_OS_X_VERSION_10_6)
# define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1
# endif
@@ -57,15 +56,16 @@
+# if !defined(MAC_OS_X_VERSION_10_7)
+# define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1
+# endif
-+# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_7)
++# if !defined(MAC_OS_X_VERSION_10_8)
++# define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1
++# endif
++# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8)
# error "This version of Mac OS X is unsupported"
# endif
#elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
-Only in doxygen-1.7.4/qtools: qglobal.h.orig
-Only in doxygen-1.7.4/qtools: qglobal.h.rej
-diff -ru doxygen-1.7.4-orig/qtools/qtools.pro.in
doxygen-1.7.4/qtools/qtools.pro.in
---- doxygen-1.7.4-orig/qtools/qtools.pro.in 2011-07-25 18:33:47.000000000
+0200
-+++ doxygen-1.7.4/qtools/qtools.pro.in 2011-07-25 18:37:40.000000000 +0200
+diff -ruN doxygen-1.7.4/qtools/qtools.pro.in
doxygen-1.7.4-patched/qtools/qtools.pro.in
+--- doxygen-1.7.4/qtools/qtools.pro.in 2010-06-09 13:41:23.000000000 -0600
++++ doxygen-1.7.4-patched/qtools/qtools.pro.in 2012-07-02 13:40:11.000000000
-0600
@@ -93,7 +93,7 @@
qmutex_win32.cpp \
qwaitcondition_win32.cpp
@@ -75,9 +75,9 @@
#TMAKE_CXXFLAGS += -DQT_NO_CODECS -DQT_LITE_UNICODE
TMAKE_CXXFLAGS += -DQT_LITE_UNICODE
win32:TMAKE_CXXFLAGS += -DQT_NODLL
-diff -ru doxygen-1.7.4-orig/src/doxygen.pro.in doxygen-1.7.4/src/doxygen.pro.in
---- doxygen-1.7.4-orig/src/doxygen.pro.in 2011-07-25 18:33:47.000000000
+0200
-+++ doxygen-1.7.4/src/doxygen.pro.in 2011-07-25 18:39:18.000000000 +0200
+diff -ruN doxygen-1.7.4/src/doxygen.pro.in
doxygen-1.7.4-patched/src/doxygen.pro.in
+--- doxygen-1.7.4/src/doxygen.pro.in 2011-01-03 13:14:46.000000000 -0700
++++ doxygen-1.7.4-patched/src/doxygen.pro.in 2012-07-02 13:40:11.000000000
-0600
@@ -18,7 +18,7 @@
CONFIG = console warn_on $extraopts
HEADERS = doxygen.h
@@ -96,9 +96,9 @@
DESTDIR = ../bin
TARGET = doxygen
unix:TARGETDEPS = ../lib/libdoxygen.a ../lib/libdoxycfg.a
-diff -ru doxygen-1.7.4-orig/src/doxytag.pro.in doxygen-1.7.4/src/doxytag.pro.in
---- doxygen-1.7.4-orig/src/doxytag.pro.in 2011-07-25 18:33:47.000000000
+0200
-+++ doxygen-1.7.4/src/doxytag.pro.in 2011-07-25 18:33:59.000000000 +0200
+diff -ruN doxygen-1.7.4/src/doxytag.pro.in
doxygen-1.7.4-patched/src/doxytag.pro.in
+--- doxygen-1.7.4/src/doxytag.pro.in 2011-01-03 13:14:46.000000000 -0700
++++ doxygen-1.7.4-patched/src/doxytag.pro.in 2012-07-02 13:40:11.000000000
-0600
@@ -18,7 +18,7 @@
CONFIG = console warn_on $extraopts
HEADERS = logos.h version.h
@@ -116,9 +116,9 @@
+INCLUDEPATH += ../qtools @PREFIX@/include
OBJECTS_DIR = ../objects
TARGET = ../bin/doxytag
-diff -ru doxygen-1.7.4-orig/src/libdoxycfg.pro.in
doxygen-1.7.4/src/libdoxycfg.pro.in
---- doxygen-1.7.4-orig/src/libdoxycfg.pro.in 2011-07-25 18:33:48.000000000
+0200
-+++ doxygen-1.7.4/src/libdoxycfg.pro.in 2011-07-25 18:33:59.000000000
+0200
+diff -ruN doxygen-1.7.4/src/libdoxycfg.pro.in
doxygen-1.7.4-patched/src/libdoxycfg.pro.in
+--- doxygen-1.7.4/src/libdoxycfg.pro.in 2011-01-03 13:14:46.000000000
-0700
++++ doxygen-1.7.4-patched/src/libdoxycfg.pro.in 2012-07-02
13:40:11.000000000 -0600
@@ -20,7 +20,7 @@
SOURCES = config.cpp configoptions.cpp portable.cpp portable_c.c
win32:TMAKE_CXXFLAGS += -DQT_NODLL
@@ -128,10 +128,9 @@
win32:INCLUDEPATH += .
DESTDIR = ../lib
TARGET = doxycfg
-Only in doxygen-1.7.4/src: libdoxycfg.pro.in.orig
-diff -ru doxygen-1.7.4-orig/src/libdoxygen.pro.in
doxygen-1.7.4/src/libdoxygen.pro.in
---- doxygen-1.7.4-orig/src/libdoxygen.pro.in 2011-07-25 18:33:48.000000000
+0200
-+++ doxygen-1.7.4/src/libdoxygen.pro.in 2011-07-25 18:40:40.000000000
+0200
+diff -ruN doxygen-1.7.4/src/libdoxygen.pro.in
doxygen-1.7.4-patched/src/libdoxygen.pro.in
+--- doxygen-1.7.4/src/libdoxygen.pro.in 2011-01-03 13:14:46.000000000
-0700
++++ doxygen-1.7.4-patched/src/libdoxygen.pro.in 2012-07-02
13:40:11.000000000 -0600
@@ -248,9 +248,10 @@
win32-msvc:TMAKE_CXXFLAGS += -Zm200
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
@@ -144,9 +143,9 @@
win32:INCLUDEPATH += .
#win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
win32-g++:INCLUDEPATH = ../qtools ../libmd5
-diff -ru doxygen-1.7.4-orig/tmake/lib/macosx-uni-c++/tmake.conf
doxygen-1.7.4/tmake/lib/macosx-uni-c++/tmake.conf
---- doxygen-1.7.4-orig/tmake/lib/macosx-uni-c++/tmake.conf 2011-07-25
18:33:48.000000000 +0200
-+++ doxygen-1.7.4/tmake/lib/macosx-uni-c++/tmake.conf 2011-07-25
18:41:51.000000000 +0200
+diff -ruN doxygen-1.7.4/tmake/lib/macosx-uni-c++/tmake.conf
doxygen-1.7.4-patched/tmake/lib/macosx-uni-c++/tmake.conf
+--- doxygen-1.7.4/tmake/lib/macosx-uni-c++/tmake.conf 2010-05-31
15:53:42.000000000 -0600
++++ doxygen-1.7.4-patched/tmake/lib/macosx-uni-c++/tmake.conf 2012-07-02
13:40:11.000000000 -0600
@@ -8,7 +8,7 @@
CONFIG = qt warn_on release
Index: doxygen.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/doxygen.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- doxygen.info 16 Oct 2011 08:46:28 -0000 1.9
+++ doxygen.info 2 Jul 2012 19:43:09 -0000 1.10
@@ -16,7 +16,7 @@
#NoSetMAKEFLAGS: true
#SetMAKEFLAGS: -j1
PatchFile: %n.patch
-PatchFile-MD5: 76520c0172b660a877827b63c6fbbeee
+PatchFile-MD5: 84ed8db406537a8e01e7940d27f1e6b7
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1
<<
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
