From owner-svn-ports-head@FreeBSD.ORG  Sat Jan  4 23:45:08 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 106F65D5;
 Sat,  4 Jan 2014 23:45:08 +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 D5B6E1CC5;
 Sat,  4 Jan 2014 23:45:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04Nj7fH064675;
 Sat, 4 Jan 2014 23:45:07 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04Nj7kS064672;
 Sat, 4 Jan 2014 23:45:07 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401042345.s04Nj7kS064672@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 4 Jan 2014 23:45:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338693 - in head: archivers/unrar archivers/unrar-iconv
 chinese/unrar
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, 04 Jan 2014 23:45:08 -0000

Author: bapt
Date: Sat Jan  4 23:45:06 2014
New Revision: 338693
URL: http://svnweb.freebsd.org/changeset/ports/338693

Log:
  Support stage

Modified:
  head/archivers/unrar-iconv/Makefile
  head/archivers/unrar/Makefile
  head/chinese/unrar/Makefile

Modified: head/archivers/unrar-iconv/Makefile
==============================================================================
--- head/archivers/unrar-iconv/Makefile	Sat Jan  4 23:42:12 2014	(r338692)
+++ head/archivers/unrar-iconv/Makefile	Sat Jan  4 23:45:06 2014	(r338693)
@@ -9,7 +9,6 @@ MASTERDIR=	${.CURDIR}/../unrar
 
 EXTRA_PATCHES=	${.CURDIR}/files/patch-iconv
 
-NO_STAGE=	yes
 CPPFLAGS+=	-DWITH_ICONV -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 USES+=		iconv

Modified: head/archivers/unrar/Makefile
==============================================================================
--- head/archivers/unrar/Makefile	Sat Jan  4 23:42:12 2014	(r338692)
+++ head/archivers/unrar/Makefile	Sat Jan  4 23:45:06 2014	(r338693)
@@ -19,8 +19,7 @@ OPENSSL_AES_DESC=	Use OpenSSL implementa
 
 CONFLICTS?=	zh-unrar-[0-9].* unrar-iconv-[0-9].*
 
-NO_STAGE=	yes
-MAKE_ARGS=	STRIP=${STRIP_CMD}
+MAKE_ARGS=	STRIP=${STRIP_CMD} CXX="${CXX}"
 MAKEFILE=	makefile.unix
 USES+=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -30,22 +29,14 @@ PORTDOCS=	license.txt readme.txt
 
 SLAVEDIRS=	archivers/unrar-iconv chinese/unrar
 
-.include <bsd.port.options.mk>
+OPENSSL_AES_CPPFLAGS=	-DOPENSSL_AES -I${OPENSSLINC}
+OPENSSL_AES_USE=	OPENSSL=yes
+OPENSSL_AES_LDFLAGS=	-L${OPENSSLLIB} -lcrypto
 
-.if ${PORT_OPTIONS:MOPENSSL_AES}
-CPPFLAGS+=	-DOPENSSL_AES -I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB} -lcrypto
-USE_OPENSSL=	yes
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e '/^CXX/ s|^|#|' ${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unrar ${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/unrar ${STAGEDIR}${PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/chinese/unrar/Makefile
==============================================================================
--- head/chinese/unrar/Makefile	Sat Jan  4 23:42:12 2014	(r338692)
+++ head/chinese/unrar/Makefile	Sat Jan  4 23:45:06 2014	(r338693)
@@ -12,5 +12,4 @@ EXTRA_PATCHES=	${.CURDIR}/files/patch-ar
 
 CONFLICTS=	unrar-[0-9]* unrar-iconv-[0-9]*
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"