Apply patches from Johnny Lam to let pth and pth-syscall co-exist.

3 files changed, 38 insertions, 45 deletions

diff --git a/devel/pth-syscall/Makefile b/devel/pth-syscall/Makefile
index 3cd21917f82..770355e3a29 100644
--- a/devel/pth-syscall/Makefile
+++ b/devel/pth-syscall/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2002/06/02 18:09:35 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/07/18 11:22:00 agc Exp $
 #
 
 DISTNAME=		pth-1.4.1
 PKGNAME=		${DISTNAME:C/pth/pth-syscall/}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=pth/}
 
@@ -10,12 +11,11 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/pth/pth.html
 COMMENT=		GNU Portable Thread library
 
-CONFLICTS=		pth-current-[0-9]* pth-[0-9]*
-
 USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		YES
+GNU_CONFIGURE_PREFIX=	${PREFIX}/pth-syscall
 CONFIGURE_ARGS+=	--enable-pthread
 CONFIGURE_ARGS+=	--enable-syscall-hard
 .if (${MACHINE_ARCH} == "i386" && ${CFLAGS:M-O2} == "-O2")
@@ -31,10 +31,4 @@ test: build
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} test | \
 		tee ${WRKSRC}/test.log
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pth/
-	cd ${WRKSRC} && ${INSTALL_DATA} ANNOUNCE AUTHORS COPYING HACKING \
-		NEWS README SUPPORT TESTS THANKS USERS pthread.ps rse-pmt.ps \
-			${PREFIX}/share/doc/pth/
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pth-syscall/PLIST b/devel/pth-syscall/PLIST
index 984826a4c3a..9d48a5869ec 100644
--- a/devel/pth-syscall/PLIST
+++ b/devel/pth-syscall/PLIST
@@ -1,33 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1 2002/05/29 08:19:58 skrll Exp $
-bin/pth-config
-bin/pthread-config
-include/pth.h
-include/pthread.h
-lib/libpth.a
-lib/libpth.la
-lib/libpth.so
-lib/libpth.so.${PTH_MAJOR}
-lib/libpth.so.${PTH_MAJOR}.${PTH_MINOR}
-lib/libpthread.a
-lib/libpthread.la
-lib/libpthread.so
-lib/libpthread.so.${PTH_MAJOR}
-lib/libpthread.so.${PTH_MAJOR}.${PTH_MINOR}
-man/man1/pth-config.1
-man/man1/pthread-config.1
-man/man3/pth.3
-man/man3/pthread.3
-share/aclocal/pth.m4
-share/doc/pth/ANNOUNCE
-share/doc/pth/AUTHORS
-share/doc/pth/COPYING
-share/doc/pth/HACKING
-share/doc/pth/NEWS
-share/doc/pth/README
-share/doc/pth/SUPPORT
-share/doc/pth/TESTS
-share/doc/pth/THANKS
-share/doc/pth/USERS
-share/doc/pth/pthread.ps
-share/doc/pth/rse-pmt.ps
-@dirrm share/doc/pth
+@comment $NetBSD: PLIST,v 1.2 2002/07/18 11:22:01 agc Exp $
+pth-syscall/bin/pth-config
+pth-syscall/bin/pthread-config
+pth-syscall/include/pth.h
+pth-syscall/include/pthread.h
+pth-syscall/lib/libpth.a
+pth-syscall/lib/libpth.la
+pth-syscall/lib/libpth.so
+pth-syscall/lib/libpth.so.${PTH_MAJOR}
+pth-syscall/lib/libpth.so.${PTH_MAJOR}.${PTH_MINOR}
+pth-syscall/lib/libpthread.a
+pth-syscall/lib/libpthread.la
+pth-syscall/lib/libpthread.so
+pth-syscall/lib/libpthread.so.${PTH_MAJOR}
+pth-syscall/lib/libpthread.so.${PTH_MAJOR}.${PTH_MINOR}
+pth-syscall/man/man1/pth-config.1
+pth-syscall/man/man1/pthread-config.1
+pth-syscall/man/man3/pth.3
+pth-syscall/man/man3/pthread.3
+pth-syscall/share/aclocal/pth.m4
+@dirrm pth-syscall/share/aclocal
+@dirrm pth-syscall/share
+@dirrm pth-syscall/man/man3
+@dirrm pth-syscall/man/man1
+@dirrm pth-syscall/man
+@dirrm pth-syscall/lib
+@dirrm pth-syscall/include
+@dirrm pth-syscall/bin
+@dirrm pth-syscall
diff --git a/devel/pth-syscall/buildlink.mk b/devel/pth-syscall/buildlink.mk
index fad1b6f9eb2..00e23feaea1 100644
--- a/devel/pth-syscall/buildlink.mk
+++ b/devel/pth-syscall/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/05/29 08:19:58 skrll Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/07/18 11:22:01 agc Exp $
 #
 # This Makefile fragment is included by packages that use pth-syscall.
 #
@@ -20,8 +20,9 @@ PTH_SYSCALL_BUILDLINK_MK=	# defined
 BUILDLINK_DEPENDS.pth-syscall?=	pth-syscall>=1.4.1
 DEPENDS+=		${BUILDLINK_DEPENDS.pth-syscall}:../../devel/pth-syscall
 
-EVAL_PREFIX+=		BUILDLINK_PREFIX.pth-syscall=pth-syscall
-BUILDLINK_PREFIX.pth-syscall_DEFAULT=	${LOCALBASE}
+EVAL_PREFIX+=		PTH_SYSCALL_PREFIX=pth-syscall
+PTH_SYSCALL_PREFIX_DEFAULT=	${LOCALBASE}
+BUILDLINK_PREFIX.pth-syscall=	${PTH_SYSCALL_PREFIX}/pth-syscall
 BUILDLINK_FILES.pth-syscall=	include/pth.h
 BUILDLINK_FILES.pth-syscall+=	include/pthread.h
 BUILDLINK_FILES.pth-syscall+=	lib/libpth.*
@@ -42,6 +43,8 @@ BUILDLINK_CONFIG_WRAPPER.pth-syscall-pthread=	${BUILDLINK_DIR}/bin/pthread-confi
 REPLACE_BUILDLINK_SED+=	\
 	-e "s|${BUILDLINK_CONFIG_WRAPPER.pth-syscall-pthread}|${BUILDLINK_CONFIG.pth-syscall-pthread}|g"
 
+LDFLAGS+=		-Wl,-R${BUILDLINK_PREFIX.pth-syscall}/lib
+
 .if defined(USE_CONFIG_WRAPPER)
 PTH_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.pth-syscall}
 PTHREAD_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.pth-syscall-pthread}