From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 3 16:10:25 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA9D316A4D2 for ; Tue, 3 Aug 2004 16:10:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89F4C43D49 for ; Tue, 3 Aug 2004 16:10:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i73GAPA7074896 for ; Tue, 3 Aug 2004 16:10:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i73GAPQs074895; Tue, 3 Aug 2004 16:10:25 GMT (envelope-from gnats) Resent-Date: Tue, 3 Aug 2004 16:10:25 GMT Resent-Message-Id: <200408031610.i73GAPQs074895@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, "Franz Klammer" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3104A16A4CE for ; Tue, 3 Aug 2004 16:01:54 +0000 (GMT) Received: from sv02.webonaut.com (kirk.webonaut.com [212.41.243.26]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EA3543D54 for ; Tue, 3 Aug 2004 16:01:53 +0000 (GMT) (envelope-from klammer@webonaut.com) Received: from localhost (localhost [127.0.0.1]) by sv02.webonaut.com (Postfix) with ESMTP id 726A47642C for ; Tue, 3 Aug 2004 18:01:51 +0200 (CEST) Received: from sv02.webonaut.com ([127.0.0.1]) by localhost (sv02.webonaut.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 92573-01 for ; Tue, 3 Aug 2004 18:01:46 +0200 (CEST) Received: from ds9.webonaut.com (sisko.webonaut.com [212.41.243.28]) by sv02.webonaut.com (Postfix) with ESMTP id 0467176428 for ; Tue, 3 Aug 2004 18:01:45 +0200 (CEST) Message-Id: <1091548909.0@ds9.webonaut.com> Date: Tue, 3 Aug 2004 18:01:49 +0200 From: "Franz Klammer" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.3.3 Subject: ports/69956: [maintainer update] www/firefox-remote X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Aug 2004 16:10:25 -0000 >Number: 69956 >Category: ports >Synopsis: [maintainer update] www/firefox-remote >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: Tue Aug 03 16:10:25 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Franz Klammer >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD 5.2-CURRENT #16: Tue Aug 3 11:47:08 CEST 2004 root@ds9.webonaut.com:/usr/obj/usr/src/sys/DS9 >Description: update to 20040803 changes: +OPTION: enable UTF8-hack to avoid problems with UTF8-filenames and ISO locale is set +OPTION: install GNOME menu entry for firefox +OPTION: install GNOME menu entry for thunderbird >How-To-Repeat: >Fix: --- firefox-remote-20040803.diff begins here --- diff -Nur firefox-remote.orig/Makefile firefox-remote/Makefile --- firefox-remote.orig/Makefile Thu Jul 1 19:14:52 2004 +++ firefox-remote/Makefile Tue Aug 3 17:54:46 2004 @@ -6,12 +6,11 @@ # PORTNAME= firefox -PORTVERSION= 20040702 +PORTVERSION= 20040803 CATEGORIES= www MASTER_SITES= http://www.webonaut.com/distfiles/${PORTNAME}${PKGNAMESUFFIX}/ PKGNAMESUFFIX= -remote DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} -EXTRACT_SUFX= .bz2 MAINTAINER= klammer@webonaut.com COMMENT= Wrapper scripts for firefox web browser @@ -19,17 +18,61 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes -NO_WRKSUBDIR= yes -EXTRACT_AFTER_ARGS= > ${PORTNAME} + +UTF8_HACK= no +FIREFOX_REMOTE= ${PORTNAME}${PKGNAMESUFFIX} +THUNDERBIRD_REMOTE= thunderbird${PKGNAMESUFFIX} + +OPTIONS=UTF8_LOCALE "Use UTF8 locale (read Makefile for details)" off \ + MENU_FIREFOX "Add GNOME menu entry for firefox" off \ + MENU_THUNDERBIRD "Add GNOME menu entry for thunderbird" off + +.include + +# firefox/thunderbird can't display unicode filenames with special +# characters like umlaute in german correctly if a ISO-locale is set. +# when enabled the remote scripts try to switch to the UTF8-locale if +# available (e.g. de_DE.UTF8 instead of de_DE.ISO8859-xx) +.if defined(WITH_UTF8_LOCALE) +UTF8_HACK= yes +.endif + +.if defined(WITH_MENU_FIREFOX) +PLIST_SUB+= MENU_FIREFOX="" +.else +PLIST_SUB+= MENU_FIREFOX="@comment " +.endif + +.if defined(WITH_MENU_THUNDERBIRD) +PLIST_SUB+= MENU_THUNDERBIRD="" +.else +PLIST_SUB+= MENU_THUNDERBIRD="@comment " +.endif do-build: @${REINPLACE_CMD} -e 's|@X11BASE@|${PREFIX}|g' \ - ${WRKDIR}/${PORTNAME} + ${WRKSRC}/${FIREFOX_REMOTE} + @${REINPLACE_CMD} -e 's|@UTF8@|${UTF8_HACK}|g' \ + ${WRKSRC}/${FIREFOX_REMOTE} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} - ${LN} -s ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} \ - ${PREFIX}/bin/thunderbird${PKGNAMESUFFIX} + ${INSTALL_SCRIPT} ${WRKSRC}/${FIREFOX_REMOTE} \ + ${PREFIX}/bin/${FIREFOX_REMOTE} + ${RM} -f ${PREFIX}/bin/${THUNDERBIRD_REMOTE} + ${LN} -s ${PREFIX}/bin/${FIREFOX_REMOTE} \ + ${PREFIX}/bin/${THUNDERBIRD_REMOTE} +.if defined (WITH_MENU_FIREFOX) + ${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.desktop \ + ${X11BASE}/share/gnome/applications/ + ${INSTALL_DATA} ${WRKSRC}/mozilla_firefox.png \ + ${X11BASE}/share/gnome/pixmaps/ +.endif +.if defined (WITH_MENU_THUNDERBIRD) + ${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.desktop \ + ${X11BASE}/share/gnome/applications/ + ${INSTALL_DATA} ${WRKSRC}/mozilla_thunderbird.png \ + ${X11BASE}/share/gnome/pixmaps/ +.endif ${CAT} ${PKGMESSAGE} -.include +.include diff -Nur firefox-remote.orig/distinfo firefox-remote/distinfo --- firefox-remote.orig/distinfo Thu Jul 1 19:14:52 2004 +++ firefox-remote/distinfo Tue Aug 3 16:29:56 2004 @@ -1,2 +1,2 @@ -MD5 (firefox-remote-20040702.bz2) = cb6a563b7dc5c5a296ace363183918eb -SIZE (firefox-remote-20040702.bz2) = 877 +MD5 (firefox-remote-20040803.tar.bz2) = 41cb8969eab5233662c24bfa75585062 +SIZE (firefox-remote-20040803.tar.bz2) = 12789 diff -Nur firefox-remote.orig/pkg-plist firefox-remote/pkg-plist --- firefox-remote.orig/pkg-plist Thu Jul 1 18:44:34 2004 +++ firefox-remote/pkg-plist Tue Aug 3 17:37:14 2004 @@ -1,2 +1,6 @@ bin/firefox-remote bin/thunderbird-remote +%%MENU_FIREFOX%%share/gnome/applications/mozilla_firefox.desktop +%%MENU_THUNDERBIRD%%share/gnome/applications/mozilla_thunderbird.desktop +%%MENU_FIREFOX%%share/gnome/pixmaps/mozilla_firefox.png +%%MENU_THUNDERBIRD%%share/gnome/pixmaps/mozilla_thunderbird.png --- firefox-remote-20040803.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: