On Wed, 26 Sep 2012, Stuart Henderson wrote:
> On 2012/09/26 14:58, David Coppa wrote:
> > dbic++ and libproxy can even go in now, if you give me an okay...
>
> those look good to me, it would be easier to review if you sent
> them as a plain attachment rather than gzip though.
>
> haven't looked at the cmake diff yet.
databases/dbic++:
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/dbic++/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 23 Apr 2012 17:15:17 -0000 1.8
+++ Makefile 26 Sep 2012 12:05:10 -0000
@@ -6,7 +6,7 @@ COMMENT= C++ database API
DISTNAME= deepfryed-dbicpp-v0.6.0
PKGNAME= dbic++-0.6.0
-REVISION = 0
+REVISION = 1
CATEGORIES= databases
HOMEPAGE= https://github.com/deepfryed/dbicpp
@@ -27,14 +27,17 @@ WANTLIB = e2fs-uuid m mysqlclient pcrec
MASTER_SITES= http://distfiles.bsdfrog.org/
-BUILD_DEPENDS= devel/cmake \
- shells/bash
+MODULES = devel/cmake
+
LIB_DEPENDS= mysql-client->=5:databases/mysql \
postgresql-client->=8.4:databases/postgresql \
devel/pcre \
sysutils/e2fsprogs
-CONFIGURE_STYLE= none
+CONFIGURE_ARGS+= -DCMAKE_MYSQL_VERSION=${LIBdbdmysql_VERSION} \
+ -DCMAKE_PG_VERSION=${LIBdbdpg_VERSION} \
+ -DCMAKE_SQLITE3_VERSION=${LIBdbdsqlite3_VERSION}
+
WRKDIST= ${WRKDIR}/deepfryed-dbicpp
NO_REGRESS= Yes
@@ -43,13 +46,6 @@ post-extract:
mv ${WRKDIR}/deepfryed-dbicpp-* ${WRKDIR}/deepfryed-dbicpp
pre-configure:
- ${SUBST_CMD}
${WRKSRC}/{CMakeLists.txt,inc/dbic++.h,src/dbic++.cc,pkgconfig/dbic++.pc}
-
-do-build:
- cd ${WRKSRC} && ${SET_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/bash build
-
-do-install:
- cd ${WRKSRC} && ${SET_ENV} ${MAKE_ENV} \
- ${LOCALBASE}/bin/bash build -i
+ ${SUBST_CMD} ${WRKSRC}/{inc/dbic++.h,src/dbic++.cc,pkgconfig/dbic++.pc}
.include <bsd.port.mk>
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/databases/dbic++/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 6 Apr 2012 19:25:23 -0000 1.3
+++ patches/patch-CMakeLists_txt 26 Sep 2012 12:05:10 -0000
@@ -1,42 +1,28 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2012/04/06 19:25:23 jeremy Exp $
---- CMakeLists.txt.orig Wed Mar 28 22:09:47 2012
-+++ CMakeLists.txt Thu Mar 29 16:09:46 2012
-@@ -35,7 +35,7 @@ IF (PQ_FOUND)
- TARGET_LINK_LIBRARIES(dbdpg ${PQ_LIBRARIES})
- ENDIF()
+--- CMakeLists.txt.orig Thu Mar 29 07:09:47 2012
++++ CMakeLists.txt Wed Sep 26 13:57:43 2012
+@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+ PROJECT(DBICPP CXX C)
-- SET_TARGET_PROPERTIES(dbdpg PROPERTIES VERSION ${CMAKE_PG_VERSION}
SOVERSION 1)
-+ SET_TARGET_PROPERTIES(dbdpg PROPERTIES VERSION
"${CMAKE_PG_VERSION}${LIBdbdpg_VERSION}")
- INSTALL(TARGETS dbdpg
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++)
-@@ -50,7 +50,7 @@ IF (MYSQL_FOUND)
- ELSE()
- TARGET_LINK_LIBRARIES(dbdmysql ${MYSQL_LIBRARIES})
- ENDIF()
-- SET_TARGET_PROPERTIES(dbdmysql PROPERTIES VERSION ${CMAKE_MYSQL_VERSION}
SOVERSION 1)
-+ SET_TARGET_PROPERTIES(dbdmysql PROPERTIES VERSION
"${CMAKE_MYSQL_VERSION}${LIBdbdmysql_VERSION}")
- INSTALL(TARGETS dbdmysql
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++)
-@@ -65,19 +65,19 @@ IF (SQLITE3_FOUND)
- ELSE()
- TARGET_LINK_LIBRARIES(dbdsqlite3 ${SQLITE3_LIBRARIES})
- ENDIF()
-- SET_TARGET_PROPERTIES(dbdsqlite3 PROPERTIES VERSION
${CMAKE_SQLITE3_VERSION} SOVERSION 1)
-+ SET_TARGET_PROPERTIES(dbdsqlite3 PROPERTIES VERSION
"${CMAKE_SQLITE3_VERSION}${LIBdbdsqlite3_VERSION}")
- INSTALL(TARGETS dbdsqlite3
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++
+ LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib)
+-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules modules)
++SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/modules)
+
+ FIND_PACKAGE(uuid REQUIRED)
+ FIND_PACKAGE(pcre REQUIRED)
+@@ -71,13 +71,13 @@ IF (SQLITE3_FOUND)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++)
ENDIF()
- ADD_EXECUTABLE(demo/demo src/examples/demo.cc)
+-ADD_EXECUTABLE(demo/demo src/examples/demo.cc)
-TARGET_LINK_LIBRARIES(demo/demo dbic++ dl ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
-+TARGET_LINK_LIBRARIES(demo/demo dbic++ ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
++ADD_EXECUTABLE(demo src/examples/demo.cc)
++TARGET_LINK_LIBRARIES(demo dbic++ ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
- ADD_EXECUTABLE(demo/async src/examples/async.cc)
+-ADD_EXECUTABLE(demo/async src/examples/async.cc)
-TARGET_LINK_LIBRARIES(demo/async dbic++ dl ${UUID_LIBRARIES}
${PCRE_LIBRARIES})
-+TARGET_LINK_LIBRARIES(demo/async dbic++ ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
++ADD_EXECUTABLE(async src/examples/async.cc)
++TARGET_LINK_LIBRARIES(async dbic++ ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
-ADD_DEFINITIONS(-Wall -Wno-sign-compare -rdynamic -fopenmp -fPIC -O3
-Wno-non-virtual-dtor)
+ADD_DEFINITIONS(-Wall -Wno-sign-compare -rdynamic -fopenmp -fPIC
-Wno-non-virtual-dtor)
Index: patches/patch-build
===================================================================
RCS file: patches/patch-build
diff -N patches/patch-build
--- patches/patch-build 6 Apr 2012 19:25:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-build,v 1.1 2012/04/06 19:25:23 jeremy Exp $
---- build.orig Wed Jan 12 18:27:58 2011
-+++ build Tue Jan 18 15:46:51 2011
-@@ -88,12 +88,10 @@ _uninstall() {
- }
-
- _install() {
-- _uninstall
- cmake -DCMAKE_PG_VERSION=$PG_VERSION \
- -DCMAKE_MYSQL_VERSION=$MYSQL_VERSION \
- -DCMAKE_SQLITE3_VERSION=$SQLITE3_VERSION \
-- -DCMAKE_INSTALL_PREFIX:PATH=/usr
-- make
-+ -DCMAKE_INSTALL_PREFIX:PATH=${LOCALBASE}
- make install
- }
-
---8<---
net/libproxy:
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/libproxy/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 1 Sep 2012 14:36:58 -0000 1.27
+++ Makefile 24 Sep 2012 15:03:09 -0000
@@ -13,7 +13,7 @@ PKGNAME-main= libproxy-${VERSION}
PKGNAME-mozilla= libproxy-mozilla-${VERSION}
PKGNAME-webkit= libproxy-webkit-${VERSION}
-REVISION-main= 1
+REVISION-main= 2
REVISION-mozilla= 1
REVISION-webkit= 1
@@ -101,8 +101,5 @@ CONFIGURE_ARGS += -DWITH_WEBKIT3:BOOL=ON
.else
CONFIGURE_ARGS += -DWITH_WEBKIT:BOOL=OFF
.endif
-
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/libproxy/cmake/libproxy.cmk
.include <bsd.port.mk>
Index: patches/patch-bindings_perl_src_CMakeLists_txt
===================================================================
RCS file: patches/patch-bindings_perl_src_CMakeLists_txt
diff -N patches/patch-bindings_perl_src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bindings_perl_src_CMakeLists_txt 24 Sep 2012 15:03:09
-0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- bindings/perl/src/CMakeLists.txt.orig Mon Jun 6 23:44:37 2011
++++ bindings/perl/src/CMakeLists.txt Mon Sep 24 15:39:04 2012
+@@ -4,7 +4,7 @@ include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOUR
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
+ COMMAND ${PERL_EXECUTABLE} ARGS
${CMAKE_CURRENT_SOURCE_DIR}/doxsubpp.pl
+ ${PERL_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs libproxy
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs proxy
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+ set(Libproxy_LIB_SRCS Libproxy.c)
+@@ -12,7 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c)
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
+ add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
+
+-target_link_libraries(PLlibproxy ${PERL_LIBRARY} libproxy)
++target_link_libraries(PLlibproxy ${PERL_LIBRARY} proxy)
+ set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
+ set_target_properties(PLlibproxy PROPERTIES PREFIX "")
+
Index: patches/patch-libproxy_cmake_libproxy_cmk
===================================================================
RCS file: /cvs/ports/net/libproxy/patches/patch-libproxy_cmake_libproxy_cmk,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libproxy_cmake_libproxy_cmk
--- patches/patch-libproxy_cmake_libproxy_cmk 25 Aug 2012 13:12:59 -0000
1.4
+++ patches/patch-libproxy_cmake_libproxy_cmk 24 Sep 2012 15:03:09 -0000
@@ -1,12 +1,15 @@
$OpenBSD: patch-libproxy_cmake_libproxy_cmk,v 1.4 2012/08/25 13:12:59
ajacoutot Exp $
---- libproxy/cmake/libproxy.cmk.orig Mon Jun 6 17:44:37 2011
-+++ libproxy/cmake/libproxy.cmk Tue Aug 21 05:11:44 2012
-@@ -2,7 +2,7 @@ add_library(libproxy SHARED extension_config.cpp exten
+--- libproxy/cmake/libproxy.cmk.orig Mon Jun 6 23:44:37 2011
++++ libproxy/cmake/libproxy.cmk Mon Sep 24 15:35:02 2012
+@@ -1,8 +1,8 @@
+-add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp
extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES})
++add_library(proxy SHARED extension_config.cpp extension_pacrunner.cpp
extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES})
if(WIN32)
- target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES})
+- target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES})
++ target_link_libraries(proxy modman;ws2_32;${LIBPROXY_LIBRARIES})
else()
- target_link_libraries(libproxy modman;m;pthread;dl;${LIBPROXY_LIBRARIES})
-+ target_link_libraries(libproxy modman;m;pthread;${LIBPROXY_LIBRARIES})
++ target_link_libraries(proxy modman;m;pthread;${LIBPROXY_LIBRARIES})
endif()
file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR)
if(WIN32)
@@ -15,7 +18,9 @@ $OpenBSD: patch-libproxy_cmake_libproxy_
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
PROPERTY COMPILE_DEFINITIONS
MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
-+set_target_properties(libproxy PROPERTIES PREFIX "" VERSION
${LIBproxy_VERSION})
- set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
- install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
+-set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
+-install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
++set_target_properties(proxy PROPERTIES VERSION 1.0.0 SOVERSION 1)
++set_target_properties(proxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
++install(TARGETS proxy DESTINATION ${LIB_INSTALL_DIR})
install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
Index: patches/patch-libproxy_cmake_pxmodule_cmk
===================================================================
RCS file: patches/patch-libproxy_cmake_pxmodule_cmk
diff -N patches/patch-libproxy_cmake_pxmodule_cmk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libproxy_cmake_pxmodule_cmk 24 Sep 2012 15:03:09 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libproxy/cmake/pxmodule.cmk.orig Mon Sep 24 15:32:27 2012
++++ libproxy/cmake/pxmodule.cmk Mon Sep 24 15:32:34 2012
+@@ -18,7 +18,7 @@ function(px_module name build builtin)
+ set(built "m")
+ set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS
LIBEXECDIR="${LIBEXECDIR}")
+ add_library(${name} MODULE modules/${name}.cpp)
+- target_link_libraries(${name} libproxy)
++ target_link_libraries(${name} proxy)
+ set_target_properties(${name} PROPERTIES PREFIX "")
+ install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR})
+ if(${ARGC} GREATER 3)
Index: patches/patch-utils_CMakeLists_txt
===================================================================
RCS file: patches/patch-utils_CMakeLists_txt
diff -N patches/patch-utils_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-utils_CMakeLists_txt 24 Sep 2012 15:03:09 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- utils/CMakeLists.txt.orig Mon Jun 6 23:44:37 2011
++++ utils/CMakeLists.txt Mon Sep 24 15:42:42 2012
+@@ -1,5 +1,6 @@
+ include_directories("../libproxy")
+
+-add_executable(proxy proxy.c)
+-target_link_libraries(proxy libproxy)
+-install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR})
++add_executable(proxyutil proxy.c)
++target_link_libraries(proxyutil proxy)
++set_target_properties(proxyutil PROPERTIES OUTPUT_NAME proxy)
++install(TARGETS proxyutil RUNTIME DESTINATION ${BIN_INSTALL_DIR})
---8<---
devel/cmake:
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile 31 Aug 2012 12:28:31 -0000 1.64
+++ Makefile 26 Sep 2012 12:41:02 -0000
@@ -7,6 +7,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.9
+REVISION = 0
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dco...@openbsd.org>
Index: patches/patch-Source_cmComputeLinkInformation_cxx
===================================================================
RCS file: patches/patch-Source_cmComputeLinkInformation_cxx
diff -N patches/patch-Source_cmComputeLinkInformation_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_cmComputeLinkInformation_cxx 26 Sep 2012 12:41:02
-0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- Source/cmComputeLinkInformation.cxx.orig Thu Aug 9 20:15:19 2012
++++ Source/cmComputeLinkInformation.cxx Wed Sep 26 11:45:53 2012
+@@ -1059,12 +1059,21 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+ this->SharedLibrariesLinked.insert(target);
+ }
+
+- // Handle case of an imported shared library with no soname.
+- if(this->NoSONameUsesPath &&
+- target->IsImportedSharedLibWithoutSOName(this->Config))
++ if(this->OpenBSD)
+ {
+- this->AddSharedLibNoSOName(item);
+- return;
++ if(target->GetType() == cmTarget::SHARED_LIBRARY)
++ {
++ this->AddSharedLibNoSOName(item);
++ return;
++ }
++ } else {
++ // Handle case of an imported shared library with no soname.
++ if(this->NoSONameUsesPath &&
++ target->IsImportedSharedLibWithoutSOName(this->Config))
++ {
++ this->AddSharedLibNoSOName(item);
++ return;
++ }
+ }
+
+ // If this platform wants a flag before the full path, add it.
Index: patches/patch-Source_cmTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
retrieving revision 1.13
diff -u -p -r1.13 patch-Source_cmTarget_cxx
--- patches/patch-Source_cmTarget_cxx 31 Aug 2012 12:28:31 -0000 1.13
+++ patches/patch-Source_cmTarget_cxx 26 Sep 2012 12:41:02 -0000
@@ -1,7 +1,24 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.13 2012/08/31 12:28:31 dcoppa Exp $
--- Source/cmTarget.cxx.orig Thu Aug 9 20:15:19 2012
-+++ Source/cmTarget.cxx Thu Aug 23 11:25:48 2012
-@@ -3380,9 +3380,43 @@ void cmTarget::GetLibraryNames(std::string& name,
++++ Source/cmTarget.cxx Mon Aug 27 15:07:12 2012
+@@ -3022,12 +3022,16 @@ std::string cmTarget::GetPDBName(const char* config)
+ //----------------------------------------------------------------------------
+ bool cmTarget::HasSOName(const char* config)
+ {
++#if !defined(__OpenBSD__)
+ // soname is supported only for shared libraries and modules,
+ // and then only when the platform supports an soname flag.
+ return ((this->GetType() == cmTarget::SHARED_LIBRARY ||
+ this->GetType() == cmTarget::MODULE_LIBRARY) &&
+ !this->GetPropertyAsBool("NO_SONAME") &&
+ this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config)));
++#else
++ return false;
++#endif
+ }
+
+ //----------------------------------------------------------------------------
+@@ -3380,9 +3384,43 @@ void cmTarget::GetLibraryNames(std::string& name,
// The library name.
name = prefix+base+suffix;
@@ -45,7 +62,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix,
-@@ -3415,7 +3449,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
+@@ -3415,7 +3453,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
if(version)
{
vName += ".";
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile 31 Aug 2012 12:28:31 -0000 1.64
+++ Makefile 26 Sep 2012 12:41:02 -0000
@@ -7,6 +7,7 @@ HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.9
+REVISION = 0
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dco...@openbsd.org>
Index: patches/patch-Source_cmComputeLinkInformation_cxx
===================================================================
RCS file: patches/patch-Source_cmComputeLinkInformation_cxx
diff -N patches/patch-Source_cmComputeLinkInformation_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_cmComputeLinkInformation_cxx 26 Sep 2012 12:41:02
-0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- Source/cmComputeLinkInformation.cxx.orig Thu Aug 9 20:15:19 2012
++++ Source/cmComputeLinkInformation.cxx Wed Sep 26 11:45:53 2012
+@@ -1059,12 +1059,21 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+ this->SharedLibrariesLinked.insert(target);
+ }
+
+- // Handle case of an imported shared library with no soname.
+- if(this->NoSONameUsesPath &&
+- target->IsImportedSharedLibWithoutSOName(this->Config))
++ if(this->OpenBSD)
+ {
+- this->AddSharedLibNoSOName(item);
+- return;
++ if(target->GetType() == cmTarget::SHARED_LIBRARY)
++ {
++ this->AddSharedLibNoSOName(item);
++ return;
++ }
++ } else {
++ // Handle case of an imported shared library with no soname.
++ if(this->NoSONameUsesPath &&
++ target->IsImportedSharedLibWithoutSOName(this->Config))
++ {
++ this->AddSharedLibNoSOName(item);
++ return;
++ }
+ }
+
+ // If this platform wants a flag before the full path, add it.
Index: patches/patch-Source_cmTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
retrieving revision 1.13
diff -u -p -r1.13 patch-Source_cmTarget_cxx
--- patches/patch-Source_cmTarget_cxx 31 Aug 2012 12:28:31 -0000 1.13
+++ patches/patch-Source_cmTarget_cxx 26 Sep 2012 12:41:02 -0000
@@ -1,7 +1,24 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.13 2012/08/31 12:28:31 dcoppa Exp $
--- Source/cmTarget.cxx.orig Thu Aug 9 20:15:19 2012
-+++ Source/cmTarget.cxx Thu Aug 23 11:25:48 2012
-@@ -3380,9 +3380,43 @@ void cmTarget::GetLibraryNames(std::string& name,
++++ Source/cmTarget.cxx Mon Aug 27 15:07:12 2012
+@@ -3022,12 +3022,16 @@ std::string cmTarget::GetPDBName(const char* config)
+ //----------------------------------------------------------------------------
+ bool cmTarget::HasSOName(const char* config)
+ {
++#if !defined(__OpenBSD__)
+ // soname is supported only for shared libraries and modules,
+ // and then only when the platform supports an soname flag.
+ return ((this->GetType() == cmTarget::SHARED_LIBRARY ||
+ this->GetType() == cmTarget::MODULE_LIBRARY) &&
+ !this->GetPropertyAsBool("NO_SONAME") &&
+ this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config)));
++#else
++ return false;
++#endif
+ }
+
+ //----------------------------------------------------------------------------
+@@ -3380,9 +3384,43 @@ void cmTarget::GetLibraryNames(std::string& name,
// The library name.
name = prefix+base+suffix;
@@ -45,7 +62,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.
// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix,
-@@ -3415,7 +3449,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
+@@ -3415,7 +3453,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
if(version)
{
vName += ".";
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/dbic++/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 23 Apr 2012 17:15:17 -0000 1.8
+++ Makefile 26 Sep 2012 12:05:10 -0000
@@ -6,7 +6,7 @@ COMMENT= C++ database API
DISTNAME= deepfryed-dbicpp-v0.6.0
PKGNAME= dbic++-0.6.0
-REVISION = 0
+REVISION = 1
CATEGORIES= databases
HOMEPAGE= https://github.com/deepfryed/dbicpp
@@ -27,14 +27,17 @@ WANTLIB = e2fs-uuid m mysqlclient pcrec
MASTER_SITES= http://distfiles.bsdfrog.org/
-BUILD_DEPENDS= devel/cmake \
- shells/bash
+MODULES = devel/cmake
+
LIB_DEPENDS= mysql-client->=5:databases/mysql \
postgresql-client->=8.4:databases/postgresql \
devel/pcre \
sysutils/e2fsprogs
-CONFIGURE_STYLE= none
+CONFIGURE_ARGS+= -DCMAKE_MYSQL_VERSION=${LIBdbdmysql_VERSION} \
+ -DCMAKE_PG_VERSION=${LIBdbdpg_VERSION} \
+ -DCMAKE_SQLITE3_VERSION=${LIBdbdsqlite3_VERSION}
+
WRKDIST= ${WRKDIR}/deepfryed-dbicpp
NO_REGRESS= Yes
@@ -43,13 +46,6 @@ post-extract:
mv ${WRKDIR}/deepfryed-dbicpp-* ${WRKDIR}/deepfryed-dbicpp
pre-configure:
- ${SUBST_CMD}
${WRKSRC}/{CMakeLists.txt,inc/dbic++.h,src/dbic++.cc,pkgconfig/dbic++.pc}
-
-do-build:
- cd ${WRKSRC} && ${SET_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/bash build
-
-do-install:
- cd ${WRKSRC} && ${SET_ENV} ${MAKE_ENV} \
- ${LOCALBASE}/bin/bash build -i
+ ${SUBST_CMD} ${WRKSRC}/{inc/dbic++.h,src/dbic++.cc,pkgconfig/dbic++.pc}
.include <bsd.port.mk>
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/databases/dbic++/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 6 Apr 2012 19:25:23 -0000 1.3
+++ patches/patch-CMakeLists_txt 26 Sep 2012 12:05:10 -0000
@@ -1,42 +1,28 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2012/04/06 19:25:23 jeremy Exp $
---- CMakeLists.txt.orig Wed Mar 28 22:09:47 2012
-+++ CMakeLists.txt Thu Mar 29 16:09:46 2012
-@@ -35,7 +35,7 @@ IF (PQ_FOUND)
- TARGET_LINK_LIBRARIES(dbdpg ${PQ_LIBRARIES})
- ENDIF()
+--- CMakeLists.txt.orig Thu Mar 29 07:09:47 2012
++++ CMakeLists.txt Wed Sep 26 13:57:43 2012
+@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+ PROJECT(DBICPP CXX C)
-- SET_TARGET_PROPERTIES(dbdpg PROPERTIES VERSION ${CMAKE_PG_VERSION}
SOVERSION 1)
-+ SET_TARGET_PROPERTIES(dbdpg PROPERTIES VERSION
"${CMAKE_PG_VERSION}${LIBdbdpg_VERSION}")
- INSTALL(TARGETS dbdpg
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++)
-@@ -50,7 +50,7 @@ IF (MYSQL_FOUND)
- ELSE()
- TARGET_LINK_LIBRARIES(dbdmysql ${MYSQL_LIBRARIES})
- ENDIF()
-- SET_TARGET_PROPERTIES(dbdmysql PROPERTIES VERSION ${CMAKE_MYSQL_VERSION}
SOVERSION 1)
-+ SET_TARGET_PROPERTIES(dbdmysql PROPERTIES VERSION
"${CMAKE_MYSQL_VERSION}${LIBdbdmysql_VERSION}")
- INSTALL(TARGETS dbdmysql
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++)
-@@ -65,19 +65,19 @@ IF (SQLITE3_FOUND)
- ELSE()
- TARGET_LINK_LIBRARIES(dbdsqlite3 ${SQLITE3_LIBRARIES})
- ENDIF()
-- SET_TARGET_PROPERTIES(dbdsqlite3 PROPERTIES VERSION
${CMAKE_SQLITE3_VERSION} SOVERSION 1)
-+ SET_TARGET_PROPERTIES(dbdsqlite3 PROPERTIES VERSION
"${CMAKE_SQLITE3_VERSION}${LIBdbdsqlite3_VERSION}")
- INSTALL(TARGETS dbdsqlite3
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++
+ LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib)
+-SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules modules)
++SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/modules)
+
+ FIND_PACKAGE(uuid REQUIRED)
+ FIND_PACKAGE(pcre REQUIRED)
+@@ -71,13 +71,13 @@ IF (SQLITE3_FOUND)
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/dbic++)
ENDIF()
- ADD_EXECUTABLE(demo/demo src/examples/demo.cc)
+-ADD_EXECUTABLE(demo/demo src/examples/demo.cc)
-TARGET_LINK_LIBRARIES(demo/demo dbic++ dl ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
-+TARGET_LINK_LIBRARIES(demo/demo dbic++ ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
++ADD_EXECUTABLE(demo src/examples/demo.cc)
++TARGET_LINK_LIBRARIES(demo dbic++ ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
- ADD_EXECUTABLE(demo/async src/examples/async.cc)
+-ADD_EXECUTABLE(demo/async src/examples/async.cc)
-TARGET_LINK_LIBRARIES(demo/async dbic++ dl ${UUID_LIBRARIES}
${PCRE_LIBRARIES})
-+TARGET_LINK_LIBRARIES(demo/async dbic++ ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
++ADD_EXECUTABLE(async src/examples/async.cc)
++TARGET_LINK_LIBRARIES(async dbic++ ${UUID_LIBRARIES} ${PCRE_LIBRARIES})
-ADD_DEFINITIONS(-Wall -Wno-sign-compare -rdynamic -fopenmp -fPIC -O3
-Wno-non-virtual-dtor)
+ADD_DEFINITIONS(-Wall -Wno-sign-compare -rdynamic -fopenmp -fPIC
-Wno-non-virtual-dtor)
Index: patches/patch-build
===================================================================
RCS file: patches/patch-build
diff -N patches/patch-build
--- patches/patch-build 6 Apr 2012 19:25:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-build,v 1.1 2012/04/06 19:25:23 jeremy Exp $
---- build.orig Wed Jan 12 18:27:58 2011
-+++ build Tue Jan 18 15:46:51 2011
-@@ -88,12 +88,10 @@ _uninstall() {
- }
-
- _install() {
-- _uninstall
- cmake -DCMAKE_PG_VERSION=$PG_VERSION \
- -DCMAKE_MYSQL_VERSION=$MYSQL_VERSION \
- -DCMAKE_SQLITE3_VERSION=$SQLITE3_VERSION \
-- -DCMAKE_INSTALL_PREFIX:PATH=/usr
-- make
-+ -DCMAKE_INSTALL_PREFIX:PATH=${LOCALBASE}
- make install
- }
-
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/libproxy/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 1 Sep 2012 14:36:58 -0000 1.27
+++ Makefile 24 Sep 2012 15:03:09 -0000
@@ -13,7 +13,7 @@ PKGNAME-main= libproxy-${VERSION}
PKGNAME-mozilla= libproxy-mozilla-${VERSION}
PKGNAME-webkit= libproxy-webkit-${VERSION}
-REVISION-main= 1
+REVISION-main= 2
REVISION-mozilla= 1
REVISION-webkit= 1
@@ -101,8 +101,5 @@ CONFIGURE_ARGS += -DWITH_WEBKIT3:BOOL=ON
.else
CONFIGURE_ARGS += -DWITH_WEBKIT:BOOL=OFF
.endif
-
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/libproxy/cmake/libproxy.cmk
.include <bsd.port.mk>
Index: patches/patch-bindings_perl_src_CMakeLists_txt
===================================================================
RCS file: patches/patch-bindings_perl_src_CMakeLists_txt
diff -N patches/patch-bindings_perl_src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bindings_perl_src_CMakeLists_txt 24 Sep 2012 15:03:09
-0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- bindings/perl/src/CMakeLists.txt.orig Mon Jun 6 23:44:37 2011
++++ bindings/perl/src/CMakeLists.txt Mon Sep 24 15:39:04 2012
+@@ -4,7 +4,7 @@ include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOUR
+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
+ COMMAND ${PERL_EXECUTABLE} ARGS
${CMAKE_CURRENT_SOURCE_DIR}/doxsubpp.pl
+ ${PERL_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs libproxy
++ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Libproxy.xs proxy
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+ set(Libproxy_LIB_SRCS Libproxy.c)
+@@ -12,7 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c)
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
+ add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
+
+-target_link_libraries(PLlibproxy ${PERL_LIBRARY} libproxy)
++target_link_libraries(PLlibproxy ${PERL_LIBRARY} proxy)
+ set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
+ set_target_properties(PLlibproxy PROPERTIES PREFIX "")
+
Index: patches/patch-libproxy_cmake_libproxy_cmk
===================================================================
RCS file: /cvs/ports/net/libproxy/patches/patch-libproxy_cmake_libproxy_cmk,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libproxy_cmake_libproxy_cmk
--- patches/patch-libproxy_cmake_libproxy_cmk 25 Aug 2012 13:12:59 -0000
1.4
+++ patches/patch-libproxy_cmake_libproxy_cmk 24 Sep 2012 15:03:09 -0000
@@ -1,12 +1,15 @@
$OpenBSD: patch-libproxy_cmake_libproxy_cmk,v 1.4 2012/08/25 13:12:59
ajacoutot Exp $
---- libproxy/cmake/libproxy.cmk.orig Mon Jun 6 17:44:37 2011
-+++ libproxy/cmake/libproxy.cmk Tue Aug 21 05:11:44 2012
-@@ -2,7 +2,7 @@ add_library(libproxy SHARED extension_config.cpp exten
+--- libproxy/cmake/libproxy.cmk.orig Mon Jun 6 23:44:37 2011
++++ libproxy/cmake/libproxy.cmk Mon Sep 24 15:35:02 2012
+@@ -1,8 +1,8 @@
+-add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp
extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES})
++add_library(proxy SHARED extension_config.cpp extension_pacrunner.cpp
extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES})
if(WIN32)
- target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES})
+- target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES})
++ target_link_libraries(proxy modman;ws2_32;${LIBPROXY_LIBRARIES})
else()
- target_link_libraries(libproxy modman;m;pthread;dl;${LIBPROXY_LIBRARIES})
-+ target_link_libraries(libproxy modman;m;pthread;${LIBPROXY_LIBRARIES})
++ target_link_libraries(proxy modman;m;pthread;${LIBPROXY_LIBRARIES})
endif()
file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR)
if(WIN32)
@@ -15,7 +18,9 @@ $OpenBSD: patch-libproxy_cmake_libproxy_
set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp
PROPERTY COMPILE_DEFINITIONS
MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES})
-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1)
-+set_target_properties(libproxy PROPERTIES PREFIX "" VERSION
${LIBproxy_VERSION})
- set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
- install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
+-set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
+-install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR})
++set_target_properties(proxy PROPERTIES VERSION 1.0.0 SOVERSION 1)
++set_target_properties(proxy PROPERTIES LINK_INTERFACE_LIBRARIES "")
++install(TARGETS proxy DESTINATION ${LIB_INSTALL_DIR})
install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR})
Index: patches/patch-libproxy_cmake_pxmodule_cmk
===================================================================
RCS file: patches/patch-libproxy_cmake_pxmodule_cmk
diff -N patches/patch-libproxy_cmake_pxmodule_cmk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libproxy_cmake_pxmodule_cmk 24 Sep 2012 15:03:09 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libproxy/cmake/pxmodule.cmk.orig Mon Sep 24 15:32:27 2012
++++ libproxy/cmake/pxmodule.cmk Mon Sep 24 15:32:34 2012
+@@ -18,7 +18,7 @@ function(px_module name build builtin)
+ set(built "m")
+ set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS
LIBEXECDIR="${LIBEXECDIR}")
+ add_library(${name} MODULE modules/${name}.cpp)
+- target_link_libraries(${name} libproxy)
++ target_link_libraries(${name} proxy)
+ set_target_properties(${name} PROPERTIES PREFIX "")
+ install(TARGETS ${name} LIBRARY DESTINATION ${MODULE_INSTALL_DIR})
+ if(${ARGC} GREATER 3)
Index: patches/patch-utils_CMakeLists_txt
===================================================================
RCS file: patches/patch-utils_CMakeLists_txt
diff -N patches/patch-utils_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-utils_CMakeLists_txt 24 Sep 2012 15:03:09 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- utils/CMakeLists.txt.orig Mon Jun 6 23:44:37 2011
++++ utils/CMakeLists.txt Mon Sep 24 15:42:42 2012
+@@ -1,5 +1,6 @@
+ include_directories("../libproxy")
+
+-add_executable(proxy proxy.c)
+-target_link_libraries(proxy libproxy)
+-install(TARGETS proxy RUNTIME DESTINATION ${BIN_INSTALL_DIR})
++add_executable(proxyutil proxy.c)
++target_link_libraries(proxyutil proxy)
++set_target_properties(proxyutil PROPERTIES OUTPUT_NAME proxy)
++install(TARGETS proxyutil RUNTIME DESTINATION ${BIN_INSTALL_DIR})
