diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-02-01 11:48:35 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-02-01 11:48:35 +0000 |
| commit | 6add111dabfe4b36dd600bd6e51a9790b1ef1167 (patch) | |
| tree | 62bdbb0caaa9f96a5be2e0772246e8bb071e0db5 /www | |
| parent | Don't install include files. Now it's a job of the www/mozilla-headers port. (diff) | |
Reflect divorce of mozilla-embedded and mozilla-headers.
Notes
Notes:
svn path=/head/; revision=37875
Diffstat (limited to 'www')
| -rw-r--r-- | www/galeon/Makefile | 19 | ||||
| -rw-r--r-- | www/galeon2/Makefile | 19 | ||||
| -rw-r--r-- | www/skipstone/Makefile | 3 | ||||
| -rw-r--r-- | www/skipstone/files/patch-aa | 2 |
4 files changed, 19 insertions, 24 deletions
diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 0c1905804003..1bf7e1f689ec 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -18,33 +18,30 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= sobomax@FreeBSD.org +BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ + ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} -WITH_FULL_MOZILLA= "I donno why, but it doesn't work with M18-embedded" +WITH_FULL_MOZILLA= "I donno why, but it doesn't work with 0.7-embedded" .if !defined(WITH_FULL_MOZILLA) MOZILLA= mozilla-embedded -BUILD_DEPENDS+= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} -MOZHEADERS= ${X11BASE}/include/${MOZILLA} -MOZLIBS= ${X11BASE}/lib/${MOZILLA} .else MOZILLA= mozilla -BUILD_DEPENDS+= /nonexistent:${PORTSDIR}/www/${MOZILLA}:build -MOZHEADERS= ${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/include -MOZLIBS= ${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib .endif USE_X_PREFIX= yes USE_NEWGCC= yes USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-mozilla-includes="${MOZHEADERS}" \ - --with-mozilla-libs="${MOZLIBS}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ + --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ + -D_REENTRANT -D_THREAD_SAFE -fno-rtti" \ LIBS="-L${LOCALBASE}/lib -L${WRKSRC} -pthread -lgcc_r" -CFLAGS+= -D_REENTRANT -D_THREAD_SAFE -fno-rtti +#CFLAGS+= -D_REENTRANT -D_THREAD_SAFE -fno-rtti post-extract: diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 0c1905804003..1bf7e1f689ec 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -18,33 +18,30 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= sobomax@FreeBSD.org +BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ + ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} LIB_DEPENDS= glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} -WITH_FULL_MOZILLA= "I donno why, but it doesn't work with M18-embedded" +WITH_FULL_MOZILLA= "I donno why, but it doesn't work with 0.7-embedded" .if !defined(WITH_FULL_MOZILLA) MOZILLA= mozilla-embedded -BUILD_DEPENDS+= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} -MOZHEADERS= ${X11BASE}/include/${MOZILLA} -MOZLIBS= ${X11BASE}/lib/${MOZILLA} .else MOZILLA= mozilla -BUILD_DEPENDS+= /nonexistent:${PORTSDIR}/www/${MOZILLA}:build -MOZHEADERS= ${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/include -MOZLIBS= ${WRKDIRPREFIX}${.CURDIR}/../../www/mozilla/work/mozilla/dist/lib .endif USE_X_PREFIX= yes USE_NEWGCC= yes USE_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-mozilla-includes="${MOZHEADERS}" \ - --with-mozilla-libs="${MOZLIBS}" -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla" \ + --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ + -D_REENTRANT -D_THREAD_SAFE -fno-rtti" \ LIBS="-L${LOCALBASE}/lib -L${WRKSRC} -pthread -lgcc_r" -CFLAGS+= -D_REENTRANT -D_THREAD_SAFE -fno-rtti +#CFLAGS+= -D_REENTRANT -D_THREAD_SAFE -fno-rtti post-extract: diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile index f10946cb91bb..e7ed0f8ac310 100644 --- a/www/skipstone/Makefile +++ b/www/skipstone/Makefile @@ -12,7 +12,8 @@ MASTER_SITES= http://www.muhri.net/skipstone/ MAINTAINER= eric@osd.bsdi.com -BUILD_DEPENDS= ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded +BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ + ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded RUN_DEPENDS= ${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded USE_GTK= yes diff --git a/www/skipstone/files/patch-aa b/www/skipstone/files/patch-aa index 9e16b8701e86..54eb19aca7c1 100644 --- a/www/skipstone/files/patch-aa +++ b/www/skipstone/files/patch-aa @@ -8,7 +8,7 @@ -MOZILLA_INCLUDES = -I/usr/include/mozilla -I/usr/local/include/mozilla -MOZILLA_LIBS = -L/usr/lib/mozilla -L/usr/local/lib/mozilla -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom -+MOZILLA_INCLUDES = -I${X11BASE}/include/mozilla-embedded ++MOZILLA_INCLUDES = -I${X11BASE}/include/mozilla +MOZILLA_LIBS = -L${X11BASE}/lib/mozilla-embedded -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom #my stuff |