Date: Wed, 16 Oct 2013 20:14:47 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330533 - head/lang/dragonegg46-33 Message-ID: <201310162014.r9GKElGL048334@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Wed Oct 16 20:14:47 2013 New Revision: 330533 URL: http://svnweb.freebsd.org/changeset/ports/330533 Log: Don't try building on libc++ systems, it won't work. Deconflict docs between master and slave ports. STAGIFY Modified: head/lang/dragonegg46-33/Makefile Modified: head/lang/dragonegg46-33/Makefile ============================================================================== --- head/lang/dragonegg46-33/Makefile Wed Oct 16 19:27:35 2013 (r330532) +++ head/lang/dragonegg46-33/Makefile Wed Oct 16 20:14:47 2013 (r330533) @@ -2,6 +2,7 @@ PORTNAME= dragonegg PORTVERSION= 3.3 +PORTREVISION= 1 CATEGORIES= lang devel MASTER_SITES= http://llvm.org/releases/${PORTVERSION}/ PKGNAMESUFFIX= ${USE_GCC:S/.//g}-${LLVM_SUFFIX} @@ -20,10 +21,11 @@ LLVM_SUFFIX= ${PORTVERSION:S/.//g} OPTIONS_DEFINE= DOCS -USES= gmake +USES= compiler:features gmake USE_GCC?= 4.6 USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/${UNIQUENAME} +UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} DRAGONEGG_RELEASE= ${PORTVERSION:C/\.r[0-9]*//} DRAGONEGG_SO= dragonegg-${DRAGONEGG_RELEASE}.so @@ -31,17 +33,22 @@ DRAGONEGG_PATH= ${GCC_LIBDIR}/${DRAGONE GCC_LIBDIR= lib/${CC} ALL_TARGET= -MAKE_ARGS= GCC=${LOCALBASE}/bin/${CC} LLVM_CONFIG=llvm-config33 +MAKE_ARGS= GCC=${LOCALBASE}/bin/${CC} LLVM_CONFIG=llvm-config${LLVM_SUFFIX} PLIST_FILES= ${GCC_LIBDIR}/${DRAGONEGG_SO} -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} PORTDOCS= README .endif +.include <bsd.port.pre.mk> + +.if ${COMPILER_FEATURES:Mlibc++} +IGNORE= "Dragonegg can't work if LLVM was built with libc++" +.endif + post-patch: ${REINPLACE_CMD} -e 's/%%CC%%/${CC}/' \ -e 's#%%PLUGINPATH%%#${LOCALBASE}/${DRAGONEGG_PATH}#' \ @@ -49,11 +56,12 @@ post-patch: ${WRKSRC}/README do-install: + ${MKDIR} ${STAGEDIR}${LOCALBASE}/${GCC_LIBDIR} ${INSTALL_LIB} ${WRKSRC}/dragonegg.so \ - ${LOCALBASE}/${GCC_LIBDIR}/${DRAGONEGG_SO} + ${STAGEDIR}${LOCALBASE}/${GCC_LIBDIR}/${DRAGONEGG_SO} .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif test: @@ -64,4 +72,4 @@ test: ${FALSE} ;\ fi -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310162014.r9GKElGL048334>