Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31828/10.7/stable/main/finkinfo/devel
Modified Files:
doxygen.info doxygen.patch
Log Message:
Revert addition that put -L/sw/lib in front of local flags.
Patch to insure use of the internal static libmd5.a.
Index: doxygen.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/doxygen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- doxygen.patch 31 Jan 2013 16:49:28 -0000 1.3
+++ doxygen.patch 16 Feb 2013 17:44:29 -0000 1.4
@@ -65,7 +65,7 @@
HEADERS = doxygen.h
SOURCES = main.cpp
-unix:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5
-lpthread
-+unix:LIBS += -L../lib -L@PREFIX@/lib -ldoxygen -ldoxycfg
-lqtools -lmd5 -lpthread
++unix:LIBS += -L../lib -L@PREFIX@/lib -ldoxygen -ldoxycfg
-lqtools ../lib/libmd5.a -lpthread
win32:INCLUDEPATH += .
win32-mingw:LIBS += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5
-lpthread
win32-msvc:LIBS += qtools.lib md5.lib doxygen.lib doxycfg.lib
shell32.lib iconv.lib
Index: doxygen.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/devel/doxygen.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- doxygen.info 14 Feb 2013 16:54:06 -0000 1.5
+++ doxygen.info 16 Feb 2013 17:44:29 -0000 1.6
@@ -14,14 +14,10 @@
libiconv-dev
<<
PatchFile: %n.patch
-PatchFile-MD5: 6fa2690fb487dd1e4e8fe513f88c739d
+PatchFile-MD5: 39faecce786584a091ac681ac2eeacfb
PatchScript: <<
sed -e 's|@PREFIX@|%p|g' \
-e 's|@FINK_ARCH@|%m|g' <%{PatchFile} | patch -p1
- perl -pi -e 's|(TMAKE_LINK\s+= c\+\+)|\1 -L%p/lib|' \
- tmake/lib/macosx-c++/tmake.conf \
- tmake/lib/macosx-intel-c++/tmake.conf \
- tmake/lib/macosx-uni-c++/tmake.conf
<<
GCC: 4.0
CompileScript: <<
@@ -66,12 +62,9 @@
Disable OSX portability games (no SDKs, no -arch flags)
because it's more portable than fink needs to support and
leads to build chaos.
-
- From J. Howarth: patch in an explict -L%p/lib to TMAKE_LINK because the
build
- didn't find Fink's libiconv for some folks. Cf.:
-
-
https://trac.macports.org/changeset/57665/trunk/dports/textproc/doxygen/Portfile
- https://trac.macports.org/ticket/20415
+
+ Explicitly point to internal libmd5.la to avoid attempting
+ unsuccessfully to link to the libmd5 from libwww-shlibs.
<<
Maintainer: Thomas Kotzian <thomas.kotz...@gmx.at>
Homepage: http://www.doxygen.org
------------------------------------------------------------------------------
The Go Parallel Website, sponsored by Intel - in partnership with Geeknet,
is your hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials, tech docs,
whitepapers, evaluation guides, and opinion stories. Check out the most
recent posts - join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
