Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Jun 2006 11:01:02 +0400 (MSD)
From:      "alecn2002" <alecn2002@yandex.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/98518: [MAINTAINER-UPDATE] Upgrade port devel/radrails to version 0.6.4
Message-ID:  <4483D6AE.000005.24431@pantene.yandex.ru>
Resent-Message-ID: <200606050710.k557ABvl095454@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         98518
>Category:       ports
>Synopsis:       Upgrade port devel/radrails to version 0.6.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 05 07:10:10 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Novitsky
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
IPOnWeb
>Environment:
System: FreeBSD rubyhosting.ru 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Wed Jan 11 02:22:02 MSK 2006 user1@da:/usr/src/sys/i386/compile/DA i386
>Description:
Upgrade port devel/radrails to ver.0.6.4

File pkg-plist was deleted

>How-To-Repeat:
>Fix:

--- radrails0.6.2-0.6.4.diff begins here ---
Index: radrails/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/radrails/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- radrails/Makefile	27 May 2006 08:05:51 -0000	1.1
+++ radrails/Makefile	5 Jun 2006 06:53:34 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	radrails
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.4
 CATEGORIES=	devel ruby java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,7 +28,6 @@
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_OS=	linux
-PLIST=		${WRKDIR}/PLIST
 
 ICONDIR=	icons
 ICON=		${ICONDIR}/radrails.png
@@ -41,7 +40,8 @@
 	"Development;IDE;" \
 	true
 
-FIND_ARGS=	-s -d .
+PLIST_FILES=	%%DATADIR%%/${ICON} bin/radrails
+PLIST_DIRS=	%%DATADIR%%/${ICONDIR}
 
 .include <bsd.port.pre.mk>
 
@@ -49,21 +49,23 @@
 
 pre-install:
 	(cd ${WRKDIR}; jar -xf ${WRKSRC}/plugins/org.radrails.ide.ui_${PORTVERSION}.jar ${ICON})
-	${ECHO} "%%DATADIR%%/${ICON}" >> ${PLIST}
 	${CP} ${FILESDIR}/radrails.sh ${WRKDIR}/radrails.sh
 	${REINPLACE_CMD} -E -e "s|%%DATADIR%%|${DATADIR}|g; s|%%JAVA%%|${JAVA}|g" ${WRKDIR}/radrails.sh
-	${ECHO} "bin/radrails" >> ${PLIST}
-	( cd ${WRKSRC} ; \
-	  ${FIND} ${FIND_ARGS} -type f | ${SED} 's|^|%%DATADIR%%/|g' >> ${PLIST} ; \
-	  ${FIND} ${FIND_ARGS} -type d -and -not -name '.' | ${SED} 's|^|@dirrm %%DATADIR%%/|g' >> ${PLIST} )
-	${ECHO} "@dirrm %%DATADIR%%/${ICONDIR}" >>${PLIST}
-	${ECHO} '@dirrm %%DATADIR%%' >> ${PLIST}
 
 do-install:
 	${MKDIR} ${DATADIR}
-	( cd ${WRKSRC} ; ${CP} -Rv `ls -a | ${EGREP} -v '^\.{1,2}$$'` ${DATADIR}/ )
+	( cd ${WRKSRC} \
+	  && ${FIND} . -type d -exec ${MKDIR} ${DATADIR}/\{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${DATADIR}/\{} \; )
 	${MKDIR} ${DATADIR}/${ICONDIR}
 	${INSTALL_DATA} ${WRKDIR}/${ICON} ${DATADIR}/${ICON}
 	${INSTALL_SCRIPT} ${WRKDIR}/radrails.sh ${PREFIX}/bin/radrails
+
+post-install:
+	@cd ${WRKSRC} \
+	  && ${FIND} -s . -type f \
+	    | ${SED} 's,^\.,${DATADIR:S,^${PREFIX}/,,},' >>${TMPPLIST} \
+	  && ${FIND} -s -d . -type d \
+	    | ${SED} 's,^\.,@dirrm ${DATADIR:S,^${PREFIX}/,,},' >>${TMPPLIST}
 
 .include <bsd.port.post.mk>
Index: radrails/distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/radrails/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- radrails/distinfo	27 May 2006 08:05:51 -0000	1.1
+++ radrails/distinfo	5 Jun 2006 06:53:34 -0000
@@ -1,3 +1,3 @@
-MD5 (radrails-0.6.2-linux.zip) = 819386b0c41bbd2a2f53cd2d1b51e9c4
-SHA256 (radrails-0.6.2-linux.zip) = b5404948f4bdd91a5d239e06b8ff2ffaf6d6bc7c3d5787869fadbd63a2808c3d
-SIZE (radrails-0.6.2-linux.zip) = 38984470
+MD5 (radrails-0.6.4-linux.zip) = f96d3bc42969695efbfac1ad85351ed8
+SHA256 (radrails-0.6.4-linux.zip) = f879ca2a1320570c31188aeb29ce555a517672a00059aa543e83b4084147bb22
+SIZE (radrails-0.6.4-linux.zip) = 39138982
Index: radrails/pkg-plist
===================================================================
RCS file: radrails/pkg-plist
diff -N radrails/pkg-plist
--- radrails/pkg-plist	27 May 2006 08:05:51 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-@comment $FreeBSD: ports/devel/radrails/pkg-plist,v 1.1 2006/05/27 08:05:51 dinoex Exp $
--- radrails0.6.2-0.6.4.diff ends here ---


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4483D6AE.000005.24431>