aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--www/galeon2/Makefile1
-rw-r--r--www/mozilla-devel-gtk1/Makefile2
-rw-r--r--www/mozilla-devel-gtk2/Makefile2
-rw-r--r--www/mozilla-devel/Makefile10
-rw-r--r--www/seamonkey/Makefile10
-rw-r--r--www/seamonkey2/Makefile10
6 files changed, 18 insertions, 17 deletions
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index 3f1a6dac1e87..6cd3a88857d8 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -76,6 +76,7 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+ s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
's|-lpthread|${PTHREAD_LIBS}|g'
diff --git a/www/mozilla-devel-gtk1/Makefile b/www/mozilla-devel-gtk1/Makefile
index adf5a2a10424..f7c73da629ac 100644
--- a/www/mozilla-devel-gtk1/Makefile
+++ b/www/mozilla-devel-gtk1/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mozilla
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 0
CATEGORIES= www
diff --git a/www/mozilla-devel-gtk2/Makefile b/www/mozilla-devel-gtk2/Makefile
index adf5a2a10424..f7c73da629ac 100644
--- a/www/mozilla-devel-gtk2/Makefile
+++ b/www/mozilla-devel-gtk2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= mozilla
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 0
CATEGORIES= www
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index daf0c9711a23..19cafdbf99ee 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -135,8 +135,8 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
-PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \
- mozilla-nspr.pc mozilla-nss.pc
+PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
+ mozilla-nspr mozilla-nss
EXTRA_PATCHES= ${FILESDIR}/xim_dekita2.patch
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
@@ -226,7 +226,7 @@ pre-install:
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \
+ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}-devel.pc >> ${PLIST} ; \
done
.endif
@@ -248,8 +248,8 @@ do-install:
fi
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \
- ${PREFIX}/libdata/pkgconfig ; \
+ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
+ ${PREFIX}/libdata/pkgconfig/$${pcfile}-devel.pc ; \
done
.endif
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index daf0c9711a23..19cafdbf99ee 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -135,8 +135,8 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
-PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \
- mozilla-nspr.pc mozilla-nss.pc
+PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
+ mozilla-nspr mozilla-nss
EXTRA_PATCHES= ${FILESDIR}/xim_dekita2.patch
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
@@ -226,7 +226,7 @@ pre-install:
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \
+ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}-devel.pc >> ${PLIST} ; \
done
.endif
@@ -248,8 +248,8 @@ do-install:
fi
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \
- ${PREFIX}/libdata/pkgconfig ; \
+ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
+ ${PREFIX}/libdata/pkgconfig/$${pcfile}-devel.pc ; \
done
.endif
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index daf0c9711a23..19cafdbf99ee 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -135,8 +135,8 @@ CONFIGURE_ARGS+= --disable-composer
.if defined(WITH_GTK2)
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
-PKGCONFIG_FILES= mozilla-gtkmozembed.pc mozilla-js.pc mozilla-xpcom.pc \
- mozilla-nspr.pc mozilla-nss.pc
+PKGCONFIG_FILES= mozilla-gtkmozembed mozilla-js mozilla-xpcom \
+ mozilla-nspr mozilla-nss
EXTRA_PATCHES= ${FILESDIR}/xim_dekita2.patch
.else
CONFIGURE_ARGS+= --enable-default-toolkit=gtk
@@ -226,7 +226,7 @@ pre-install:
${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST}
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${ECHO_CMD} libdata/pkgconfig/$$pcfile >> ${PLIST} ; \
+ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}-devel.pc >> ${PLIST} ; \
done
.endif
@@ -248,8 +248,8 @@ do-install:
fi
.if defined(WITH_GTK2)
for pcfile in ${PKGCONFIG_FILES}; do \
- ${INSTALL_DATA} ${WRKSRC}/build/unix/$$pcfile \
- ${PREFIX}/libdata/pkgconfig ; \
+ ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \
+ ${PREFIX}/libdata/pkgconfig/$${pcfile}-devel.pc ; \
done
.endif