From owner-svn-ports-all@FreeBSD.ORG Thu Oct 10 00:58:17 2013 Return-Path: Delivered-To: svn-ports-all@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 ESMTP id D2D065D8; Thu, 10 Oct 2013 00:58:17 +0000 (UTC) (envelope-from jhale@FreeBSD.org) 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 BF05222B0; Thu, 10 Oct 2013 00:58:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9A0wHgX048356; Thu, 10 Oct 2013 00:58:17 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9A0wGJT048333; Thu, 10 Oct 2013 00:58:16 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201310100058.r9A0wGJT048333@svn.freebsd.org> From: "Jason E. Hale" Date: Thu, 10 Oct 2013 00:58:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329953 - in head/devel: gwenhywfar gwenhywfar-fox16 gwenhywfar-gtk2 gwenhywfar-qt4 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.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 00:58:17 -0000 Author: jhale Date: Thu Oct 10 00:58:16 2013 New Revision: 329953 URL: http://svnweb.freebsd.org/changeset/ports/329953 Log: - Support staging - Use new LIB_DEPENDS syntax - Use options helpers Modified: head/devel/gwenhywfar-fox16/Makefile head/devel/gwenhywfar-gtk2/Makefile (contents, props changed) head/devel/gwenhywfar-qt4/Makefile (contents, props changed) head/devel/gwenhywfar/Makefile Modified: head/devel/gwenhywfar-fox16/Makefile ============================================================================== --- head/devel/gwenhywfar-fox16/Makefile Thu Oct 10 00:32:10 2013 (r329952) +++ head/devel/gwenhywfar-fox16/Makefile Thu Oct 10 00:58:16 2013 (r329953) @@ -10,5 +10,4 @@ MASTERDIR= ${.CURDIR}/../../devel/gwenhy SLAVEPORT= fox16 PLIST= ${.CURDIR}/pkg-plist -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/devel/gwenhywfar-gtk2/Makefile ============================================================================== --- head/devel/gwenhywfar-gtk2/Makefile Thu Oct 10 00:32:10 2013 (r329952) +++ head/devel/gwenhywfar-gtk2/Makefile Thu Oct 10 00:58:16 2013 (r329953) @@ -10,5 +10,4 @@ MASTERDIR= ${.CURDIR}/../../devel/gwenhy SLAVEPORT= gtk2 PLIST= ${.CURDIR}/pkg-plist -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/devel/gwenhywfar-qt4/Makefile ============================================================================== --- head/devel/gwenhywfar-qt4/Makefile Thu Oct 10 00:32:10 2013 (r329952) +++ head/devel/gwenhywfar-qt4/Makefile Thu Oct 10 00:58:16 2013 (r329953) @@ -10,5 +10,4 @@ MASTERDIR= ${.CURDIR}/../../devel/gwenhy SLAVEPORT= qt4 PLIST= ${.CURDIR}/pkg-plist -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/devel/gwenhywfar/Makefile ============================================================================== --- head/devel/gwenhywfar/Makefile Thu Oct 10 00:32:10 2013 (r329952) +++ head/devel/gwenhywfar/Makefile Thu Oct 10 00:58:16 2013 (r329953) @@ -11,14 +11,8 @@ COMMENT?= Multi-platform helper library LICENSE= LGPL21 -LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt \ - gnutls:${PORTSDIR}/security/gnutls - -.if !defined(SLAVEPORT) -OPTIONS_DEFINE= DOXYGEN MEMDEBUG - -MEMDEBUG_DESC= Enable memory debugger statistic -.endif +LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libgnutls.so:${PORTSDIR}/security/gnutls USES= pathfix pkgconfig gettext gmake USE_OPENSSL= yes @@ -34,26 +28,26 @@ USE_LDCONFIG= yes GWEN_SHLIB_VER= 60 -NO_STAGE= yes -.include +.if !defined(SLAVEPORT) +OPTIONS_DEFINE= DOXYGEN MEMDEBUG -.if ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ - dot:${PORTSDIR}/graphics/graphviz -CONFIGURE_ARGS+=--enable-full-doc -.endif +DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ + dot:${PORTSDIR}/graphics/graphviz +DOXYGEN_CONFIGURE_ENABLE= full-doc -.if ${PORT_OPTIONS:MMEMDEBUG} -CONFIGURE_ARGS+=--enable-memtrace +MEMDEBUG_DESC= Enable memory debugger statistic +MEMDEBUG_CONFIGURE_ENABLE= memtrace .endif +.include + .if defined(SLAVEPORT) -LIB_DEPENDS+= gwenhywfar:${PORTSDIR}/devel/gwenhywfar +LIB_DEPENDS+= libgwenhywfar.so:${PORTSDIR}/devel/gwenhywfar BUILD_WRKSRC= ${WRKSRC}/gui INSTALL_WRKSRC= ${WRKSRC}/gui/${SLAVEPORT} .if ${SLAVEPORT}=="fox16" -LIB_DEPENDS+= FOX-1.6:${PORTSDIR}/x11-toolkits/fox16 +LIB_DEPENDS+= libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif @@ -81,13 +75,13 @@ post-build: post-install: .if ${PORT_OPTIONS:MDOXYGEN} - ${MKDIR} ${DOCSDIR}/apidoc + ${MKDIR} ${STAGEDIR}${DOCSDIR}/apidoc cd ${WRKSRC}/apidoc && \ - ${COPYTREE_SHARE} \* ${DOCSDIR}/apidoc - @${FIND} -P ${DOCSDIR} -type f 2>/dev/null | \ - ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST} - @${FIND} -P -d ${DOCSDIR} -type d 2>/dev/null | \ - ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} + ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/apidoc + @${FIND} -P ${STAGEDIR}${DOCSDIR} -type f 2>/dev/null | \ + ${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST} + @${FIND} -P -d ${STAGEDIR}${DOCSDIR} -type d 2>/dev/null | \ + ${SED} -ne 's|^${STAGEDIR}${PREFIX}/|@dirrm |p' >> ${TMPPLIST} .endif .include