From owner-svn-ports-all@FreeBSD.ORG  Tue May  6 13:03:46 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ACE5C51E;
 Tue,  6 May 2014 13:03:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 72FFBA59;
 Tue,  6 May 2014 13:03:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46D3kTp002699;
 Tue, 6 May 2014 13:03:46 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46D3jeu002696;
 Tue, 6 May 2014 13:03:45 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201405061303.s46D3jeu002696@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Tue, 6 May 2014 13:03:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r353089 - head/editors/gnotepad+
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 May 2014 13:03:46 -0000

Author: pawel
Date: Tue May  6 13:03:45 2014
New Revision: 353089
URL: http://svnweb.freebsd.org/changeset/ports/353089
QAT: https://qat.redports.org/buildarchive/r353089/

Log:
  - Add staging support
  - Convert to new options framework, use options helper
  - Remove gnome1 support leftovers

Modified:
  head/editors/gnotepad+/Makefile
  head/editors/gnotepad+/pkg-plist

Modified: head/editors/gnotepad+/Makefile
==============================================================================
--- head/editors/gnotepad+/Makefile	Tue May  6 12:48:51 2014	(r353088)
+++ head/editors/gnotepad+/Makefile	Tue May  6 13:03:45 2014	(r353089)
@@ -8,9 +8,6 @@ CATEGORIES=	editors www gnome
 MASTER_SITES=	SF/gnotepad/gnotepad-stable/${PORTVERSION} \
 		SF/gnotepad/gnotepad%20User_s%20Manual/${DOCVERSION}:doc
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT
-.if !defined(NOPORTDOCS)
-DISTFILES+=	${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}:doc
-.endif
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple GTK-based text/HTML editor
@@ -19,13 +16,10 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 USE_XORG=	xpm
-WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gtk12
 USES=		gettext
 GNU_CONFIGURE=	yes
 
-MAN1=		gnp.1
-
 CONFIGURE_ARGS=	--disable-gnome
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -33,22 +27,27 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCVERSION=	1.2.0
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
+
+DOCS_DISTFILES=	${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}:doc
+
+.include <bsd.port.options.mk>
 
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 PLIST_SUB+=	NOPORTDOCS=""
 .else
 PLIST_SUB+=	NOPORTDOCS="@comment "
 .endif
 
 post-extract:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MV} ${WRKSRC}/docs ${WRKSRC}/docs.old
 	@${CP} -R ${WRKDIR}/${PORTNAME}-help-${DOCVERSION}/docs ${WRKSRC}/docs
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(use_gtkhtml=\)yes|\1no|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} '/destdir/ s|gnulocaledir)|DESTDIR)$$(&|' \
+		${WRKSRC}/po/Makefile.in.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/editors/gnotepad+/pkg-plist
==============================================================================
--- head/editors/gnotepad+/pkg-plist	Tue May  6 12:48:51 2014	(r353088)
+++ head/editors/gnotepad+/pkg-plist	Tue May  6 13:03:45 2014	(r353089)
@@ -1,6 +1,5 @@
 bin/gnp
-%%GNOME:%%share/gnome/apps/Applications/gnotepad+.desktop
-%%GNOME:%%share/gnome/apps/Applications/gnotepad+.spec
+man/man1/gnp.1.gz
 share/gnome/help/gnotepad+/C/index.html
 share/gnome/help/gnotepad+/C/index-5.html
 share/gnome/help/gnotepad+/C/topic.dat