From nemysis@gmx.ch  Wed Jun 19 01:43:39 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id A68C6AFF
	for <freebsd-gnats-submit@freebsd.org>; Wed, 19 Jun 2013 01:43:39 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 540A01082
	for <freebsd-gnats-submit@freebsd.org>; Wed, 19 Jun 2013 01:43:39 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.10]) by mrigmx.server.lan
 (mrigmx001) with ESMTP (Nemesis) id 0M6hJq-1U42Yw1yvU-00wZIa for
 <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Jun 2013 03:43:38 +0200
Received: (qmail invoked by alias); 19 Jun 2013 01:43:37 -0000
Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5]
  by mail.gmx.net (mp010) with SMTP; 19 Jun 2013 03:43:37 +0200
Received: by something.email.com (sSMTP sendmail emulation); Wed, 19 Jun 2013 03:43:36 +0200
Message-Id: <20130619014339.A68C6AFF@hub.freebsd.org>
Date: Wed, 19 Jun 2013 03:43:36 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jpaetzel@FreeBSD.org
Subject: [PATCH] sysutils/lxterminal: Add license, NLS option and fix, take maintainership
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         179699
>Category:       ports
>Synopsis:       [PATCH] sysutils/lxterminal: Add license, NLS option and fix, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 19 01:50:00 UTC 2013
>Closed-Date:    Fri Jun 21 15:14:36 UTC 2013
>Last-Modified:  Fri Jun 21 15:20:00 UTC 2013
>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:

- Take maintainership
- Remove leading article from COMMENT
- Add license (GPLv2)
- Add docs
- Add NLS Option
- Fix NLS
- 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/20130619004500-47427/

>Fix:

--- lxterminal-0.1.11_1.patch begins here ---
diff -ruN /usr/ports/sysutils/lxterminal/Makefile ./Makefile
--- /usr/ports/sysutils/lxterminal/Makefile	2013-06-18 18:26:44.000000000 +0200
+++ ./Makefile	2013-06-19 03:38:40.000000000 +0200
@@ -7,19 +7,26 @@
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/lxde/LXTerminal%20%28terminal%20emulator%29/LXTerminal%20${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A lightweight terminal emulator from the LXDE project
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Lightweight terminal emulator from the LXDE project
+
+LICENSE=	GPLv2
 
 LIB_DEPENDS=	vte.9:${PORTSDIR}/x11-toolkits/vte
 
-USE_GNOME=	gtk20 intlhack
-USE_GMAKE=	yes
 USES=		iconv
+USE_GNOME=	gtk20 intlhack
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+
 MAN1=		lxterminal.1
 
+PORTDOCS=	AUTHORS README
+
+OPTIONS_DEFINE=	NLS
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -28,8 +35,19 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .else
-CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+post-patch:
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|src po|src|' \
+		${WRKSRC}/Makefile.in
+.endif
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 .include <bsd.port.mk>
diff -ruN /usr/ports/sysutils/lxterminal/pkg-plist ./pkg-plist
--- /usr/ports/sysutils/lxterminal/pkg-plist	2013-06-02 18:58:48.000000000 +0200
+++ ./pkg-plist	2013-06-19 01:50:31.000000000 +0200
@@ -1,4 +1,5 @@
 bin/lxterminal
+share/applications/lxterminal.desktop
 %%NLS%%share/locale/af/LC_MESSAGES/lxterminal.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/lxterminal.mo
 %%NLS%%share/locale/be/LC_MESSAGES/lxterminal.mo
@@ -56,27 +57,18 @@
 %%NLS%%share/locale/vi/LC_MESSAGES/lxterminal.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lxterminal.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lxterminal.mo
-share/applications/lxterminal.desktop
+%%DATADIR%%/lxterminal-preferences.ui
+%%DATADIR%%/lxterminal.conf
 share/pixmaps/lxterminal.png
-share/lxterminal/lxterminal.conf
-share/lxterminal/lxterminal-preferences.ui
-@dirrm share/lxterminal
+@dirrm %%DATADIR%%
 @dirrmtry share/applications
-%%NLS%%@dirrmtry share/locale/nb_NO/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb_NO
-%%NLS%%@dirrmtry share/locale/es_VE/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es_VE
-%%NLS%%@dirrmtry share/locale/fo/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fo
-%%NLS%%@dirrmtry share/locale/frp/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/frp
-%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lg
-%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sr@latin
-%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/te
-%%NLS%%@dirrmtry share/locale/tt_RU/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tt_RU
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/tt_RU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tt_RU
+%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lg
+%%NLS%%@dirrmtry share/locale/frp/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/frp
+%%NLS%%@dirrmtry share/locale/es_VE/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es_VE
--- lxterminal-0.1.11_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Fri Jun 21 13:01:33 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179699 

From: William Grzybowski <william88@gmail.com>
To: bug-followup@FreeBSD.org, nemysis@gmx.ch
Cc:  
Subject: Re: ports/179699: [PATCH] sysutils/lxterminal: Add license, NLS
 option and fix, take maintainership
Date: Fri, 21 Jun 2013 10:11:29 -0300

 The patch does not apply cleanly, please take a look.
 
 Thanks
 
 --
 William Grzybowski
 ------------------------------------------
 Curitiba/PR - Brasil
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Fri Jun 21 15:14:35 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179699 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179699: commit references a PR
Date: Fri, 21 Jun 2013 15:14:13 +0000 (UTC)

 Author: wg
 Date: Fri Jun 21 15:14:00 2013
 New Revision: 321474
 URL: http://svnweb.freebsd.org/changeset/ports/321474
 
 Log:
   sysutils/lxterminal: minor fixes
   
   - Add LICENSE (GPLv2) [1]
   - Remove leading article from COMMENT [1]
   - Fix NLS option [1]
   - Install docs [1]
   - Add DOCS option
   - Remove lib ABI from LIB_DEPENDS
   - Pass maintainership to submitter
   
   PR:		ports/179699
   Submitted by:	nemysis <nemysis@gmx.ch>
 
 Modified:
   head/sysutils/lxterminal/Makefile
   head/sysutils/lxterminal/pkg-plist
 
 Modified: head/sysutils/lxterminal/Makefile
 ==============================================================================
 --- head/sysutils/lxterminal/Makefile	Fri Jun 21 14:03:48 2013	(r321473)
 +++ head/sysutils/lxterminal/Makefile	Fri Jun 21 15:14:00 2013	(r321474)
 @@ -5,21 +5,28 @@ PORTNAME=	lxterminal
  PORTVERSION=	0.1.11
  PORTREVISION=	1
  CATEGORIES=	sysutils
 -MASTER_SITES=	SF/lxde/LXTerminal%20%28terminal%20emulator%29/LXTerminal%20${PORTVERSION}
 +MASTER_SITES=	SF/lxde/LXTerminal%20%28terminal%20emulator%29/LXTerminal%20${PORTVERSION}/
  
 -MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	A lightweight terminal emulator from the LXDE project
 +MAINTAINER=	nemysis@gmx.ch
 +COMMENT=	Lightweight terminal emulator from the LXDE project
  
 -LIB_DEPENDS=	vte.9:${PORTSDIR}/x11-toolkits/vte
 +LICENSE=	GPLv2
 +
 +LIB_DEPENDS=	vte:${PORTSDIR}/x11-toolkits/vte
  
 -USE_GNOME=	gtk20 intlhack
 -USE_GMAKE=	yes
  USES=		iconv
 +USE_GNOME=	gtk20 intlhack
  GNU_CONFIGURE=	yes
 -USE_LDCONFIG=	yes
  CONFIGURE_ARGS=	--prefix=${PREFIX}
 +USE_GMAKE=	yes
 +USE_LDCONFIG=	yes
 +
  MAN1=		lxterminal.1
  
 +PORTDOCS=	AUTHORS README
 +
 +OPTIONS_DEFINE=	DOCS NLS
 +
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MNLS}
 @@ -28,8 +35,19 @@ PLIST_SUB+=	NLS=""
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib
  .else
 -CONFIGURE_ARGS+=--disable-nls
  PLIST_SUB+=	NLS="@comment "
  .endif
  
 +post-patch:
 +.if ! ${PORT_OPTIONS:MNLS}
 +	@${REINPLACE_CMD} -e 's|src po|src|' \
 +		${WRKSRC}/Makefile.in
 +.endif
 +
 +post-install:
 +.if ${PORT_OPTIONS:MDOCS}
 +	@${MKDIR} ${DOCSDIR}
 +	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 +.endif
 +
  .include <bsd.port.mk>
 
 Modified: head/sysutils/lxterminal/pkg-plist
 ==============================================================================
 --- head/sysutils/lxterminal/pkg-plist	Fri Jun 21 14:03:48 2013	(r321473)
 +++ head/sysutils/lxterminal/pkg-plist	Fri Jun 21 15:14:00 2013	(r321474)
 @@ -1,4 +1,5 @@
  bin/lxterminal
 +share/applications/lxterminal.desktop
  %%NLS%%share/locale/af/LC_MESSAGES/lxterminal.mo
  %%NLS%%share/locale/ar/LC_MESSAGES/lxterminal.mo
  %%NLS%%share/locale/be/LC_MESSAGES/lxterminal.mo
 @@ -56,25 +57,18 @@ bin/lxterminal
  %%NLS%%share/locale/vi/LC_MESSAGES/lxterminal.mo
  %%NLS%%share/locale/zh_CN/LC_MESSAGES/lxterminal.mo
  %%NLS%%share/locale/zh_TW/LC_MESSAGES/lxterminal.mo
 -share/applications/lxterminal.desktop
 +%%DATADIR%%/lxterminal-preferences.ui
 +%%DATADIR%%/lxterminal.conf
  share/pixmaps/lxterminal.png
 -share/lxterminal/lxterminal.conf
 -share/lxterminal/lxterminal-preferences.ui
 -@dirrm share/lxterminal
 +@dirrm %%DATADIR%%
  @dirrmtry share/applications
 -%%NLS%%@dirrmtry share/locale/es_VE/LC_MESSAGES
 -%%NLS%%@dirrmtry share/locale/es_VE
 -%%NLS%%@dirrmtry share/locale/fo/LC_MESSAGES
 -%%NLS%%@dirrmtry share/locale/fo
 -%%NLS%%@dirrmtry share/locale/frp/LC_MESSAGES
 -%%NLS%%@dirrmtry share/locale/frp
 -%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
 -%%NLS%%@dirrmtry share/locale/lg
 -%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES
 -%%NLS%%@dirrmtry share/locale/sr@latin
 -%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
 -%%NLS%%@dirrmtry share/locale/te
 -%%NLS%%@dirrmtry share/locale/tt_RU/LC_MESSAGES
 -%%NLS%%@dirrmtry share/locale/tt_RU
  %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
  %%NLS%%@dirrmtry share/locale/ur_PK
 +%%NLS%%@dirrmtry share/locale/tt_RU/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/tt_RU
 +%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/lg
 +%%NLS%%@dirrmtry share/locale/frp/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/frp
 +%%NLS%%@dirrmtry share/locale/es_VE/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/es_VE
 _______________________________________________
 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"
 
>Unformatted:
