Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Jan 2014 09:26:33 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340158 - head/japanese/plain2
Message-ID:  <201401180926.s0I9QXvc074779@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



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