Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 May 2013 17:43:21 +0000 (UTC)
From:      Florian Smeets <flo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r318394 - head/www/firefox
Message-ID:  <201305171743.r4HHhLhc049222@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: flo
Date: Fri May 17 17:43:21 2013
New Revision: 318394
URL: http://svnweb.freebsd.org/changeset/ports/318394

Log:
  Fix icon installation
  
  PR:		ports/178711
  PR:		ports/178721
  Submitted by:	Denny Lin <dennylin93@hs.ntnu.edu.tw>
  
  > Description of fields to fill in above:                     76 columns --|
  > PR:            If a GNATS PR is affected by the change.
  > Submitted by:  If someone else sent in the change.
  > Reviewed by:   If someone else reviewed your modification.
  > Approved by:   If you needed approval for this commit.
  > Obtained from: If the change is from a third party.
  > MFC after:     N [day[s]|week[s]|month[s]].  Request a reminder email.
  > Security:      Vulnerability reference (one per line) or description.
  > Sponsored by:  If the change was sponsored by an organization.
  > Empty fields above will be automatically removed.
  
  M    firefox/Makefile

Modified:
  head/www/firefox/Makefile

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Fri May 17 17:09:05 2013	(r318393)
+++ head/www/firefox/Makefile	Fri May 17 17:43:21 2013	(r318394)
@@ -3,6 +3,7 @@
 
 PORTNAME=	firefox
 DISTVERSION=	21.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
@@ -40,7 +41,7 @@ USE_DOS2UNIX=	media/webrtc/trunk/webrtc/
 NO_MOZPKGINSTALL=yes
 
 FIREFOX_ICON=		${MOZILLA}.png
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 MOZ_OPTIONS=	--program-transform-name='s/firefox/${MOZILLA}/' \
 		--enable-application=browser \
 		--enable-official-branding
@@ -100,14 +101,10 @@ port-pre-install:
 	${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
 	${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
-	${ECHO_CMD} "@dirrm lib/firefox/chrome/icons/default" >> ${PLISTD}
-	${ECHO_CMD} "@dirrm lib/firefox/chrome/icons" >> ${PLISTD}
-	${ECHO_CMD} "@dirrm lib/firefox/chrome" >> ${PLISTD}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
-	${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 	@${CAT} ${PKGMESSAGE}
 



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