diff options
author | joerg <joerg@pkgsrc.org> | 2006-12-06 17:15:15 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-12-06 17:15:15 +0000 |
commit | b838322dbad3fbd2a74b8d20faae98f54fcd360c (patch) | |
tree | 7279fed78acdb6c624053fa8b9be29cfc9cda3c3 /databases | |
parent | 7501a8173a0a3df439401e53d9552177353993e8 (diff) | |
download | pkgsrc-b838322dbad3fbd2a74b8d20faae98f54fcd360c.tar.gz |
Redo patch-ab to actually get the intended results of dot-less versions.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/pgtclng/distinfo | 4 | ||||
-rw-r--r-- | databases/pgtclng/patches/patch-ab | 40 |
2 files changed, 29 insertions, 15 deletions
diff --git a/databases/pgtclng/distinfo b/databases/pgtclng/distinfo index d8eec7d589f..57207dc7705 100644 --- a/databases/pgtclng/distinfo +++ b/databases/pgtclng/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/11/03 15:10:11 is Exp $ +$NetBSD: distinfo,v 1.2 2006/12/06 17:15:15 joerg Exp $ SHA1 (pgtcl1.5.3.tar.gz) = 0f8a832acc347fba5d2974c91ee4ea0db8eb8dc2 RMD160 (pgtcl1.5.3.tar.gz) = 8a0839526f41e68617e36f65816c321c2125c07a Size (pgtcl1.5.3.tar.gz) = 166300 bytes -SHA1 (patch-ab) = 1b14c8d494a2bd2a22983c63679dab2b15a17874 +SHA1 (patch-ab) = 074f7d37e33310c5d74faf146134bf10cb03a978 diff --git a/databases/pgtclng/patches/patch-ab b/databases/pgtclng/patches/patch-ab index bb945c0a4d1..a723a7cdead 100644 --- a/databases/pgtclng/patches/patch-ab +++ b/databases/pgtclng/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/11/03 15:10:11 is Exp $ +$NetBSD: patch-ab,v 1.2 2006/12/06 17:15:15 joerg Exp $ ---- configure.orig 2006-09-10 02:32:55.000000000 +0200 +--- configure.orig 2006-09-10 00:32:55.000000000 +0000 +++ configure @@ -7381,7 +7381,7 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' @@ -11,20 +11,25 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/11/03 15:10:11 is Exp $ # FreeBSD 3.* and greater have ELF. SHLIB_CFLAGS="-fPIC" SHLIB_LD="ld -Bshareable -x" -@@ -7407,6 +7407,12 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 - ;; - esac +@@ -7398,14 +7398,9 @@ echo "${ECHO_T}$tcl_cv_ld_elf" >&6 + CFLAGS="$CFLAGS -pthread" + LDFLAGS="$LDFLAGS -pthread" + fi +- case $system in +- FreeBSD-3.*) +- # FreeBSD-3 doesn't handle version numbers with dots. +- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' +- TCL_LIB_VERSIONS_OK=nodots +- ;; +- esac ++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' ++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' ++ TCL_LIB_VERSIONS_OK=nodots ;; -+ DragonFly-*) -+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a' -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so' -+ TCL_LIB_VERSIONS_OK=nodots -+ ;; -+ Darwin-*) CFLAGS_OPTIMIZE="-Os" - SHLIB_CFLAGS="-fno-common" -@@ -7941,7 +7947,7 @@ fi; +@@ -7941,7 +7936,7 @@ fi; ;; IRIX*) ;; @@ -33,3 +38,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2006/11/03 15:10:11 is Exp $ ;; Darwin-*) ;; +@@ -9456,6 +9451,8 @@ do + _ACEOF + cat >>$CONFIG_STATUS <<\_ACEOF + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ : Avoid regenerating within pkgsrc ++ exit 0 + ac_cs_recheck=: ;; + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; |