ports/148621: [PATCH] java/eclipse-cdt: update path for new eclipse version

[Greg Lewis]

>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 at 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 at 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 <bsd.port.post.mk>
--- eclipse-cdt-3.1.2_4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: