From owner-svn-ports-all@FreeBSD.ORG Fri Apr 25 10:47:58 2014 Return-Path: Delivered-To: svn-ports-all@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 D8C05CB8; Fri, 25 Apr 2014 10:47:58 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C3265116A; Fri, 25 Apr 2014 10:47:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PAlw8c077854; Fri, 25 Apr 2014 10:47:58 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PAlwls077852; Fri, 25 Apr 2014 10:47:58 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404251047.s3PAlwls077852@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 25 Apr 2014 10:47:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352105 - head/graphics/cairo-java 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.17 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: Fri, 25 Apr 2014 10:47:58 -0000 Author: bapt Date: Fri Apr 25 10:47:58 2014 New Revision: 352105 URL: http://svnweb.freebsd.org/changeset/ports/352105 QAT: https://qat.redports.org/buildarchive/r352105/ Log: Support stage Modified: head/graphics/cairo-java/Makefile head/graphics/cairo-java/pkg-plist Modified: head/graphics/cairo-java/Makefile ============================================================================== --- head/graphics/cairo-java/Makefile Fri Apr 25 10:46:03 2014 (r352104) +++ head/graphics/cairo-java/Makefile Fri Apr 25 10:47:58 2014 (r352105) @@ -4,7 +4,7 @@ PORTNAME= cairo-java PORTVERSION= 1.0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics java MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -12,15 +12,15 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Java wrapper for the cairo graphics package -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - glibjni-${GLIB_API_VERSION}.1:${PORTSDIR}/devel/glib-java +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ + libglibjni-${GLIB_API_VERSION}.so:${PORTSDIR}/devel/glib-java -USE_BZIP2= yes -USES= gmake pathfix pkgconfig +OPTIONS_DEFINE= docs + +USES= gmake pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes -JAVA_VERSION= 1.6+ JAVA_OS= native CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd @@ -34,33 +34,27 @@ SUB_LIST= JAVAJARDIR=${JAVAJARDIR} CAIRO CONFIGURE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} MAKE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure do-install: - ${MKDIR} ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/.libs/libcairojni-${CAIRO_API_VERSION}.so \ - ${PREFIX}/lib/libcairojni-${CAIRO_API_VERSION}.so.1 - ${LN} -sf ${PREFIX}/lib/libcairojni-${CAIRO_API_VERSION}.so.1 \ - ${PREFIX}/lib/libcairojni-${CAIRO_API_VERSION}.so - ${MKDIR} ${PREFIX}/libdata/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/cairo-java.pc ${PREFIX}/libdata/pkgconfig - ${MKDIR} ${JAVAJARDIR} - ${INSTALL_DATA} ${WRKSRC}/cairo${CAIRO_API_VERSION}.jar ${JAVAJARDIR} - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${MKDIR} ${DOCSDIR}/api - cd ${WRKSRC}/doc/api && ${FIND} . | ${CPIO} -pdmu ${DOCSDIR}/api - ${TOUCH} ${DOCSDIR}/api/packages.html -.endif - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/.libs/libcairojni-${CAIRO_API_VERSION}.so \ + ${STAGEDIR}${PREFIX}/lib/libcairojni-${CAIRO_API_VERSION}.so.1 + ${LN} -sf libcairojni-${CAIRO_API_VERSION}.so.1 \ + ${STAGEDIR}${PREFIX}/lib/libcairojni-${CAIRO_API_VERSION}.so + @${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/cairo-java.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig + @${MKDIR} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/cairo${CAIRO_API_VERSION}.jar ${STAGEDIR}${JAVAJARDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR}/api + cd ${WRKSRC}/doc/api && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/api + ${TOUCH} ${STAGEDIR}${DOCSDIR}/api/packages.html .include Modified: head/graphics/cairo-java/pkg-plist ============================================================================== --- head/graphics/cairo-java/pkg-plist Fri Apr 25 10:46:03 2014 (r352104) +++ head/graphics/cairo-java/pkg-plist Fri Apr 25 10:47:58 2014 (r352105) @@ -53,7 +53,10 @@ libdata/pkgconfig/%%PORTNAME%%.pc %%PORTDOCS%%%%DOCSDIR%%/api/overview-tree.html %%PORTDOCS%%%%DOCSDIR%%/api/package-list %%PORTDOCS%%%%DOCSDIR%%/api/packages.html -%%PORTDOCS%%%%DOCSDIR%%/api/resources/inherit.gif +%%PORTDOCS%%%%DOCSDIR%%/api/resources/background.gif +%%PORTDOCS%%%%DOCSDIR%%/api/resources/tab.gif +%%PORTDOCS%%%%DOCSDIR%%/api/resources/titlebar.gif +%%PORTDOCS%%%%DOCSDIR%%/api/resources/titlebar_end.gif %%PORTDOCS%%%%DOCSDIR%%/api/serialized-form.html %%PORTDOCS%%%%DOCSDIR%%/api/stylesheet.css share/java/classes/cairo%%CAIRO_API_VERSION%%.jar