Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory vz-cvs-3.sog:/tmp/cvs-serv24256
Modified Files:
libproxy1.info libproxy1.patch
Log Message:
new version
Index: libproxy1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libproxy1.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libproxy1.info 17 Jul 2011 16:18:45 -0000 1.4
+++ libproxy1.info 16 Sep 2011 10:24:24 -0000 1.5
@@ -1,8 +1,8 @@
Package: libproxy1
-Version: 0.4.0
-Revision: 4
+Version: 0.4.7
+Revision: 1
Source: http://libproxy.googlecode.com/files/libproxy-%v.tar.gz
-Source-MD5: b22c95df70a40949e99add5171fc3084
+Source-MD5: 509e03a488a61cd62bfbaf3ab6a2a7a5
BuildDepends: <<
cmake,
fink (>= 0.28),
@@ -14,33 +14,26 @@
BuildDependsOnly: true
GCC: 4.0
PatchFile: %n.patch
-PatchFile-MD5: 917013c954980b3a6a37003178e4b8cb
+PatchFile-MD5: ab8f3fdbe1e94b4771a522a6e5b0764c
PatchScript: <<
%{default_script}
- perl -pi -e 's/_POSIX_C_SOURCE/_DARWIN_C_SOURCE/' CMakeLists.txt
+ perl -pi -e 's/_POSIX_C_SOURCE/_DARWIN_C_SOURCE/'
libproxy/CMakeLists.txt
perl -pi -e 's/false/NULL/' libproxy/modules/wpad_dns_alias.cpp
<<
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
+ CMAKE_MODULE_PATH=%p/share/cmake/Modules cmake
-DCMAKE_INSTALL_PREFIX=%p -DCMAKE_INSTALL_NAME_DIR=%p/lib
+ make
<<
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
@@ -57,16 +50,11 @@
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.
+ cmake can't find libmodman even when libmodman is hacked to
+ install the public detection files and even when we explicitly
+ point to it. Whatever...just force use of onboard libmodman.
- Upstream patch to enable installation of .pc file. See:
- http://code.google.com/p/libproxy/issues/detail?id=87
- And to fix its Version field. See:
- http://code.google.com/p/libproxy/source/detail?spec=svn622&r=622
+ We're apple, but we still want public lib-detection files.
<<
DescDetail: <<
This is the core library only, and the plugins to support
Index: libproxy1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/libproxy1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libproxy1.patch 19 Mar 2010 15:09:41 -0000 1.2
+++ libproxy1.patch 16 Sep 2011 10:24:24 -0000 1.3
@@ -1,94 +1,42 @@
-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 @@
+diff -Nurd -x'*~' libproxy-0.4.7.orig/CMakeLists.txt
libproxy-0.4.7/CMakeLists.txt
+--- libproxy-0.4.7.orig/CMakeLists.txt 2011-06-06 17:44:37.000000000 -0400
++++ libproxy-0.4.7/CMakeLists.txt 2011-09-16 06:21:31.000000000 -0400
+@@ -29,7 +29,6 @@
### 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)
+ # Conditionally build bundled libmodman
+ option(FORCE_SYSTEM_LIBMODMAN "Force using system libmodman" OFF)
+-find_package(libmodman QUIET)
+ if(LIBMODMAN_FOUND)
+ if("${LIBMODMAN_VERSION_MAJOR}" STREQUAL "2")
+ message(STATUS "Building with system libmodman")
+@@ -48,7 +47,6 @@
-- 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()
+ # Conditionally build bindings
+ if(NOT WIN32)
+- add_subdirectory(bindings)
endif()
- if(UNIX AND NOT APPLE)
-@@ -96,21 +66,6 @@
+ # Always build these
+diff -Nurd -x'*~' libproxy-0.4.7.orig/libproxy/cmake/devfiles.cmk
libproxy-0.4.7/libproxy/cmake/devfiles.cmk
+--- libproxy-0.4.7.orig/libproxy/cmake/devfiles.cmk 2011-06-06
17:44:37.000000000 -0400
++++ libproxy-0.4.7/libproxy/cmake/devfiles.cmk 2011-09-16 04:58:22.000000000
-0400
+@@ -1,4 +1,4 @@
+-if(NOT WIN32 AND NOT APPLE)
++if(NOT WIN32)
+ # PkgConfig file
+ set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX})
+
+diff -Nurd -x'*~'
libproxy-0.4.7.orig/libproxy/cmake/modules/pacrunner_webkit.cmk
libproxy-0.4.7/libproxy/cmake/modules/pacrunner_webkit.cmk
+--- libproxy-0.4.7.orig/libproxy/cmake/modules/pacrunner_webkit.cmk
2011-06-06 17:44:37.000000000 -0400
++++ libproxy-0.4.7/libproxy/cmake/modules/pacrunner_webkit.cmk 2011-09-16
05:01:43.000000000 -0400
+@@ -7,10 +7,6 @@
+ include_directories("${WEBKIT_INCLUDE_DIR}")
endif()
- endif()
-
--if(APPLE)
+ elseif(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)
-@@ -137,7 +92,7 @@
-
- ### Misc files
- # PkgConfig file
--if(NOT ${WIN32})
-+if(NOT WIN32)
- configure_file(libproxy-1.0.pc.in libproxy-1.0.pc @ONLY)
- install(FILES libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig)
- endif()
-diff -Nurd -x'*~' libproxy-0.4.0.orig/libproxy/libproxy-1.0.pc.in
libproxy-0.4.0/libproxy/libproxy-1.0.pc.in
---- libproxy-0.4.0.orig/libproxy/libproxy-1.0.pc.in 2010-02-25
15:29:54.000000000 -0500
-+++ libproxy-0.4.0/libproxy/libproxy-1.0.pc.in 2010-03-19 11:05:42.000000000
-0400
-@@ -2,8 +2,8 @@
- libdir=@libdir@
- includedir=@includedir@
-
--Name: libproxy
-+Name: libproxy-1.0
- Description: Proxy Configuration Library
--Version: @VERSION@
-+Version: @CMAKE_PROJECT_VERSION@
- Libs: -L${libdir} -lproxy
- Cflags: -I${includedir}
+ else()
+ if(WITH_WEBKIT3)
+ px_check_modules(WEBKIT webkitgtk-3.0)
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
