Import of pkgsrc-2014Q1
This commit is contained in:
+18
-14
@@ -1,7 +1,6 @@
|
||||
# $NetBSD: Makefile,v 1.23 2013/03/01 14:49:53 gdt Exp $
|
||||
#
|
||||
# $NetBSD: Makefile,v 1.25 2013/10/25 12:59:07 adam Exp $
|
||||
|
||||
DISTNAME= lensfun-0.2.7
|
||||
DISTNAME= lensfun-0.2.8
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= http://download.berlios.de/lensfun/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
@@ -15,33 +14,38 @@ LICENSE= gnu-lgpl-v3
|
||||
# Defer, because cmake is coming.
|
||||
BUILD_DEPENDS+= makedepend-[0-9]*:../../devel/makedepend
|
||||
|
||||
USE_LANGUAGES= c c++
|
||||
USE_TOOLS+= gmake pkg-config gsed
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_ARGS+= --prefix=${PREFIX} --libdir=${PREFIX}/lib
|
||||
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib
|
||||
CONFIGURE_ARGS+= --prefix=${PREFIX}
|
||||
CONFIGURE_ARGS+= --vectorization=
|
||||
MAKE_FILE= GNUmakefile
|
||||
|
||||
CONFIG_SHELL= ${PYTHONBIN}
|
||||
PYTHON_FOR_BUILD_ONLY= yes
|
||||
REPLACE_PYTHON= configure
|
||||
USE_LANGUAGES= c c++
|
||||
USE_TOOLS+= gmake pkg-config gsed
|
||||
PKGCONFIG_OVERRIDE= libs/lensfun/lensfun.pc.in
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
# Starting in 0.2.6, the library is misinstalled as liblensfun.so,
|
||||
# with no .0 variant. Manually fix it, because that's easier than
|
||||
# understanding the build, and upstream is moving to cmake anyway.
|
||||
post-install:
|
||||
${MV} ${DESTDIR}${PREFIX}/lib/liblensfun.so \
|
||||
${DESTDIR}${PREFIX}/lib/liblensfun.so.${PKGVERSION:C/nb[0-9]*//}
|
||||
${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
|
||||
${DESTDIR}${PREFIX}/lib/liblensfun.so.0
|
||||
${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
|
||||
${DESTDIR}${PREFIX}/lib/liblensfun.so
|
||||
.if ${OPSYS} == "Darwin"
|
||||
${MV} ${DESTDIR}${PREFIX}/lib/liblensfun.dylib.${PKGVERSION_NOREV} \
|
||||
${DESTDIR}${PREFIX}/lib/liblensfun.${PKGVERSION_NOREV}.dylib
|
||||
${RM} ${DESTDIR}${PREFIX}/lib/liblensfun.dylib*
|
||||
${LN} -s liblensfun.${PKGVERSION_NOREV}.dylib \
|
||||
${DESTDIR}${PREFIX}/lib/liblensfun.0.dylib
|
||||
${LN} -s liblensfun.${PKGVERSION_NOREV}.dylib \
|
||||
${DESTDIR}${PREFIX}/lib/liblensfun.dylib
|
||||
.endif
|
||||
|
||||
.include "../../devel/glib2/buildlink3.mk"
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
# png: for test programs only
|
||||
.include "../../graphics/png/buildlink3.mk"
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
.include "../../lang/python/application.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
# DO NOT DELETE
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@comment $NetBSD: PLIST,v 1.9 2013/03/01 14:49:53 gdt Exp $
|
||||
@comment $NetBSD: PLIST,v 1.10 2013/10/25 12:59:07 adam Exp $
|
||||
include/lensfun.h
|
||||
lib/liblensfun.so
|
||||
lib/liblensfun.so.0
|
||||
@@ -21,14 +21,18 @@ share/lensfun/compact-olympus.xml
|
||||
share/lensfun/compact-panasonic.xml
|
||||
share/lensfun/compact-pentax.xml
|
||||
share/lensfun/compact-ricoh.xml
|
||||
share/lensfun/compact-samsung.xml
|
||||
share/lensfun/compact-sigma.xml
|
||||
share/lensfun/compact-sony.xml
|
||||
share/lensfun/generic.xml
|
||||
share/lensfun/mil-canon.xml
|
||||
share/lensfun/mil-fujifilm.xml
|
||||
share/lensfun/mil-nikon.xml
|
||||
share/lensfun/mil-olympus.xml
|
||||
share/lensfun/mil-panasonic.xml
|
||||
share/lensfun/mil-samsung.xml
|
||||
share/lensfun/mil-samyang.xml
|
||||
share/lensfun/mil-sigma.xml
|
||||
share/lensfun/mil-sony.xml
|
||||
share/lensfun/rf-leica.xml
|
||||
share/lensfun/slr-canon.xml
|
||||
@@ -41,8 +45,10 @@ share/lensfun/slr-olympus.xml
|
||||
share/lensfun/slr-panasonic.xml
|
||||
share/lensfun/slr-pentax.xml
|
||||
share/lensfun/slr-samsung.xml
|
||||
share/lensfun/slr-samyang.xml
|
||||
share/lensfun/slr-schneider.xml
|
||||
share/lensfun/slr-sigma.xml
|
||||
share/lensfun/slr-soligor.xml
|
||||
share/lensfun/slr-sony.xml
|
||||
share/lensfun/slr-tamron.xml
|
||||
share/lensfun/slr-tokina.xml
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
$NetBSD: distinfo,v 1.10 2013/03/04 14:44:25 joerg Exp $
|
||||
$NetBSD: distinfo,v 1.13 2013/10/25 12:59:07 adam Exp $
|
||||
|
||||
SHA1 (lensfun-0.2.7.tar.bz2) = f26121093dfee85d6371c2c79dae22e6d1b8d0d6
|
||||
RMD160 (lensfun-0.2.7.tar.bz2) = 87cee31658f1083734356c678b934a712bccefad
|
||||
Size (lensfun-0.2.7.tar.bz2) = 552960 bytes
|
||||
SHA1 (lensfun-0.2.8.tar.bz2) = 0e85eb7692620668d27e2303687492ad68c90eb4
|
||||
RMD160 (lensfun-0.2.8.tar.bz2) = 527b4ca0e9ce40f514e7340548d0d0635bdc875e
|
||||
Size (lensfun-0.2.8.tar.bz2) = 628913 bytes
|
||||
SHA1 (patch-aa) = d31dd742f232aa8a75f50f14f782918ba11a8119
|
||||
SHA1 (patch-ab) = 5455bda9546dce6cc5b4a73429092afdee04bd23
|
||||
SHA1 (patch-ad) = f9d54534d3be809e8517ec262e776c9d1785acd8
|
||||
SHA1 (patch-ae) = c7f47ac5081d52244f38d0fc40795c7cb00f40e4
|
||||
SHA1 (patch-libs_auxfun_image.cpp) = 613b2f80ede85285195c20eb096cd70fe6783b1a
|
||||
SHA1 (patch-ae) = 9fe7181571f24d90058b340e9f95e7a5557cdd48
|
||||
SHA1 (patch-build_tibs_compiler_pkgconfig.mak) = 692dd4c04c3b1f348a8c7ef5a1c708cf254a0b14
|
||||
|
||||
@@ -1,8 +1,20 @@
|
||||
$NetBSD: patch-ae,v 1.1 2011/01/17 16:38:21 drochner Exp $
|
||||
$NetBSD: patch-ae,v 1.2 2013/10/25 06:41:47 wiz Exp $
|
||||
|
||||
--- configure.orig 2010-03-24 00:22:24.000000000 +0000
|
||||
GNU Make check is broken -- does not recognize 4.0 as newer than 3.81.
|
||||
http://developer.berlios.de/bugs/?func=detailbug&bug_id=19153&group_id=9034
|
||||
Remove doxygen detection to avoid pulling it in unintendedly.
|
||||
|
||||
--- configure.orig 2013-01-27 16:51:06.000000000 +0000
|
||||
+++ configure
|
||||
@@ -52,11 +52,7 @@ if tibs.check_program ("makedep", "maked
|
||||
@@ -45,18 +45,14 @@ if tibs.TARGET [0] == "windows":
|
||||
}
|
||||
|
||||
# Check for tools
|
||||
-tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "3.81", True)
|
||||
+#tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "3.81", True)
|
||||
if tibs.check_program ("makedep", "makedep -V", ".*Version.*?([0-9\.]+).*", "0.1.0"):
|
||||
tibs.add_config_mak ("MAKEDEP", "makedep")
|
||||
makedep = "yes"
|
||||
else:
|
||||
makedep = "no"
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
$NetBSD: patch-build_tibs_compiler_pkgconfig.mak,v 1.1 2013/08/04 19:12:00 adam Exp $
|
||||
|
||||
Install pkgconfig file also on Darwin.
|
||||
|
||||
--- build/tibs//compiler/pkgconfig.mak.orig 2013-08-04 19:08:20.000000000 +0000
|
||||
+++ build/tibs//compiler/pkgconfig.mak
|
||||
@@ -4,7 +4,7 @@ ifdef CONF_LIBDIR
|
||||
# Try to guess here if target supports pkgconfig
|
||||
# - Any POSIX platform
|
||||
# - Cross-compiling on a POSIX target for WINDOWS (mingw32)
|
||||
-ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /posix-windows/,/$(HOST)-$(TARGET)/),)
|
||||
+ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /mac/,/$(TARGET)/),)
|
||||
|
||||
XFNAME.PKGCONFIG = $(addprefix $$(OUT),$1)
|
||||
MKDEPS.PKGCONFIG = $1
|
||||
@@ -1,12 +0,0 @@
|
||||
$NetBSD: patch-libs_auxfun_image.cpp,v 1.1 2013/03/04 14:44:25 joerg Exp $
|
||||
|
||||
--- libs/auxfun/image.cpp.orig 2013-03-04 13:54:30.000000000 +0000
|
||||
+++ libs/auxfun/image.cpp
|
||||
@@ -7,6 +7,7 @@
|
||||
#include <zlib.h>
|
||||
#include <png.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#ifdef _MSC_VER
|
||||
#define _USE_MATH_DEFINES 1
|
||||
#include <math.h>
|
||||
Reference in New Issue
Block a user