From 9ab9d458d59b97979ccd637feb35a9d80322d09e Mon Sep 17 00:00:00 2001 From: brad Date: Tue, 30 Mar 1999 02:00:31 +0000 Subject: [PATCH] fixup dependencies --- x11/gtk+/Makefile | 13 ++++++------- x11/gtkglarea/Makefile | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/x11/gtk+/Makefile b/x11/gtk+/Makefile index d51545a712f..2806aa7539d 100644 --- a/x11/gtk+/Makefile +++ b/x11/gtk+/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 1999/03/26 07:17:03 brad Exp $ +# $OpenBSD: Makefile,v 1.17 1999/03/30 02:00:31 brad Exp $ DISTNAME= gtk+-1.2.1 CATEGORIES= x11 @@ -11,19 +11,18 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ http://www.ameth.org/gimp/gtk/v1.2/ -BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext -RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib.1.2:${PORTSDIR}/devel/glib +LIB_DEPENDS= glib.1.2:${PORTSDIR}/devel/glib \ + intl:${PORTSDIR}/devel/gettext USE_X11= yes USE_PERL5= yes SYSCONFDIR= ${PREFIX}/lib SEPARATE_BUILD= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+=--enable-static --sysconfdir=${SYSCONFDIR} +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +CONFIGURE_ARGS+= --enable-static --sysconfdir=${SYSCONFDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" # People that installed an older version of gtk+ wound up with # libglib.a and other things in /usr/X11R6/lib... these files diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile index 0a0fd489be6..325c459c630 100644 --- a/x11/gtkglarea/Makefile +++ b/x11/gtkglarea/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 1999/03/22 16:18:16 brad Exp $ +# $OpenBSD: Makefile,v 1.2 1999/03/30 02:02:52 brad Exp $ DISTNAME= gtkglarea-1.2.1 CATEGORIES= x11 graphics @@ -12,7 +12,7 @@ MAINTAINER= brad@openbsd.org LIB_DEPENDS= MesaGL:${PORTSDIR}/graphics/MesaGL \ MesaGLU:${PORTSDIR}/graphics/MesaGL \ - gtk\\.1\\.2:${PORTSDIR}/x11/gtk+ + gtk.1.2:${PORTSDIR}/x11/gtk+ USE_X11= yes SEPARATE_BUILD= yes