CVS commit: pkgsrc/devel/pth

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 29 11:40:13 UTC 2017

Modified Files:
        pkgsrc/devel/pth: Makefile distinfo
Added Files:
        pkgsrc/devel/pth/patches: patch-Makefile.in

Log Message:
Honor LDFLAGS.
Remove some old workarounds.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 pkgsrc/devel/pth/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/pth/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/pth/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/devel/pth/Makefile
diff -u pkgsrc/devel/pth/Makefile:1.79 pkgsrc/devel/pth/Makefile:1.80
--- pkgsrc/devel/pth/Makefile:1.79      Tue Jun 16 13:06:30 2015
+++ pkgsrc/devel/pth/Makefile   Tue Aug 29 11:40:13 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2015/06/16 13:06:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.80 2017/08/29 11:40:13 wiz Exp $
 
 DISTNAME=              pth-2.0.7
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GNU:=pth/}
 
@@ -10,12 +10,10 @@ HOMEPAGE=           http://www.gnu.org/software/p
 COMMENT=               GNU Portable Thread library
 LICENSE=               gnu-lgpl-v2.1
 
-CONFLICTS=             pth-current-[0-9]* pth-syscall<1.4.1nb1
-
 MAKE_JOBS_SAFE=                no
 
-USE_LIBTOOL=           YES
-GNU_CONFIGURE=         YES
+USE_LIBTOOL=           yes
+GNU_CONFIGURE=         yes
 #CONFIGURE_ARGS+=      --enable-debug
 
 TEST_TARGET=           test
@@ -23,22 +21,12 @@ TEST_TARGET=                test
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "NetBSD"
-.  if ${MACHINE_ARCH} == "m68k" && (!empty(OS_VERSION:M1.5.[12]*) || !empty(OS_VERSION:M1.[0-4]*))
-pre-configure:
-       @${ECHO} Building without --enable-syscall-hard. lib/18644 needs fixing.
-.  else
 CONFIGURE_ARGS+=       --enable-syscall-hard
-.  endif
 .elif ${OPSYS} == "Interix" || ${OPSYS} == "Darwin"
 CONFIGURE_ENV+=                ac_cv_check_nfdstype='unsigned int'
 CONFIGURE_ENV+=                ac_cv_typedef_nfds_t=no # in <poll.h>, but that's unused
 .endif
 
-# XXX: Check this is still required and reverse test to OS which need it.
-.if ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+=       --with-fdsetsize=1024
-.endif
-
 PLIST_VARS+=           pthread
 
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/devel/pth/distinfo
diff -u pkgsrc/devel/pth/distinfo:1.18 pkgsrc/devel/pth/distinfo:1.19
--- pkgsrc/devel/pth/distinfo:1.18      Tue Nov  3 03:29:04 2015
+++ pkgsrc/devel/pth/distinfo   Tue Aug 29 11:40:13 2017
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.18 2015/11/03 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.19 2017/08/29 11:40:13 wiz Exp $
 
 SHA1 (pth-2.0.7.tar.gz) = 9a71915c89ff2414de69fe104ae1016d513afeee
 RMD160 (pth-2.0.7.tar.gz) = 80bc66777ba20d9648b7aaf3f58d593be6416910
 SHA512 (pth-2.0.7.tar.gz) = f79d74047c50e06f3198356f88647c5c1c8a04ebdd94641fc31d5ab0fd2750d86615fcb81da2f98d7ea73d012a501195d3fa09060571d18dcfdaec5d7a0ecb12
 Size (pth-2.0.7.tar.gz) = 652640 bytes
+SHA1 (patch-Makefile.in) = ee52ef657b753340bf559112ab9ff8365b5e8fc6
 SHA1 (patch-ab) = 8495e25d31dadc9f0b56e48950eecf3e895a9f30
 SHA1 (patch-ac) = d3683f603c3e4f1826b55967639823b3295d1fb7
 SHA1 (patch-ad) = ddabeeff5bab8b580904861ea5437ed8f24f3965

Added files:

Index: pkgsrc/devel/pth/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/devel/pth/patches/patch-Makefile.in:1.1
--- /dev/null   Tue Aug 29 11:40:13 2017
+++ pkgsrc/devel/pth/patches/patch-Makefile.in  Tue Aug 29 11:40:13 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile.in,v 1.1 2017/08/29 11:40:13 wiz Exp $
+
+Honor LDFLAGS.
+
+--- Makefile.in.orig   2006-06-08 17:54:01.000000000 +0000
++++ Makefile.in
+@@ -168,10 +168,10 @@ pth_p.h: $(S)pth_p.h.in
+ 
+ #   build the static and possibly shared libraries
+ libpth.la: $(LOBJS)
+-      $(LIBTOOL) --mode=link --quiet $(CC) -o libpth.la $(LOBJS) \
++      $(LIBTOOL) --mode=link --quiet $(CC) -o libpth.la $(LDFLAGS) $(LOBJS) \
+       -rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)`
+ libpthread.la: pthread.lo $(LOBJS)
+-      $(LIBTOOL) --mode=link --quiet $(CC) -o libpthread.la pthread.lo $(LOBJS) \
++      $(LIBTOOL) --mode=link --quiet $(CC) -o libpthread.la pthread.lo $(LDFLAGS) $(LOBJS) \
+       -rpath $(libdir) -version-info `$(SHTOOL) version -lc -dlibtool $(_VERSION_FILE)`
+ 
+ #   build the manual pages