Attachment 188885 Details for Bug 223462 – gegl3.diff

[patch] gegl3.diff

gegl3.diff (text/plain), 2.92 KB, created by Tobias Kortkamp on 2017-12-16 15:18:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2017-12-16 15:18:57 UTC

Size: 2.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 456472)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gegl
> PORTVERSION=	0.3.20
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	graphics
> MASTER_SITES=	GIMP
> PKGNAMESUFFIX=	3
>@@ -21,7 +21,7 @@
> 		libpng.so:graphics/png
> 
> USES=		cpe gettext gmake jpeg libtool localbase pathfix pkgconfig \
>-		shebangfix tar:bzip2
>+		shebangfix uniquefiles tar:bzip2
> USE_GNOME=	glib20 intltool introspection:build
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>@@ -40,6 +40,10 @@
> 
> SHEBANG_FILES=	tools/xml_insert.sh
> 
>+# Fix conflicts with graphics/gegl and sysutils/coreutils
>+EXAMPLESDIR=	${PREFIX}/share/examples/gegl${PKGNAMESUFFIX}
>+UNIQUE_SUFFIX_FILES=	bin/gcut bin/gegl
>+
> OPTIONS_SUB=	yes
> OPTIONS_DEFINE=	CAIRO ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER \
> 		LUA OPENEXR RAW PANGO LIBRSVG2 SDL SPIRO V4L \
>@@ -135,18 +139,11 @@
> 	${REINPLACE_CMD} -e 's|$lua$$5\.1$|\1-\2|g ; s|x86_64|amd64|g' \
> 		${WRKSRC}/configure
> 
>-post-install:
>-.if ${PORT_OPTIONS:MEXAMPLES}
>+post-install-EXAMPLES-on:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/data
> 	${INSTALL_DATA} ${WRKSRC}/examples/data/surfer.png ${STAGEDIR}${EXAMPLESDIR}/data
> .for ex in ${EXAMPLES}
> 	${INSTALL_DATA} ${WRKSRC}/examples/${ex}.c ${STAGEDIR}${EXAMPLESDIR}
> .endfor
>-# temporary hacks to allow parallel install
>-	@${MV} ${STAGEDIR}${PREFIX}/share/examples/gegl \
>-		${STAGEDIR}${PREFIX}/share/examples/gegl3
>-.endif
>-# temporary hacks to allow parallel install
>-	@${MV} ${STAGEDIR}${PREFIX}/bin/gegl ${STAGEDIR}${PREFIX}/bin/gegl3
> 
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 456472)
>+++ pkg-plist	(working copy)
>@@ -1,5 +1,5 @@
> bin/gcut
>-bin/gegl3
>+bin/gegl
> bin/gegl-imgcmp
> include/gegl-%%GEGL_VER%%/gegl-apply.h
> include/gegl-%%GEGL_VER%%/gegl-audio-fragment.h
>@@ -119,14 +119,14 @@
> lib/libgegl-sc-%%GEGL_VER%%.so
> libdata/pkgconfig/gegl-%%GEGL_VER%%.pc
> libdata/pkgconfig/gegl-sc-%%GEGL_VER%%.pc
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/2geglbuffer.c
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/data/surfer.png
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/gegl-convert.c
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/gegl-slicer.c
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/geglbuffer-add-image.c
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/geglbuffer-clock.c
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/hello-world.c
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%3/sdl-draw.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2geglbuffer.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/data/surfer.png
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gegl-convert.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gegl-slicer.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geglbuffer-add-image.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geglbuffer-clock.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello-world.c
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sdl-draw.c
> share/gir-1.0/Gegl-%%GEGL_VER%%.gir
> share/locale/bs/LC_MESSAGES/gegl-%%GEGL_VER%%.mo
> share/locale/ca/LC_MESSAGES/gegl-%%GEGL_VER%%.mo

Flags:

tobik: maintainer-approval? (gnome)

Actions: View | Diff

Attachments on bug 223462: 188883 | 188885