diff options
-rw-r--r-- | www/epiphany/Makefile | 3 | ||||
-rw-r--r-- | www/galeon/Makefile | 3 | ||||
-rw-r--r-- | www/galeon2/Makefile | 3 | ||||
-rw-r--r-- | www/mozilla-bonobo/Makefile | 3 | ||||
-rw-r--r-- | www/mozilla-devel/Makefile | 10 | ||||
-rw-r--r-- | www/mozilla-headers-devel/Makefile | 63 | ||||
-rw-r--r-- | www/mozilla-headers-devel/pkg-descr | 3 | ||||
-rw-r--r-- | www/mozilla-headers/Makefile | 62 | ||||
-rw-r--r-- | www/mozilla-headers/pkg-descr | 3 | ||||
-rw-r--r-- | www/mozilla/Makefile | 12 | ||||
-rw-r--r-- | www/seamonkey/Makefile | 10 | ||||
-rw-r--r-- | www/seamonkey2/Makefile | 10 |
12 files changed, 45 insertions, 140 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 49d99303fc36..6006fbf13124 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -16,8 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An extremely lightweight and simple web browser for GNOME 2 -BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} +BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.6" diff --git a/www/galeon/Makefile b/www/galeon/Makefile index da71cddfc1e5..81ff7d1133df 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME Web browser based on gecko (the Mozilla rendering engine) -BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \ - ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} +BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 65bca6982bb0..e3c9058fb402 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -17,8 +17,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} MAINTAINER= gnome@freebsd.org COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine) -BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} +BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk" diff --git a/www/mozilla-bonobo/Makefile b/www/mozilla-bonobo/Makefile index 3f453cad0de0..2c4f78ca4ba0 100644 --- a/www/mozilla-bonobo/Makefile +++ b/www/mozilla-bonobo/Makefile @@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR= moz-bonobo MAINTAINER= jylefort@brutele.be COMMENT= A Netscape/Mozilla plugin using Bonobo controls to display files -BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} +BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} MOZILLA= mozilla-gtk2 diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index 6411d9ce18ff..6051de3230f6 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -260,6 +260,11 @@ pre-install: for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done + cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ + ${SED} -e 's:^:include/mozilla/:' >> ${PLIST} \ + && ${FIND} -d * -type d | \ + ${SED} -e 's:^:@dirrm include/mozilla/:' >> ${PLIST} + ${ECHO_CMD} @dirrm include/mozilla >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} @@ -286,6 +291,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done + -${RM} -fr ${PREFIX}/include/mozilla + ${MKDIR} ${PREFIX}/include/mozilla + ${CHMOD} 755 ${PREFIX}/include/mozilla + cd ${WRKSRC}/dist/include && ${FIND} . | \ + cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components diff --git a/www/mozilla-headers-devel/Makefile b/www/mozilla-headers-devel/Makefile deleted file mode 100644 index f7dc6e5f75e5..000000000000 --- a/www/mozilla-headers-devel/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# New ports collection makefile for: mozilla-headers -# Date created: 1 February 2001 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= mozilla-headers -PORTVERSION= ${MAKE} -V PORTVERSION -f ${MAINDIR}/${MKFILE} -PORTREVISION= ${MAKE} -V PORTREVISION -f ${MAINDIR}/${MKFILE} -PORTEPOCH= ${MAKE} -V PORTEPOCH -f ${MAINDIR}/${MKFILE} -CATEGORIES= www -DISTFILES= - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Header files for mozilla communicator web-surfboard - -.if !defined(WITH_MOZILLA) -MOZILLA= mozilla-devel -.else -.if ${WITH_MOZILLA}=="mozilla-devel-gtk2" -MOZILLA= mozilla-devel-gtk2 -.else -MOZILLA= mozilla-devel -.endif -.endif - -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/www/${MOZILLA}:configure - -USE_X_PREFIX= yes - -LATEST_LINK= mozilla-headers-devel -PLIST= ${WRKSRC}/pkg-plist -MAINDIR= ${.CURDIR}/../${MOZILLA} -MKFILE!= /usr/bin/basename ${MAKEFILE} -PORTVERSION!= ${PORTVERSION} -PORTREVISION!= ${PORTREVISION} -PORTEPOCH!= ${PORTEPOCH} -WRKSRC= ${WRKDIRPREFIX}${MAINDIR}/work/mozilla -USE_GMAKE= yes -ALL_TARGET= export - -.if defined(INCOWN) || defined(INCGRP) -CPIOOWN= -R ${INCOWN}:${INCGRP} -.endif - -pre-install: - ${RM} -f ${PLIST} - ${TOUCH} -f ${PLIST} - cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:include/mozilla-devel/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm include/mozilla-devel/:' >> ${PLIST} - ${ECHO_CMD} @dirrm include/mozilla-devel >> ${PLIST} - -do-install: - -${RM} -fr ${PREFIX}/include/mozilla-devel - ${MKDIR} ${PREFIX}/include/mozilla-devel - ${CHMOD} 755 ${PREFIX}/include/mozilla-devel - cd ${WRKSRC}/dist/include && ${FIND} . | \ - cpio -pdm -L ${CPIOOWN} ${PREFIX}/include/mozilla-devel - -.include <bsd.port.mk> diff --git a/www/mozilla-headers-devel/pkg-descr b/www/mozilla-headers-devel/pkg-descr deleted file mode 100644 index e68ad99d5f66..000000000000 --- a/www/mozilla-headers-devel/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Header files for mozilla communicator web-surfboard. - -WWW: http://www.mozilla.org/ diff --git a/www/mozilla-headers/Makefile b/www/mozilla-headers/Makefile deleted file mode 100644 index 11c565af074c..000000000000 --- a/www/mozilla-headers/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# New ports collection makefile for: mozilla-headers -# Date created: 1 February 2001 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= mozilla-headers -PORTVERSION= ${MAKE} -V PORTVERSION -f ${MAINDIR}/${MKFILE} -PORTREVISION= ${MAKE} -V PORTREVISION -f ${MAINDIR}/${MKFILE} -PORTEPOCH= ${MAKE} -V PORTEPOCH -f ${MAINDIR}/${MKFILE} -CATEGORIES= www -DISTFILES= - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Header files for mozilla communicator web-surfboard - -.if !defined(WITH_MOZILLA) -MOZILLA= mozilla -.else -.if ${WITH_MOZILLA}=="mozilla-gtk2" -MOZILLA= mozilla-gtk2 -.else -MOZILLA= mozilla -.endif -.endif - -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/www/${MOZILLA}:configure - -USE_X_PREFIX= yes - -PLIST= ${WRKSRC}/pkg-plist -MAINDIR= ${.CURDIR}/../${MOZILLA} -MKFILE!= /usr/bin/basename ${MAKEFILE} -PORTVERSION!= ${PORTVERSION} -PORTREVISION!= ${PORTREVISION} -PORTEPOCH!= ${PORTEPOCH} -WRKSRC= ${WRKDIRPREFIX}${MAINDIR}/work/mozilla -USE_GMAKE= yes -ALL_TARGET= export - -.if defined(INCOWN) || defined(INCGRP) -CPIOOWN= -R ${INCOWN}:${INCGRP} -.endif - -pre-install: - ${RM} -f ${PLIST} - ${TOUCH} -f ${PLIST} - cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:include/mozilla/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm include/mozilla/:' >> ${PLIST} - ${ECHO_CMD} @dirrm include/mozilla >> ${PLIST} - -do-install: - -${RM} -fr ${PREFIX}/include/mozilla - ${MKDIR} ${PREFIX}/include/mozilla - ${CHMOD} 755 ${PREFIX}/include/mozilla - cd ${WRKSRC}/dist/include && ${FIND} . | \ - cpio -pdm -L ${CPIOOWN} ${PREFIX}/include/mozilla - -.include <bsd.port.mk> diff --git a/www/mozilla-headers/pkg-descr b/www/mozilla-headers/pkg-descr deleted file mode 100644 index e68ad99d5f66..000000000000 --- a/www/mozilla-headers/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Header files for mozilla communicator web-surfboard. - -WWW: http://www.mozilla.org/ diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 7862580a2c89..255b8a97546b 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -7,7 +7,7 @@ PORTNAME?= mozilla PORTVERSION= 1.6 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ @@ -258,6 +258,11 @@ pre-install: for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done + cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ + ${SED} -e 's:^:include/mozilla/:' >> ${PLIST} \ + && ${FIND} -d * -type d | \ + ${SED} -e 's:^:@dirrm include/mozilla/:' >> ${PLIST} + ${ECHO_CMD} @dirrm include/mozilla >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} @@ -284,6 +289,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done + -${RM} -fr ${PREFIX}/include/mozilla + ${MKDIR} ${PREFIX}/include/mozilla + ${CHMOD} 755 ${PREFIX}/include/mozilla + cd ${WRKSRC}/dist/include && ${FIND} . | \ + cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 6411d9ce18ff..6051de3230f6 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -260,6 +260,11 @@ pre-install: for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done + cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ + ${SED} -e 's:^:include/mozilla/:' >> ${PLIST} \ + && ${FIND} -d * -type d | \ + ${SED} -e 's:^:@dirrm include/mozilla/:' >> ${PLIST} + ${ECHO_CMD} @dirrm include/mozilla >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} @@ -286,6 +291,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done + -${RM} -fr ${PREFIX}/include/mozilla + ${MKDIR} ${PREFIX}/include/mozilla + ${CHMOD} 755 ${PREFIX}/include/mozilla + cd ${WRKSRC}/dist/include && ${FIND} . | \ + cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile index 6411d9ce18ff..6051de3230f6 100644 --- a/www/seamonkey2/Makefile +++ b/www/seamonkey2/Makefile @@ -260,6 +260,11 @@ pre-install: for pcfile in ${PKGCONFIG_FILES}; do \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc >> ${PLIST} ; \ done + cd ${WRKSRC}/dist/include && ${FIND} -s * -type f -o -type l | \ + ${SED} -e 's:^:include/mozilla/:' >> ${PLIST} \ + && ${FIND} -d * -type d | \ + ${SED} -e 's:^:@dirrm include/mozilla/:' >> ${PLIST} + ${ECHO_CMD} @dirrm include/mozilla >> ${PLIST} do-install: ${MKDIR} ${PREFIX}/lib/${MOZILLA} @@ -286,6 +291,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}${PKGNAMESUFFIX}.pc ; \ done + -${RM} -fr ${PREFIX}/include/mozilla + ${MKDIR} ${PREFIX}/include/mozilla + ${CHMOD} 755 ${PREFIX}/include/mozilla + cd ${WRKSRC}/dist/include && ${FIND} . | \ + cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/mozilla post-install: @${CHMOD} -R u-w ${PREFIX}/lib/${MOZILLA}/components |