diff options
author | mjl <mjl@pkgsrc.org> | 2000-01-01 17:17:56 +0000 |
---|---|---|
committer | mjl <mjl@pkgsrc.org> | 2000-01-01 17:17:56 +0000 |
commit | 6c51f4f36127315d90d4734830deafa09649fdce (patch) | |
tree | 90cea9fbe4b297b27307b09cc5e123780e7306e4 /devel | |
parent | 3f7c2a044910fc7d3b4e67b559694440381323fc (diff) | |
download | pkgsrc-6c51f4f36127315d90d4734830deafa09649fdce.tar.gz |
Update to 1.3.10. Changes are bugfixes only.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/libslang/Makefile | 6 | ||||
-rw-r--r-- | devel/libslang/files/md5 | 4 | ||||
-rw-r--r-- | devel/libslang/files/patch-sum | 5 | ||||
-rw-r--r-- | devel/libslang/patches/patch-aa | 22 | ||||
-rw-r--r-- | devel/libslang/patches/patch-ac | 16 |
5 files changed, 14 insertions, 39 deletions
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 6dc35c658a8..6556f3733cd 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.15 1999/10/15 23:51:31 mjl Exp $ +# $NetBSD: Makefile,v 1.16 2000/01/01 17:17:56 mjl Exp $ # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp # -DISTNAME= slang-1.3.9 -PKGNAME= libslang-1.3.9 +DISTNAME= slang-1.3.10 +PKGNAME= lib$(DISTNAME) CATEGORIES= devel MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.3/ \ http://gd.tuwien.ac.at/editors/davis/slang/v1.3/ diff --git a/devel/libslang/files/md5 b/devel/libslang/files/md5 index a33973f6041..5659e45a37d 100644 --- a/devel/libslang/files/md5 +++ b/devel/libslang/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.6 1999/10/15 23:51:32 mjl Exp $ +$NetBSD: md5,v 1.7 2000/01/01 17:17:57 mjl Exp $ -MD5 (slang-1.3.9.tar.gz) = cb7046633520f0ada2cfff312f46aa8e +MD5 (slang-1.3.10.tar.gz) = 3157a9496f21b169c1b3d8f25bcd51b8 diff --git a/devel/libslang/files/patch-sum b/devel/libslang/files/patch-sum index 27bf23d56a3..5147cdbed7f 100644 --- a/devel/libslang/files/patch-sum +++ b/devel/libslang/files/patch-sum @@ -1,4 +1,3 @@ -$NetBSD: patch-sum,v 1.4 1999/10/15 23:51:32 mjl Exp $ +$NetBSD: patch-sum,v 1.5 2000/01/01 17:17:57 mjl Exp $ -MD5 (patch-aa) = a5aae8da3c26b8f2cfcc6a284c23edd5 -MD5 (patch-ac) = 40230c6f41113da3127bb2b4465252b9 +MD5 (patch-aa) = fb262e1c9439388047b5bb7854912c4a diff --git a/devel/libslang/patches/patch-aa b/devel/libslang/patches/patch-aa index 6743ef61154..ad7bb56ceab 100644 --- a/devel/libslang/patches/patch-aa +++ b/devel/libslang/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.9 1999/09/20 18:44:00 tron Exp $ +$NetBSD: patch-aa,v 1.10 2000/01/01 17:17:57 mjl Exp $ ---- src/Makefile.in.orig Tue Jul 13 22:30:40 1999 -+++ src/Makefile.in Mon Sep 20 20:35:58 1999 +--- src/Makefile.in.orig Sun Nov 14 07:21:11 1999 ++++ src/Makefile.in Sat Jan 1 17:53:05 2000 @@ -2,9 +2,9 @@ #--------------------------------------------------------------------------- # ANSI C compiler @@ -32,14 +32,7 @@ $NetBSD: patch-aa,v 1.9 1999/09/20 18:44:00 tron Exp $ DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt #--------------------------------------------------------------------------- # Misc commands (safe to leave these untouched) -@@ -63,13 +63,13 @@ - ELF_MINOR_VERSION = @slang_minor_version@# - - CONFIG_H = config.h --ALL_CFLAGS = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES) -+ALL_CFLAGS = -Dunix $(CFLAGS) $(THIS_LIB_DEFINES) - ALL_ELF_CFLAGS = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES) - COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) +@@ -69,7 +69,7 @@ ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS) ELF_LINK_CMD = @ELF_LINK_CMD@ @@ -57,7 +50,7 @@ $NetBSD: patch-aa,v 1.9 1999/09/20 18:44:00 tron Exp $ EXECDEPS = $(OBJDIR_NORMAL_LIB) OFILES = @PROGRAM_OFILES@ -@@ -93,13 +93,13 @@ +@@ -94,13 +94,12 @@ #--------------------------------------------------------------------------- # Rules #--------------------------------------------------------------------------- @@ -66,7 +59,7 @@ $NetBSD: patch-aa,v 1.9 1999/09/20 18:44:00 tron Exp $ elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB) $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS) - -$(RM) $(OBJDIR_NORMAL_LIB) +- -$(RM) $(OBJDIR_NORMAL_LIB) - cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES) - $(RANLIB) $(OBJDIR_NORMAL_LIB) + cd $(OBJDIR); $(LIBTOOL) --mode=link cc -o $(NORMAL_LIB) $(OFILES:.o=.lo) \ @@ -74,13 +67,12 @@ $NetBSD: patch-aa,v 1.9 1999/09/20 18:44:00 tron Exp $ @echo "" @echo $(NORMAL_LIB) created in $(OBJDIR) -@@ -124,9 +124,7 @@ +@@ -125,8 +124,7 @@ install: install_basic_lib install_docs install_basic_lib: $(install_lib_dir) $(install_include_dir) $(OBJDIR_NORMAL_LIB) @echo installing $(OBJDIR_NORMAL_LIB) in $(install_lib_dir) - $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir) - $(RANLIB) $(install_lib_dir)/$(NORMAL_LIB) -- chmod 644 $(install_lib_dir)/$(NORMAL_LIB) + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(install_lib_dir) @echo installing slang.h and slcurses.h in $(install_include_dir) $(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir) diff --git a/devel/libslang/patches/patch-ac b/devel/libslang/patches/patch-ac deleted file mode 100644 index f416f047d4f..00000000000 --- a/devel/libslang/patches/patch-ac +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ac,v 1.2 1999/10/15 23:51:32 mjl Exp $ - ---- src/slang.h.orig Thu Sep 23 09:25:59 1999 -+++ src/slang.h Sat Oct 16 01:34:16 1999 -@@ -24,6 +24,11 @@ - # endif - #endif /* __watcomc__ */ - -+#ifdef __NetBSD__ -+#undef unix -+#define unix 1 -+#endif -+ - #if defined(unix) || defined(__unix) - # ifndef __unix__ - # define __unix__ 1 |