pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add SHLIB_VERSION to Original pkgsrc Makefile.in. patches to Makefile.in. SHLIB_VERSION is not set.



Module Name:	pkgsrc-wip
Committed By:	Boyd Lynn Gerber <gerberb%zenez.com@localhost>
Pushed By:	gerberb
Date:		Thu Jun 9 06:45:43 2022 -0600
Changeset:	d280df6381ccbe499a82a37a49dce5a94ca5e79f

Modified Files:
	tcl-expect/PLIST
	tcl-expect/distinfo
	tcl-expect/patches/patch-Makefile.in

Log Message:
Add SHLIB_VERSION to Original pkgsrc Makefile.in. patches to Makefile.in. SHLIB_VERSION is not set.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d280df6381ccbe499a82a37a49dce5a94ca5e79f

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

diffstat:
 tcl-expect/PLIST                     |  4 ++--
 tcl-expect/distinfo                  |  2 +-
 tcl-expect/patches/patch-Makefile.in | 21 +++++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diffs:
diff --git a/tcl-expect/PLIST b/tcl-expect/PLIST
index 82f6ebc661..c5fffe9ce4 100644
--- a/tcl-expect/PLIST
+++ b/tcl-expect/PLIST
@@ -27,8 +27,8 @@ include/expect_tcl.h
 include/tcldbg.h
 lib/libexpect${SONUM}.a
 lib/libexpect${SONUM}.so
-lib/libexpect5454.so.@SHLIB_VERSION@
-lib/tcl/expect${BASEVER}/libexpect5454.so
+lib/libexpect${SONUM}.so.1.0
+lib/tcl/expect${BASEVER}/libexpect${SONUM}.so
 lib/tcl/expect${BASEVER}/pkgIndex.tcl
 man/man1/autoexpect.1
 man/man1/cryptdir.1
diff --git a/tcl-expect/distinfo b/tcl-expect/distinfo
index 8a86010438..bd3d3348cd 100644
--- a/tcl-expect/distinfo
+++ b/tcl-expect/distinfo
@@ -3,7 +3,7 @@ $NetBSD: distinfo,v 1.22 2021/10/26 10:51:57 nia Exp $
 BLAKE2s (expect5.45.4.tar.gz) = 41310882c3658679f60911aca1a3cf9c353784f164410abf919ce7adefdc73e0
 SHA512 (expect5.45.4.tar.gz) = a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 Size (expect5.45.4.tar.gz) = 632363 bytes
-SHA1 (patch-Makefile.in) = 24efcbdb0a21985cb8a0fb7812c5f45f67de7c30
+SHA1 (patch-Makefile.in) = 16ef8b14ae05b432b92b48d5fe0803d3024914d4
 SHA1 (patch-configure) = 095a64052903d7af168786ebba728a39302978ec
 SHA1 (patch-retoglob.c) = 4406f9e5d7622f393e35e7a1f70a700a98d6e981
 SHA1 (patch-tclconfig_tcl.m4) = 45d1f405ca1b506c0a0fe60492b13ada111fa813
diff --git a/tcl-expect/patches/patch-Makefile.in b/tcl-expect/patches/patch-Makefile.in
index 8ca14c67fb..b1e316b4ab 100644
--- a/tcl-expect/patches/patch-Makefile.in
+++ b/tcl-expect/patches/patch-Makefile.in
@@ -1,20 +1,21 @@
 $NetBSD: patch-Makefile.in,v 1.4 2018/08/27 07:12:08 wiz Exp $
 
-New Makefile.in patch, no libtool
+New Makefile.in patch, no libtool taken from Original pkgsrc Makefil.in patches
 
---- Makefile.in.orig	2010-09-30 17:14:07.000000000 +0000
-+++ Makefile.in
-@@ -99,7 +99,9 @@ PKG_HEADERS	= @PKG_HEADERS@
+--- Makefile.in.orig	2018-02-02 12:15:52.000000000 -0700
++++ Makefile.in	2022-06-09 06:35:29.261652426 -0600
+@@ -99,7 +99,10 @@
  # configuration options) composed of the named objects.
  #========================================================================
  
-+SHLIB_VERSION	= .@SHLIB_VERSION@
++# Add a SHLIB_VERSION because it is not defined
++SHLIB_VERSION	= .1.0
  PKG_LIB_FILE	= @PKG_LIB_FILE@
 +PKG_LIB_A_FILE  = ${PKG_LIB_FILE:.so=.a}
  PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
  
  lib_BINARIES	= $(PKG_LIB_FILE)
-@@ -121,9 +123,9 @@ includedir	= @includedir@
+@@ -121,9 +124,9 @@
  DESTDIR		=
  
  PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
@@ -27,7 +28,7 @@ New Makefile.in patch, no libtool
  
  top_builddir	= .
  
-@@ -149,7 +151,7 @@ RANLIB		= @RANLIB@
+@@ -149,7 +152,7 @@
  RANLIB_STUB	= @RANLIB_STUB@
  SHLIB_CFLAGS	= @SHLIB_CFLAGS@
  SHLIB_LD	= @SHLIB_LD@
@@ -36,7 +37,7 @@ New Makefile.in patch, no libtool
  STLIB_LD	= @STLIB_LD@
  TCL_DEFS	= @TCL_DEFS@
  TCL_BIN_DIR	= @TCL_BIN_DIR@
-@@ -214,10 +216,15 @@ all: binaries libraries doc
+@@ -214,10 +217,15 @@
  # of the Makefile, in the "BINARIES" variable.
  #========================================================================
  
@@ -53,7 +54,7 @@ New Makefile.in patch, no libtool
  doc:
  
  install: all install-binaries install-libraries install-doc
-@@ -547,6 +554,9 @@ install-lib-binaries:
+@@ -547,6 +555,9 @@
  	    fi; \
  	  fi; \
  	done
@@ -63,7 +64,7 @@ New Makefile.in patch, no libtool
  	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
  	  if test -f $(srcdir)/$$p; then \
  	    destp=`basename $$p`; \
-@@ -554,9 +564,11 @@ install-lib-binaries:
+@@ -554,9 +565,11 @@
  	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
  	  fi; \
  	done


Home | Main Index | Thread Index | Old Index