diff options
| author | avilla <avilla@FreeBSD.org> | 2010-05-01 07:34:12 +0800 |
|---|---|---|
| committer | avilla <avilla@FreeBSD.org> | 2010-05-01 07:34:12 +0800 |
| commit | fb301a129f05ebd7db4d0b35e7abc2c1d269da29 (patch) | |
| tree | 292aeb0b60214bc3fddd4be2f599e517571defdb | |
| parent | f202548429e18ab47ef3bf214b67a6b2a20642f7 (diff) | |
| download | freebsd-ports-gnome-fb301a129f05ebd7db4d0b35e7abc2c1d269da29.tar.gz freebsd-ports-gnome-fb301a129f05ebd7db4d0b35e7abc2c1d269da29.tar.zst freebsd-ports-gnome-fb301a129f05ebd7db4d0b35e7abc2c1d269da29.zip | |
- Disable dependency on graphics/opengtl.
- Use better CTL/Shiva handling. [1]
- Bump PORTREVISION.
- Cleanup plist whitespaces.
Submitted by: [1] fluffy in area51
Approved by: tabthorpe (mentor)
| -rw-r--r-- | editors/calligra/Makefile | 7 | ||||
| -rw-r--r-- | editors/calligra/pkg-plist | 6 | ||||
| -rw-r--r-- | editors/koffice-kde4/Makefile | 7 | ||||
| -rw-r--r-- | editors/koffice-kde4/pkg-plist | 6 |
4 files changed, 14 insertions, 12 deletions
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 692c4b13765d..d00c301ed99b 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 2.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/ @@ -51,11 +51,12 @@ USE_LDCONFIG= yes CMAKE_VERBOSE= yes CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" -OPTIONS= GTL "Color transformations in Krita (requires devel/llvm)" on +OPTIONS= GTL "Color transformations in Krita (currently broken)" off .include <bsd.port.pre.mk> -.ifndef(WITHOUT_GTL) +WITHOUT_GTL= yes +.if !defined(WITHOUT_GTL) || exists (${LOCALBASE}/lib/libQtShiva.so) LIB_DEPENDS+= OpenCTL.0:${PORTSDIR}/graphics/opengtl \ QtShiva.0:${PORTSDIR}/graphics/qtgtl PLIST_SUB+= GTL="" diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist index 218d9269128f..d4b34db43c2e 100644 --- a/editors/calligra/pkg-plist +++ b/editors/calligra/pkg-plist @@ -1581,11 +1581,11 @@ share/apps/krita/shaders/linear_gradient.frag share/apps/krita/shaders/radial_gradient.frag share/apps/krita/shaders/square_gradient.frag %%GTL%%share/apps/krita/shiva/kernels/AntiBullify.shiva -%%GTL%%share/apps/krita/shiva/kernels/Bullify.shiva +%%GTL%%share/apps/krita/shiva/kernels/Bullify.shiva %%GTL%%share/apps/krita/shiva/kernels/Caleidoscope.shiva %%GTL%%share/apps/krita/shiva/kernels/CheckerBoard.shiva -%%GTL%%share/apps/krita/shiva/kernels/Disco.shiva -%%GTL%%share/apps/krita/shiva/kernels/Droste.shiva +%%GTL%%share/apps/krita/shiva/kernels/Disco.shiva +%%GTL%%share/apps/krita/shiva/kernels/Droste.shiva %%GTL%%share/apps/krita/shiva/kernels/MandelbrotSet.shiva %%GTL%%share/apps/krita/shiva/kernels/MirrorImpose.shiva %%GTL%%share/apps/krita/shiva/kernels/Moire.shiva diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 692c4b13765d..d00c301ed99b 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 2.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/ @@ -51,11 +51,12 @@ USE_LDCONFIG= yes CMAKE_VERBOSE= yes CMAKE_ARGS+= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" -OPTIONS= GTL "Color transformations in Krita (requires devel/llvm)" on +OPTIONS= GTL "Color transformations in Krita (currently broken)" off .include <bsd.port.pre.mk> -.ifndef(WITHOUT_GTL) +WITHOUT_GTL= yes +.if !defined(WITHOUT_GTL) || exists (${LOCALBASE}/lib/libQtShiva.so) LIB_DEPENDS+= OpenCTL.0:${PORTSDIR}/graphics/opengtl \ QtShiva.0:${PORTSDIR}/graphics/qtgtl PLIST_SUB+= GTL="" diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist index 218d9269128f..d4b34db43c2e 100644 --- a/editors/koffice-kde4/pkg-plist +++ b/editors/koffice-kde4/pkg-plist @@ -1581,11 +1581,11 @@ share/apps/krita/shaders/linear_gradient.frag share/apps/krita/shaders/radial_gradient.frag share/apps/krita/shaders/square_gradient.frag %%GTL%%share/apps/krita/shiva/kernels/AntiBullify.shiva -%%GTL%%share/apps/krita/shiva/kernels/Bullify.shiva +%%GTL%%share/apps/krita/shiva/kernels/Bullify.shiva %%GTL%%share/apps/krita/shiva/kernels/Caleidoscope.shiva %%GTL%%share/apps/krita/shiva/kernels/CheckerBoard.shiva -%%GTL%%share/apps/krita/shiva/kernels/Disco.shiva -%%GTL%%share/apps/krita/shiva/kernels/Droste.shiva +%%GTL%%share/apps/krita/shiva/kernels/Disco.shiva +%%GTL%%share/apps/krita/shiva/kernels/Droste.shiva %%GTL%%share/apps/krita/shiva/kernels/MandelbrotSet.shiva %%GTL%%share/apps/krita/shiva/kernels/MirrorImpose.shiva %%GTL%%share/apps/krita/shiva/kernels/Moire.shiva |