[PATCH] graphics/gegl: Stageify + Modernize, tested

Matthias Andree mandree at FreeBSD.org
Mon Apr 7 20:56:53 UTC 2014 

>Submitter-Id:	current-users
>Originator:	Matthias Andree
>Organization:	
>Confidential:	no
>Synopsis:	[PATCH] graphics/gegl: Stageify + Modernize, tested
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		change-request
>Release:	FreeBSD 9.2-RELEASE-p3 amd64
>Environment:
System: FreeBSD apollo.emma.line.org 9.2-RELEASE-p3 FreeBSD 9.2-RELEASE-p3 #0: Sat Jan 11 03:25:02 UTC 2014
>Description:
Redports logs: https://redports.org/buildarchive/20140407201100-46050/
FreeBSD 11 suffers from a clang 3.4 crash.

Support staging.
Strip installed .so files.
Update LIB_DEPENDS to new form.
Use proper libtool magic to fix issues with .la files.
Bump portrevision (.la files and one .so file name changed)

Port maintainer (gnome at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- gegl-0.2.0.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 350542)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gegl
 PORTVERSION=	0.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gegl/0.2/
 
@@ -10,7 +10,7 @@
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	Graph based image processing framework
 
-LIB_DEPENDS=	babl-0.1:${PORTSDIR}/x11/babl
+LIB_DEPENDS=	libbabl-0.1.so:${PORTSDIR}/x11/babl
 
 OPTIONS_DEFINE=	CAIRO ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER JPEG \
 		LUA OPENEXR OPENRAW SIMD PANGO PNG LIBRSVG2 SDL SPIRO V4L
@@ -21,7 +21,7 @@
 SPIRO_DESC=	Spiro support
 #UMFPACK_DESC=	UMFpack support
 
-USES=		gettext gmake pathfix pkgconfig shebangfix tar:bzip2
+USES=		gettext gmake libtool pathfix pkgconfig shebangfix tar:bzip2
 USE_GNOME=	glib20 intltool
 USE_LDCONFIG=	${PREFIX}/lib/gegl-0.2
 GNU_CONFIGURE=	yes
@@ -41,7 +41,6 @@
 
 SHEBANG_FILES=	tools/xml_insert.sh
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPIXBUF}
@@ -53,7 +52,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+=	cairo:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS+=	libcairo.so:${PORTSDIR}/graphics/cairo
 PLIST_SUB+=	CAIRO=""
 .else
 CONFIGURE_ARGS+=--without-cairo
@@ -80,7 +79,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	avformat:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg
 PLIST_SUB+=	FFMPEG=""
 .else
 CONFIGURE_ARGS+=--without-libavformat
@@ -88,13 +87,13 @@
 .endif
 
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-LIB_DEPENDS+=	cgraph:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS+=	libcgraph.so:${PORTSDIR}/graphics/graphviz
 .else
 CONFIGURE_ARGS+=--without-graphviz
 .endif
 
 .if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+=	jasper:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=	libjasper.so:${PORTSDIR}/graphics/jasper
 PLIST_SUB+=	JP2=""
 .else
 CONFIGURE_ARGS+=--without-jasper
@@ -102,7 +101,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 PLIST_SUB+=	JPEG=""
 .else
 CONFIGURE_ARGS+=--without-libjpeg
@@ -116,7 +115,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
-LIB_DEPENDS+=	IlmImf:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
 PLIST_SUB+=	OPENEXR=""
 .else
 CONFIGURE_ARGS+=--without-openexr
@@ -137,7 +136,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
 PLIST_SUB+=	PNG=""
 .else
 CONFIGURE_ARGS+=--without-libpng
@@ -145,7 +144,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MLIBRSVG2}
-LIB_DEPENDS+=	rsvg-2:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS+=	librsvg-2.so:${PORTSDIR}/graphics/librsvg2
 PLIST_SUB+=	RSVG=""
 .else
 CONFIGURE_ARGS+=--without-librsvg
@@ -161,7 +160,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MSPIRO}
-LIB_DEPENDS+=	spiro:${PORTSDIR}/graphics/libspiro
+LIB_DEPENDS+=	libspiro.so:${PORTSDIR}/graphics/libspiro
 .else
 CONFIGURE_ARGS+=--without-libspiro
 .endif
@@ -176,7 +175,7 @@
 
 # umfpack library is broken
 #.if ${PORT_OPTIONS:MUMFPACK}
-#LIB_DEPENDS+=	umfpack:${PORTSDIR}/math/suitesparse
+#LIB_DEPENDS+=	libumfpack.so:${PORTSDIR}/math/suitesparse
 #PLIST_SUB+=	UMFPACK=""
 #.else
 CONFIGURE_ARGS+=--without-umfpack
@@ -184,7 +183,7 @@
 #.endif
 
 .if ${PORT_OPTIONS:MEXIV2}
-LIB_DEPENDS+=	exiv2:${PORTSDIR}/graphics/exiv2
+LIB_DEPENDS+=	libexiv2.so:${PORTSDIR}/graphics/exiv2
 PLIST_SUB+=	EXIV2=""
 .else
 CONFIGURE_ARGS+=--without-exiv2
@@ -224,20 +223,22 @@
 .endif
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gegl*/*.so* \
+		${STAGEDIR}${PREFIX}/lib/libgegl*.so*
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/gallery
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/gallery
 	(cd ${WRKSRC}/docs && \
-	    ${COPYTREE_SHARE} \*.html ${DOCSDIR} && \
-	    ${INSTALL_DATA} ChangeLog gegl.css gegl.devhelp devhelp.css ${DOCSDIR} && \
-	    ${INSTALL_DATA} gallery/OpenRaster* ${DOCSDIR}/gallery && \
-	    ${INSTALL_DATA} gallery/clones* ${DOCSDIR}/gallery && \
-	    ${INSTALL_DATA} gallery/index.html ${DOCSDIR}/gallery )
+	    ${COPYTREE_SHARE} \*.html ${STAGEDIR}${DOCSDIR} && \
+	    ${INSTALL_DATA} ChangeLog gegl.css gegl.devhelp devhelp.css ${STAGEDIR}${DOCSDIR} && \
+	    ${INSTALL_DATA} gallery/OpenRaster* ${STAGEDIR}${DOCSDIR}/gallery && \
+	    ${INSTALL_DATA} gallery/clones* ${STAGEDIR}${DOCSDIR}/gallery && \
+	    ${INSTALL_DATA} gallery/index.html ${STAGEDIR}${DOCSDIR}/gallery )
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/data
-	${INSTALL_DATA} ${WRKSRC}/examples/data/surfer.png ${EXAMPLESDIR}/data
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/data
+	${INSTALL_DATA} ${WRKSRC}/examples/data/surfer.png ${STAGEDIR}${EXAMPLESDIR}/data
 .for ex in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/examples/${ex}.c ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/${ex}.c ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 .endif
 
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 350542)
+++ pkg-plist	(working copy)
@@ -290,7 +290,8 @@
 lib/gegl-%%GEGL_VER%%/xor.so
 lib/libgegl-%%GEGL_VER%%.la
 lib/libgegl-%%GEGL_VER%%.so
-lib/libgegl-%%GEGL_VER%%.so.%%GEGL_MINOR%%
+lib/libgegl-%%GEGL_VER%%.so.0
+lib/libgegl-%%GEGL_VER%%.so.0.%%GEGL_MINOR%%.1
 libdata/pkgconfig/gegl-%%GEGL_VER%%.pc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/api.html
--- gegl-0.2.0.patch ends here ---

More information about the freebsd-gnome mailing list