diff options
-rw-r--r-- | graphics/geomview/Makefile | 6 | ||||
-rw-r--r-- | graphics/geomview/PLIST | 4 | ||||
-rw-r--r-- | graphics/geomview/distinfo | 3 | ||||
-rw-r--r-- | graphics/geomview/patches/patch-ak | 45 |
4 files changed, 51 insertions, 7 deletions
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index 44609490596..b45761cbba6 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2003/07/03 13:40:28 seb Exp $ +# $NetBSD: Makefile,v 1.24 2003/07/03 17:38:27 jschauma Exp $ DISTNAME= geomview-1.8.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=geomview/} @@ -9,8 +9,6 @@ MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://www.geomview.org COMMENT= Interactive geometry viewing program -CONFLICTS= ImageMagick-[0-9]* # both have a program named 'animate' - USE_BUILDLINK2= yes USE_X11BASE= yes GNU_CONFIGURE= yes diff --git a/graphics/geomview/PLIST b/graphics/geomview/PLIST index 5a981df764b..db35c3037bb 100644 --- a/graphics/geomview/PLIST +++ b/graphics/geomview/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.3 2003/07/03 13:40:29 seb Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/07/03 17:38:27 jschauma Exp $ bin/.geomview-animate bin/.geomview-drawbdy -bin/animate bin/anytooff bin/anytoucd bin/bdy @@ -9,6 +8,7 @@ bin/bez2mesh bin/clip bin/drawbdy bin/geomview +bin/gv-animate bin/gvx bin/math2oogl bin/offconsol diff --git a/graphics/geomview/distinfo b/graphics/geomview/distinfo index a99ff994ce3..88bba4114dd 100644 --- a/graphics/geomview/distinfo +++ b/graphics/geomview/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/07/04 03:08:57 jlam Exp $ +$NetBSD: distinfo,v 1.4 2003/07/03 17:38:27 jschauma Exp $ SHA1 (geomview-1.8.1.tar.gz) = 026a22ecba471f7d55c407de4fc409213d166477 Size (geomview-1.8.1.tar.gz) = 2766832 bytes @@ -12,3 +12,4 @@ SHA1 (patch-ag) = 427d9d114d581b0bcbfbba9ca1122bd384aa79a6 SHA1 (patch-ah) = 458e2e764acf83309104c74fcfbf3dfba8251d29 SHA1 (patch-ai) = 44b8fe3c228d5761cc1578c0418c358101ec3adc SHA1 (patch-aj) = 8c04229693165b471228c8bcb0b092afcdd6d890 +SHA1 (patch-ak) = 8d62f3a0da7c03567ef0ab5bc30b95d97c4e7254 diff --git a/graphics/geomview/patches/patch-ak b/graphics/geomview/patches/patch-ak new file mode 100644 index 00000000000..2062c73ca60 --- /dev/null +++ b/graphics/geomview/patches/patch-ak @@ -0,0 +1,45 @@ +$NetBSD: patch-ak,v 1.1 2003/07/03 17:38:28 jschauma Exp $ + +Rename 'animate' to 'gv-animate' to avoid conflict with ImageMagick's +'animate' program. + +--- src/bin/animate/Makefile.in.orig Thu Jul 3 13:09:48 2003 ++++ src/bin/animate/Makefile.in Thu Jul 3 13:11:48 2003 +@@ -98,9 +98,9 @@ + + INCLUDES = $(default_includes) $(MOTIFINCLUDE) + SUBDIRS = interface +-EXTRA_DIST = animate.1 ++EXTRA_DIST = gv-animate.1 + +-module_PROGRAMS = animate ++module_PROGRAMS = gv-animate + animate_SOURCES = animate.c xanimate.c glob.c animate.h glob.h xanimate.h + LDADD = ../../lib/mib/libmib.a $(MOTIFLIBS) $(XMULIBS) $(XLIBS) $(MATHLIB) + +@@ -194,8 +194,8 @@ + + maintainer-clean-compile: + +-animate: $(animate_OBJECTS) $(animate_DEPENDENCIES) +- @rm -f animate ++gv-animate: $(animate_OBJECTS) $(animate_DEPENDENCIES) ++ @rm -f gv-animate + $(LINK) $(animate_LDFLAGS) $(animate_OBJECTS) $(animate_LDADD) $(LIBS) + + install-moduleDATA: $(module_DATA) +@@ -416,12 +416,12 @@ + + + .geomview-animate: +- echo '(emodule-define "Animator" "animate")' > .geomview-animate ++ echo '(emodule-define "Animator" "gv-animate")' > .geomview-animate + + # Populate local "modules" directory, allowing animate to run in the build dir. + all-local: + $(top_srcdir)/mkmodulesdir $(top_builddir) +- echo '(emodule-define "Animator" "$(subdir)/animate")' > $(top_builddir)/modules/.geomview-animate ++ echo '(emodule-define "Animator" "$(subdir)/gv-animate")' > $(top_builddir)/modules/.geomview-animate + + # noinst_SCRIPTS = install-geomview-dotfile + # bin_SCRIPTS = .geomview-animate |