[Midnightbsd-cvs] mports: www/browser: Fix pkg-config files.
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Mon Oct 20 13:38:11 EDT 2008
Log Message:
-----------
Fix pkg-config files.
USE_LDCONFIG so the link can find our libraries.
Fix double fake with the prefs stuff.
Modified Files:
--------------
mports/www/browser:
Makefile (r1.11 -> r1.12)
pkg-plist (r1.6 -> r1.7)
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/browser/pkg-plist,v
retrieving revision 1.6
retrieving revision 1.7
diff -L www/browser/pkg-plist -L www/browser/pkg-plist -u -r1.6 -r1.7
--- www/browser/pkg-plist
+++ www/browser/pkg-plist
@@ -2308,12 +2308,12 @@
lib/browser/libgtkembedmoz.so
lib/browser/TestGtkEmbed
lib/browser/browser-bin
-lib/pkgconfig/firefox-nspr.pc
-lib/pkgconfig/firefox-xpcom.pc
-lib/pkgconfig/firefox-js.pc
-lib/pkgconfig/firefox-gtkmozembed.pc
-lib/pkgconfig/firefox-nss.pc
-lib/pkgconfig/firefox-plugin.pc
+lib/pkgconfig/browser-nspr.pc
+lib/pkgconfig/browser-xpcom.pc
+lib/pkgconfig/browser-js.pc
+lib/pkgconfig/browser-gtkmozembed.pc
+lib/pkgconfig/browser-nss.pc
+lib/pkgconfig/browser-plugin.pc
share/applications/browser.desktop
share/idl/firefox-2.0.0.17/nsIConsoleListener.idl
share/idl/firefox-2.0.0.17/nsIConsoleMessage.idl
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/browser/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -L www/browser/Makefile -L www/browser/Makefile -u -r1.11 -r1.12
--- www/browser/Makefile
+++ www/browser/Makefile
@@ -9,7 +9,7 @@
PORTNAME= browser
DISTVERSION= 2.0.0.17
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED}
@@ -32,6 +32,8 @@
CONFLICTS= firefox-[0-9]*
+USE_LDCONFIG= ${PREFIX}/lib/${MOZILLA}
+
USE_GNOME+= gtk20 libidl desktopfileutils
USE_ICONV= yes
USE_PERL5= yes
@@ -60,7 +62,7 @@
FIREFOX_ICON= ${MOZILLA}.xpm
FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm
-SYSTEM_PREFS= ${FAKE_DESTDIR}${PREFIX}/lib/${MOZILLA}/defaults/pref/firefox.js
+SYSTEM_PREFS= ${PREFIX}/lib/${MOZILLA}/defaults/pref/firefox.js
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
OPTIONS= NEWTAB "Open external links in a new tab" on \
@@ -201,7 +203,7 @@
pre-install:
.if !defined(WITHOUT_NEWTAB)
- ${MKDIR} ${FAKE_DESTDIR}${PREFIX}/lib/${MOZILLA}/defaults/pref
+ ${MKDIR} ${PREFIX}/lib/${MOZILLA}/defaults/pref
${ECHO_CMD} >> ${SYSTEM_PREFS}
${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS}
${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
@@ -228,5 +230,11 @@
${MV} ${PREFIX}/bin/firefox ${PREFIX}/bin/browser
${MV} ${PREFIX}/lib/browser/firefox-bin ${PREFIX}/lib/browser/browser-bin
${MV} ${PREFIX}/bin/firefox-config ${PREFIX}/bin/browser-config
-
+ ${MV} ${PREFIX}/lib/pkgconfig/firefox-nspr.pc ${PREFIX}/lib/pkgconfig/browser-nspr.pc
+ ${MV} ${PREFIX}/lib/pkgconfig/firefox-xpcom.pc ${PREFIX}/lib/pkgconfig/browser-xpcom.pc
+ ${MV} ${PREFIX}/lib/pkgconfig/firefox-js.pc ${PREFIX}/lib/pkgconfig/browser-js.pc
+ ${MV} ${PREFIX}/lib/pkgconfig/firefox-gtkmozembed.pc ${PREFIX}/lib/pkgconfig/browser-gtkmozembed.pc
+ ${MV} ${PREFIX}/lib/pkgconfig/firefox-nss.pc ${PREFIX}/lib/pkgconfig/browser-nss.pc
+ ${MV} ${PREFIX}/lib/pkgconfig/firefox-plugin.pc ${PREFIX}/lib/pkgconfig/browser-plugin.pc
+
.include <bsd.port.post.mk>
More information about the Midnightbsd-cvs
mailing list