From owner-svn-ports-all@FreeBSD.ORG Sat Apr 12 15:39:05 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 1D92EAA2; Sat, 12 Apr 2014 15:39:05 +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 F1E9112E7; Sat, 12 Apr 2014 15:39:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3CFd4nN006404; Sat, 12 Apr 2014 15:39:04 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3CFd4s2006402; Sat, 12 Apr 2014 15:39:04 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201404121539.s3CFd4s2006402@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 12 Apr 2014 15:39:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351106 - head/devel/glib-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: Sat, 12 Apr 2014 15:39:05 -0000 Author: bapt Date: Sat Apr 12 15:39:04 2014 New Revision: 351106 URL: http://svnweb.freebsd.org/changeset/ports/351106 QAT: https://qat.redports.org/buildarchive/r351106/ Log: Support stage Modified: head/devel/glib-java/Makefile head/devel/glib-java/pkg-plist Modified: head/devel/glib-java/Makefile ============================================================================== --- head/devel/glib-java/Makefile Sat Apr 12 15:32:01 2014 (r351105) +++ head/devel/glib-java/Makefile Sat Apr 12 15:39:04 2014 (r351106) @@ -4,7 +4,7 @@ PORTNAME= glib-java PORTVERSION= 0.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel java MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -12,15 +12,15 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Java wrapper GLib 2 -USE_BZIP2= yes -USE_GMAKE= yes +OPTIONS_DEFINE= DOCS + +USES= gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_OS= native -USE_GNOME= gnomehack glib20 -USES= pkgconfig +USE_GNOME= glib20 CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd GLIB_API_VERSION= 0.4 @@ -31,7 +31,6 @@ PKGMESSAGE= ${WRKDIR}/pkg-message CONFIGURE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} MAKE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} -NO_STAGE= yes .include post-patch: @@ -39,37 +38,32 @@ post-patch: ${WRKSRC}/configure do-install: - ${MKDIR} ${PREFIX}/lib ${INSTALL_DATA} ${WRKSRC}/.libs/libglibjni-${GLIB_API_VERSION}.so \ - ${PREFIX}/lib/libglibjni-${GLIB_API_VERSION}.so.1 - ${LN} -sf ${PREFIX}/lib/libglibjni-${GLIB_API_VERSION}.so.1 \ - ${PREFIX}/lib/libglibjni-${GLIB_API_VERSION}.so - ${MKDIR} ${PREFIX}/libdata/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/glib-java.pc ${PREFIX}/libdata/pkgconfig - ${MKDIR} ${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/src/jni/jg_jnu.h ${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/src/jni/glib_java.h ${PREFIX}/include/${PORTNAME} - ${MKDIR} ${JAVAJARDIR} - ${INSTALL_DATA} ${WRKSRC}/glib${GLIB_API_VERSION}.jar ${JAVAJARDIR} - ${MKDIR} ${PREFIX}/share/${PORTNAME}/macros - ${INSTALL_DATA} ${WRKSRC}/macros/* ${PREFIX}/share/${PORTNAME}/macros - -post-install: + ${STAGEDIR}${PREFIX}/lib/libglibjni-${GLIB_API_VERSION}.so.1 + ${LN} -sf libglibjni-${GLIB_API_VERSION}.so.1 \ + ${STAGEDIR}${PREFIX}/lib/libglibjni-${GLIB_API_VERSION}.so + ${INSTALL_DATA} ${WRKSRC}/glib-java.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig + ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/src/jni/jg_jnu.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/src/jni/glib_java.h ${STAGEDIR}${PREFIX}/include/${PORTNAME} + ${MKDIR} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/glib${GLIB_API_VERSION}.jar ${STAGEDIR}${JAVAJARDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/macros + ${INSTALL_DATA} ${WRKSRC}/macros/* ${STAGEDIR}${PREFIX}/share/${PORTNAME}/macros .if ${PORT_OPTIONS:MDOCS} - ${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 - ${TOUCH} ${DOCSDIR}/api/serialized-form.html + ${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 + ${TOUCH} ${STAGEDIR}${DOCSDIR}/api/serialized-form.html .endif @${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; \ s|%%PREFIX%%|${PREFIX}|g ; \ s|%%GLIB_API_VERSION%%|${GLIB_API_VERSION}|g' \ < ${PKGDIR}/pkg-message > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} .include Modified: head/devel/glib-java/pkg-plist ============================================================================== --- head/devel/glib-java/pkg-plist Sat Apr 12 15:32:01 2014 (r351105) +++ head/devel/glib-java/pkg-plist Sat Apr 12 15:39:04 2014 (r351106) @@ -14,6 +14,10 @@ libdata/pkgconfig/%%PORTNAME%%.pc %%PORTDOCS%%%%DOCSDIR%%/api/help-doc.html %%PORTDOCS%%%%DOCSDIR%%/api/index-all.html %%PORTDOCS%%%%DOCSDIR%%/api/index.html +%%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/org/gnu/glib/Boxed.html %%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/Config.html %%PORTDOCS%%%%DOCSDIR%%/api/org/gnu/glib/Enum.html @@ -47,7 +51,6 @@ 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/serialized-form.html %%PORTDOCS%%%%DOCSDIR%%/api/stylesheet.css %%DATADIR%%/macros/ac_prog_jar.m4