From owner-freebsd-gnome@FreeBSD.ORG Wed Aug 3 12:06:30 2005 Return-Path: X-Original-To: gnome@FreeBSD.org Delivered-To: freebsd-gnome@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 448E616A41F; Wed, 3 Aug 2005 12:06:30 +0000 (GMT) (envelope-from chinsan@chinsan.twbbs.org) Received: from chinsan.twbbs.org (220-135-48-40.HINET-IP.hinet.net [220.135.48.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id C712243D46; Wed, 3 Aug 2005 12:06:29 +0000 (GMT) (envelope-from chinsan@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 1001) id 0CC5A7301F; Wed, 3 Aug 2005 20:06:42 +0800 (CST) To: FreeBSD-gnats-submit@freebsd.org From: chinsan X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20050803120642.0CC5A7301F@chinsan.twbbs.org> Date: Wed, 3 Aug 2005 20:06:42 +0800 (CST) Cc: gnome@FreeBSD.org Subject: [PATCH] www/mozilla-devel: fix error path(make install) X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: chinsan List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2005 12:06:30 -0000 >Submitter-Id: current-users >Originator: chinsan >Organization: FreeBSD Taiwan >Confidential: no >Synopsis: [PATCH] www/mozilla-devel: fix error path(make install) >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 5.4-STABLE i386 >Environment: System: FreeBSD chinsan.twbbs.org 5.4-STABLE FreeBSD 5.4-STABLE #2: Sat Jul 30 16:27:25 CST 2005 root@chinsan.twbbs.org:/usr/obj/usr/src/sys/TAKAKO i386 >Description: - While `make install' stage, it will "cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER}" However, in the ${FAKEDIR}/share/idl is "mozilla-1.8b" - port maintainer team(gnome@) is CC'd >How-To-Repeat: # cd /usr/ports/www/mozilla-devel && make install clean echo "@exec /usr/local/bin/update-desktop-database > /dev/null || true" >> /usr/ports/www/mozilla-devel/work/pkg-plist echo "@unexec /usr/local/bin/update-desktop-database > /dev/null || true" >> /usr/ports/www/mozilla-devel/work/pkg-plist cd /usr/ports/www/mozilla-devel/work/fake/share/idl/mozilla-devel-1.8b1 && /usr/bin/find -s * -type f -o -type l | /usr/bin/sed -e 's:^:share/idl/mozilla-devel/:' >> /usr/ports/www/mozilla-devel/work/pkg-plist && /usr/bin/find -d * -type d | /usr/bin/sed -e 's:^:@dirrm share/idl/mozilla-devel/:' >> /usr/ports/www/mozilla-devel/work/pkg-plist cd: can't cd to /usr/ports/www/mozilla-devel/work/fake/share/idl/mozilla-devel-1.8b1 *** Error code 2 Stop in /usr/ports/www/mozilla-devel. *** Error code 1 Stop in /usr/ports/www/mozilla-devel. >Fix: --- mozilla-devel.diff begins here --- diff -ruN mozilla-devel.orig/Makefile mozilla-devel/Makefile --- mozilla-devel.orig/Makefile Wed Aug 3 16:57:05 2005 +++ mozilla-devel/Makefile Wed Aug 3 16:57:26 2005 @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} MOZILLA?= mozilla-devel MOZ_SUFX?= -devel -MOZ_VER?= ${PORTVERSION:S/.b1/b1/} +MOZ_VER?= ${PORTVERSION:S/.b1/b/} LATEST_LINK= ${MOZILLA} EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ @@ -306,7 +306,7 @@ ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER} \ + cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} \ && ${FIND} -s * -type f -o -type l | \ ${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ @@ -353,7 +353,7 @@ ${INSTALL_DATA} ${WRKDIR}/mozilla-devel.desktop \ ${PREFIX}/share/applications ${MKDIR} ${PREFIX}/share/idl/${MOZILLA} - cd ${FAKEDIR}/share/idl/${MOZILLA}-${MOZ_VER} && ${FIND} . | \ + cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} && ${FIND} . | \ ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA} post-install: --- mozilla-devel.diff ends here ---