pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/guppi don't enable gnumeric support, and bump PKG...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a3d43d27c16
branches:  trunk
changeset: 477420:7a3d43d27c16
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Jul 02 15:18:06 2004 +0000

description:
don't enable gnumeric support, and bump PKGREVISION
This only worked with gnumeric-1.0.x, and depends on gnome1 structures.
gnumeric is at 1.2.x now, uses gnome2 and comes with an own plotting
package.
Should fix PR pkg/26009 by MLH.

diffstat:

 math/guppi/Makefile |  18 +++---------------
 math/guppi/PLIST    |   7 +------
 2 files changed, 4 insertions(+), 21 deletions(-)

diffs (71 lines):

diff -r 7b80267c00cd -r 7a3d43d27c16 math/guppi/Makefile
--- a/math/guppi/Makefile       Fri Jul 02 15:12:07 2004 +0000
+++ b/math/guppi/Makefile       Fri Jul 02 15:18:06 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2004/05/03 15:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2004/07/02 15:18:06 drochner Exp $
 
 DISTNAME=      Guppi-0.40.3
 PKGNAME=       ${DISTNAME:S/G/g/}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    math graphics
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/Guppi/0.40/}
 EXTRACT_SUFX=  .tar.bz2
@@ -11,19 +11,8 @@
 HOMEPAGE=      http://www.gnome.org/guppi/
 COMMENT=       Plot program with integrated statistics capabilities
 
-.if exists(/usr/include/wctype.h)
-#
-# "guppi" only accepts newer versions of the "gnumeric" package which
-# cannot be build on all platforms. We only enable "gnumeric" support
-# on platforms which can build the "gnumeric" 1.0.x packages.
-#
-DEPENDS+=              gnumeric>=1.0.9:../../math/gnumeric
-CONFIGURE_ARGS=                --enable-gnumeric
-PLIST_SUBST+=          GNUMERIC=
-.else
+# works only with gnumeric-1.0.x (gnome1 based)
 CONFIGURE_ARGS=                --disable-gnumeric
-PLIST_SUBST+=          GNUMERIC="@comment "
-.endif
 
 USE_BUILDLINK3=                YES
 USE_DIRS+=             xdg-1.1
@@ -34,7 +23,6 @@
 USE_LIBTOOL=           YES
 
 .include "../../devel/bonobo/buildlink3.mk"
-.include "../../devel/gal/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../lang/guile14/buildlink3.mk"
diff -r 7b80267c00cd -r 7a3d43d27c16 math/guppi/PLIST
--- a/math/guppi/PLIST  Fri Jul 02 15:12:07 2004 +0000
+++ b/math/guppi/PLIST  Fri Jul 02 15:18:06 2004 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2004/05/03 15:58:55 wiz Exp $
-${GNUMERIC}bin/guppi-gnumeric
+@comment $NetBSD: PLIST,v 1.19 2004/07/02 15:18:06 drochner Exp $
 include/gnome-1.0/libguppi/gnan.h
 include/gnome-1.0/libguppi/guppi-2d.h
 include/gnome-1.0/libguppi/guppi-alpha-template.h
@@ -217,9 +216,6 @@
 share/gnome/help/guppi/C/ln14.html
 share/gnome/help/guppi/C/topic.dat
 share/guppi/glade/view-properties.glade
-${GNUMERIC}share/guppi/glade/guppi-gnumeric-format-guru.glade
-${GNUMERIC}share/guppi/scripts/guppi-gnumeric-plots.xml
-${GNUMERIC}share/oaf/GNOME_Guppi_Gnumeric.oaf
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/Guppi.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/Guppi.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/Guppi.mo
@@ -320,7 +316,6 @@
 share/pixmaps/guppi/surface.xpm
 @exec ${MKDIR} %D/share/gnome/help/guppi/C/images
 @dirrm share/pixmaps/guppi
-${GNUMERIC}@dirrm share/guppi/scripts
 @dirrm share/guppi/glade
 @dirrm share/guppi
 @dirrm share/gnome/help/guppi/C/images



Home | Main Index | Thread Index | Old Index