Bug 179336

Summary: [PATCH] graphics/diacanvas2: Add license, NLS, fix docs
Product: Ports & Packages Reporter: nemysis <nemysis>
Component: Individual Port(s)Assignee: Rusmir Dusko <nemysis>
Status: Closed FIXED    
Severity: Affects Only Me CC: jpaetzel
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
diacanvas2-0.15.4_4.patch none

Description nemysis 2013-06-05 17:20:00 UTC 
- 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/
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-06-05 17:20:14 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->beech

beech@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 Thomas Abthorpe freebsd_committer freebsd_triage 2014-01-10 03:40:24 UTC 
Responsible Changed
From-To: beech->nemysis

Submitter is committer
Comment 3 Rusmir Dusko freebsd_committer freebsd_triage 2014-03-12 20:15:45 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2014-03-12 20:22:04 UTC 
Author: nemysis
Date: Wed Mar 12 20:21:56 2014
New Revision: 348002
URL: http://svnweb.freebsd.org/changeset/ports/348002
QAT: https://qat.redports.org/buildarchive/r348002/

Log:
  - Add license (GPLv2)
  - Add NLS Option and OPTIONS_SUB
  - Change REINPLACE, install conditional NLS
  - Strip libraries
  - Recreate pkg-plist with make makeplist
  
  PR:		ports/179336
  Submitted by:	nemysis (self)

Modified:
  head/graphics/diacanvas2/Makefile
  head/graphics/diacanvas2/pkg-plist

Modified: head/graphics/diacanvas2/Makefile
==============================================================================
--- head/graphics/diacanvas2/Makefile	Wed Mar 12 20:11:00 2014	(r348001)
+++ head/graphics/diacanvas2/Makefile	Wed Mar 12 20:21:56 2014	(r348002)
@@ -11,32 +11,45 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General drawing canvas from dia dialog editor
 
+LICENSE=	GPLv2
+
 USES=		gmake pathfix pkgconfig
 USE_GNOME=	pygnome2
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	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
+OPTIONS_SUB=	yes
+
+PRINT_CONFIGURE_ENABLE=	gnome-print
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPRINT}
 USE_GNOME+=	libgnomeprintui
-CONFIGURE_ARGS+=--enable-gnome-print
-.else
-CONFIGURE_ARGS+=--disable-gnome-print
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
+
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|po diacanvas po |diacanvas |' \
+		${WRKSRC}/Makefile.in
+.endif
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0
+.for l in _canvasmodule shapemodule viewmodule geometrymodule
+	${STRIP_CMD} ${STAGEDIR}${PYTHON}${PYTHON_SITELIBDIR}/diacanvas/${l}.so
+.endfor
 
 .include <bsd.port.mk>

Modified: head/graphics/diacanvas2/pkg-plist
==============================================================================
--- head/graphics/diacanvas2/pkg-plist	Wed Mar 12 20:11:00 2014	(r348001)
+++ head/graphics/diacanvas2/pkg-plist	Wed Mar 12 20:21:56 2014	(r348002)
@@ -46,13 +46,6 @@ lib/libdiacanvas2.a
 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,12 @@ share/pygtk/2.0/defs/diaview.defs
 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.a
 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.la
 %%PYTHON_SITELIBDIR%%/diacanvas/viewmodule.so
+libdata/pkgconfig/diacanvas2.pc
+%%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 %%PYTHON_SITELIBDIR%%/diacanvas
 @dirrm include/diacanvas
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"