diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2012-06-12 20:48:24 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2012-06-12 20:48:24 +0000 |
commit | 14cf6cf0eec76f1dbd28f2779c54a0de759ecf34 (patch) | |
tree | cd4427738603397efa93cd64c96c5aeb938239f0 /graphics/cimg | |
parent | Update CONFLICTS (1). (diff) |
Register a conflict with graphics/gimp-gmic-plugin (1).
Since I'm there, try to pet portlint.
Submitted by: "Sulev-Madis 'ketas' Silber" <madis555 (at) hot.ee> (1)
Notes
Notes:
svn path=/head/; revision=299151
Diffstat (limited to 'graphics/cimg')
-rw-r--r-- | graphics/cimg/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 75cfaffff4f4..e54c0fa0e4d7 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -18,17 +18,17 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= thierry@FreeBSD.org COMMENT= The C++ Template Image Processing Library -ONLY_FOR_ARCHS= i386 amd64 -ONLY_FOR_ARCHS_REASON= "invokes i386 asm" - LICENSE= CeCILL_C CeCILL -LICENSE_PERMS_CeCILL_C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_PERMS_CeCILL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_COMB= dual LICENSE_NAME_CeCILL_C= CeCILL-C LICENSE_NAME_CeCILL= CeCILL LICENSE_FILE_CeCILL_C= ${WRKSRC}/Licence_CeCILL-C_V1-en.txt LICENSE_FILE_CeCILL= ${WRKSRC}/Licence_CeCILL_V2-en.txt -LICENSE_COMB= dual +LICENSE_PERMS_CeCILL_C= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_CeCILL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +ONLY_FOR_ARCHS= i386 amd64 +ONLY_FOR_ARCHS_REASON= "invokes i386 asm" USE_ZIP= yes WRKSRC= ${WRKDIR}/${DISTNAME:C/_/-/} @@ -45,6 +45,8 @@ LIB_DEPENDS+= board.0:${PORTSDIR}/graphics/libboard USE_FORTRAN= yes +CONFLICTS= gimp-gmic-plugin-1.* + . if !defined(WITH_DEBUG) LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ |