cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust depends due to www/mozilla conversion to devel/nspr

Browse Source
This commit is contained in:
kurt 2006-11-17 19:41:58 +00:00
parent 962627241c
commit 8a66388653
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
devel/eclipse/sdk/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2006/11/02 10:59:17 espie Exp $
# $OpenBSD: Makefile,v 1.23 2006/11/17 19:44:11 kurt Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -8,9 +8,9 @@ COMMENT-mozilla= "mozilla integration library for eclipse HTML Browser Widget"
ECLIPSE_VER= 3.2
DISTNAME= eclipse-sourceBuild-srcIncluded-${ECLIPSE_VER}
PKGNAME= eclipse-sdk-${ECLIPSE_VER}p2
PKGNAME-gnome= eclipse-sdk-gnome-${ECLIPSE_VER}p2
PKGNAME-mozilla= eclipse-sdk-mozilla-${ECLIPSE_VER}p2
PKGNAME= eclipse-sdk-${ECLIPSE_VER}p3
PKGNAME-gnome= eclipse-sdk-gnome-${ECLIPSE_VER}p3
PKGNAME-mozilla= eclipse-sdk-mozilla-${ECLIPSE_VER}p3
SHARED_LIBS= swt-atk-gtk-3232 3.0 \
swt-cde-gtk-3232 3.0 \
swt-awt-gtk-3232 3.0 \
@ -68,7 +68,12 @@ SUBPACKAGE?=
GNOME_LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui
MOZILLA_LIB_DEPENDS= mozilla/xpcom,mozilla/gtkembedmoz,mozilla/nspr4,mozilla/plc4,mozilla/plds4:mozilla->=1.7.11:www/mozilla
MOZILLA_LIB_DEPENDS= mozilla/gtkembedmoz,mozilla/xpcom:mozilla->=1.7.13p2:www/mozilla
WANTLIB= GL GLU X11 Xtst c m fontconfig \
freetype atk-1.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 \
pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-gnome"
@ -78,22 +83,14 @@ WANTLIB= gnome-2 gnomevfs-2
. elif ${SUBPACKAGE} == "-mozilla"
RUN_DEPENDS= :${PKGNAME}:devel/eclipse/sdk
LIB_DEPENDS= ${MOZILLA_LIB_DEPENDS}
WANTLIB= c nspr4 plc4 plds4
. else
RUN_DEPENDS= ::java/javaPathHelper
MODULES+= devel/gettext
WANTLIB= GL GLU X11 Xtst c m fontconfig \
freetype atk-1.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 pango-1.0 \
pangoft2-1.0 pangocairo-1.0 cairo
. endif
.else
MODULES+= devel/gettext
. if ${MULTI_PACKAGES:M-gnome}
LIB_DEPENDS+= ${GNOME_LIB_DEPENDS}
. endif
. if ${MULTI_PACKAGES:M-mozilla}
LIB_DEPENDS+= ${MOZILLA_LIB_DEPENDS}
. endif
LIB_DEPENDS+= ${GNOME_LIB_DEPENDS} ${MOZILLA_LIB_DEPENDS}
.endif
MOZILLA_HOME= ${LOCALBASE}/mozilla

13
www/galeon/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.30 2006/10/01 22:23:47 brad Exp $
# $OpenBSD: Makefile,v 1.31 2006/11/17 19:41:58 kurt Exp $
COMMENT= "GNOME web browser based on gecko"
V= 1.3.21
DISTNAME= galeon-${V}
PKGNAME= ${DISTNAME}p5
PKGNAME= ${DISTNAME}p6
CATEGORIES= www
HOMEPAGE= http://galeon.sourceforge.net/
@ -21,20 +21,21 @@ WANTLIB= ORBit-2 ORBitCosNaming-2 art_lgpl_2 atk-1.0 audiofile \
gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg \
pango-1.0 pangoft2-1.0 pangocairo-1.0 popt cairo glitz \
startup-notification-1 xml2 ICE SM X11 Xext Xrender png \
c crypto fontconfig freetype m pthread ssl stdc++ z
c crypto fontconfig freetype m pthread ssl stdc++ z \
nspr4 plc4 plds4
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/}
MODULES= devel/gettext
BUILD_DEPENDS= :mozilla->=1.7.11:www/mozilla \
:mozilla-devel->=1.7.11:www/mozilla,-devel \
BUILD_DEPENDS= :mozilla->=1.7.13p2:www/mozilla \
:mozilla-devel->=1.7.13p2:www/mozilla,-devel \
:pkgconfig-*:devel/pkgconfig \
:p5-XML-Parser-*:textproc/p5-XML-Parser \
:scrollkeeper->=0.3.12:textproc/scrollkeeper
LIB_DEPENDS= gnome-desktop-2::x11/gnome/desktop \
gnomeui-2::x11/gnome/libgnomeui \
mozilla/gtkembedmoz,mozilla/xpcom,mozilla/plds4,mozilla/plc4,mozilla/nspr4:mozilla->=1.7.11:www/mozilla
mozilla/gtkembedmoz,mozilla/xpcom:mozilla->=1.7.13p2:www/mozilla
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/mozilla -L${LOCALBASE}/lib" \