svn commit: r457579 - head/graphics/gegl3
Tobias Kortkamp
tobik at FreeBSD.org
Sat Dec 30 05:32:07 UTC 2017
Author: tobik
Date: Sat Dec 30 05:32:06 2017
New Revision: 457579
URL: https://svnweb.freebsd.org/changeset/ports/457579
Log:
graphics/gegl3: Fix conflict with sysutils/coreutils
Both ports install bin/gcut. graphics/gegl3 already renames
bin/gegl -> bin/gegl3, so rename bin/gcut -> bin/gcut3 as well.
Set EXAMPLESDIR and let USES=uniquefiles do the renaming instead of
moving files manually.
While here also use options target helpers for EXAMPLES.
PR: 223462
Reported by: FreeBSD at ShaneWare.Biz
Approved by: gnome (maintainer timeout, 2 weeks)
Modified:
head/graphics/gegl3/Makefile
head/graphics/gegl3/pkg-plist
Modified: head/graphics/gegl3/Makefile
==============================================================================
--- head/graphics/gegl3/Makefile Sat Dec 30 00:16:13 2017 (r457578)
+++ head/graphics/gegl3/Makefile Sat Dec 30 05:32:06 2017 (r457579)
@@ -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 @@ LIB_DEPENDS= libbabl-0.1.so:x11/babl \
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 @@ EXAMPLES= 2geglbuffer \
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 \
@@ -127,26 +131,19 @@ PLIST_SUB+= PANGOCAIRO="@comment "
.endif
post-patch:
- ${REINPLACE_CMD} "s/lua >/lua-${LUA_VER} >/g" ${WRKSRC}/configure
-.if ! ${PORT_OPTIONS:MEXAMPLES}
+ ${REINPLACE_CMD} -e "s/lua >/lua-${LUA_VER} >/g" \
+ -e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g' \
+ ${WRKSRC}/configure
+
+post-patch-EXAMPLES-off:
${REINPLACE_CMD} -e 's|tools examples|tools|g' \
${WRKSRC}/Makefile.in
-.endif
- ${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>
Modified: head/graphics/gegl3/pkg-plist
==============================================================================
--- head/graphics/gegl3/pkg-plist Sat Dec 30 00:16:13 2017 (r457578)
+++ head/graphics/gegl3/pkg-plist Sat Dec 30 05:32:06 2017 (r457579)
@@ -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-npd-%%GEGL_VER%%.so
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
More information about the svn-ports-all
mailing list