mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-27 05:10:36 +00:00
Update to 1.4.1.j0.
PR: ports/20027 Submitted by: IWASHITA Yoji <shuna@pop16.odn.ne.jp>
This commit is contained in:
Akinori MUSHA
parent
24916051a2
commit
c0559befef
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=30822
@ -8,22 +8,16 @@
|
||||
PORTNAME= libslang
|
||||
PORTVERSION= ${VERSION}.j${JP_VERSION}
|
||||
CATEGORIES= japanese devel
|
||||
MASTER_SITES= http://home.sprintmail.com/~kikutani/slang/ \
|
||||
http://www.actweb.ne.jp/k-yosino/
|
||||
DISTNAME= slang-${PREV_VERSION}-20000123
|
||||
|
||||
PATCH_SITES= http://www.actweb.ne.jp/k-yosino/
|
||||
PATCHFILES= ${PREV_VERSION}__${VERSION}jp${JP_VERSION}.diff.gz
|
||||
PATCH_DIST_STRIP= -p1
|
||||
MASTER_SITES= http://www.actweb.ne.jp/k-yosino/ \
|
||||
http://home.sprintmail.com/~kikutani/slang/
|
||||
DISTNAME= slang-${VERSION}jp${JP_VERSION}
|
||||
|
||||
MAINTAINER= mega@minz.org
|
||||
|
||||
VERSION= 1.4.0
|
||||
VERSION= 1.4.1
|
||||
JP_VERSION= 0
|
||||
PREV_VERSION= 1.3.10jp0
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
WRKSRC= ${WRKDIR}/slang-${PREV_VERSION}
|
||||
CONFIGURE_ARGS= --includedir=${PREFIX}/include/slang
|
||||
ALL_TARGET= all elf
|
||||
INSTALL_TARGET= install-elf
|
||||
|
||||
@ -1,2 +1 @@
|
||||
MD5 (slang-1.3.10jp0-20000123.tar.gz) = fc93176df905affcd201a5d13b9259ba
|
||||
MD5 (1.3.10jp0__1.4.0jp0.diff.gz) = 545e71f0c39e51b98b08e4036cf7ab83
|
||||
MD5 (slang-1.4.1jp0.tar.gz) = a37bc3e6665286ed03e1abd479e7643e
|
||||
|
||||
@ -1,115 +1,81 @@
|
||||
*** configure.orig Thu Feb 3 05:30:44 2000
|
||||
--- configure Sat Feb 5 01:22:00 2000
|
||||
***************
|
||||
*** 1760,1766 ****
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
! LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1766 "configure"
|
||||
#include "confdefs.h"
|
||||
--- 1760,1766 ----
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
!
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1766 "configure"
|
||||
#include "confdefs.h"
|
||||
***************
|
||||
*** 1818,1824 ****
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
! DYNAMIC_LINK_LIB="-ldl"
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_DLFCN_H 1
|
||||
EOF
|
||||
--- 1818,1824 ----
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
! DYNAMIC_LINK_LIB=""
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_DLFCN_H 1
|
||||
EOF
|
||||
***************
|
||||
*** 1866,1876 ****
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
! echo "Note: ELF compiler for host_os=$host_os may be wrong"
|
||||
! ELF_CC="\$(CC)"
|
||||
! ELF_CFLAGS="\$(CFLAGS) -fPIC"
|
||||
! ELF_LINK="\$(CC) -shared"
|
||||
! ELF_LINK_CMD="\$(ELF_LINK)"
|
||||
esac
|
||||
|
||||
|
||||
--- 1866,1884 ----
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
! if [ "$PORTOBJFORMAT" = elf ]; then
|
||||
! DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
|
||||
! ELF_CC="\$(CC)"
|
||||
! ELF_CFLAGS="\$(CFLAGS) -fPIC"
|
||||
! ELF_LINK="\$(CC) -shared -Wl,-soname#"
|
||||
! ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
|
||||
! else
|
||||
! DYNAMIC_LINK_FLAGS=""
|
||||
! ELF_CC="\$(CC)"
|
||||
! ELF_CFLAGS="\$(CFLAGS) -fPIC"
|
||||
! ELF_LINK="ld -Bshareable -x"
|
||||
! ELF_LINK_CMD="\$(ELF_LINK)"
|
||||
! fi
|
||||
esac
|
||||
|
||||
|
||||
***************
|
||||
*** 2183,2196 ****
|
||||
echo "configure:2184: 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_version="$slang_major_version.$slang_minor_version"
|
||||
echo "$ac_t""$slang_version" 1>&6
|
||||
|
||||
--- 2191,2198 ----
|
||||
echo "configure:2184: checking SLANG_VERSION" >&5
|
||||
slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h |
|
||||
awk '{ print $3 }'`
|
||||
! slang_major_version=2
|
||||
! slang_minor_version=2
|
||||
slang_version="$slang_major_version.$slang_minor_version"
|
||||
echo "$ac_t""$slang_version" 1>&6
|
||||
|
||||
***************
|
||||
*** 2712,2729 ****
|
||||
|
||||
|
||||
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 $DYNAMIC_LINK_FLAGS"
|
||||
- echo ""
|
||||
- echo " ELF_CC =" "$ELF_CC"
|
||||
- echo " ELF_LINK =" "$ELF_LINK"
|
||||
- echo "ELF_CFLAGS=" "$ELF_CFLAGS"
|
||||
- echo ""
|
||||
echo "Installation Prefix:" "$prefix"
|
||||
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."
|
||||
--- 2714,2718 ----
|
||||
--- configure.orig Thu Apr 27 22:32:55 2000
|
||||
+++ configure Tue Jul 18 10:58:01 2000
|
||||
@@ -1760,7 +1760,7 @@
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
-LIBS="-ldl $LIBS"
|
||||
+
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1766 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -1818,7 +1818,7 @@
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
|
||||
- DYNAMIC_LINK_LIB="-ldl"
|
||||
+ DYNAMIC_LINK_LIB=""
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_DLFCN_H 1
|
||||
EOF
|
||||
@@ -1866,11 +1866,19 @@
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
- echo "Note: ELF compiler for host_os=$host_os may be wrong"
|
||||
- ELF_CC="\$(CC)"
|
||||
- ELF_CFLAGS="\$(CFLAGS) -fPIC"
|
||||
- ELF_LINK="\$(CC) -shared"
|
||||
- ELF_LINK_CMD="\$(ELF_LINK)"
|
||||
+ if [ "$PORTOBJFORMAT" = elf ]; then
|
||||
+ DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
|
||||
+ ELF_CC="\$(CC)"
|
||||
+ ELF_CFLAGS="\$(CFLAGS) -fPIC"
|
||||
+ ELF_LINK="\$(CC) -shared -Wl,-soname#"
|
||||
+ ELF_LINK_CMD="\$(ELF_LINK),\$(ELFLIB_MAJOR)"
|
||||
+ else
|
||||
+ DYNAMIC_LINK_FLAGS=""
|
||||
+ ELF_CC="\$(CC)"
|
||||
+ ELF_CFLAGS="\$(CFLAGS) -fPIC"
|
||||
+ ELF_LINK="ld -Bshareable -x"
|
||||
+ ELF_LINK_CMD="\$(ELF_LINK)"
|
||||
+ fi
|
||||
esac
|
||||
|
||||
|
||||
@@ -2201,14 +2209,8 @@
|
||||
echo "configure:2202: 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=2
|
||||
+slang_minor_version=3
|
||||
slang_version="$slang_major_version.$slang_minor_version"
|
||||
echo "$ac_t""$slang_version" 1>&6
|
||||
|
||||
@@ -2730,18 +2732,5 @@
|
||||
|
||||
|
||||
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 $DYNAMIC_LINK_FLAGS"
|
||||
-echo ""
|
||||
-echo " ELF_CC =" "$ELF_CC"
|
||||
-echo " ELF_LINK =" "$ELF_LINK"
|
||||
-echo "ELF_CFLAGS=" "$ELF_CFLAGS"
|
||||
-echo ""
|
||||
echo "Installation Prefix:" "$prefix"
|
||||
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."
|
||||
|
||||
@ -1,37 +1,27 @@
|
||||
*** autoconf/Makefile.in.orig Sun Nov 14 15:20:58 1999
|
||||
--- autoconf/Makefile.in Thu Feb 3 04:09:19 2000
|
||||
***************
|
||||
*** 10,16 ****
|
||||
cd src; $(MAKE) all
|
||||
elf:
|
||||
cd src; $(MAKE) elf
|
||||
! @echo Use make install-elf to install it.
|
||||
runtests:
|
||||
cd src/test; $(MAKE)
|
||||
demos:
|
||||
--- 10,16 ----
|
||||
cd src; $(MAKE) all
|
||||
elf:
|
||||
cd src; $(MAKE) elf
|
||||
!
|
||||
runtests:
|
||||
cd src/test; $(MAKE)
|
||||
demos:
|
||||
***************
|
||||
*** 23,37 ****
|
||||
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
|
||||
--- 23,30 ----
|
||||
--- autoconf/Makefile.in.orig Sun Nov 14 15:20:58 1999
|
||||
+++ autoconf/Makefile.in Tue Jul 18 04:53:27 2000
|
||||
@@ -10,7 +10,7 @@
|
||||
cd src; $(MAKE) all
|
||||
elf:
|
||||
cd src; $(MAKE) elf
|
||||
- @echo Use make install-elf to install it.
|
||||
+
|
||||
runtests:
|
||||
cd src/test; $(MAKE)
|
||||
demos:
|
||||
@@ -23,15 +23,8 @@
|
||||
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
|
||||
|
||||
@ -1,43 +1,31 @@
|
||||
*** src/Makefile.in.orig Thu Feb 3 03:25:50 2000
|
||||
--- src/Makefile.in Thu Feb 3 04:15:43 2000
|
||||
***************
|
||||
*** 36,42 ****
|
||||
exec_prefix = @exec_prefix@
|
||||
install_lib_dir = @libdir@
|
||||
install_include_dir = @includedir@
|
||||
! install_doc_dir = $(prefix)/doc/slang/@slang_version@
|
||||
DOC_FILES = ../changes.txt ../COPY* ../doc/slangdoc.html ../doc/text/*.txt
|
||||
#---------------------------------------------------------------------------
|
||||
# Misc commands (safe to leave these untouched)
|
||||
--- 36,42 ----
|
||||
exec_prefix = @exec_prefix@
|
||||
install_lib_dir = @libdir@
|
||||
install_include_dir = @includedir@
|
||||
! 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)
|
||||
***************
|
||||
*** 74,80 ****
|
||||
--- 74,84 ----
|
||||
|
||||
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)#
|
||||
|
||||
***************
|
||||
*** 107,112 ****
|
||||
--- 111,117 ----
|
||||
$(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); strip $(ELFLIB_MAJOR_MINOR)
|
||||
cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
|
||||
@echo ""
|
||||
@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
|
||||
--- src/Makefile.in.orig Thu Apr 27 22:32:56 2000
|
||||
+++ src/Makefile.in Tue Jul 18 04:54:20 2000
|
||||
@@ -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)
|
||||
@@ -74,7 +74,11 @@
|
||||
|
||||
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)#
|
||||
|
||||
@@ -107,6 +111,7 @@
|
||||
$(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); strip $(ELFLIB_MAJOR_MINOR)
|
||||
cd $(ELFDIR); $(RM) $(ELFLIB); $(LN) $(ELFLIB_MAJOR_MINOR) $(ELFLIB)
|
||||
@echo ""
|
||||
@echo $(ELFLIB_MAJOR_MINOR) created in $(ELFDIR).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user