summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-07-28 01:56:34 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-07-28 01:56:34 +0800
commit21cad4bac6741a64d25f69c6a42a61d553515dfc (patch)
tree97748cb9f85615c2d1b31b986dfc08f2253de8a0
parent7e7b9ab4714b7e5ffee1990746eba737f69e446d (diff)
downloadmarcuscom-ports-21cad4bac6741a64d25f69c6a42a61d553515dfc.tar.gz
marcuscom-ports-21cad4bac6741a64d25f69c6a42a61d553515dfc.tar.zst
marcuscom-ports-21cad4bac6741a64d25f69c6a42a61d553515dfc.zip
Use the correct MTREE_FILE, and remove the share/pixmaps directory.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6872 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--www/firefox/Makefile3
-rw-r--r--www/mozilla/Makefile.common4
2 files changed, 4 insertions, 3 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 07e3e1c70..3ddb1e2d9 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,7 +3,7 @@
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/firefox/Makefile,v 1.31 2006/07/18 14:45:45 ahze Exp $
+# $MCom: ports/www/firefox/Makefile,v 1.32 2006/07/27 00:07:49 ahze Exp $
PORTNAME= firefox
DISTVERSION= 1.5.0.5
@@ -75,6 +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}
.if !defined(WITHOUT_NEWTAB)
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index ae9bebd99..f505f641e 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -4,7 +4,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/Makefile.common,v 1.20 2006/03/09 00:45:43 ahze Exp $
+# $MCom: ports/www/mozilla/Makefile.common,v 1.22 2006/07/18 15:03:40 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,
@@ -72,7 +72,7 @@ MOZ_RPATH?= ${MOZILLA}
USE_GNOME+= gtk20 libidl desktopfileutils
USE_ICONV= yes
USE_PERL5_BUILD=yes
-USE_X_PREFIX= yes
+USE_XLIB= yes
MOZILLA_SUFX?= none
WRKSRC?= ${WRKDIR}/mozilla