From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 15 06:20:04 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEA81106567D for ; Thu, 15 Jul 2010 06:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 8C21A8FC24 for ; Thu, 15 Jul 2010 06:20:04 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6F6K4DV000731 for ; Thu, 15 Jul 2010 06:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6F6K4wp000730; Thu, 15 Jul 2010 06:20:04 GMT (envelope-from gnats) Resent-Date: Thu, 15 Jul 2010 06:20:04 GMT Resent-Message-Id: <201007150620.o6F6K4wp000730@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Greg Lewis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5226B1065670 for ; Thu, 15 Jul 2010 06:19:07 +0000 (UTC) (envelope-from glewis@misty.eyesbeyond.com) Received: from misty.eyesbeyond.com (gerbercreations.com [71.39.140.16]) by mx1.freebsd.org (Postfix) with ESMTP id 0B3F88FC2A for ; Thu, 15 Jul 2010 06:19:06 +0000 (UTC) Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1]) by misty.eyesbeyond.com (8.14.4/8.14.4) with ESMTP id o6F6J62v054800; Wed, 14 Jul 2010 23:19:06 -0700 (PDT) (envelope-from glewis@misty.eyesbeyond.com) Received: (from glewis@localhost) by misty.eyesbeyond.com (8.14.4/8.14.4/Submit) id o6F6J664054799; Wed, 14 Jul 2010 23:19:06 -0700 (PDT) (envelope-from glewis) Message-Id: <201007150619.o6F6J664054799@misty.eyesbeyond.com> Date: Wed, 14 Jul 2010 23:19:06 -0700 (PDT) From: Greg Lewis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: girgen@FreeBSD.org Subject: ports/148621: [PATCH] java/eclipse-cdt: update path for new eclipse version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2010 06:20:04 -0000 >Number: 148621 >Category: ports >Synopsis: [PATCH] java/eclipse-cdt: update path for new eclipse version >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 15 06:20:04 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Greg Lewis >Release: FreeBSD 7.3-RELEASE i386 >Organization: >Environment: System: FreeBSD misty.eyesbeyond.com 7.3-RELEASE FreeBSD 7.3-RELEASE #0: Sat Apr 10 10:48:33 PDT 2010 >Description: . Update installation path for the new version of eclipse. Port maintainer (girgen@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- eclipse-cdt-3.1.2_4.patch begins here --- Index: Makefile =================================================================== RCS file: /var/fcvs/ports/java/eclipse-cdt/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 28 Mar 2010 06:38:37 -0000 1.23 +++ Makefile 15 Jul 2010 06:09:48 -0000 @@ -18,7 +18,7 @@ MAINTAINER= girgen@FreeBSD.org COMMENT= C/C++ IDE for Eclipse -RUN_DEPENDS= ${LOCALBASE}/eclipse:${PORTSDIR}/java/eclipse +RUN_DEPENDS= ${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse PATCH_DEPENDS= unzip:${PORTSDIR}/archivers/unzip NO_WRKSUBDIR= yes @@ -35,8 +35,8 @@ ECLIPSE_ARCH= amd64 .else ECLIPSE_ARCH= x86 -PLIST_FILES+= eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION_TS}/os/freebsd/x86/libpty.so \ - eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION_TS}/os/freebsd/x86/libspawner.so +PLIST_FILES+= lib/eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION_TS}/os/freebsd/x86/libpty.so \ + lib/eclipse/plugins/org.eclipse.cdt.core.freebsd.x86_${PORTVERSION_TS}/os/freebsd/x86/libspawner.so .endif SCRIPTS_ENV= PORTVERSION_TS=${PORTVERSION_TS} UNZIP_CMD=${UNZIP_CMD} @@ -75,7 +75,7 @@ eclipse/plugins/org.eclipse.cdt.ui_${PORTVERSION_TS}.jar \ eclipse/plugins/org.eclipse.cdt_${PORTVERSION_TS}.jar -PLIST_FILES= ${CDT_JARS} +PLIST_FILES= ${CDT_JARS:S/^eclipse/lib\/eclipse/} do-build: @${FIND} ${WRKSRC} -name \*.orig -delete @@ -91,17 +91,17 @@ .endif do-install: - @${MKDIR} ${PREFIX}/eclipse - @${MKDIR} ${PREFIX}/eclipse/features - @${MKDIR} ${PREFIX}/eclipse/plugins - cd ${WRKSRC} && ${INSTALL_DATA} ${CDT_JARS} ${PREFIX}/eclipse/plugins + @${MKDIR} ${PREFIX}/lib/eclipse + @${MKDIR} ${PREFIX}/lib/eclipse/features + @${MKDIR} ${PREFIX}/lib/eclipse/plugins + cd ${WRKSRC} && ${INSTALL_DATA} ${CDT_JARS} ${PREFIX}/lib/eclipse/plugins cd ${WRKSRC} && ${FIND} ${CDT_DIRS} \ - -type f -not -name '*.o' -print0 | ${XARGS} -0 ${TAR} -cf - | ( cd ${PREFIX} && ${TAR} -xf - ) + -type f -not -name '*.o' -print0 | ${XARGS} -0 ${TAR} -cf - | ( cd ${PREFIX}/lib && ${TAR} -xf - ) post-install: cd ${WRKSRC} && ${FIND} -d ${CDT_DIRS} \ - -type f -not -name '*.o' -print >> ${TMPPLIST} + -type f -not -name '*.o' -print | ${SED} -e 's,^eclipse,lib/eclipse,' >> ${TMPPLIST} cd ${WRKSRC} && ${FIND} -d ${CDT_DIRS} \ - -type d -not -name '*.o' -print0 | ${XARGS} -0 printf '@dirrm %s\n' >> ${TMPPLIST} + -type d -not -name '*.o' -print0 | ${XARGS} -0 printf '@dirrm lib/%s\n' >> ${TMPPLIST} .include --- eclipse-cdt-3.1.2_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: