From 10ccbb6398e9f0178a127cc34e8c45a6697b59e8 Mon Sep 17 00:00:00 2001 From: brad Date: Mon, 26 Mar 2001 23:54:42 +0000 Subject: [PATCH] upgrade to pth 1.4.0 --- devel/pth/Makefile | 18 +++-- devel/pth/files/md5 | 6 +- devel/pth/patches/patch-Makefile.in | 107 ---------------------------- devel/pth/pkg/COMMENT | 1 - devel/pth/pkg/DESCR | 1 - devel/pth/pkg/PFRAG.shared | 8 +-- devel/pth/pkg/PLIST | 16 +++-- 7 files changed, 29 insertions(+), 128 deletions(-) delete mode 100644 devel/pth/patches/patch-Makefile.in delete mode 100644 devel/pth/pkg/COMMENT diff --git a/devel/pth/Makefile b/devel/pth/Makefile index 73aa36f963b..4b3d97608b8 100644 --- a/devel/pth/Makefile +++ b/devel/pth/Makefile @@ -1,8 +1,10 @@ -# $OpenBSD: Makefile,v 1.4 2001/01/19 18:26:06 brad Exp $ +# $OpenBSD: Makefile,v 1.5 2001/03/26 23:54:42 brad Exp $ -DISTNAME= pth-1.3.7 +COMMENT= "GNU portable threads" + +DISTNAME= pth-1.4.0 CATEGORIES= devel -NEED_VERSION= 1.336 +NEED_VERSION= 1.363 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= pth @@ -17,8 +19,14 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static --enable-pthread --enable-syscall-soft \ - --enable-optimize --enable-batch +CONFIGURE_ARGS+= --enable-static --enable-pthread \ + --enable-syscall-soft --enable-optimize \ + --enable-batch \ + --includedir="${PREFIX}/include/pth" \ + --libdir="${PREFIX}/lib/pth" + +post-build: + @${ECHO_MSG} "===> Use 'make test' to run a quick test suite." test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} -f ${MAKE_FILE} test diff --git a/devel/pth/files/md5 b/devel/pth/files/md5 index b25fa995851..63eb2c8f173 100644 --- a/devel/pth/files/md5 +++ b/devel/pth/files/md5 @@ -1,3 +1,3 @@ -MD5 (pth-1.3.7.tar.gz) = 8735d8e113307f098749340ecbae81c6 -RMD160 (pth-1.3.7.tar.gz) = 5ea08d0ff81da49a0c8bf54950e98615615c7e6e -SHA1 (pth-1.3.7.tar.gz) = 6e6fde6c552e3f000d7d9537d476684b5d7dc2a5 +MD5 (pth-1.4.0.tar.gz) = 146314a4c90067f20bc807e0e261fc31 +RMD160 (pth-1.4.0.tar.gz) = 2db9ab2a0746d8184111c1cdfd90017f2d5357b0 +SHA1 (pth-1.4.0.tar.gz) = bc1adf3fd9a8fa2845f9e89e94255250b479c2d0 diff --git a/devel/pth/patches/patch-Makefile.in b/devel/pth/patches/patch-Makefile.in deleted file mode 100644 index f5b5e303e1b..00000000000 --- a/devel/pth/patches/patch-Makefile.in +++ /dev/null @@ -1,107 +0,0 @@ ---- Makefile.in.orig Fri Jul 28 05:43:28 2000 -+++ Makefile.in Fri Jul 28 05:50:59 2000 -@@ -45,6 +45,8 @@ - mandir = @mandir@ - datadir = @datadir@ - -+DESTDIR = -+ - ## - ## ____ TOOL DEFINITIONS ___________________________________________ - ## -@@ -213,28 +215,28 @@ - @touch .done-install - @$(MAKE) $(MFLAGS) what-next - install-dirs: -- $(SHTOOL) mkdir -f -p -m 755 $(prefix) -- $(SHTOOL) mkdir -f -p -m 755 $(bindir) -- $(SHTOOL) mkdir -f -p -m 755 $(includedir) -- $(SHTOOL) mkdir -f -p -m 755 $(libdir) -- $(SHTOOL) mkdir -f -p -m 755 $(mandir)/man1 -- $(SHTOOL) mkdir -f -p -m 755 $(mandir)/man3 -- $(SHTOOL) mkdir -f -p -m 755 $(datadir)/aclocal -+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix) -+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) -+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir) -+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir) -+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1 -+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3 -+ $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(datadir)/aclocal - install-pth: -- $(SHTOOL) install -c -m 755 pth-config $(bindir)/pth-config -- $(SHTOOL) install -c -m 644 $(S)pth-config.1 $(mandir)/man1/pth-config.1 -- $(SHTOOL) install -c -m 644 $(S)pth.3 $(mandir)/man3/pth.3 -- $(SHTOOL) install -c -m 644 $(S)pth.m4 $(datadir)/aclocal/pth.m4 -- $(SHTOOL) install -c -m 644 pth.h $(includedir)/pth.h -+ $(SHTOOL) install -c -m 755 pth-config $(DESTDIR)$(bindir)/pth-config -+ $(SHTOOL) install -c -m 644 $(S)pth-config.1 $(DESTDIR)$(mandir)/man1/pth-config.1 -+ $(SHTOOL) install -c -m 644 $(S)pth.3 $(DESTDIR)$(mandir)/man3/pth.3 -+ $(SHTOOL) install -c -m 644 $(S)pth.m4 $(DESTDIR)$(datadir)/aclocal/pth.m4 -+ $(SHTOOL) install -c -m 644 pth.h $(DESTDIR)$(includedir)/pth.h - @umask 022; $(LIBTOOL) --mode=install \ -- $(SHTOOL) install -c libpth.la $(libdir)/libpth.la -+ $(SHTOOL) install -c libpth.la $(DESTDIR)$(libdir)/libpth.la - install-pthread: -- $(SHTOOL) install -c -m 755 pthread-config $(bindir)/pthread-config -- $(SHTOOL) install -c -m 644 $(S)pthread-config.1 $(mandir)/man1/pthread-config.1 -- $(SHTOOL) install -c -m 644 pthread.h $(includedir)/pthread.h -- $(SHTOOL) install -c -m 644 $(S)pthread.3 $(mandir)/man3/pthread.3 -+ $(SHTOOL) install -c -m 755 pthread-config $(DESTDIR)$(bindir)/pthread-config -+ $(SHTOOL) install -c -m 644 $(S)pthread-config.1 $(DESTDIR)$(mandir)/man1/pthread-config.1 -+ $(SHTOOL) install -c -m 644 pthread.h $(DESTDIR)$(includedir)/pthread.h -+ $(SHTOOL) install -c -m 644 $(S)pthread.3 $(DESTDIR)$(mandir)/man3/pthread.3 - @umask 022; $(LIBTOOL) --mode=install \ -- $(SHTOOL) install -c libpthread.la $(libdir)/libpthread.la -+ $(SHTOOL) install -c libpthread.la $(DESTDIR)$(libdir)/libpthread.la - - # uninstall the package - uninstall: -@@ -242,28 +244,28 @@ - @touch .done-uninstall - @$(MAKE) $(MFLAGS) what-next - uninstall-pthread: -- $(RM) $(bindir)/pthread-config -- $(RM) $(mandir)/man1/pthread-config.1 -- $(RM) $(includedir)/pthread.h -- $(RM) $(mandir)/man3/pthread.3 -- @$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/libpthread.la -+ $(RM) $(DESTDIR)$(bindir)/pthread-config -+ $(RM) $(DESTDIR)$(mandir)/man1/pthread-config.1 -+ $(RM) $(DESTDIR)$(includedir)/pthread.h -+ $(RM) $(DESTDIR)$(mandir)/man3/pthread.3 -+ @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libpthread.la - uninstall-pth: -- $(RM) $(bindir)/pth-config -- $(RM) $(mandir)/man1/pth-config.1 -- $(RM) $(mandir)/man3/pth.3 -- $(RM) $(datadir)/aclocal/pth.m4 -- $(RM) $(includedir)/pth.h -- @$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/libpth.la -+ $(RM) $(DESTDIR)$(bindir)/pth-config -+ $(RM) $(DESTDIR)$(mandir)/man1/pth-config.1 -+ $(RM) $(DESTDIR)$(mandir)/man3/pth.3 -+ $(RM) $(DESTDIR)$(datadir)/aclocal/pth.m4 -+ $(RM) $(DESTDIR)$(includedir)/pth.h -+ @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libpth.la - uninstall-dirs: -- -$(RMDIR) $(datadir)/aclocal >/dev/null 2>&1 || $(TRUE) -- -$(RMDIR) $(datadir) >/dev/null 2>&1 || $(TRUE) -- -$(RMDIR) $(mandir)/man1 >/dev/null 2>&1 || $(TRUE) -- -$(RMDIR) $(mandir)/man3 >/dev/null 2>&1 || $(TRUE) -- -$(RMDIR) $(mandir) >/dev/null 2>&1 || $(TRUE) -- -$(RMDIR) $(libdir) >/dev/null 2>&1 || $(TRUE) -- -$(RMDIR) $(includedir) >/dev/null 2>&1 || $(TRUE) -- -$(RMDIR) $(bindir) >/dev/null 2>&1 || $(TRUE) -- -$(RMDIR) $(prefix) >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(datadir)/aclocal >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(datadir) >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(mandir)/man3 >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(libdir) >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE) -+ -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE) - - # clean the source tree for re-building - clean: diff --git a/devel/pth/pkg/COMMENT b/devel/pth/pkg/COMMENT deleted file mode 100644 index ea08bce30b7..00000000000 --- a/devel/pth/pkg/COMMENT +++ /dev/null @@ -1 +0,0 @@ -GNU portable threads diff --git a/devel/pth/pkg/DESCR b/devel/pth/pkg/DESCR index b00f9b825ea..c1ef4dbfe15 100644 --- a/devel/pth/pkg/DESCR +++ b/devel/pth/pkg/DESCR @@ -1,5 +1,4 @@ GNU Pth - GNU Portable Threads -Copyright (c) 1999-2000 Ralf S. Engelschall Pth is a very portable POSIX/ANSI-C based library for Unix platforms which provides non-preemptive priority-based scheduling for multiple diff --git a/devel/pth/pkg/PFRAG.shared b/devel/pth/pkg/PFRAG.shared index 3bf33ba2d8e..ee19bfaceb4 100644 --- a/devel/pth/pkg/PFRAG.shared +++ b/devel/pth/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/29 22:42:18 brad Exp $ -lib/libpth.so.13.27 -lib/libpthread.so.13.27 -DYNLIBDIR(%B) +@comment $OpenBSD: PFRAG.shared,v 1.3 2001/03/26 23:54:43 brad Exp $ +lib/pth/libpth.so.14.20 +lib/pth/libpthread.so.14.20 +NEWDYNLIBDIR(%B) diff --git a/devel/pth/pkg/PLIST b/devel/pth/pkg/PLIST index e02a5f7fd88..97a7a84af0d 100644 --- a/devel/pth/pkg/PLIST +++ b/devel/pth/pkg/PLIST @@ -1,15 +1,17 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2000/07/28 10:39:00 brad Exp $ +@comment $OpenBSD: PLIST,v 1.2 2001/03/26 23:54:44 brad Exp $ bin/pth-config bin/pthread-config -include/pth.h -include/pthread.h -lib/libpth.a -lib/libpth.la -lib/libpthread.a -lib/libpthread.la +include/pth/pth.h +include/pth/pthread.h +lib/pth/libpth.a +lib/pth/libpth.la +lib/pth/libpthread.a +lib/pth/libpthread.la %%SHARED%% man/man1/pth-config.1 man/man1/pthread-config.1 man/man3/pth.3 man/man3/pthread.3 share/aclocal/pth.m4 +@dirrm include/pth +@dirrm lib/pth