cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to libslang 1.4.2

Browse Source
This commit is contained in:
brad 2000-09-05 03:27:29 +00:00
parent 50041ddd64
commit 2653a8244e
6 changed files with 116 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devel/libslang/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2000/07/04 01:46:39 krw Exp $
# $OpenBSD: Makefile,v 1.22 2000/09/05 03:27:29 brad Exp $
DISTNAME= slang-1.4.1
PKGNAME= libslang-1.4.1
DISTNAME= slang-1.4.2
PKGNAME= libslang-1.4.2
CATEGORIES= devel
NEED_VERSION= 1.310
NEED_VERSION= 1.322
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
http://gd.tuwien.ac.at/editors/davis/slang/v1.4/
@ -18,12 +18,6 @@ PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= gnu
do-install:
@cd ${WRKDIST}/src && ${MAKE} prefix="${PREFIX}" ${INSTALL_TARGET}
@if [ ${INSTALL_TARGET} == "install-elf" ]; then \
cd ${WRKDIST}/src && ${MAKE} prefix="${PREFIX}" install-links; \
fi
test: build
@cd ${WRKSRC} && ${MAKE} runtests

6
devel/libslang/files/md5
View File

@ -1,3 +1,3 @@
MD5 (slang-1.4.1.tar.gz) = bd3ce3f0de9e1a97e59829f43ed93693
RMD160 (slang-1.4.1.tar.gz) = 9309b1377f8daa67de56349ef853f60b8764389b
SHA1 (slang-1.4.1.tar.gz) = 29c21258163105c783e17effd7bbecdc438d0bde
MD5 (slang-1.4.2.tar.gz) = 81f769cb2ff1fb3dbe28bd58866e07c4
RMD160 (slang-1.4.2.tar.gz) = 38b817370d0c385dc7ba10e6e37801bc04684c6a
SHA1 (slang-1.4.2.tar.gz) = 1db7ab988629f31f97a3a94c8604b8985c8ee899

64
devel/libslang/patches/patch-aa
View File

@ -1,64 +0,0 @@
--- src/Makefile.in.orig Tue Jun 13 17:40:10 2000
+++ src/Makefile.in Tue Jun 13 17:42:56 2000
@@ -2,8 +2,8 @@
#---------------------------------------------------------------------------
# ANSI C compiler
#---------------------------------------------------------------------------
-CC = @CC@
-CFLAGS = @CFLAGS@
+#CC = @CC@
+#CFLAGS = @CFLAGS@
LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
#-----------------------------------------------------------------------------
# System library that contains functions for dynamic linking (-ldl)
@@ -13,9 +13,9 @@
#---------------------------------------------------------------------------
# Compiler for producing a shared library (ELF)
#---------------------------------------------------------------------------
-ELF_CC = @ELF_CC@
-ELF_CFLAGS = @ELF_CFLAGS@
-ELF_LINK = @ELF_LINK@
+ELF_CC = $(CC)
+ELF_CFLAGS = $(CFLAGS) -fpic -DPIC
+ELF_LINK = ld -Bshareable -Bforcearchive
ELF_DEP_LIBS = $(DL_LIB) -lm -lc
#---------------------------------------------------------------------------
@@ -36,7 +36,7 @@
exec_prefix = @exec_prefix@
install_lib_dir = @libdir@
install_include_dir = @includedir@
-install_doc_dir = $(prefix)/doc/slang/@slang_version@
+install_doc_dir = $(prefix)/share/doc/slang
DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
#---------------------------------------------------------------------------
# Misc commands (safe to leave these untouched)
@@ -106,11 +106,9 @@
$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)
-$(RM) $(ELFDIR_ELF_LIB)
- cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)
- cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
+ cd $(ELFDIR); $(ELF_LINK) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LLIBS)
@echo ""
@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
- @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
@echo ""
$(OBJDIR) :
-$(MKDIR) $(OBJDIR)
@@ -144,15 +142,10 @@
$(install_lib_dir):
$(MKINSDIR) $(install_lib_dir)
install-elf: elf install
- -$(RM) $(install_lib_dir)/$(ELFLIB)
- -$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR)
@echo installing $(ELFLIB_MAJOR_MINOR) in $(install_lib_dir)
$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(install_lib_dir)
- @echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
- -cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
@echo ""
@echo $(ELFLIB_MAJOR_MINOR) created in $(install_lib_dir).
- @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
@echo ""
install-links:
-$(RM) $(install_lib_dir)/$(ELFLIB)

6
devel/libslang/patches/patch-ad → devel/libslang/patches/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig Tue Jun 13 17:43:55 2000
+++ configure Tue Jun 13 17:45:13 2000
@@ -2208,7 +2208,8 @@
--- configure.orig Mon Sep 4 22:16:58 2000
+++ configure Mon Sep 4 22:18:04 2000
@@ -2240,7 +2240,8 @@
slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version |
awk '{ print ($1 - $2*10000 - $3*100) }'`

104
devel/libslang/patches/patch-src_Makefile.in Normal file
View File

@ -0,0 +1,104 @@
--- src/Makefile.in.orig Sat Aug 19 22:20:31 2000
+++ src/Makefile.in Mon Sep 4 23:00:33 2000
@@ -13,9 +13,9 @@
#---------------------------------------------------------------------------
# Compiler for producing a shared library (ELF)
#---------------------------------------------------------------------------
-ELF_CC = @ELF_CC@
-ELF_CFLAGS = @ELF_CFLAGS@
-ELF_LINK = @ELF_LINK@
+ELF_CC = $(CC)
+ELF_CFLAGS = $(CFLAGS) -fpic -DPIC
+ELF_LINK = ld -Bshareable -Bforcearchive
ELF_DEP_LIBS = @ELF_DEP_LIBS@
#---------------------------------------------------------------------------
@@ -32,11 +32,13 @@
#---------------------------------------------------------------------------
# Directory where library is going to go when installed
#---------------------------------------------------------------------------
+DESTDIR =
+
prefix = @prefix@
exec_prefix = @exec_prefix@
install_lib_dir = @libdir@
install_include_dir = @includedir@
-install_doc_dir = $(prefix)/doc/slang/@slang_version@
+install_doc_dir = $(prefix)/share/doc/slang
DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
#---------------------------------------------------------------------------
# Misc commands (safe to leave these untouched)
@@ -107,11 +109,9 @@
$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS)
-$(RM) $(ELFDIR_ELF_LIB)
- cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)
- cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
+ cd $(ELFDIR); $(ELF_LINK) -o $(ELFLIB_MAJOR_MINOR) $(OFILES) $(ELF_DEP_LIBS)
@echo ""
@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
- @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
@echo ""
$(OBJDIR) :
-$(MKDIR) $(OBJDIR)
@@ -125,41 +125,36 @@
#---------------------------------------------------------------------------
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)
- @echo installing slang.h and slcurses.h in $(install_include_dir)
- $(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir)
- $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir)
+ @echo installing $(OBJDIR_NORMAL_LIB) in $(DESTDIR)$(install_lib_dir)
+ $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DESTDIR)$(install_lib_dir)
+ $(RANLIB) $(DESTDIR)$(install_lib_dir)/$(NORMAL_LIB)
+ @echo installing slang.h and slcurses.h in $(DESTDIR)$(install_include_dir)
+ $(INSTALL_DATA) $(SRCDIR)/slang.h $(DESTDIR)$(install_include_dir)
+ $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(DESTDIR)$(install_include_dir)
install_docs: $(install_doc_dir)
- $(INSTALL_DATA) $(DOC_FILES) $(install_doc_dir)/
+ $(INSTALL_DATA) $(DOC_FILES) $(DESTDIR)$(install_doc_dir)/
@for i in $(DOC_FILES); \
do \
- echo $(INSTALL_DATA) $$i $(install_doc_dir)/; \
- $(INSTALL_DATA) $$i $(install_doc_dir); \
+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(install_doc_dir)/; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(install_doc_dir); \
done
$(install_doc_dir):
- $(MKINSDIR) $(install_doc_dir)
+ $(MKINSDIR) $(DESTDIR)$(install_doc_dir)
$(install_include_dir):
- $(MKINSDIR) $(install_include_dir)
+ $(MKINSDIR) $(DESTDIR)$(install_include_dir)
$(install_lib_dir):
- $(MKINSDIR) $(install_lib_dir)
+ $(MKINSDIR) $(DESTDIR)$(install_lib_dir)
install-elf: elf install
- -$(RM) $(install_lib_dir)/$(ELFLIB)
- -$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR)
- @echo installing $(ELFLIB_MAJOR_MINOR) in $(install_lib_dir)
- $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(install_lib_dir)
- @echo creating symbolic links to $(ELFLIB_MAJOR_MINOR)
- -cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
+ @echo installing $(ELFLIB_MAJOR_MINOR) in $(DESTDIR)$(install_lib_dir)
+ $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DESTDIR)$(install_lib_dir)
@echo ""
- @echo $(ELFLIB_MAJOR_MINOR) created in $(install_lib_dir).
- @echo The link $(ELFLIB) to $(ELFLIB_MAJOR_MINOR) was also created.
+ @echo $(ELFLIB_MAJOR_MINOR) created in $(DESTDIR)$(install_lib_dir).
@echo ""
install-links:
- -$(RM) $(install_lib_dir)/$(ELFLIB)
- -$(RM) $(install_lib_dir)/$(ELFLIB_MAJOR)
- cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
- cd $(install_lib_dir); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
+ -$(RM) $(DESTDIR)$(install_lib_dir)/$(ELFLIB)
+ -$(RM) $(DESTDIR)$(install_lib_dir)/$(ELFLIB_MAJOR)
+ cd $(DESTDIR)$(install_lib_dir); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB_MAJOR)
+ cd $(DESTDIR)$(install_lib_dir); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
@echo
@echo A link $(ELFLIB_MAJOR) to $(ELFLIB_MAJOR_MINOR) was created.
@echo A link $(ELFLIB) to $(ELFLIB_MAJOR) was created.

4
devel/libslang/pkg/PFRAG.shared
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/04 01:46:39 krw Exp $
lib/libslang.so.14.1
@comment $OpenBSD: PFRAG.shared,v 1.3 2000/09/05 03:27:30 brad Exp $
lib/libslang.so.14.2
DYNLIBDIR(%B)