pkgsrc-WIP-changes archive

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

tcl-expect: Tidy patch-configure



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Mon Jun 20 06:22:06 2022 -0400
Changeset:	d07126bf94b0e51379cdfc8830c11075f3ac9f54

Modified Files:
	tcl-expect/distinfo
	tcl-expect/patches/patch-configure

Log Message:
tcl-expect: Tidy patch-configure

Drop added comment about MirBSD support coming from FreeBSD ports
(because it didn't).

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

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

diffstat:
 tcl-expect/distinfo                |  2 +-
 tcl-expect/patches/patch-configure | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diffs:
diff --git a/tcl-expect/distinfo b/tcl-expect/distinfo
index ae7a76951c..164592dbf8 100644
--- a/tcl-expect/distinfo
+++ b/tcl-expect/distinfo
@@ -4,7 +4,7 @@ BLAKE2s (expect5.45.4.tar.gz) = 41310882c3658679f60911aca1a3cf9c353784f164410abf
 SHA512 (expect5.45.4.tar.gz) = a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
 Size (expect5.45.4.tar.gz) = 632363 bytes
 SHA1 (patch-Makefile.in) = 29813ec821902582e6991fc29a9378cf92cee2cd
-SHA1 (patch-configure) = d82e62975d854a4cae92f17051f13e0f586542d7
+SHA1 (patch-configure) = 1cfef5b77e37584799624b59232b717f8e64da3a
 SHA1 (patch-exp__chan.c) = 8dbb1b1abea73858cc9eba05d4662976edf664f5
 SHA1 (patch-retoglob.c) = 41bb63f893dcf6e1d1c768986bffc9e59206d17a
 SHA1 (patch-tclconfig_tcl.m4) = fb468fb941261dba4f5b5d39ee045283134a0de4
diff --git a/tcl-expect/patches/patch-configure b/tcl-expect/patches/patch-configure
index deefb82f38..7e59d98950 100644
--- a/tcl-expect/patches/patch-configure
+++ b/tcl-expect/patches/patch-configure
@@ -29,17 +29,16 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  STLIB_LD
  CFLAGS_WARNING
  CFLAGS_OPTIMIZE
-@@ -6480,7 +6481,8 @@ fi
+@@ -6480,7 +6481,7 @@ fi
  		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  	    ;;
 -	OpenBSD-*)
 +	OpenBSD-*|MirBSD-*)
-+	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
  	    SHLIB_SUFFIX=".so"
-@@ -6563,11 +6565,11 @@ fi
+@@ -6563,11 +6564,11 @@ fi
  		;;
  	    esac
  	    ;;
@@ -53,7 +52,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    SHLIB_SUFFIX=".so"
  	    LDFLAGS=""
  	    if test $doRpath = yes; then :
-@@ -6941,6 +6943,54 @@ fi
+@@ -6941,6 +6942,54 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	SCO_SV-3.2*)
@@ -108,7 +107,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    if test "$GCC" = yes; then :
  
  		SHLIB_CFLAGS="-fPIC -melf"
-@@ -7150,7 +7200,7 @@ fi
+@@ -7150,7 +7199,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*) ;;
  	    IRIX*) ;;
@@ -117,7 +116,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
  	    Darwin-*) ;;
  	    SCO_SV-3.2*) ;;
  	    windows) ;;
-@@ -9596,15 +9646,7 @@ fi
+@@ -9596,15 +9645,7 @@ fi
  #   up the Tcl library.
  
  PACKAGE_VERSION_NODOTS="`echo $PACKAGE_VERSION | sed -e 's/\.//g'`"
@@ -125,15 +124,15 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
 -if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 -    EXP_LIB_VERSION=$PACKAGE_VERSION
 -else
--    EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
+     EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
 -fi
 -if test $iunix -eq 1 ; then
-     EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
+-    EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
 -fi
  
  # also remove dots on systems that don't support filenames > 14
  # (are there systems which support shared libs and restrict filename lengths!?)
-@@ -9659,11 +9701,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+@@ -9659,11 +9700,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
      $as_echo "#define EXP_FRAMEWORK 1" >>confdefs.h
  
  else
@@ -146,7 +145,7 @@ Substitute the already-computed SHLIB_VERSION, for use in Makefile.in.
      EXP_BUILD_LIB_SPEC="-L`pwd` ${EXP_LIB_FLAG}"
      EXP_LIB_SPEC="-L${libdir} ${EXP_LIB_FLAG}"
  fi
-@@ -9965,6 +10003,9 @@ rm -f conftest*
+@@ -9965,6 +10002,9 @@ rm -f conftest*
      # substituted. (@@@ Might not be necessary anymore)
      #--------------------------------------------------------------------
  


Home | Main Index | Thread Index | Old Index