Attachment 5802 Details for Bug 13592 – file.diff

[patch] file.diff

file.diff (text/plain), 13.78 KB, created by shuna on 1999-09-06 05:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: shuna

Created: 1999-09-06 05:50:01 UTC

Size: 13.78 KB

patch

obsolete

>diff -cNr libslang-old/Makefile libslang/Makefile
>*** libslang-old/Makefile	Fri Aug 27 12:41:42 1999
>--- libslang/Makefile	Sun Sep  5 01:08:52 1999
>***************
>*** 1,13 ****
>  # New ports collection makefile for:	ja-S-lang library
>! # Version required:	1.2.2_j055
>! # Date created:		22 April 1999
>  # Whom:			IWASHITA Yoji <shuna@pop16.odn.ne.jp>
>  #
>! # $FreeBSD: ports/japanese/libslang/Makefile,v 1.6 1999/08/25 05:25:14 obrien Exp $
>  #
>  
>! DISTNAME=	slang1.2.2_j055
>! PKGNAME=	ja-libslang-1.2.2.j055
>  CATEGORIES=	japanese devel
>  MASTER_SITES=	http://home.sprintmail.com/~kikutani/slang/
>  
>--- 1,13 ----
>  # New ports collection makefile for:	ja-S-lang library
>! # Version required:	1.3.8_j067
>! # Date created:		3 September 1999
>  # Whom:			IWASHITA Yoji <shuna@pop16.odn.ne.jp>
>  #
>! # $Id$
>  #
>  
>! DISTNAME=	slang-1.3.8__J067
>! PKGNAME=	ja-libslang-1.3.8.j067
>  CATEGORIES=	japanese devel
>  MASTER_SITES=	http://home.sprintmail.com/~kikutani/slang/
>  
>***************
>*** 16,29 ****
>  GNU_CONFIGURE=	yes
>  CONFIGURE_ARGS=	--includedir=${PREFIX}/include/slang
>  ALL_TARGET=	all elf
>! INSTALL_TARGET=	install install-elf
>! WRKSRC=		${WRKDIR}/slang
>  
>  post-install:
>  	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
>- 	${ECHO} "===> Installing documents in ${PREFIX}/share/doc/slang"
>- 	@${MKDIR} ${PREFIX}/share/doc/slang
>- 	${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/slang
>  	${CP} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang
>  
>  .include <bsd.port.mk>
>--- 16,25 ----
>  GNU_CONFIGURE=	yes
>  CONFIGURE_ARGS=	--includedir=${PREFIX}/include/slang
>  ALL_TARGET=	all elf
>! INSTALL_TARGET=	install-elf
>  
>  post-install:
>  	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
>  	${CP} ${WRKSRC}/slang-j.doc ${PREFIX}/share/doc/slang
>  
>  .include <bsd.port.mk>
>diff -cNr libslang-old/files/md5 libslang/files/md5
>*** libslang-old/files/md5	Sat May  1 12:28:08 1999
>--- libslang/files/md5	Sun Sep  5 01:08:52 1999
>***************
>*** 1 ****
>! MD5 (slang1.2.2_j055.tar.gz) = 0e80f4200b920d0cf07d9d03d58f76bf
>--- 1 ----
>! MD5 (slang-1.3.8__J067.tar.gz) = 3e1d4b4d35d479091fb3f6a876433d8b
>diff -cNr libslang-old/patches/patch-aa libslang/patches/patch-aa
>*** libslang-old/patches/patch-aa	Sat May  1 12:28:10 1999
>--- libslang/patches/patch-aa	Sun Sep  5 01:08:52 1999
>***************
>*** 1,12 ****
>! *** 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 |
>--- 1,10 ----
>! *** configure.orig	Wed Jul 14 05:30:30 1999
>! --- configure	Fri Sep  3 04:10:29 1999
>  ***************
>! *** 2025,2038 ****
>!   echo "configure:2026: 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 |
>***************
>*** 14,23 ****
>  ! 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
>!   
>    
>    
>    
>    
>--- 12,32 ----
>  ! 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
>!   
>! --- 2025,2032 ----
>!   echo "configure:2026: checking SLANG_VERSION" >&5
>!   slang_version=`grep "^#define  *SLANG_VERSION " $srcdir/src/slang.h |
>!                  awk '{ print $3 }'`
>! ! slang_major_version=2
>! ! slang_minor_version=1
>!   slang_version="$slang_major_version.$slang_minor_version"
>!   echo "$ac_t""$slang_version" 1>&6
>    
>+ ***************
>+ *** 2040,2054 ****
>    
>    
>    
>***************
>*** 33,47 ****
>      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
>!   
>!   
>    
>    
>    
>--- 42,48 ----
>      ELF_LINK_CMD="\$(ELF_LINK)"
>    fi
>    
>! --- 2034,2048 ----
>    
>    
>    
>***************
>*** 58,78 ****
>    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 ----
>--- 59,99 ----
>    fi
>    
>  ***************
>! *** 2569,2586 ****
>!   
>!   
>!   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."
>! --- 2563,2580 ----
>    
>    
>    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."
>diff -cNr libslang-old/patches/patch-ab libslang/patches/patch-ab
>*** libslang-old/patches/patch-ab	Sat May  1 12:28:10 1999
>--- libslang/patches/patch-ab	Thu Jan  1 09:00:00 1970
>***************
>*** 1,19 ****
>- *** src/sltermin.c.orig	Mon Apr 13 12:57:43 1998
>- --- src/sltermin.c	Sun Apr 18 15:29:06 1999
>- ***************
>- *** 273,279 ****
>-        {
>-   	tidir = Terminfo_Dirs[i];
>-   	if ((tidir != NULL)
>- ! 	    && (sizeof (file) > strlen (tidir) + 2 + strlen (term)))
>-   	  {
>-   	     sprintf (file, "%s/%c/%s", tidir, *term, term);
>-   	     if (NULL != (fp = open_terminfo (file, ti)))
>- --- 273,279 ----
>-        {
>-   	tidir = Terminfo_Dirs[i];
>-   	if ((tidir != NULL)
>- ! 	    && (sizeof (file) > strlen (tidir) + 3 + strlen (term)))
>-   	  {
>-   	     sprintf (file, "%s/%c/%s", tidir, *term, term);
>-   	     if (NULL != (fp = open_terminfo (file, ti)))
>--- 0 ----
>diff -cNr libslang-old/patches/patch-ac libslang/patches/patch-ac
>*** libslang-old/patches/patch-ac	Sat May  1 12:28:11 1999
>--- libslang/patches/patch-ac	Sun Sep  5 01:08:52 1999
>***************
>*** 1,17 ****
>! *** 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
>--- 1,17 ----
>! *** autoconf/Makefile.in.orig	Wed Jul 14 05:30:30 1999
>! --- autoconf/Makefile.in	Fri Sep  3 03:54:21 1999
>  ***************
>  *** 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,15 ----
>  ***************
>! *** 23,37 ****
>    	cd src; $(MAKE) install
>    install-elf:
>    	cd src; $(MAKE) install-elf
>***************
>*** 27,30 ****
>    #
>    distclean:
>    	/bin/rm -f *~ Makefile config.status config.log config.cache files.pck
>! --- 20,27 ----
>--- 27,30 ----
>    #
>    distclean:
>    	/bin/rm -f *~ Makefile config.status config.log config.cache files.pck
>! --- 22,29 ----
>diff -cNr libslang-old/patches/patch-ad libslang/patches/patch-ad
>*** libslang-old/patches/patch-ad	Sat May  1 12:28:12 1999
>--- libslang/patches/patch-ad	Sun Sep  5 01:08:52 1999
>***************
>*** 1,8 ****
>! *** 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)#
>--- 1,25 ----
>! *** src/Makefile.in.orig	Mon Jul 19 21:28:29 1999
>! --- src/Makefile.in	Fri Sep  3 04:26:09 1999
>  ***************
>! *** 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)#
>***************
>*** 15,40 ****
>    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)
>--- 32,43 ----
>    ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)#
>    
>  ***************
>! *** 106,111 ****
>! --- 110,116 ----
>!   $(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).
>diff -cNr libslang-old/pkg/PLIST libslang/pkg/PLIST
>*** libslang-old/pkg/PLIST	Sat May  1 12:28:13 1999
>--- libslang/pkg/PLIST	Sun Sep  5 01:08:52 1999
>***************
>*** 8,41 ****
>  include/slang/slcurses.h
>  include/slang/slkanji.h
>  @dirrm include/slang
>  share/doc/slang/slang-j.doc
>- share/doc/slang/README
>- share/doc/slang/OLD/help/README
>- share/doc/slang/OLD/help/makefile.djg
>- share/doc/slang/OLD/help/makefile.os2
>- share/doc/slang/OLD/help/makefile.unx
>- share/doc/slang/OLD/help/slang.hlp
>- share/doc/slang/OLD/help/slhelp.c
>- @dirrm share/doc/slang/OLD/help
>- @dirrm share/doc/slang/OLD
>- share/doc/slang/internal/rpn.txt
>- @dirrm share/doc/slang/internal
>- share/doc/slang/text/cref.txt
>- share/doc/slang/text/cslang.txt
>- share/doc/slang/text/slang.txt
>- share/doc/slang/text/slangfun.txt
>- @dirrm share/doc/slang/text
>- share/doc/slang/tm/tools/Makefile
>- share/doc/slang/tm/tools/sl2tm.c
>- share/doc/slang/tm/tools/tm2txt.c
>- @dirrm share/doc/slang/tm/tools
>- share/doc/slang/tm/Makefile
>- share/doc/slang/tm/copyright.tm
>- share/doc/slang/tm/cref.tm
>- share/doc/slang/tm/cslang.tm
>- share/doc/slang/tm/fixtex.sl
>- share/doc/slang/tm/preface.tm
>- share/doc/slang/tm/slang.tm
>- share/doc/slang/tm/slangfun.tm
>- @dirrm share/doc/slang/tm
>  @dirrm share/doc/slang
>--- 8,22 ----
>  include/slang/slcurses.h
>  include/slang/slkanji.h
>  @dirrm include/slang
>+ share/doc/slang/COPYING
>+ share/doc/slang/COPYING.ART
>+ share/doc/slang/COPYING.GPL
>+ share/doc/slang/COPYRIGHT
>+ share/doc/slang/changes.txt
>+ share/doc/slang/cref.txt
>+ share/doc/slang/cslang.txt
>+ share/doc/slang/slang.txt
>+ share/doc/slang/slangdoc.html
>+ share/doc/slang/slangfun.txt
>  share/doc/slang/slang-j.doc
>  @dirrm share/doc/slang

Actions: View | Diff

Attachments on bug 13592: 5802