From owner-svn-ports-all@FreeBSD.ORG Wed Jan 22 17:22:40 2014 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 ESMTPS id C96B4A9A; Wed, 22 Jan 2014 17:22:40 +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 B57DE1EDC; Wed, 22 Jan 2014 17:22:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0MHMenq068109; Wed, 22 Jan 2014 17:22:40 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0MHMe3O068108; Wed, 22 Jan 2014 17:22:40 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201401221722.s0MHMe3O068108@svn.freebsd.org> From: Koop Mast Date: Wed, 22 Jan 2014 17:22:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340723 - head/x11/libgnome-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: Wed, 22 Jan 2014 17:22:40 -0000 Author: kwm Date: Wed Jan 22 17:22:40 2014 New Revision: 340723 URL: http://svnweb.freebsd.org/changeset/ports/340723 QAT: https://qat.redports.org/buildarchive/r340723/ Log: Use USES=dos2unix instead of manualy 's|^M||g' [1] While here switch to USES=pathfix shebangfix. Stagify the port and use INSTALL_LIB for the library so it get auto stripped. Submitted by: mat [1] Modified: head/x11/libgnome-java/Makefile Modified: head/x11/libgnome-java/Makefile ============================================================================== --- head/x11/libgnome-java/Makefile Wed Jan 22 17:00:46 2014 (r340722) +++ head/x11/libgnome-java/Makefile Wed Jan 22 17:22:40 2014 (r340723) @@ -15,19 +15,21 @@ COMMENT= Java wrapper for GNOME 2 BUILD_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java RUN_DEPENDS= ${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java -USES= gmake pkgconfig +USES= dos2unix gmake pathfix pkgconfig shebangfix USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_JAVA= yes JAVA_VERSION= 1.6+ JAVA_OS= native -USE_GNOME= gnomehack libgnomeui +USE_GNOME= libgnomeui CONFIGURE_ARGS= --without-gcj-compile --with-jardir=${JAVAJARDIR} CONFIGURE_ENV= ac_cv_path_DB1="nocommand" \ ac_cv_path_DB2="nocommand" CPPFLAGS+= -I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd MAKE_JOBS_UNSAFE= yes +DOS2UNIX_FILES= gnome2-java.pc.in +SHEBANG_FILES= doc/examples/runExample.sh.in # jikes related CONFIGURE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} @@ -39,45 +41,41 @@ PLIST_SUB= GNOME_API_VERSION=${GNOME_AP PKGMESSAGE= ${WRKDIR}/pkg-message -NO_STAGE= yes post-extract: - @${REINPLACE_CMD} -e 's| ||g' \ - ${WRKSRC}/gnome2-java.pc.in @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure do-install: - ${MKDIR} ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/.libs/libgnomejni-${GNOME_API_VERSION}.so \ - ${PREFIX}/lib/libgnomejni-${GNOME_API_VERSION}.so.1 - ${LN} -sf ${PREFIX}/lib/libgnomejni-${GNOME_API_VERSION}.so.1 \ - ${PREFIX}/lib/libgnomejni-${GNOME_API_VERSION}.so - ${MKDIR} ${PREFIX}/libdata/pkgconfig - ${INSTALL_DATA} ${WRKSRC}/gnome2-java.pc ${PREFIX}/libdata/pkgconfig - ${MKDIR} ${JAVAJARDIR} - ${INSTALL_DATA} ${WRKSRC}/gnome${GNOME_API_VERSION}.jar ${JAVAJARDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/.libs/libgnomejni-${GNOME_API_VERSION}.so \ + ${STAGEDIR}${PREFIX}/lib/libgnomejni-${GNOME_API_VERSION}.so.1 + ${LN} -sf libgnomejni-${GNOME_API_VERSION}.so.1 \ + ${STAGEDIR}${PREFIX}/lib/libgnomejni-${GNOME_API_VERSION}.so + ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig + ${INSTALL_DATA} ${WRKSRC}/gnome2-java.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig + ${MKDIR} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/gnome${GNOME_API_VERSION}.jar ${STAGEDIR}${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} - ${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR} - ${MKDIR} ${PREFIX}/share/${PORTNAME}/tutorial - ${INSTALL_DATA} ${WRKSRC}/doc/tutorial/* ${PREFIX}/share/${PORTNAME}/tutorial - ${MKDIR} ${DOCSDIR}/api - cd ${WRKSRC}/doc/api && ${FIND} . | ${CPIO} -pdmu ${DOCSDIR}/api - ${TOUCH} ${DOCSDIR}/api/packages.html - ${MKDIR} ${DOCSDIR}/examples + ${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} + ${INSTALL_DATA} ${WRKSRC}/TODO ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/tutorial + ${INSTALL_DATA} ${WRKSRC}/doc/tutorial/* \ + ${STAGEDIR}${PREFIX}/share/${PORTNAME}/tutorial + ${MKDIR} ${STAGEDIR}${DOCSDIR}/api + cd ${WRKSRC}/doc/api && ${FIND} . | ${CPIO} -pdmu ${STAGEDIR}${DOCSDIR}/api + ${TOUCH} ${STAGEDIR}${DOCSDIR}/api/packages.html + ${MKDIR} ${STAGEDIR}${DOCSDIR}/examples cd ${WRKSRC}/doc/examples && ${FIND} . \ - | ${CPIO} -pdmu ${DOCSDIR}/examples -.endif + | ${CPIO} -pdmu ${STAGEDIR}${DOCSDIR}/examples @${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g ; \ s|%%PREFIX%%|${PREFIX}|g ; \ s|%%GNOME_API_VERSION%%|${GNOME_API_VERSION}|g' \ < ${PKGDIR}/pkg-message > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} .include