CVS commit: pkgsrc/devel/libtecla

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/libtecla
From: "Niclas Rosenvik" <nros%netbsd.org@localhost>
Date: Sun, 17 Dec 2023 13:59:39 +0000

Module Name:    pkgsrc
Committed By:   nros
Date:           Sun Dec 17 13:59:39 UTC 2023

Modified Files:
        pkgsrc/devel/libtecla: Makefile buildlink3.mk distinfo
        pkgsrc/devel/libtecla/patches: patch-aa patch-configure
Added Files:
        pkgsrc/devel/libtecla: PLIST.SunOS
Removed Files:
        pkgsrc/devel/libtecla/patches: patch-Makefile.in

Log Message:
libtecla: Update to version 1.6.3, fix install on solaris

pkgsrc changes:
Install the man pages in the same catalogs
as other systems in pkgsrc.
Also install .so.${PKG_VERSION} on solaris.
Readd PLIST.SunOS for the reentrant versions
of libtecla.
patch-Makefile.in removed since it has been
applied upstream.
Set LICENSE.

Changes from release notes:
Version 1.6.3:

  This release corrects some problems in the build process,
  including one that was preventing libtecla from being compiled
  on Mac OS X.

Version 1.6.2:

  This release updates the configuration script to ensure that the
  enhance utility program is compiled correctly on systems that have
  system V psuedo-terminal allocation but not system V streams.

  There are no new features.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/libtecla/Makefile
cvs rdiff -u -r0 -r1.3 pkgsrc/devel/libtecla/PLIST.SunOS
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/libtecla/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/libtecla/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/libtecla/patches/patch-Makefile.in
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libtecla/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libtecla/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libtecla/Makefile
diff -u pkgsrc/devel/libtecla/Makefile:1.19 pkgsrc/devel/libtecla/Makefile:1.20
--- pkgsrc/devel/libtecla/Makefile:1.19 Fri Dec 15 13:49:37 2023
+++ pkgsrc/devel/libtecla/Makefile      Sun Dec 17 13:59:38 2023
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2023/12/15 13:49:37 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2023/12/17 13:59:38 nros Exp $
 
-DISTNAME=      libtecla-1.6.1
-PKGREVISION=   4
+DISTNAME=      libtecla-1.6.3
 CATEGORIES=    devel
 MASTER_SITES=  http://www.astro.caltech.edu/~mcs/tecla/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.astro.caltech.edu/~mcs/tecla/
 COMMENT=       Interactive command line editing facilities
+LICENSE=       x11
 
 MAKE_JOBS_SAFE=                no
 

Index: pkgsrc/devel/libtecla/buildlink3.mk
diff -u pkgsrc/devel/libtecla/buildlink3.mk:1.9 pkgsrc/devel/libtecla/buildlink3.mk:1.10
--- pkgsrc/devel/libtecla/buildlink3.mk:1.9     Sun Jan  7 13:04:07 2018
+++ pkgsrc/devel/libtecla/buildlink3.mk Sun Dec 17 13:59:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:07 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2023/12/17 13:59:38 nros Exp $
 
 BUILDLINK_TREE+=       libtecla
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libtecla
 LIBTECLA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libtecla+=       libtecla>=1.5.0
-BUILDLINK_ABI_DEPENDS.libtecla+=       libtecla>=1.6.1nb1
+BUILDLINK_ABI_DEPENDS.libtecla+=       libtecla>=1.6.3
 BUILDLINK_PKGSRCDIR.libtecla?=         ../../devel/libtecla
 .endif # LIBTECLA_BUILDLINK3_MK
 

Index: pkgsrc/devel/libtecla/distinfo
diff -u pkgsrc/devel/libtecla/distinfo:1.11 pkgsrc/devel/libtecla/distinfo:1.12
--- pkgsrc/devel/libtecla/distinfo:1.11 Wed Mar 30 07:09:57 2022
+++ pkgsrc/devel/libtecla/distinfo      Sun Dec 17 13:59:38 2023
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.11 2022/03/30 07:09:57 wiz Exp $
+$NetBSD: distinfo,v 1.12 2023/12/17 13:59:38 nros Exp $
 
-BLAKE2s (libtecla-1.6.1.tar.gz) = eb4bc5ef10493a400f11bce594e8dc03ed76f8cb1c7a6cd2dae98886b1e61f16
-SHA512 (libtecla-1.6.1.tar.gz) = 89d550868c99739b5cfd0ddba45f61d9a8fd1454c7044f29db6cced9cd1de83b895409706a8b85024d6c75678469a4b8b39dd184322d01e1ab6b5faf03c90fc7
-Size (libtecla-1.6.1.tar.gz) = 518995 bytes
-SHA1 (patch-Makefile.in) = c35528253258c5aa7a4cde643341e1cb71daaa32
-SHA1 (patch-aa) = 11be4b3d36a8bfc3247db1999b0c0546d5994413
-SHA1 (patch-configure) = 16200249075ab7379e3a0f03331b9265862742b0
+BLAKE2s (libtecla-1.6.3.tar.gz) = bbebec30932e29f014fdf120246c07d2a9ec763cbd1f29eae63a8c817acf8454
+SHA512 (libtecla-1.6.3.tar.gz) = e92da3e52f1e06f731378ea8d4529865526b7816f92c3cd41a24ee8b629453564ec1995cf528928dd0673826cdd88f57e057ec0641f9c00fc9ebb255c725df6b
+Size (libtecla-1.6.3.tar.gz) = 531499 bytes
+SHA1 (patch-aa) = 19bf75e91707946e4ca453e1c16db60c92271547
+SHA1 (patch-configure) = a088a9e6430340201f1febb7bd99ff12be273d70

Index: pkgsrc/devel/libtecla/patches/patch-aa
diff -u pkgsrc/devel/libtecla/patches/patch-aa:1.4 pkgsrc/devel/libtecla/patches/patch-aa:1.5
--- pkgsrc/devel/libtecla/patches/patch-aa:1.4  Sun Mar 22 13:38:28 2020
+++ pkgsrc/devel/libtecla/patches/patch-aa      Sun Dec 17 13:59:38 2023
@@ -1,35 +1,35 @@
-$NetBSD: patch-aa,v 1.4 2020/03/22 13:38:28 tnn Exp $
+$NetBSD: patch-aa,v 1.5 2023/12/17 13:59:38 nros Exp $
 
 Patch out bogus rpaths that point to the build directory.
 Add missing LDFLAGS, needed when termcap provides by pkgsrc.
 
---- Makefile.rules.orig        2002-12-04 06:26:56.000000000 +0000
+--- Makefile.rules.orig        2014-11-09 21:36:53.000000000 +0000
 +++ Makefile.rules
 @@ -54,20 +54,20 @@ libtecla.map.opt: $(srcdir)/libtecla.map
  demos: $(DEMO_PROGS)
  
- demo$(SUFFIX): $(OBJDIR)/demo.o
+ demo$(SUFFIX): $(OBJDIR)/demo.o $(TARGETS)
 -      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
 - $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LIBS)
-+      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH" $(CC) $(CFLAGS) -o $@ \
++      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:" $(CC) $(CFLAGS) -o $@ \
 + $(OBJDIR)/demo.o -L. -ltecla$(SUFFIX) $(LDFLAGS) $(LIBS)
  
- demo2$(SUFFIX): $(OBJDIR)/demo2.o
+ demo2$(SUFFIX): $(OBJDIR)/demo2.o $(TARGETS)
 -      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
 - $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LIBS)
-+      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH" $(CC) $(CFLAGS) -o $@ \
++      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:" $(CC) $(CFLAGS) -o $@ \
 + $(OBJDIR)/demo2.o -L. -ltecla$(SUFFIX) $(LDFLAGS) $(LIBS)
  
- demo3$(SUFFIX): $(OBJDIR)/demo3.o
+ demo3$(SUFFIX): $(OBJDIR)/demo3.o $(TARGETS)
 -      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
 - $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LIBS)
-+      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH" $(CC) $(CFLAGS) -o $@ \
++      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:" $(CC) $(CFLAGS) -o $@ \
 + $(OBJDIR)/demo3.o -L. -ltecla$(SUFFIX) $(LDFLAGS) $(LIBS)
  
- enhance$(SUFFIX): $(OBJDIR)/enhance.o
+ enhance$(SUFFIX): $(OBJDIR)/enhance.o $(TARGETS)
 -      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:`pwd`" $(CC) $(CFLAGS) -o $@ \
 - $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LIBS)
-+      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH" $(CC) $(CFLAGS) -o $@ \
++      LD_RUN_PATH="$(LIBDIR):$$LD_RUN_PATH:" $(CC) $(CFLAGS) -o $@ \
 + $(OBJDIR)/enhance.o -L. -ltecla$(SUFFIX) $(LDFLAGS) $(LIBS)
  
  #-----------------------------------------------------------------------

Index: pkgsrc/devel/libtecla/patches/patch-configure
diff -u pkgsrc/devel/libtecla/patches/patch-configure:1.1 pkgsrc/devel/libtecla/patches/patch-configure:1.2
--- pkgsrc/devel/libtecla/patches/patch-configure:1.1   Sun Mar 15 23:41:54 2020
+++ pkgsrc/devel/libtecla/patches/patch-configure       Sun Dec 17 13:59:38 2023
@@ -1,28 +1,46 @@
-$NetBSD: patch-configure,v 1.1 2020/03/15 23:41:54 tnn Exp $
+$NetBSD: patch-configure,v 1.2 2023/12/17 13:59:38 nros Exp $
 
 Always link shared. Honour LDFLAGS.
+Install manpages on solaris just like on 
+the other systems.
 
---- configure.orig     2004-11-04 01:16:58.000000000 +0000
+--- configure.orig     2014-11-09 22:15:29.000000000 +0000
 +++ configure
-@@ -4152,7 +4152,7 @@ _ACEOF
+@@ -4161,9 +4161,9 @@ case $target in
+ *solaris*)
+   $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
  
-   SHARED_EXT=".so.${MAJOR_VER}"
-   SHARED_ALT=".so"
+-  SHARED_EXT=".so.${MAJOR_VER}"
+-  SHARED_ALT=".so"
 -  LINK_SHARED="$LD"' -G -M $$(srcdir)/libtecla.map -o $$@ -h $$(@F) -z defs -i $$(LIB_OBJECTS) $$(LIBS) -lc'
++  SHARED_EXT=".so.${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}"
++  SHARED_ALT=".so .so.${MAJOR_VER}"
 +  LINK_SHARED="$LD"' $$(LDFLAGS) -G -M $$(srcdir)/libtecla.map -o $$@ -h $$(@F) -z defs -i $$(LIB_OBJECTS) $$(LIBS) -lc'
    SHARED_CFLAGS="-Kpic"
    case $CC in
    */cc|cc) SHARED_CFLAGS="$SHARED_CFLAGS -xstrconst" ;;
-@@ -4172,7 +4172,7 @@ _ACEOF
-   FILE_MANDIR="man4"
-   FILE_MANEXT="4"
+@@ -4171,19 +4171,8 @@ case $target in
+   case $target_cpu in
+   sparc) SHARED_CFLAGS="$SHARED_CFLAGS -xregs=no%appl"
+   esac
+-  case $target_os in
+-  solaris2.[89]*|solaris2.1[0-9]*)
+-    LIBR_MANEXT=3lib
+-    FUNC_MANEXT=3tecla
+-    LIBR_MANDIR=man$LIBR_MANEXT
+-    FUNC_MANDIR=man$FUNC_MANEXT
+-  esac
+-  MISC_MANDIR="man5"
+-  MISC_MANEXT="5"
+-  FILE_MANDIR="man4"
+-  FILE_MANEXT="4"
    ;;
 -*linux*)
 +*linux*|*netbsd*)
    SHARED_EXT=".so.${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}"
    SHARED_ALT=".so .so.${MAJOR_VER}"
  
-@@ -4200,7 +4200,7 @@ echo "${ECHO_T}$tecla_cv_gnu_ld_script" 
+@@ -4211,7 +4200,7 @@ $as_echo "$tecla_cv_gnu_ld_script" >&6;
      VERSION_OPT=''
    fi
  
@@ -31,7 +49,7 @@ Always link shared. Honour LDFLAGS.
    SHARED_CFLAGS="-fpic"
  
  
-@@ -4219,7 +4219,7 @@ echo "${ECHO_T}$tecla_cv_gnu_ld_script" 
+@@ -4230,7 +4219,7 @@ $as_echo "$tecla_cv_gnu_ld_script" >&6;
  *darwin*)
    SHARED_EXT=".${MAJOR_VER}.${MINOR_VER}.${MICRO_VER}.dylib"
    SHARED_ALT=".dylib .${MAJOR_VER}.dylib"
@@ -40,7 +58,7 @@ Always link shared. Honour LDFLAGS.
    SHARED_CFLAGS=""
    ;;
  *dec-osf*)
-@@ -4232,7 +4232,7 @@ _ACEOF
+@@ -4241,7 +4230,7 @@ $as_echo "$tecla_cv_gnu_ld_script" >&6;
    SHARED_EXT=".so.${MAJOR_VER}"
    SHARED_ALT=".so"
    VERSION_OPT='--version-script=$$(srcdir)/libtecla.map'
@@ -49,11 +67,3 @@ Always link shared. Honour LDFLAGS.
    SHARED_CFLAGS="-fpic"
    ;;
  mips-sgi-irix*)
-@@ -4254,7 +4254,6 @@ if test "$GCC"_ = "yes"_ && test "$LINK_
-     SHARED_CFLAGS=""
-     ;;
-   esac
--  LINK_SHARED="$LINK_SHARED `gcc -print-libgcc-file-name`"
- fi
- 
- 

Added files:

Index: pkgsrc/devel/libtecla/PLIST.SunOS
diff -u /dev/null pkgsrc/devel/libtecla/PLIST.SunOS:1.3
--- /dev/null   Sun Dec 17 13:59:39 2023
+++ pkgsrc/devel/libtecla/PLIST.SunOS   Sun Dec 17 13:59:38 2023
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.SunOS,v 1.3 2023/12/17 13:59:38 nros Exp $
+lib/libtecla_r.a
+lib/libtecla_r.so
+lib/libtecla_r.so.1
+lib/libtecla_r.so.${PKGVERSION}

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index