diff options
| author | jlam <jlam@pkgsrc.org> | 1999-10-06 23:26:56 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 1999-10-06 23:26:56 +0000 |
| commit | b741d039167df3bd1d415f26279d5e1a08224244 (patch) | |
| tree | 1be0b0e07c4c9fafbe34cf4504cbc27b86759dc8 /x11 | |
| parent | ecf1247b9d783030fdfe133c5c2599a7565ce1bc (diff) | |
| download | pkgsrc-b741d039167df3bd1d415f26279d5e1a08224244.tar.gz | |
* change dependency on giflib to wildcard dependency
* enable user-defined application-specific menus
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/windowmaker/Makefile | 19 | ||||
| -rw-r--r-- | x11/windowmaker/files/patch-sum | 4 | ||||
| -rw-r--r-- | x11/windowmaker/patches/patch-ab | 28 |
3 files changed, 29 insertions, 22 deletions
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile index 9b7f9b3c67e..0e0390d75ef 100644 --- a/x11/windowmaker/Makefile +++ b/x11/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 1999/10/05 20:46:53 tron Exp $ +# $NetBSD: Makefile,v 1.36 1999/10/06 23:26:56 jlam Exp $ DISTNAME= WindowMaker-0.61.1 PKGNAME= windowmaker-0.61.1 @@ -13,7 +13,7 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.windowmaker.org/ DEPENDS+= libproplist-0.9.*:../../devel/libproplist -DEPENDS+= giflib-3.0:../../graphics/giflib +DEPENDS+= giflib-*:../../graphics/giflib DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= png-1.0.3:../../graphics/png DEPENDS+= tiff-3.4:../../graphics/tiff @@ -22,10 +22,18 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm USE_LIBTOOL= yes USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/share/locale \ - --with-incs-from="-I${LOCALBASE}/include \ +CONFIGURE_ARGS+= --enable-usermenu \ + --with-nlsdir=${PREFIX}/share/locale \ + --with-incs-from=" \ + -I${LOCALBASE}/include \ -I${LOCALBASE}/include/giflib" -LDFLAGS+= -L${LOCALBASE}/lib # for libintl.a + +# The following ensures that `get-wraster-flags --ldflags' returns the +# correct linker flags. +# +CONFIGURE_ARGS+= --with-libs-from=" \ + -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib \ + -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options # to support. Currently supported options: @@ -55,6 +63,7 @@ CONFIGURE_ARGS+= --enable-${OPTION} BUILD_DEPENDS+= gettext-0.10.35:../../devel/gettext CONFIGURE_ARGS+= --enable-modelock CONFIGURE_ENV+= LINGUAS="${LINGUAS}" +LDFLAGS+= -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib # -lintl .endif # LINGUAS post-extract: diff --git a/x11/windowmaker/files/patch-sum b/x11/windowmaker/files/patch-sum index 8510ab0b6cd..0dad29f81be 100644 --- a/x11/windowmaker/files/patch-sum +++ b/x11/windowmaker/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.3 1999/09/21 18:05:39 tron Exp $ +$NetBSD: patch-sum,v 1.4 1999/10/06 23:26:56 jlam Exp $ MD5 (patch-aa) = 3f5b71a606eac91124110089f417e6b4 -MD5 (patch-ab) = cf96812c054add143ea0df06ebdf7ef4 +MD5 (patch-ab) = b5519b03b96751986e50217621928ccd diff --git a/x11/windowmaker/patches/patch-ab b/x11/windowmaker/patches/patch-ab index 32f8af85dbd..9f52fe5450d 100644 --- a/x11/windowmaker/patches/patch-ab +++ b/x11/windowmaker/patches/patch-ab @@ -1,22 +1,20 @@ -$NetBSD: patch-ab,v 1.10 1999/09/21 18:05:39 tron Exp $ +$NetBSD: patch-ab,v 1.11 1999/10/06 23:26:56 jlam Exp $ ---- configure.orig Thu Sep 16 05:21:30 1999 -+++ configure Tue Sep 21 19:40:37 1999 -@@ -1303,6 +1303,8 @@ - echo "$ac_t""no" 1>&6 +--- configure.orig Sat Oct 2 18:17:29 1999 ++++ configure Wed Oct 6 02:43:35 1999 +@@ -1350,6 +1350,7 @@ fi -+# Use NetBSD's pkglibtool. -+if false; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -@@ -1364,7 +1366,7 @@ - esac - W_SYSTEM=`uname -s` -- ++if false; then + # Check for any special flags to pass to ltconfig. + libtool_flags="--cache-file=$cache_file" + test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" +@@ -1507,6 +1508,7 @@ + # Redirect the config.log output again, so that the ltconfig log is not + # clobbered by the next message. + exec 5>>./config.log +fi - + # by Marcelo Magallon <mmagallo@efis.ucr.ac.cr> |