diff options
author | Steve Price <steve@FreeBSD.org> | 1999-05-01 03:28:13 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1999-05-01 03:28:13 +0000 |
commit | b79c0889c890bcfc7a97fc4c18d7f41f0775745c (patch) | |
tree | be5c1f1afcab811dec97536c05f3ef565d2a8d23 /japanese/libslang/files | |
parent | 2aa59dc6ece37de8eb69441d946c8bf663082ce3 (diff) | |
download | ports-b79c0889c890bcfc7a97fc4c18d7f41f0775745c.tar.gz ports-b79c0889c890bcfc7a97fc4c18d7f41f0775745c.zip |
Notes
Diffstat (limited to 'japanese/libslang/files')
-rw-r--r-- | japanese/libslang/files/patch-aa | 89 | ||||
-rw-r--r-- | japanese/libslang/files/patch-ac | 30 | ||||
-rw-r--r-- | japanese/libslang/files/patch-ad | 103 |
3 files changed, 148 insertions, 74 deletions
diff --git a/japanese/libslang/files/patch-aa b/japanese/libslang/files/patch-aa index 5660d068dff3..7a63728e219e 100644 --- a/japanese/libslang/files/patch-aa +++ b/japanese/libslang/files/patch-aa @@ -1,11 +1,78 @@ ---- src/sltermin.c.orig Sun Jul 26 15:57:36 1998 -+++ src/sltermin.c Sun Jul 26 15:58:06 1998 -@@ -273,7 +273,7 @@ - { - tidir = Terminfo_Dirs[i]; - if ((tidir != NULL) -- && (sizeof (file) > strlen (tidir) + 2 + strlen (term))) -+ && (sizeof (file) > strlen (tidir) + 3 + strlen (term))) - { - sprintf (file, "%s/%c/%s", tidir, *term, term); - if (NULL != (fp = open_terminfo (file, ti))) +*** configure.orig Mon Apr 13 12:57:32 1998 +--- configure Wed Apr 21 11:05:02 1999 +*************** +*** 1489,1519 **** + + echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6 + echo "configure:1492: checking SLANG_VERSION" >&5 +! slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h | +! awk '{ print $3 }'` +! slang_major_version=`echo $slang_version | +! awk '{ print int($1/10000) }'` +! slang_minor_version=`echo $slang_version $slang_major_version | +! awk '{ print int(($1 - $2*10000)/100) }'` +! slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version | +! awk '{ print ($1 - $2*10000 - $3*100) }'` +! +! slang_minor_version=$slang_minor_version.$slang_mminor_version + echo "$ac_t""$slang_major_version.$slang_minor_version" 1>&6 + + + + + +! if test "$GCC" = yes; then +! ELF_CC="gcc" +! ELF_CFLAGS="-O2 -fno-strength-reduce -fPIC" +! ELF_LINK="gcc -shared -Wl,-soname#" +! ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)" + else +! ELF_CC="cc" +! ELF_CFLAGS="-K pic" +! ELF_LINK="ld -G -z text" + ELF_LINK_CMD="\$(ELF_LINK)" + fi + +--- 1489,1511 ---- + + echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6 + echo "configure:1492: checking SLANG_VERSION" >&5 +! slang_major_version=2 +! slang_minor_version=0 + echo "$ac_t""$slang_major_version.$slang_minor_version" 1>&6 + + + + + +! if [ "$PORTOBJFORMAT" = elf ]; then +! ELF_CC="\$(CC)" +! ELF_CFLAGS="\$(CFLAGS) -fPIC" +! ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)" +! ELF_LINK_CMD="\$(ELF_LINK)" + else +! ELF_CC="\$(CC)" +! ELF_CFLAGS="\$(CFLAGS) -fPIC" +! ELF_LINK="ld -Bshareable -x" + ELF_LINK_CMD="\$(ELF_LINK)" + fi + +*************** +*** 2033,2048 **** + + + echo "" +- echo "Configuration complete. You may need to edit src/Makefile." +- echo "You are compiling SLANG with the following compiler configuration:" +- echo " CC =" "$CC" +- echo " CFLAGS =" "$CFLAGS" +- echo " LDFLAGS =" "$LDFLAGS" +- echo "" +- echo " ELF_CC =" "$ELF_CC" +- echo " ELF_LINK =" "$ELF_LINK" +- echo "ELF_CFLAGS=" "$ELF_CFLAGS" +- echo "" +- echo "See also src/sl-feat.h for various features." +- echo "Type 'make' to build normal library." +- echo "On ELF systems, type 'make elf' to create ELF shared library." +--- 2025,2027 ---- diff --git a/japanese/libslang/files/patch-ac b/japanese/libslang/files/patch-ac new file mode 100644 index 000000000000..a1a784991261 --- /dev/null +++ b/japanese/libslang/files/patch-ac @@ -0,0 +1,30 @@ +*** autoconf/Makefile.in.orig Mon Apr 13 12:57:32 1998 +--- autoconf/Makefile.in Thu Apr 22 03:32:46 1999 +*************** +*** 10,16 **** + cd src; $(MAKE) all + elf: + cd src; $(MAKE) elf +- @echo Use make install-elf to install it. + demos: + cd demo; $(MAKE) + clean: +--- 10,15 ---- +*************** +*** 21,35 **** + cd src; $(MAKE) install + install-elf: + cd src; $(MAKE) install-elf +- @echo "" +- @echo "Although not required, consider doing 'make install-links' to extra links" +- @echo "You will also have to run ldconfig." +- @echo "" + install-links: + cd src; $(MAKE) install-links +- @echo "" +- @echo "Make sure that you remember to run ldconfig to complete the installation." +- @echo "" + # + distclean: + /bin/rm -f *~ Makefile config.status config.log config.cache files.pck +--- 20,27 ---- diff --git a/japanese/libslang/files/patch-ad b/japanese/libslang/files/patch-ad index ef8ddd3c7960..99be7feaa171 100644 --- a/japanese/libslang/files/patch-ad +++ b/japanese/libslang/files/patch-ad @@ -1,63 +1,40 @@ ---- configure.orig Fri Apr 24 01:16:57 1998 -+++ configure Tue Sep 22 16:11:04 1998 -@@ -1489,35 +1489,25 @@ - - echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6 - echo "configure:1492: checking SLANG_VERSION" >&5 --slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h | -- awk '{ print $3 }'` --slang_major_version=`echo $slang_version | -- awk '{ print int($1/10000) }'` --slang_minor_version=`echo $slang_version $slang_major_version | -- awk '{ print int(($1 - $2*10000)/100) }'` --slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version | -- awk '{ print ($1 - $2*10000 - $3*100) }'` -- --slang_minor_version=$slang_minor_version.$slang_mminor_version -+slang_major_version=1 -+slang_minor_version=3 - echo "$ac_t""$slang_major_version.$slang_minor_version" 1>&6 - - - - - --if test "$GCC" = yes; then -- ELF_CC="gcc" -- ELF_CFLAGS="-O2 -fno-strength-reduce -fPIC" -- ELF_LINK="gcc -shared -Wl,-soname#" -- ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)" -+if [ $PORTOBJFORMAT = elf ]; then -+ELF_CC="\$(CC)" -+ELF_CFLAGS="\$(CFLAGS) -fPIC" -+ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)" -+ELF_LINK_CMD="\$(ELF_LINK)" - else -- ELF_CC="cc" -- ELF_CFLAGS="-K pic" -- ELF_LINK="ld -G -z text" -- ELF_LINK_CMD="\$(ELF_LINK)" -+ELF_CC="\$(CC)" -+ELF_CFLAGS="\$(CFLAGS) -fPIC" -+ELF_LINK="ld -Bshareable -x" -+ELF_LINK_CMD="\$(ELF_LINK)" - fi -- -- - - - ---- src/Makefile.in Fri Apr 24 01:17:04 1998 -+++ /tmp/Makefile.in Tue Sep 22 15:45:26 1998 -@@ -68,7 +68,11 @@ - - ELFLIB = lib$(THIS_LIB).so# - ELFLIB_MAJOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# -+.if ${PORTOBJFORMAT} == elf -+ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# -+.else - ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)# -+.endif - - ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)# - +*** src/Makefile.in.orig Wed Nov 25 23:02:20 1998 +--- src/Makefile.in Thu Apr 22 03:04:38 1999 +*************** +*** 68,74 **** +--- 68,78 ---- + + ELFLIB = lib$(THIS_LIB).so# + ELFLIB_MAJOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# ++ .if ( ${PORTOBJFORMAT} == "aout" ) + ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)# ++ .else ++ ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# ++ .endif + + ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)# + +*************** +*** 126,136 **** + $(MKINSDIR) $(install_include_dir) + $(install_lib_dir): + $(MKINSDIR) $(install_lib_dir) +! install-elf: install elf $(install_lib_dir) $(install_include_dir) $(ELFDIR_ELF_LIB) + $(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir) + $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir) +! -$(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) +--- 130,139 ---- + $(MKINSDIR) $(install_include_dir) + $(install_lib_dir): + $(MKINSDIR) $(install_lib_dir) +! install-elf: elf $(install_lib_dir) $(install_include_dir) $(ELFDIR_ELF_LIB) + $(INSTALL_DATA) $(SRCDIR)/slang.h $(install_include_dir) + $(INSTALL_DATA) $(SRCDIR)/slcurses.h $(install_include_dir) +! $(INSTALL_DATA) $(SRCDIR)/slkanji.h $(install_include_dir) + @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) |