diff options
| -rw-r--r-- | math/gnumeric/Makefile | 52 | ||||
| -rw-r--r-- | math/grpn/Makefile | 11 | ||||
| -rw-r--r-- | math/grpn/distinfo | 4 | ||||
| -rw-r--r-- | math/grpn/patches/patch-aa | 13 | ||||
| -rw-r--r-- | math/pari/Makefile | 22 | ||||
| -rw-r--r-- | math/pari/distinfo | 4 | ||||
| -rw-r--r-- | math/pari/patches/patch-aa | 10 | ||||
| -rw-r--r-- | sysutils/xosview/Makefile | 30 |
8 files changed, 55 insertions, 91 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 171f3912efe..849b5fbf0d8 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2002/09/10 16:06:45 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2002/09/23 21:55:11 jlam Exp $ # DISTNAME= gnumeric-1.0.9 @@ -16,48 +16,30 @@ ONLY_FOR_PLATFORM= NetBSD-1.5[R-Z]-* NetBSD-1.5Z[A-Z]-* NetBSD-1.[6-9]*-* SunOS- # for Python support a shared libpython is required but not provided yet #BUILD_DEPENDS+= python>=2.0:../../lang/python -BUILDLINK_DEPENDS.gtk= gtk+>=1.2.7 -BUILDLINK_DEPENDS.libole2= libole2>=0.2.4 -BUILDLINK_DEPENDS.gnome-print= gnome-print>=0.29 -BUILDLINK_DEPENDS.bonobo= bonobo>=1.0.9 -BUILDLINK_DEPENDS.oaf= oaf>=0.6.2 -BUILDLINK_DEPENDS.libglade= libglade>=0.16 -BUILDLINK_DEPENDS.gal= gal>=0.16 - -GNU_CONFIGURE= YES -USE_LIBTOOL= YES +USE_BUILDLINK2= YES USE_X11BASE= YES USE_GMAKE= YES USE_PERL5= YES -USE_BUILDLINK_ONLY= YES -LDFLAGS+= -Wl,-R${LOCALBASE}/lib -LDFLAGS+= -lunicode +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --without-guile # needs CVS-only guile-1.5 CONFIGURE_ARGS+= --without-python CONFIGURE_ARGS+= --without-psiconv CONFIGURE_ARGS+= --localstatedir=${X11PREFIX}/var/lib +LIBS+= -lunicode + +USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -pre-configure: - for i in ${WRKSRC}/plugins/*/Makefile.in ; do \ - ${SED} <$$i >$$i.fixed \ - -e 's/^\(COMPILE.*\)\\$$/\1 $${EXTRA_GNOME_CFLAGS} \\/' \ - -e 's/^\(COMPILE.*[^\\]\)$$/\1 $${EXTRA_GNOME_CFLAGS}/' && \ - ${MV} $$i.fixed $$i ; \ - done - -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../devel/oaf/buildlink.mk" -.include "../../devel/libglade/buildlink.mk" -.include "../../devel/gal/buildlink.mk" -.include "../../devel/bonobo/buildlink.mk" -.include "../../devel/libole2/buildlink.mk" -.include "../../devel/oaf/buildlink.mk" -.include "../../devel/gal/buildlink.mk" -.include "../../print/gnome-print/buildlink.mk" -.include "../../textproc/libunicode/buildlink.mk" -.include "../../textproc/libxml/buildlink.mk" -.include "../../textproc/scrollkeeper/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/bonobo/buildlink2.mk" +.include "../../devel/gal/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../devel/libglade/buildlink2.mk" +.include "../../devel/libole2/buildlink2.mk" +.include "../../devel/oaf/buildlink2.mk" +.include "../../print/gnome-print/buildlink2.mk" +.include "../../textproc/libunicode/buildlink2.mk" +.include "../../textproc/libxml/buildlink2.mk" +.include "../../textproc/scrollkeeper/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/math/grpn/Makefile b/math/grpn/Makefile index 80ef51d7af9..4e4ed83268d 100644 --- a/math/grpn/Makefile +++ b/math/grpn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/05/12 23:21:53 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.9 2002/09/23 22:08:13 jlam Exp $ # DISTNAME= grpn-1.1.2 @@ -11,12 +11,9 @@ MAINTAINER= dmcmahill@netbsd.org HOMEPAGE= http://lashwhip.com/grpn.html COMMENT= Graphical reverse polish notation (RPN) calculator -USE_BUILDLINK_ONLY= yes +USE_BUILDLINK2= # defined +USE_X11= # defined ALL_TARGET= grpn -#DEPENDS+= gtk+-1.2.*:../../x11/gtk -#USE_X11= yes - -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../x11/gtk/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/grpn/distinfo b/math/grpn/distinfo index dd2195a5f48..89219ede421 100644 --- a/math/grpn/distinfo +++ b/math/grpn/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2002/05/12 23:21:54 dmcmahill Exp $ +$NetBSD: distinfo,v 1.5 2002/09/23 22:08:13 jlam Exp $ SHA1 (grpn-1.1.2.tar.gz) = c7a6b89d9d9316f89d02b000b77e35a48ec3343b Size (grpn-1.1.2.tar.gz) = 46153 bytes -SHA1 (patch-aa) = 07316a77bbb366f9f28062207969f8eab2f8b3f2 +SHA1 (patch-aa) = 633c81b1bbe2537a61425b0e070cdc47eebb8a43 SHA1 (patch-ab) = 2aea4f5283d42491ef500ba637dc47228dc33f03 SHA1 (patch-ag) = c7e24d2786203b9eff6d1921bd82885ad412db09 SHA1 (patch-ah) = eaa503abd7ae9ee08efe63462eb9aae6591aad3a diff --git a/math/grpn/patches/patch-aa b/math/grpn/patches/patch-aa index a9e783d1990..b4027f7c50e 100644 --- a/math/grpn/patches/patch-aa +++ b/math/grpn/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2002/05/12 23:21:54 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.3 2002/09/23 22:08:13 jlam Exp $ --- Makefile.orig Thu Apr 4 22:56:05 2002 +++ Makefile @@ -21,19 +21,10 @@ $NetBSD: patch-aa,v 1.2 2002/05/12 23:21:54 dmcmahill Exp $ -CFLAGS = -g -O2 -I/usr/X11/include `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1 +#CFLAGS = -g -O2 -I/usr/X11/include `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1 -+CFLAGS+=`$(GTK_CONFIG) --cflags` -DGTK_VER_1_1 ++CFLAGS+=`gtk-config --cflags` -DGTK_VER_1_1 -DFLAGS = -L/usr/X11/lib +#DFLAGS = -L/usr/X11/lib # end of user configurable section -@@ -37,7 +38,7 @@ - - - --LIBS = `$(GTK_DIR)gtk-config --libs` -lX11 -lm -+LIBS = `$(GTK_DIR)$(GTK_CONFIG) --libs` -lX11 -lm - - - grpn: $(OBJS) diff --git a/math/pari/Makefile b/math/pari/Makefile index 77dd25546f1..2382683dc13 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/03/13 17:37:24 fredb Exp $ +# $NetBSD: Makefile,v 1.11 2002/09/23 22:24:16 jlam Exp $ DISTNAME= pari-2.1.1 PKGREVISION= 1 @@ -13,23 +13,19 @@ COMMENT= software package for computer-aided number theory BUILD_DEPENDS+= teTeX-[0-9]*:../../print/teTeX BUILD_DEPENDS+= emacs-[0-9]*:../../editors/emacs -USE_PERL5= yes +USE_BUILDLINK2= yes +USE_X11= yes +USE_GNU_READLINE= # rl_save_prompt -USE_BUILDLINK_ONLY= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ${WRKSRC}/Configure - -# rl_save_prompt -USE_GNU_READLINE= yes - CONFIGURE_ARGS+= --prefix=${PREFIX} --share-prefix=${PREFIX}/share - +CONFIGURE_ARGS+= --graphic=X11 CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} -CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} +CONFIGURE_ENV+= X11BASE=${X11BASE} -CONFIGURE_ARGS+= --graphic=X11 +.include "../../devel/ncurses/buildlink2.mk" +.include "../../devel/readline/buildlink2.mk" +.include "../../lang/perl5/buildlink2.mk" -.include "../../devel/ncurses/buildlink.mk" -.include "../../devel/readline/buildlink.mk" -.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pari/distinfo b/math/pari/distinfo index 2cb6e0cf9c6..db09901d7e6 100644 --- a/math/pari/distinfo +++ b/math/pari/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2002/07/02 12:59:18 wiz Exp $ +$NetBSD: distinfo,v 1.8 2002/09/23 22:24:16 jlam Exp $ SHA1 (pari-2.1.1.tar.gz) = 358e90e2caf1afbd4440e3a43af827feec019b8d Size (pari-2.1.1.tar.gz) = 1530823 bytes -SHA1 (patch-aa) = a6ead8ee4468396d19e75d7a8367f9c171de82c9 +SHA1 (patch-aa) = e6f0e39f6d3fb18032626dcc6e497be2ff355992 SHA1 (patch-ab) = 97951552f9b9836d0375fd41c7abd18a5ce90238 SHA1 (patch-ac) = 84af235f319ae108aadeedea5a25e005540160ac SHA1 (patch-ad) = 82c0532ba6bc23b1c91865591c2bdfbee144bcf9 diff --git a/math/pari/patches/patch-aa b/math/pari/patches/patch-aa index 90e77156812..cc822d2b446 100644 --- a/math/pari/patches/patch-aa +++ b/math/pari/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.7 2002/09/23 22:24:16 jlam Exp $ --- Configure.orig Fri Apr 27 09:51:44 2001 +++ Configure @@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $ - /usr/libexec\ - /usr/openwin/bin\ - /usr/local/bin\ -+ $BUILDLINK_DIR/lib\ ++ $LOCALBASE/lib\ " # /usr/openwin/bin added for xmkmf @@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $ - /usr/ccs/lib\ - /usc/ucblib\ - /usr/shlib\ -+ $BUILDLINK_DIR/lib\ ++ $LOCALBASE/lib\ .\ ";; esac @@ -104,7 +104,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $ - /opt/include\ - /opt/local/include\ - /opt/gnu/include\ -+ $BUILDLINK_DIR/include\ ++ $LOCALBASE/include\ ";; esac pth="$readline_add $incpth" @@ -153,7 +153,7 @@ $NetBSD: patch-aa,v 1.6 2002/03/31 16:24:29 dmcmahill Exp $ - /usr/athena/lib\ - /usr/local/x11r5/lib\ - /usr/lpp/Xamples/lib\ -+ $BUILDLINK_DIR/lib\ ++ $X11BASE/lib\ "; pth=`echo $x11pth | s,/lib,/include,g` x=`./locate X11/Xos.h '' $pth` diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index cfcc317e1ee..3dfea87ca85 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2002/06/04 06:50:13 tron Exp $ +# $NetBSD: Makefile,v 1.40 2002/09/23 22:01:31 jlam Exp $ DISTNAME= xosview-1.7.0.b PKGNAME= xosview-1.7.0b @@ -10,31 +10,29 @@ MAINTAINER= bgrayson@netbsd.org HOMEPAGE= http://lore.ece.utexas.edu/~bgrayson/xosview.html COMMENT= X11 graphical display of OS statistics +USE_BUILDLINK2= YES +USE_X11BASE= YES + HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --x-includes=${BUILDLINK_X11_DIR}/include -CONFIGURE_ARGS+= --x-libraries=${BUILDLINK_X11_DIR}/lib - -USE_X11BASE= YES -USE_BUILDLINK_ONLY= YES +CONFIGURE_ARGS+= --x-includes=${X11BASE}/include +CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -BUILD_DEFS= UVM - -.if !defined(UVM) && exists(/usr/include/uvm/uvm.h) -UVM= # defined +. if !defined(UVM) && exists(/usr/include/uvm/uvm.h) CFLAGS+= -DUVM -.endif +UVM= # defined +BUILD_DEFS= UVM +. endif .elif ${OPSYS} == "SunOS" +USE_GMAKE= YES BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs -CONFIGURE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++ -CPPFLAGS+= -I${BUILDLINK_X11_DIR}/include +CXX= ${LOCALBASE}/egcs/bin/g++ +CPPFLAGS+= -I${X11BASE}/include LIBS+= -lsocket -lnsl -USE_GMAKE= YES .endif -.include "../../graphics/xpm/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../graphics/xpm/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |