From 943965934c325ea5b2d1e2c18ead3ab897986443 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Fri, 12 Jul 2013 00:58:47 +0000 Subject: [PATCH] nfqueue-bindings: more prefix fixes --- net-libs/nfqueue-bindings/Manifest | 6 +++-- .../nfqueue-bindings/files/0.4-perl.patch | 24 +++++++++++++++++++ .../nfqueue-bindings/files/2013-perl.patch | 22 +++++++++++++++++ .../nfqueue-bindings-0.4.ebuild | 10 ++++++-- .../nfqueue-bindings-20130605.ebuild | 10 +++++--- 5 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 net-libs/nfqueue-bindings/files/0.4-perl.patch create mode 100644 net-libs/nfqueue-bindings/files/2013-perl.patch diff --git a/net-libs/nfqueue-bindings/Manifest b/net-libs/nfqueue-bindings/Manifest index ab1df2724..01f31f76b 100644 --- a/net-libs/nfqueue-bindings/Manifest +++ b/net-libs/nfqueue-bindings/Manifest @@ -1,4 +1,6 @@ +AUX 0.4-perl.patch 916 SHA256 dc46da8a2efe427cba57753d2748c385093975aa5cb1f810584c3053006c83ba SHA512 10bb672f4a2b113c3e7abcf5bd9586137a74451077381cf016f918452d2640ef6d1b6641400f3f3532c63c5523ca0107fa8f853fcfeea8734b67a05a74bf6509 WHIRLPOOL 51ec13d36b14f73bdafbcf58fce636a7039415b633117723e69112d5a47b9f7fed2cac958902de1ab4bfff60937e9eeed178b0a1e1330a37236cbbb9855f4b90 AUX 10-fix-ftbfs-uint32.patch 286 SHA256 9f7cf72642fe33beeff9458cbe53e69bb49dc1bf1cfdfec04b6ec0cf1600646a SHA512 7e3f89400f5e6d4db1ee7125f0e61fa64d370d09bd63ad0d2da140e63127be9bd47674c3ebedf402b6080d4e2a70953703693fa2b2a55cfe1aade7e6b33f013f WHIRLPOOL 48c63a7543651891a6ccc7c9d92b3348160f9f02abfe158769b3da14dbb345d651eac5975db31de80048f9aec25c08f06054df9482c2bef7f9744fe325bcdbd1 +AUX 2013-perl.patch 793 SHA256 59198c0c9d0e9c477f17fe2f945bcb3b8020cc5c748e7e30e3dce1b9be4f2376 SHA512 56d09cdc7ea57a842dafd70ba16a7068f73589396071664cd4ec17bf45680dfa97238db23be44e76337aa4a7805365cdc3d9434399e8616af3726d2efa7c4712 WHIRLPOOL 13fd406acb280863c42cb530761b85faebb384b6868bf3b4fcbb950d5a54af369da59f0dae32994196b38370e70adb45b664a205950ab87de76f031ceeef6f34 DIST nfqueue-bindings-0.4.tar.gz 22664 SHA256 cdbdb8987f2a3e2e1f9895814590f680aaf154b14de27336474bc52e28e5b2ce SHA512 2469447b84b11afd448ea7cd8bf50d4d4227f532bf0e2ddbef963f9e2c1d5a272fe210ba06df2a44661bd43b989de60cc6338f3a4d7978709963a7ef5bbc0992 WHIRLPOOL 01338eb8e368d75a00ef4aee322de231c15c99e5c9691e6984a817c0ce62212314a2b1d2b95c292f5bac19b99c96543a44961180798260576093daba9698002b -EBUILD nfqueue-bindings-0.4.ebuild 1791 SHA256 8d964b17f039c5182513efa17f0787bff7636c41d0b9b5b3d09d26cdb3ac772a SHA512 c5ce65e1d79b856b2090ba0caac21d202e00662db533e859aadb708f2496812fbc3bc1b9f1244e7541ebc03aa998280f8219a7dd1e3a033223c7aa555a47d189 WHIRLPOOL f70758a25ddad8d42390726c645c08b9666146a44db1fbaab165d9235a34a8af8e31bf58f8dfc73ec6232fc785b79494b5ad1a1ed5839410b4a0e9689c1e2a5b -EBUILD nfqueue-bindings-20130605.ebuild 1899 SHA256 67775f6a5ff9599fe74c1eb7c038b5b0c772aa94700af8f0695babd0e4c299c2 SHA512 507ffe4a0f698c455c89b0eae70a25eb9cc91c6167c9c95483c8706fe9544a65831f50033c24f4891c7fb9805b433dfbae9724fa29127fb2ac8cf8601e1754ec WHIRLPOOL 1383cb94d3cd10aeb89d16f37848fbf364806fd61b430872a70bab43b8121e9201a6d6a833e38501d8ae7e4b8b60f12b7e8ddac6799e4e37c968d94453945dc4 +EBUILD nfqueue-bindings-0.4.ebuild 1917 SHA256 bee95778bb79708d873bfcc7713df4abadc75960b863409c6edbfc8f85f7b591 SHA512 9e0f895a22e6c50961f46caeb34d2e2999493ea0a717fb59b69aff29d1d8ff1c7e4761ce368649850d869c6a6653ff80c5fef96fcf3f481598c97f6eb18f4212 WHIRLPOOL df53e3faf440f28cd668ff2b08ec2cdc34b53c9dca450a507ea59907a346694c4f2955fd75a321388be3db3aa19007a624069481684e987533814db183751116 +EBUILD nfqueue-bindings-20130605.ebuild 1959 SHA256 74b43fef58f608c64bbf549e81d82e9680c943f841def65e5e790a273324912c SHA512 23f675348dc3be888b952329ebb5902ae77aaac0dfd7060fbf282fc8b909157ef32640eb3455318ecb7558d40680fb01dc0ea336753dc58e6de7c3a1caf50d63 WHIRLPOOL 21262296435840f61f9f80e75058aca0325acfb8cfebf66b2d3f16113ea26c6ecc25f3d437d65e157934ca9702fa685dd108525c5d61f933d7f44b76e2349ec1 diff --git a/net-libs/nfqueue-bindings/files/0.4-perl.patch b/net-libs/nfqueue-bindings/files/0.4-perl.patch new file mode 100644 index 000000000..1d711818c --- /dev/null +++ b/net-libs/nfqueue-bindings/files/0.4-perl.patch @@ -0,0 +1,24 @@ +--- a/perl/CMakeLists.txt.orig 2013-07-12 08:05:38.000000000 +0800 ++++ a/perl/CMakeLists.txt 2013-07-12 08:11:19.000000000 +0800 +@@ -2,7 +2,7 @@ + + SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") + FIND_PACKAGE(Perl) +-FIND_PACKAGE(PerlLibs2) ++FIND_PACKAGE(PerlLibs) + + IF ( PERL_EXECUTABLE ) + EXEC_PROGRAM( ${PERL_EXECUTABLE} ARGS "-e 'use Config; print \$Config{revision},\"\\n\"'" OUTPUT_VARIABLE PERL_VERSION ) +@@ -20,9 +20,7 @@ + SWIG_ADD_MODULE(nfqueue perl ../libnetfilter_queue.i ${SOURCES}) + SWIG_LINK_LIBRARIES(nfqueue ${PERL_LIBRARY} ${LIBNFQ_LDFLAGS}) + +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/nfqueue.pm +- DESTINATION ${LIB_INSTALL_DIR}/perl${PERL_VERSION}/) +- +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfqueue.so +- DESTINATION ${LIB_INSTALL_DIR}/perl${PERL_VERSION}/) + ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/nfqueue.pm ++ ${CMAKE_CURRENT_BINARY_DIR}/libnfqueue.so ++ DESTINATION ${PERL_ARCHLIB}) diff --git a/net-libs/nfqueue-bindings/files/2013-perl.patch b/net-libs/nfqueue-bindings/files/2013-perl.patch new file mode 100644 index 000000000..152c112c2 --- /dev/null +++ b/net-libs/nfqueue-bindings/files/2013-perl.patch @@ -0,0 +1,22 @@ +--- a/perl/CMakeLists.txt.orig 2013-07-12 08:05:38.000000000 +0800 ++++ a/perl/CMakeLists.txt 2013-07-12 08:11:19.000000000 +0800 +@@ -2,7 +2,7 @@ + + SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") + FIND_PACKAGE(Perl) +-FIND_PACKAGE(PerlLibs2) ++FIND_PACKAGE(PerlLibs) + + IF ( PERL_EXECUTABLE ) + EXEC_PROGRAM( ${PERL_EXECUTABLE} ARGS "-e 'use Config; print \$Config{revision},\"\\n\"'" OUTPUT_VARIABLE PERL_VERSION ) +@@ -21,8 +21,5 @@ + SWIG_LINK_LIBRARIES(nfqueue ${PERL_LIBRARY} ${LIBNFQ_LDFLAGS}) + + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/nfqueue.pm +- DESTINATION ${LIB_INSTALL_DIR}/perl${PERL_VERSION}/) +- +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/nfqueue.so +- DESTINATION ${LIB_INSTALL_DIR}/perl${PERL_VERSION}/) +- ++ ${CMAKE_CURRENT_BINARY_DIR}/libnfqueue.so ++ DESTINATION ${PERL_ARCHLIB}) diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.4.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.4.ebuild index e4456853e..01ce85280 100644 --- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.4.ebuild +++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.4.ebuild @@ -41,9 +41,15 @@ pkg_setup() { } src_prepare() { + +#perl_set_version + #upstream was smoking something - sed -i "s|PerlLibs2|PerlLibs|g" perl/CMakeLists.txt +# sed -i "s|PerlLibs2|PerlLibs|g" perl/CMakeLists.txt +# sed -i "s|nfqueue.so|libnfqueue.so|g" perl/CMakeLists.txt + epatch "${FILESDIR}/0.4-perl.patch" rm FindPerlLibs2.cmake + #outdated epatch "${FILESDIR}/10-fix-ftbfs-uint32.patch" @@ -53,7 +59,7 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install /usr + emake DESTDIR="${D}" install PREFIX=/usr docinto examples use examples && dodoc examples/* } diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-20130605.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-20130605.ebuild index 5a901af95..eef1042b3 100644 --- a/net-libs/nfqueue-bindings/nfqueue-bindings-20130605.ebuild +++ b/net-libs/nfqueue-bindings/nfqueue-bindings-20130605.ebuild @@ -43,14 +43,18 @@ pkg_setup() { } src_prepare() { + +#perl_set_version + #upstream was smoking something - sed -i "s|PerlLibs2|PerlLibs|g" perl/CMakeLists.txt +# sed -i "s|PerlLibs2|PerlLibs|g" perl/CMakeLists.txt +# sed -i "s|nfqueue.so|libnfqueue.so|g" perl/CMakeLists.txt + epatch "${FILESDIR}/2013-perl.patch" rm FindPerlLibs2.cmake + #outdated epatch "${FILESDIR}/10-fix-ftbfs-uint32.patch" - sed -i "s|nfqueue.so|libnfqueue.so|g" perl/CMakeLists.txt - # # Disable Perl/Python from USE flags use perl || sed -i '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*perl[[:space:]]*)/s/^/#/g' CMakeLists.txt use python || sed -i '/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*python[[:space:]]*)/s/^/#/g' CMakeLists.txt