From owner-svn-ports-head@FreeBSD.ORG  Sat Jan 18 09:26:33 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B857BCF4;
 Sat, 18 Jan 2014 09:26:33 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A48031FE6;
 Sat, 18 Jan 2014 09:26:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0I9QXQA074780;
 Sat, 18 Jan 2014 09:26:33 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0I9QXvc074779;
 Sat, 18 Jan 2014 09:26:33 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401180926.s0I9QXvc074779@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 18 Jan 2014 09:26:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340158 - head/japanese/plain2
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Jan 2014 09:26:33 -0000

Author: bapt
Date: Sat Jan 18 09:26:33 2014
New Revision: 340158
URL: http://svnweb.freebsd.org/changeset/ports/340158
QAT: https://qat.redports.org/buildarchive/r340158/

Log:
  Support stage
  Fix build with clang
  Remove references to NOPORTDATA

Modified:
  head/japanese/plain2/Makefile

Modified: head/japanese/plain2/Makefile
==============================================================================
--- head/japanese/plain2/Makefile	Sat Jan 18 09:12:43 2014	(r340157)
+++ head/japanese/plain2/Makefile	Sat Jan 18 09:26:33 2014	(r340158)
@@ -15,26 +15,23 @@ PATCHFILES=	${PORTNAME}_${PORTVERSION:R}
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	turutani@scphys.kyoto-u.ac.jp
-COMMENT=	A text converter from plain to any format
+COMMENT=	Text converter from plain to any format
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}p${PORTVERSION:E}.orig
 BUILD_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}p${PORTVERSION:E}.orig/src
 PLIST_FILES=	bin/plain2
 PORTDATA=	OHP.p2 OHP_t.p2 header.p2 header_t.p2 jbook.p2 supsnum.p2
 
-CFLAGS+=	-DBSD -DKANJI -DPICTURE -DHTML
+CFLAGS+=	-DBSD -DKANJI -DPICTURE -DHTML -Wno-return-type
 ALL_TARGET=	${PORTNAME}
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/lib/plain2|${DATADIR}|g' ${BUILD_WRKSRC}/plain2.h
 
 do-install:
-	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.if !defined(NOPORTDATA)
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${DATADIR}
-.endif
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/*.p2 ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>