Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 05 Jun 2013 18:10:30 +0200
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@freebsd.org
Cc:        jpaetzel@freebsd.org
Subject:   ports/179336: [PATCH] graphics/diacanvas2: Add license, NLS, fix docs
Message-ID:  <20130605161033.C20F54CA@hub.freebsd.org>
Resent-Message-ID: <201306051620.r55GK0sP074769@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         179336
>Category:       ports
>Synopsis:       [PATCH] graphics/diacanvas2: Add license, NLS, fix docs
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 05 16:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p3 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013
>Description:

- Trim comment
- Add license
- Add NLS Option
- Comply with OptionsNG
- Fix docs
- Trim pkg-plist

Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:

Build log

https://redports.org/buildarchive/20130604204000-17435/

>Fix:

--- diacanvas2-0.15.4_4.patch begins here ---
diff -ruN /usr/ports/graphics/diacanvas2/Makefile ./Makefile
--- /usr/ports/graphics/diacanvas2/Makefile	2013-06-02 18:53:13.000000000 +0200
+++ ./Makefile	2013-06-04 22:38:24.000000000 +0200
@@ -9,26 +9,42 @@
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A general drawing canvas from dia dialog editor
+COMMENT=	General drawing canvas from dia dialog editor
+
+LICENSE=	GPLv2
 
 USES=		pathfix pkgconfig
 USE_GNOME=	pygnome2
 USE_PYTHON=	2.2+
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USE_DISPLAY=	yes
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-OPTIONS_DEFINE=	PRINT
+OPTIONS_DEFINE=	NLS PRINT
 OPTIONS_DEFAULT=PRINT
 PRINT_DESC=	GNOME print support
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+=	APIDOCS=""
+.else
+PLIST_SUB+=	APIDOCS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MPRINT}
 USE_GNOME+=	libgnomeprintui
 CONFIGURE_ARGS+=--enable-gnome-print
@@ -37,7 +53,12 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in
+.if ! ${PORT_OPTIONS:MDOCS}
+	@${REINPLACE_CMD} -e '/SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
+.endif
+
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|po diacanvas po |diacanvas |g' ${WRKSRC}/Makefile.in
+.endif
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/graphics/diacanvas2/pkg-plist ./pkg-plist
--- /usr/ports/graphics/diacanvas2/pkg-plist	2013-06-02 18:53:13.000000000 +0200
+++ ./pkg-plist	2013-06-04 22:18:40.000000000 +0200
@@ -46,13 +46,6 @@
 lib/libdiacanvas2.la
 lib/libdiacanvas2.so
 lib/libdiacanvas2.so.0
-libdata/pkgconfig/diacanvas2.pc
-share/locale/nl/LC_MESSAGES/diacanvas.mo
-share/pygtk/2.0/defs/dia-boxed.defs
-share/pygtk/2.0/defs/diacanvas.defs
-share/pygtk/2.0/defs/diageometry.defs
-share/pygtk/2.0/defs/diashape.defs
-share/pygtk/2.0/defs/diaview.defs
 %%PYTHON_SITELIBDIR%%/diacanvas/__init__.py
 %%PYTHON_SITELIBDIR%%/diacanvas/__init__.pyc
 %%PYTHON_SITELIBDIR%%/diacanvas/__init__.pyo
@@ -71,5 +64,60 @@
 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.a
 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.la
 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.so
-@dirrm %%PYTHON_SITELIBDIR%%/diacanvas
+libdata/pkgconfig/diacanvas2.pc
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvas.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasBox.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasEditable.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasElement.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasGroup.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasGroupable.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasImage.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasItem.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasLine.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasText.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasView.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaCanvasViewItem.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaConstraint.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaHandle.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaHandleLayer.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaSolver.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaTool.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaUndoManager.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/DiaVariable.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/arrowhead.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/chap-DiaCanvas.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/chap-Geometry.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/chap-Objects.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/chap-Python.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/chap-Solver.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/chap-Views.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2-DiaExpression.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2-DiaGeometry.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2-DiaShape-functions-for-LibArt-rendering.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2-DiaShape-functions-for-X11-rendering.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2-DiaShape.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2-DiaStrength.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2-Exporting.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2.devhelp
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvas2.devhelp2
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diacanvasview.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/diasolver.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/element.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/home.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/index.html
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/index.sgml
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/left.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/line.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/right.png
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/style.css
+%%APIDOCS%%share/gtk-doc/html/diacanvas2/up.png
+%%NLS%%share/locale/nl/LC_MESSAGES/diacanvas.mo
+share/pygtk/2.0/defs/dia-boxed.defs
+share/pygtk/2.0/defs/diacanvas.defs
+share/pygtk/2.0/defs/diageometry.defs
+share/pygtk/2.0/defs/diashape.defs
+share/pygtk/2.0/defs/diaview.defs
 @dirrm include/diacanvas
+@dirrmtry %%PYTHON_SITELIBDIR%%/diacanvas
+%%APIDOCS%%@dirrm share/gtk-doc/html/diacanvas2
--- diacanvas2-0.15.4_4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130605161033.C20F54CA>