pkgsrc/devel/libslang/patches/patch-aa

$NetBSD: patch-aa,v 1.17 2008/03/01 03:09:35 jlam Exp $

--- src/Makefile.in.orig	Sun Feb 10 18:39:19 2002
+++ src/Makefile.in	Mon Mar 25 11:59:49 2002
@@ -4,7 +4,7 @@
 #---------------------------------------------------------------------------
 CC              = @CC@
 CFLAGS 		= @CFLAGS@
-LDFLAGS		= @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
+LDFLAGS		= $(EXECLIBS)
 #-----------------------------------------------------------------------------
 # System library that contains functions for dynamic linking (-ldl)
 #-----------------------------------------------------------------------------
@@ -22,7 +22,7 @@
 # Set these values to ABSOLUTE path names
 #---------------------------------------------------------------------------
 SRCDIR = @SRCDIR@# Location of sources
-OBJDIR = @OBJDIR@# Location of objects
+OBJDIR = .# Location of objects
 ELFDIR = @ELFDIR@# Location of elf objects
 
 #---------------------------------------------------------------------------
@@ -38,7 +38,7 @@
 exec_prefix = @exec_prefix@
 install_lib_dir = @libdir@
 install_include_dir = @includedir@
-install_doc_dir = $(prefix)/doc/slang
+install_doc_dir = $(prefix)/share/doc/slang
 DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
 MODULE_INSTALL_DIR = @libdir@/slang/modules
 #---------------------------------------------------------------------------
@@ -76,11 +76,11 @@
 CONFIG_H		= config.h
 ALL_CFLAGS		= $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
 ALL_ELF_CFLAGS		= $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
-COMPILE_CMD		= $(CC) -c $(ALL_CFLAGS)
+COMPILE_CMD		= $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS)
 ELFCOMPILE_CMD		= $(ELF_CC) -c $(ALL_ELF_CFLAGS)
 ELF_LINK_CMD		= @ELF_LINK_CMD@
 
-NORMAL_LIB = lib$(THIS_LIB).a
+NORMAL_LIB = lib$(THIS_LIB).la
 OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
 
 # ELFLIB = lib$(THIS_LIB).so#
@@ -92,7 +92,7 @@
 
 ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
 
-EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB) $(DL_LIB)
+EXECLIBS = libslang.la $(TCAPLIB)
 EXECDEPS = $(OBJDIR_NORMAL_LIB)
 
 OFILES = @PROGRAM_OFILES@
@@ -112,13 +112,12 @@
 #---------------------------------------------------------------------------
 # Rules
 #---------------------------------------------------------------------------
-all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)
 elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
 
 $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
-	-$(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) \
+		-rpath $(PREFIX)/lib $(DL_LIB) -lm $(TCAPLIB) -version-info 1:4
 	@echo ""
 	@echo $(NORMAL_LIB) created in $(OBJDIR)
 
@@ -143,8 +142,7 @@
 install: install_basic_lib install_docs
 install_basic_lib: $(DEST_LIBDIR) $(DEST_INCDIR) $(OBJDIR_NORMAL_LIB)
 	@echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)
-	$(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)
-	$(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)
+	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)
 	@echo installing slang.h and slcurses.h in $(DEST_INCDIR)
 	$(INSTALL_DATA) $(SRCDIR)/slang.h $(DEST_INCDIR)
 	$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR)
Fix patch so that it refers to $(TCAPLIB) and doesn't hardcode "-ltermcap". Now the only time that libslang.so links against libtermcap.so only when we're using termcap. In the case where we don't, libslang.so includes its own terminfo database parser, so we don't need to link against any curses or other terminfo library. Bump the PKGREVISION to 7. 2008-03-01 04:09:35 +01:00			$NetBSD: patch-aa,v 1.17 2008/03/01 03:09:35 jlam Exp $
Add NetBSD RCS Ids. 1998-08-07 12:35:47 +02:00
update for 1.4.5 (bug fixes, macosx and cygwin improvements). 1.4.4 no longer on master site. use bz2 file. 2002-03-25 13:25:29 +01:00			`--- src/Makefile.in.orig Sun Feb 10 18:39:19 2002`
			`+++ src/Makefile.in Mon Mar 25 11:59:49 2002`
Be more careful when using libtool: use $(CC) not cc as this may not be the c compiler. 2001-04-23 16:52:51 +02:00			`@@ -4,7 +4,7 @@`
Update libslang to 1.2.2. Make use of libtool. 1998-07-15 16:15:59 +02:00			`#---------------------------------------------------------------------------`
Be more careful when using libtool: use $(CC) not cc as this may not be the c compiler. 2001-04-23 16:52:51 +02:00			`CC = @CC@`
Update libslang to 1.3.7. The changes are too numerous to mention, mostly bug fixes though. 1999-06-18 00:57:23 +02:00			`CFLAGS = @CFLAGS@`
			`-LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@`
Fix building the library: somehow, COMPILE_CMD was not being used the first time I built this. 1998-07-16 19:15:34 +02:00			`+LDFLAGS = $(EXECLIBS)`
Update libslang to 1.3.7. The changes are too numerous to mention, mostly bug fixes though. 1999-06-18 00:57:23 +02:00			`#-----------------------------------------------------------------------------`
			`# System library that contains functions for dynamic linking (-ldl)`
			`#-----------------------------------------------------------------------------`
			`@@ -22,7 +22,7 @@`
Update libslang to 1.2.2. Make use of libtool. 1998-07-15 16:15:59 +02:00			`# Set these values to ABSOLUTE path names`
			`#---------------------------------------------------------------------------`
			`SRCDIR = @SRCDIR@# Location of sources`
			`-OBJDIR = @OBJDIR@# Location of objects`
			`+OBJDIR = .# Location of objects`
			`ELFDIR = @ELFDIR@# Location of elf objects`

			`#---------------------------------------------------------------------------`
update for 1.4.5 (bug fixes, macosx and cygwin improvements). 1.4.4 no longer on master site. use bz2 file. 2002-03-25 13:25:29 +01:00			`@@ -38,7 +38,7 @@`
Install documentation files in "share/doc/slang" instead of "doc/slang/1.3.8" and add them to the package list. 1999-09-20 20:43:58 +02:00			`exec_prefix = @exec_prefix@`
			`install_lib_dir = @libdir@`
			`install_include_dir = @includedir@`
Update slang to 1.4.3, and update the homepage URL. From the announcement on usenet: Version 1.4.3 is primarily a bug-fix release, and will probably be the last release in the 1.x series. It is time to move on to v2.x. In fact, v1.4.3 adds DESTDIR support, and extends the ABI. The change log given in the announcement is too long and detailed to included here. Please refer to <URL:news:slrn97ou3d.87i.davis@aluche.mit.edu>, available at your nearest usenet archive, for details. 2001-02-05 18:30:07 +01:00			`-install_doc_dir = $(prefix)/doc/slang`
Install documentation files in "share/doc/slang" instead of "doc/slang/1.3.8" and add them to the package list. 1999-09-20 20:43:58 +02:00			`+install_doc_dir = $(prefix)/share/doc/slang`
			`DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt`
Update slang to 1.4.3, and update the homepage URL. From the announcement on usenet: Version 1.4.3 is primarily a bug-fix release, and will probably be the last release in the 1.x series. It is time to move on to v2.x. In fact, v1.4.3 adds DESTDIR support, and extends the ABI. The change log given in the announcement is too long and detailed to included here. Please refer to <URL:news:slrn97ou3d.87i.davis@aluche.mit.edu>, available at your nearest usenet archive, for details. 2001-02-05 18:30:07 +01:00			`MODULE_INSTALL_DIR = @libdir@/slang/modules`
Install documentation files in "share/doc/slang" instead of "doc/slang/1.3.8" and add them to the package list. 1999-09-20 20:43:58 +02:00			`#---------------------------------------------------------------------------`
update for 1.4.5 (bug fixes, macosx and cygwin improvements). 1.4.4 no longer on master site. use bz2 file. 2002-03-25 13:25:29 +01:00			`@@ -76,11 +76,11 @@`
Be more careful when using libtool: use $(CC) not cc as this may not be the c compiler. 2001-04-23 16:52:51 +02:00			`CONFIG_H = config.h`
			`ALL_CFLAGS = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)`
			`ALL_ELF_CFLAGS = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)`
			`-COMPILE_CMD = $(CC) -c $(ALL_CFLAGS)`
			`+COMPILE_CMD = $(LIBTOOL) --mode=compile $(CC) -c $(ALL_CFLAGS)`
Update libslang to 1.2.2. Make use of libtool. 1998-07-15 16:15:59 +02:00			`ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS)`
			`ELF_LINK_CMD = @ELF_LINK_CMD@`

			`-NORMAL_LIB = lib$(THIS_LIB).a`
			`+NORMAL_LIB = lib$(THIS_LIB).la`
			`OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)`

update for 1.4.5 (bug fixes, macosx and cygwin improvements). 1.4.4 no longer on master site. use bz2 file. 2002-03-25 13:25:29 +01:00			`# ELFLIB = lib$(THIS_LIB).so#`
			`@@ -92,7 +92,7 @@`
Fix building the library: somehow, COMPILE_CMD was not being used the first time I built this. 1998-07-16 19:15:34 +02:00
			`ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#`

Update libslang to 1.3.7. The changes are too numerous to mention, mostly bug fixes though. 1999-06-18 00:57:23 +02:00			`-EXECLIBS = -L$(OBJDIR) -lslang -lm $(TCAPLIB) $(DL_LIB)`
Fix building the library: somehow, COMPILE_CMD was not being used the first time I built this. 1998-07-16 19:15:34 +02:00			`+EXECLIBS = libslang.la $(TCAPLIB)`
			`EXECDEPS = $(OBJDIR_NORMAL_LIB)`

			`OFILES = @PROGRAM_OFILES@`
update for 1.4.5 (bug fixes, macosx and cygwin improvements). 1.4.4 no longer on master site. use bz2 file. 2002-03-25 13:25:29 +01:00			`@@ -112,13 +112,12 @@`
We don't install any binaries, so don't even try working around the funky objdir stuff for building calc, worm, untic. 1998-07-16 21:07:46 +02:00			`#---------------------------------------------------------------------------`
			`# Rules`
			`#---------------------------------------------------------------------------`
			`-all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)`
			`+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)`
			`elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)`
Update libslang to 1.2.2. Make use of libtool. 1998-07-15 16:15:59 +02:00
			`$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)`
Update to 1.3.10. Changes are bugfixes only. 2000-01-01 18:17:56 +01:00			`- -$(RM) $(OBJDIR_NORMAL_LIB)`
Update libslang to 1.2.2. Make use of libtool. 1998-07-15 16:15:59 +02:00			`- cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)`
			`- $(RANLIB) $(OBJDIR_NORMAL_LIB)`
Be more careful when using libtool: use $(CC) not cc as this may not be the c compiler. 2001-04-23 16:52:51 +02:00			`+ cd $(OBJDIR); $(LIBTOOL) --mode=link $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \`
Fix patch so that it refers to $(TCAPLIB) and doesn't hardcode "-ltermcap". Now the only time that libslang.so links against libtermcap.so only when we're using termcap. In the case where we don't, libslang.so includes its own terminfo database parser, so we don't need to link against any curses or other terminfo library. Bump the PKGREVISION to 7. 2008-03-01 04:09:35 +01:00			`+ -rpath $(PREFIX)/lib $(DL_LIB) -lm $(TCAPLIB) -version-info 1:4`
Update libslang to 1.2.2. Make use of libtool. 1998-07-15 16:15:59 +02:00			`@echo ""`
			`@echo $(NORMAL_LIB) created in $(OBJDIR)`

update for 1.4.5 (bug fixes, macosx and cygwin improvements). 1.4.4 no longer on master site. use bz2 file. 2002-03-25 13:25:29 +01:00			`@@ -143,8 +142,7 @@`
Install documentation files in "share/doc/slang" instead of "doc/slang/1.3.8" and add them to the package list. 1999-09-20 20:43:58 +02:00			`install: install_basic_lib install_docs`
Update slang to 1.4.3, and update the homepage URL. From the announcement on usenet: Version 1.4.3 is primarily a bug-fix release, and will probably be the last release in the 1.x series. It is time to move on to v2.x. In fact, v1.4.3 adds DESTDIR support, and extends the ABI. The change log given in the announcement is too long and detailed to included here. Please refer to <URL:news:slrn97ou3d.87i.davis@aluche.mit.edu>, available at your nearest usenet archive, for details. 2001-02-05 18:30:07 +01:00			`install_basic_lib: $(DEST_LIBDIR) $(DEST_INCDIR) $(OBJDIR_NORMAL_LIB)`
			`@echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)`
			`- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)`
			`- $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)`
			`+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)`
			`@echo installing slang.h and slcurses.h in $(DEST_INCDIR)`
			`$(INSTALL_DATA) $(SRCDIR)/slang.h $(DEST_INCDIR)`
			`$(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DEST_INCDIR)`