Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1477
Modified Files:
libproxy0.info
Added Files:
libproxy1.info libproxy1.patch
Log Message:
new libproxy, keeping same plugins disabled as old for now
--- NEW FILE: libproxy1.info ---
Package: libproxy1
Version: 0.4.0
Revision: 1
Source: http://libproxy.googlecode.com/files/libproxy-%v.tar.gz
Source-MD5: b22c95df70a40949e99add5171fc3084
BuildDepends: <<
cmake,
fink (>= 0.28),
pkgconfig (>= 0.23)
<<
Depends: %n-shlibs (= %v-%r)
Conflicts: libproxy0
Replaces: libproxy0
BuildDependsOnly: true
GCC: 4.0
PatchFile: %n.patch
PatchFile-MD5: f26625cdd3572073a5ed652e34d2f8c2
CompileScript: <<
cmake -DCMAKE_INSTALL_PREFIX=%p -DCMAKE_INSTALL_NAME_DIR=%p/lib
perl -pi -e 's/\.\.\/libmodman\/libmodman\S+dylib//'
utils/CMakeFiles/proxy.dir/link.txt
make VERBOSE=1
<<
InstallScript: <<
make install DESTDIR=%d
rm %i/lib/libmodman.dylib
rm %i/lib/libmodman.0.0.0.dylib
mv %i/lib/libmodman.0.dylib %i/lib/libmodman.0.0.0.dylib
<<
SplitOff: <<
Package: %N-shlibs
Files: <<
lib/libmodman.0.0.0.dylib
lib/libproxy.1.0.0.dylib
lib/libproxy.1.dylib
<<
Shlibs: <<
!%p/lib/libmodman.0.0.0.dylib
%p/lib/libproxy.1.dylib 1.0.0 %n (>= 0.4.0-1)
<<
DocFiles:AUTHORS COPYING ChangeLog NEWS README
<<
SplitOff2: <<
Package: libproxy-bin
Depends: %N-shlibs (>= %v-%r)
Files: bin
DocFiles: AUTHORS COPYING ChangeLog NEWS README
Description: Command-line proxy detector
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
DescPackaging: <<
Hacking CMakeLists.txt seems to be only way to disable building
certain plugins.
Fix -I ordering. See:
http://code.google.com/p/libproxy/issues/detail?id=49
libmodman appears to be internal support only, no public
headers and no valid interface versioning.
<<
DescDetail: <<
This is the core library only, and the plugins to support
proxy-configuration via envvar and file. Other plugins will be
packaged separately. Note: plugins are tied to specific %%v of
library, not its ABI or other libversion field. Updating
library package will require updating external plugin
packages.
<<
Description: Generic access to network proxy settings
Homepage: code.google.com/p/libproxy
License: LGPL
Maintainer: Daniel Macks <[email protected]>
Index: libproxy0.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libproxy0.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libproxy0.info 20 May 2009 22:09:23 -0000 1.1
+++ libproxy0.info 19 Mar 2010 14:41:13 -0000 1.2
@@ -1,6 +1,6 @@
Package: libproxy0
Version: 0.2.3
-Revision: 1
+Revision: 2
Source: http://libproxy.googlecode.com/files/libproxy-%v.tar.gz
Source-MD5: 86b635e1eb2d665cfbef4c6134fe6604
BuildDepends: <<
@@ -11,6 +11,8 @@
pkgconfig (>= 0.23)
<<
Depends: %n-shlibs (= %v-%r)
+Conflicts: libproxy1
+Replaces: libproxy1
BuildDependsOnly: true
PatchFile: %n.patch
PatchFile-MD5: f1ea14a6524e54d296d28a5310735e5d
@@ -19,6 +21,7 @@
autoreconf -fi
./configure %c
make
+ rm -rf %i/bin
<<
InstallScript: make install DESTDIR=%d
SplitOff: <<
@@ -30,13 +33,6 @@
Shlibs: %p/lib/libproxy.0.dylib 1.0.0 %n (>= 0.2.3-1)
DocFiles:AUTHORS COPYING ChangeLog NEWS README
<<
-SplitOff2: <<
- Package: libproxy-bin
- Depends: %N-shlibs (>= %v-%r)
- Files: bin
- DocFiles: AUTHORS COPYING ChangeLog NEWS README
- Description: Command-line proxy detector
-<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README
DescPackaging: <<
pkg-config may/may-not detect many external things that would
--- NEW FILE: libproxy1.patch ---
diff -Nurd -x'*~' libproxy-0.4.0.orig/CMakeLists.txt
libproxy-0.4.0/CMakeLists.txt
--- libproxy-0.4.0.orig/CMakeLists.txt 2010-02-25 15:29:54.000000000 -0500
+++ libproxy-0.4.0/CMakeLists.txt 2010-03-19 10:02:06.000000000 -0400
@@ -62,5 +62,4 @@
### Subdirectories
add_subdirectory(libmodman)
add_subdirectory(libproxy)
-add_subdirectory(bindings)
add_subdirectory(utils)
diff -Nurd -x'*~' libproxy-0.4.0.orig/libproxy/CMakeLists.txt
libproxy-0.4.0/libproxy/CMakeLists.txt
--- libproxy-0.4.0.orig/libproxy/CMakeLists.txt 2010-02-25 15:29:54.000000000
-0500
+++ libproxy-0.4.0/libproxy/CMakeLists.txt 2010-03-19 07:55:34.000000000
-0400
@@ -41,36 +41,6 @@
endif()
endfunction(px_check_modules)
- px_check_modules(X11 x11 xmu)
- px_check_modules(NM NetworkManager dbus-1)
- px_check_modules(WEBKIT webkit-1.0)
- px_check_modules(MOZJS xulrunner-js)
- if(NOT MOZJS_FOUND)
- unset(MOZJS_FOUND)
- px_check_modules(MOZJS firefox-js)
- if(NOT MOZJS_FOUND)
- unset(MOZJS_FOUND)
- px_check_modules(MOZJS mozilla-js)
- if(NOT MOZJS_FOUND)
- unset(MOZJS_FOUND)
- px_check_modules(MOZJS seamonkey-js)
- endif()
- endif()
- endif()
- if(X11_FOUND)
- px_check_modules(GNOME gconf-2.0)
- find_package(KDE4)
- find_package(Qt4)
- if(KDE4_FOUND AND QT4_FOUND)
- set(KDE4_FOUND 1)
- set(KDE4_LIBRARIES ${KDE4_KDECORE_LIBS} ${QT_LIBRARIES})
- include_directories(${KDE4_INCLUDE_DIR} ${QT_INCLUDES})
- link_directories(${KDE4_LIB_DIR})
- string(REGEX REPLACE " *-fno-exceptions" "" CMAKE_CXX_FLAGS
${CMAKE_CXX_FLAGS})
- else()
- set(KDE4_FOUND 0)
- endif()
- endif()
endif()
if(UNIX AND NOT APPLE)
@@ -96,21 +66,6 @@
endif()
endif()
-if(APPLE)
- find_library(WEBKIT_LIBRARIES JavaScriptCore)
- find_library(SC_LIBRARIES SystemConfiguration)
- find_library(CF_LIBRARIES CoreFoundation)
- if(WEBKIT_LIBRARIES)
- set(WEBKIT_FOUND 1)
- endif()
- if(SC_LIBRARIES)
- set(SC_FOUND 1)
- endif()
- if(CF_LIBRARIES)
- set(CF_FOUND 1)
- endif()
-endif()
-
# Build the pacrunner into libproxy unless we are building for multiple engines
set(BIPR 1)
if(MOZJS_FOUND AND WEBKIT_FOUND)
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
