diff options
| author | wiz <wiz> | 2010-06-13 22:43:46 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2010-06-13 22:43:46 +0000 |
| commit | c3512e82cfd1ef757581484eb740c7cd398411b9 (patch) | |
| tree | 4a9b97c2969a25f1eeb6596ee96fc25429cef7d5 /devel/cmake | |
| parent | e9a8c2a53822e7578f98d3ebcd4e60f3d153b02a (diff) | |
| download | pkgsrc-c3512e82cfd1ef757581484eb740c7cd398411b9.tar.gz | |
Bump PKGREVISION for libpng shlib name change.
Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.
Diffstat (limited to 'devel/cmake')
| -rw-r--r-- | devel/cmake/Makefile | 6 | ||||
| -rw-r--r-- | devel/cmake/PLIST | 3 | ||||
| -rw-r--r-- | devel/cmake/distinfo | 3 | ||||
| -rw-r--r-- | devel/cmake/patches/patch-ad | 13 |
4 files changed, 21 insertions, 4 deletions
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index ae5b26e1663..8bbe3476563 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.50 2010/04/09 13:25:34 adam Exp $ +# $NetBSD: Makefile,v 1.51 2010/06/13 22:44:03 wiz Exp $ DISTNAME= cmake-${CMAKE_API}.1 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.cmake.org/files/v2.8/ @@ -42,6 +43,9 @@ SUBST_VARS.cmake= X11BASE post-patch: ${RM} ${WRKSRC}/Modules/*.orig +post-install: + ${RM} -f ${DESTDIR}${PREFIX}/share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake.orig + .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../textproc/xmlrpc-c/buildlink3.mk" diff --git a/devel/cmake/PLIST b/devel/cmake/PLIST index 03b8cb98f24..571081de3f0 100644 --- a/devel/cmake/PLIST +++ b/devel/cmake/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2010/04/09 13:25:34 adam Exp $ +@comment $NetBSD: PLIST,v 1.20 2010/06/13 22:44:03 wiz Exp $ bin/ccmake bin/cmake bin/cpack @@ -397,7 +397,6 @@ share/cmake-${CMAKE_API}/Modules/Platform/Tru64.cmake share/cmake-${CMAKE_API}/Modules/Platform/ULTRIX.cmake share/cmake-${CMAKE_API}/Modules/Platform/UNIX_SV.cmake share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake -share/cmake-${CMAKE_API}/Modules/Platform/UnixPaths.cmake.orig share/cmake-${CMAKE_API}/Modules/Platform/UnixWare.cmake share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-C.cmake share/cmake-${CMAKE_API}/Modules/Platform/Windows-Borland-CXX.cmake diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 4c8b5053ada..04ebb404cd2 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2010/04/09 13:25:34 adam Exp $ +$NetBSD: distinfo,v 1.25 2010/06/13 22:44:03 wiz Exp $ SHA1 (cmake-2.8.1.tar.gz) = e9f99cfccf8ec4fb5bbd8ca7d499771a2f1d4ebe RMD160 (cmake-2.8.1.tar.gz) = 71e216704ee4313640efdbefcc65c6576071ef82 @@ -6,3 +6,4 @@ Size (cmake-2.8.1.tar.gz) = 3605586 bytes SHA1 (patch-aa) = b093f4992a7fea099d7c26a90b150ac0d057067a SHA1 (patch-ab) = f7372942f7e28b01c26794ce1a94914b68d1b24e SHA1 (patch-ac) = e5127b9e28375528e977898c59cb6b5044d76ebe +SHA1 (patch-ad) = a3c705c01dc7de4354756092fc5f3ad3b9a8090c diff --git a/devel/cmake/patches/patch-ad b/devel/cmake/patches/patch-ad new file mode 100644 index 00000000000..b56d5b8652f --- /dev/null +++ b/devel/cmake/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.7 2010/06/13 22:44:03 wiz Exp $ + +--- Modules/FindPNG.cmake.orig 2010-04-06 14:45:31.000000000 +0000 ++++ Modules/FindPNG.cmake +@@ -33,7 +33,7 @@ if(ZLIB_FOUND) + /usr/local/include/libpng # OpenBSD + ) + +- set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12) ++ set(PNG_NAMES ${PNG_NAMES} png libpng png12 libpng12 png14 libpng14) + find_library(PNG_LIBRARY NAMES ${PNG_NAMES} ) + + if (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR) |