From nobody@FreeBSD.org  Thu Feb  3 15:50:11 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7983916A4CF
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  3 Feb 2005 15:50:11 +0000 (GMT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 39C3443D31
	for <freebsd-gnats-submit@FreeBSD.org>; Thu,  3 Feb 2005 15:50:11 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id j13FoAtF016174
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 3 Feb 2005 15:50:10 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id j13FoAUf016173;
	Thu, 3 Feb 2005 15:50:10 GMT
	(envelope-from nobody)
Message-Id: <200502031550.j13FoAUf016173@www.freebsd.org>
Date: Thu, 3 Feb 2005 15:50:10 GMT
From: Gerrit Beine <tux@pinguru.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: java/eclipse-EPIC
X-Send-Pr-Version: www-2.3
X-GNATS-Notify: vs

>Number:         77068
>Category:       ports
>Synopsis:       Update port: java/eclipse-EPIC
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lawrance
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 03 15:50:16 GMT 2005
>Closed-Date:    Tue May 17 10:34:02 GMT 2005
>Last-Modified:  Tue May 17 10:34:02 GMT 2005
>Originator:     Gerrit Beine
>Release:        FreeBSD 5.3-RELEASE
>Organization:
pitcom GmbH
>Environment:
FreeBSD asus.site 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 12 23:43:33 CET 2004     root@asus.site:/usr/src/sys/i386/compile/ASUS  i386

>Description:
The port now unzips the jar files.

Portrevision bumped, no functional change.
>How-To-Repeat:
      
>Fix:
diff -Nur /usr/ports/java/eclipse-EPIC/Makefile eclipse-EPIC/Makefile
--- /usr/ports/java/eclipse-EPIC/Makefile	Thu Dec 23 12:52:13 2004
+++ eclipse-EPIC/Makefile	Thu Feb  3 16:43:15 2005
@@ -5,12 +5,12 @@
 # $FreeBSD: ports/java/eclipse-EPIC/Makefile,v 1.1 2004/12/23 11:52:13 nork Exp $
 #
 
-PORTNAME=	EPIC
+PORTNAME=	eclipse-EPIC
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	java editors devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	e-p-i-c
-PKGNAMEPREFIX=	eclipse-
 DISTNAME=	${EPIC}_${PORTVERSION}_20040711
 
 MAINTAINER=	tux@pinguru.net
@@ -22,17 +22,35 @@
 USE_ZIP=	yes
 WRKSRC=		${WRKDIR}/${EPIC}
 
-EPIC=		org.epic.updatesite
 ECLIPSE=	${PREFIX}/eclipse
+EPIC=		org.epic.updatesite
+EPICFILES=	features/org.epic.feature.main_0.3.0 \
+		plugins/org.epic.debug_0.2.0 \
+		plugins/org.epic.ext.cbg.editor_0.3.0 \
+		plugins/org.epic.perleditor_0.1.2 \
+		plugins/org.epic.regexp_0.1.2
+
+post-extract:
+.for file in ${EPICFILES}
+	cd ${WRKSRC} \
+	  && ${MKDIR} ${file} \
+	  && ${UNZIP_CMD} ${file}.jar -d ${file}
+.endfor
 
 do-install:
-	@${CP} -r ${WRKSRC}/features/*.jar ${ECLIPSE}/features
-	@${CP} -r ${WRKSRC}/plugins/*.jar ${ECLIPSE}/plugins
+.for file in ${EPICFILES}
+	cd ${WRKSRC} \
+          && ${MKDIR} ${ECLIPSE}/${file} \
+	  && ${FIND} ${file} -type d -exec ${MKDIR} ${ECLIPSE}/{} \; \
+	  && ${FIND} ${file} -type f -exec ${INSTALL_DATA} {} ${ECLIPSE}/{} \;
+.endfor
 
 post-install:
-	@${FIND} -s ${WRKSRC}/features -name "*.jar" \
-	  | ${SED} -ne 's,^${WRKSRC},${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s ${WRKSRC}/plugins -name "*.jar" \
+.for file in ${EPICFILES}
+	@${FIND} ${WRKSRC}/${file} -not -type d \
 	  | ${SED} -ne 's,^${WRKSRC},${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	@${FIND} -d ${WRKSRC}/${file} -type d \
+	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+.endfor
 
 .include <bsd.port.mk>
diff -Nur /usr/ports/java/eclipse-EPIC/distinfo eclipse-EPIC/distinfo
--- /usr/ports/java/eclipse-EPIC/distinfo	Thu Dec 23 12:52:13 2004
+++ eclipse-EPIC/distinfo	Sun Nov 28 19:15:24 2004
@@ -1,2 +1,2 @@
-MD5 (org.epic.updatesite_0.3.0_20040711.zip) = 5ab8b866c599bd41f8dcb57564d5bc2d
+MD5 (org.epic.updatesite_0.3.0_20040711.zip) = ae5f45738b9d9aed2ba42905aa01a35a
 SIZE (org.epic.updatesite_0.3.0_20040711.zip) = 2649757
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: vs 
State-Changed-When: Sun Feb 27 18:23:45 GMT 2005 
State-Changed-Why:  
Patch does not fetch: org.epic.updatesite_0.3.0_20040711.zip 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77068 

From: Gerrit Beine <tux@pinguru.net>
To: freebsd-gnats-submit@FreeBSD.org, tux@pinguru.net
Cc:  
Subject: Re: ports/77068: Update port: java/eclipse-EPIC
Date: Sun, 27 Feb 2005 21:57:36 +0100

 I'll fix it!
 
 
 -- 
 mail tux@pinguru.net
 icq  123851585
 web  http://arme-und-beine.de

From: Gerrit Beine <gerrit.beine@pitcom.de>
To: freebsd-gnats-submit@FreeBSD.org, tux@pinguru.net
Cc:  
Subject: Re: ports/77068: Update port: java/eclipse-EPIC
Date: Wed, 02 Mar 2005 10:25:35 +0100

 The port fetch perfectly here.
 I'm not able to find any problem with this :(
 
 Gerrit
 
 --
 Besuchen Sie uns zu:  http://chemnitzer.linux-tage.de
 
 
 
 

From: Phil Schulz <ph.schulz@gmx.de>
To: freebsd-gnats-submit@FreeBSD.org, tux@pinguru.net
Cc:  
Subject: Re: ports/77068: Update port: java/eclipse-EPIC
Date: Tue, 22 Mar 2005 15:32:37 +0100

 Hi,
 
  on my system, the patch in the PR fails to apply cleanly and creates
 fetch problems caused by wrong information in distinfo.
 
  Below is a patch which works fine for me.
 
 HTH,
 
 Phil.
 
 
 --- Makefile.orig	Sat Mar 12 11:54:08 2005
 +++ Makefile	Tue Mar 22 15:22:20 2005
 @@ -5,13 +5,12 @@
  # $FreeBSD: ports/java/eclipse-EPIC/Makefile,v 1.2 2005/03/12 10:54:08
 marcus Exp $
  #
 
 -PORTNAME=	EPIC
 +PORTNAME=	eclipse-EPIC
  PORTVERSION=	0.3.0
  PORTREVISION=	1
  CATEGORIES=	java editors devel
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	e-p-i-c
 -PKGNAMEPREFIX=	eclipse-
  DISTNAME=	${EPIC}_${PORTVERSION}_20040711
 
  MAINTAINER=	tux@pinguru.net
 @@ -23,17 +22,35 @@
  USE_ZIP=	yes
  WRKSRC=		${WRKDIR}/${EPIC}
 
 -EPIC=		org.epic.updatesite
  ECLIPSE=	${PREFIX}/eclipse
 +EPIC=		org.epic.updatesite
 +EPICFILES=	features/org.epic.feature.main_0.3.0 \
 +		plugins/org.epic.debug_0.2.0 \
 +		plugins/org.epic.ext.cbg.editor_0.3.0 \
 +		plugins/org.epic.perleditor_0.1.2 \
 +		plugins/org.epic.regexp_0.1.2
 +
 +post-extract:
 +.for file in ${EPICFILES}
 +	cd ${WRKSRC} \
 +	  && ${MKDIR} ${file} \
 +	  && ${UNZIP_CMD} ${file}.jar -d ${file}
 +.endfor
 
  do-install:
 -	@${CP} -r ${WRKSRC}/features/*.jar ${ECLIPSE}/features
 -	@${CP} -r ${WRKSRC}/plugins/*.jar ${ECLIPSE}/plugins
 +.for file in ${EPICFILES}
 +	cd ${WRKSRC} \
 +          && ${MKDIR} ${ECLIPSE}/${file} \
 +	  && ${FIND} ${file} -type d -exec ${MKDIR} ${ECLIPSE}/{} \; \
 +	  && ${FIND} ${file} -type f -exec ${INSTALL_DATA} {} ${ECLIPSE}/{} \;
 +.endfor
 
  post-install:
 -	@${FIND} -s ${WRKSRC}/features -name "*.jar" \
 -	  | ${SED} -ne 's,^${WRKSRC},${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 -	@${FIND} -s ${WRKSRC}/plugins -name "*.jar" \
 +.for file in ${EPICFILES}
 +	@${FIND} ${WRKSRC}/${file} -not -type d \
  	  | ${SED} -ne 's,^${WRKSRC},${ECLIPSE:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
 +	@${FIND} -d ${WRKSRC}/${file} -type d \
 +	  | ${SED} -ne 's,^${WRKSRC},@dirrm ${ECLIPSE:S,^${PREFIX}/,,},p' >>
 ${TMPPLIST}
 +.endfor
 
  .include <bsd.port.mk>
 
Responsible-Changed-From-To: freebsd-ports-bugs->lawrance 
Responsible-Changed-By: lawrance 
Responsible-Changed-When: Sun Apr 24 06:54:32 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77068 
State-Changed-From-To: feedback->closed 
State-Changed-By: lawrance 
State-Changed-When: Tue May 17 10:33:23 GMT 2005 
State-Changed-Why:  
Committed with minor changes, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77068 
>Unformatted:
