From d6d967df425ba8c16392123819eebf4d4b5df2ae Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 5 Oct 2006 21:37:18 +0000 Subject: Move the '@dirrmtry share/pixamps' from mozilla/Makefile.common to the rest ports' Makefile to correct the order of remove from files to directories. Bump these ports, but not firefox since it already has a fix in its own Makefile. I only replace it from @unexec[...] to @dirrmtry[...]. Before (incorrect): ============================== # grep share/pixmaps /var/db/pkg/firefox-1.5.0.7_1,1/+CONTENTS @unexec rmdir %D/share/pixmaps 2>/dev/null || true share/pixmaps/firefox.xpm ============================== After (correct): ============================== # grep share/pixmaps /var/db/pkg/firefox-1.5.0.7_1,1/+CONTENTS share/pixmaps/firefox.xpm @unexec rmdir %D/share/pixmaps 2>/dev/null || true ============================== Reported by: pointyhat git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7597 df743ca5-7f9a-e211-a948-0013205c9059 --- deskutils/sunbird/Makefile | 5 +++-- www/firefox-devel/Makefile | 6 ++++-- www/firefox/Makefile | 4 ++-- www/firefox3-devel/Makefile | 6 ++++-- www/flock/Makefile | 5 +++-- www/mozilla/Makefile.common | 3 +-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile index 372f238e9..67d891461 100644 --- a/deskutils/sunbird/Makefile +++ b/deskutils/sunbird/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/deskutils/sunbird/Makefile,v 1.16 2006/09/30 05:09:42 ahze Exp $ +# $MCom: ports/deskutils/sunbird/Makefile,v 1.17 2006/09/30 06:26:32 ahze Exp $ # PORTNAME= sunbird PORTVERSION= 0.3a1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= sunbird/new-directory/releases/${DISTVERSION}/source @@ -64,6 +64,7 @@ post-patch: pre-install: ${ECHO_CMD} 'share/applications/sunbird.desktop' >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${SUNBIRD_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} do-install: diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile index 5e746ebf7..dcd897d78 100644 --- a/www/firefox-devel/Makefile +++ b/www/firefox-devel/Makefile @@ -3,11 +3,12 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox-devel/Makefile,v 1.26 2006/03/29 18:31:20 ahze Exp $ +# $MCom: ports/www/firefox-devel/Makefile,v 1.28 2006/07/18 14:48:15 ahze Exp $ +# PORTNAME= firefox DISTVERSION= 2.0a3 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -82,6 +83,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 12cf31070..c85891cf2 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,7 +3,7 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.34 2006/08/02 14:12:09 ahze Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.35 2006/09/14 12:37:00 ahze Exp $ PORTNAME= firefox DISTVERSION= 1.5.0.7 @@ -75,7 +75,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/pixmaps 2>/dev/null || ${TRUE}" >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile index 5e746ebf7..dcd897d78 100644 --- a/www/firefox3-devel/Makefile +++ b/www/firefox3-devel/Makefile @@ -3,11 +3,12 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox-devel/Makefile,v 1.26 2006/03/29 18:31:20 ahze Exp $ +# $MCom: ports/www/firefox-devel/Makefile,v 1.28 2006/07/18 14:48:15 ahze Exp $ +# PORTNAME= firefox DISTVERSION= 2.0a3 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -82,6 +83,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} .if !defined(WITHOUT_NEWTAB) ${ECHO_CMD} >> ${SYSTEM_PREFS} ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} diff --git a/www/flock/Makefile b/www/flock/Makefile index 2d528a1b0..6abe9d42f 100644 --- a/www/flock/Makefile +++ b/www/flock/Makefile @@ -3,12 +3,12 @@ # Whom: Alan Eldridge # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.29 2006/02/01 02:11:23 ahze Exp $ +# $MCom: ports/www/flock/Makefile,v 1.1 2006/07/18 14:53:33 ahze Exp $ # PORTNAME= flock DISTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} # http://ftp.osuosl.org/pub/${PORTNAME}/source/${PORTVERSION}/:flock @@ -85,6 +85,7 @@ pre-install: ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} 'share/pixmaps/${FLOCK_ICON}' >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${PLIST} do-install: if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index d369eca65..508b1ac33 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -4,7 +4,7 @@ # Whom: Michael Johnson # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.24 2006/09/03 01:52:30 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile.common,v 1.25 2006/09/30 06:27:37 ahze Exp $ # This file contains some reusable components for mozilla ports. It's of # use primarily to apps from the mozilla project itself (such as Firefox, @@ -361,7 +361,6 @@ gecko-create-plist: -e 's|${MOZILLA}-nspr = ${PORTVERSION}|nspr|' \ ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc .endfor - ${ECHO_CMD} "@dirrmtry share/pixmaps" >> ${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} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}" >> ${PLIST} -- cgit