From f837cb8990a543ca69e924446646bc1631cf6f22 Mon Sep 17 00:00:00 2001 From: jdolecek Date: Sun, 1 Dec 2002 18:31:41 +0000 Subject: update pwlib to version 1.4.4 list of changes is not available, but the old distfile isn't available anymore partially based on PR pkg/7969 and PR pkg/17980 by Wojciech Puchar pkg was also converted to not depend on unproven-pthreads; this is good enough to have the sample thread program running correctly with pth, other pwlib apps need to be tested if they work with non-preemptive threads --- devel/pwlib/Makefile | 44 ++++++++++---------- devel/pwlib/PLIST | 97 +++++++++++++++++++++++++++----------------- devel/pwlib/distinfo | 26 ++++++------ devel/pwlib/patches/patch-aa | 62 +++++++++++++++++++--------- devel/pwlib/patches/patch-ab | 63 +++++++++++----------------- devel/pwlib/patches/patch-ac | 45 +++++++------------- devel/pwlib/patches/patch-ad | 15 ------- devel/pwlib/patches/patch-ae | 24 ++++++----- devel/pwlib/patches/patch-af | 79 ++++++++++++++++-------------------- devel/pwlib/patches/patch-ag | 51 ++++++++++++++++++----- devel/pwlib/patches/patch-ah | 16 -------- devel/pwlib/patches/patch-ai | 47 +++++++++++++-------- devel/pwlib/patches/patch-aj | 38 +++++------------ devel/pwlib/patches/patch-ak | 13 ------ devel/pwlib/patches/patch-al | 30 ++++++++++++++ 15 files changed, 335 insertions(+), 315 deletions(-) delete mode 100644 devel/pwlib/patches/patch-ad delete mode 100644 devel/pwlib/patches/patch-ah delete mode 100644 devel/pwlib/patches/patch-ak create mode 100644 devel/pwlib/patches/patch-al (limited to 'devel') diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile index e6bda26cc17..f737e04e7e2 100644 --- a/devel/pwlib/Makefile +++ b/devel/pwlib/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.14 2002/10/09 10:29:24 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/12/01 18:31:41 jdolecek Exp $ # -DISTNAME= pwlib_min_1.1pl17 -PKGNAME= pwlib-1.1pl17 +DISTNAME= pwlib_1.4.4 +PKGNAME= pwlib-1.4.4 CATEGORIES= devel MASTER_SITES= http://www.openh323.org/bin/ -COUNTRY_MIRRORS= au au2 us1 us2 ru de at cz pl +COUNTRY_MIRRORS= at us1 us2 ru de cz .for COUNTRY in ${COUNTRY_MIRRORS} MASTER_SITES+= ftp://www.${COUNTRY}.openh323.org/bin/ .endfor @@ -18,39 +18,41 @@ BUILD_DEPENDS= bison-[0-9]*:../../devel/bison WRKSRC= ${WRKDIR}/pwlib -USE_BUILDLINK2= yes +USE_BUILDLINK_ONLY= yes USE_GMAKE= yes USE_LIBTOOL= yes -PTHREAD_OPTS+= native -MAKE_ENV+= PWLIBDIR=${WRKSRC} -MAKE_ENV+= CC="${PGCC}" CPLUS="${PGXX}" +MAKE_ENV+= PWLIBDIR="${WRKSRC}" +MAKE_ENV+= CC="${CC}" +MAKE_ENV+= CPLUS="${CXX}" ALL_TARGET= opt -do-configure: - ${LN} -sf ${WRKDIR} ${WRKSRC}/share +FILES_SUBST+= LIBTOOL="${LIBTOOL}" +FILES_SUBST+= PTHREADS_PREFIX="${BUILDLINK_PREFIX.pthread}" -pre-install: - ${FIND} ${WRKSRC} \( -name CVS -o -name "*.orig" \) -print | \ - ${XARGS} ${RM} -rf +post-patch: + ${_PKG_SILENT}cd ${WRKSRC}/make; \ + for f in unix.mak lib.mak common.mak; do \ + ${SED} ${FILES_SUBST_SED} $$f > $$f.sed; \ + ${MV} -f $$f.sed $$f; \ + done + ${LN} -sf ${WRKDIR} ${WRKSRC}/share -post-install: +do-install: + ${_PKG_SILENT}cd ${WRKSRC}/src/ptlib/unix && ${MAKE_ENV} ${GMAKE} install + ${_PKG_SILENT}cd ${WRKSRC}/tools/asnparser && ${MAKE_ENV} ${GMAKE} install ${INSTALL_DATA_DIR} ${PREFIX}/include/ptclib ${INSTALL_DATA_DIR} ${PREFIX}/include/ptlib/unix/ptlib cd ${WRKSRC}/include; \ - for f in `${FIND} . -type f -print`; do \ + for f in `${FIND} . -type f -a ! -path '*/CVS/*' -print`; do \ ${INSTALL_DATA} $$f ${PREFIX}/include/`${DIRNAME} $$f`; \ done ${INSTALL_DATA_DIR} ${PREFIX}/share/pwlib/make cd ${WRKSRC}/make; \ - for f in unix.mak common.mak lib.mak ptlib.mak; do \ + for f in *.mak; do \ ${INSTALL_DATA} $$f ${PREFIX}/share/pwlib/make; \ done .include "../../mk/pthread.buildlink2.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -. include "../../devel/unproven-pthreads/buildlink2.mk" -.endif - +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pwlib/PLIST b/devel/pwlib/PLIST index 81b9df7c80a..bc1dd57d87f 100644 --- a/devel/pwlib/PLIST +++ b/devel/pwlib/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/08 06:26:49 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/12/01 18:31:41 jdolecek Exp $ bin/asnparser -include/ptclib/asner.h include/ptclib/cypher.h +include/ptclib/asner.h +include/ptclib/delaychan.h +include/ptclib/dtmf.h include/ptclib/ftp.h include/ptclib/html.h include/ptclib/http.h @@ -10,16 +12,59 @@ include/ptclib/httpsvc.h include/ptclib/inetmail.h include/ptclib/inetprot.h include/ptclib/ipacl.h +include/ptclib/memfile.h include/ptclib/mime.h include/ptclib/modem.h include/ptclib/pasn.h include/ptclib/psnmp.h include/ptclib/pssl.h +include/ptclib/ptts.h +include/ptclib/pwavfile.h +include/ptclib/pxml.h +include/ptclib/pxmlrpc.h +include/ptclib/pxmlrpcs.h +include/ptclib/qchannel.h include/ptclib/random.h +include/ptclib/shttpsvc.h include/ptclib/socks.h include/ptclib/telnet.h include/ptclib/url.h -include/ptlib.h +include/ptclib/vxml.h +include/ptlib/unix/ptlib/channel.h +include/ptlib/unix/ptlib/conchan.h +include/ptlib/unix/ptlib/config.h +include/ptlib/unix/ptlib/contain.h +include/ptlib/unix/ptlib/dynalink.h +include/ptlib/unix/ptlib/ethsock.h +include/ptlib/unix/ptlib/file.h +include/ptlib/unix/ptlib/filepath.h +include/ptlib/unix/ptlib/icmpsock.h +include/ptlib/unix/ptlib/ipdsock.h +include/ptlib/unix/ptlib/ipsock.h +include/ptlib/unix/ptlib/mutex.h +include/ptlib/unix/ptlib/pdirect.h +include/ptlib/unix/ptlib/pipechan.h +include/ptlib/unix/ptlib/pmachdep.h +include/ptlib/unix/ptlib/pprocess.h +include/ptlib/unix/ptlib/ptime.h +include/ptlib/unix/ptlib/ptlib.inl +include/ptlib/unix/ptlib/remconn.h +include/ptlib/unix/ptlib/semaphor.h +include/ptlib/unix/ptlib/serchan.h +include/ptlib/unix/ptlib/sfile.h +include/ptlib/unix/ptlib/socket.h +include/ptlib/unix/ptlib/sound.h +include/ptlib/unix/ptlib/timer.h +include/ptlib/unix/ptlib/svcproc.h +include/ptlib/unix/ptlib/syncpoint.h +include/ptlib/unix/ptlib/tcpsock.h +include/ptlib/unix/ptlib/textfile.h +include/ptlib/unix/ptlib/thread.h +include/ptlib/unix/ptlib/timeint.h +include/ptlib/unix/ptlib/udpsock.h +include/ptlib/unix/ptlib/video.h +include/ptlib/unix/ptlib/videoio.h +include/ptlib/MacMainIf.h include/ptlib/args.h include/ptlib/array.h include/ptlib/channel.h @@ -48,6 +93,7 @@ include/ptlib/pprocess.h include/ptlib/pstring.h include/ptlib/ptime.h include/ptlib/remconn.h +include/ptlib/safecoll.h include/ptlib/semaphor.h include/ptlib/serchan.h include/ptlib/sfile.h @@ -64,49 +110,26 @@ include/ptlib/thread.h include/ptlib/timeint.h include/ptlib/timer.h include/ptlib/udpsock.h -include/ptlib/unix/ptlib/channel.h -include/ptlib/unix/ptlib/conchan.h -include/ptlib/unix/ptlib/config.h -include/ptlib/unix/ptlib/contain.h -include/ptlib/unix/ptlib/dynalink.h -include/ptlib/unix/ptlib/ethsock.h -include/ptlib/unix/ptlib/file.h -include/ptlib/unix/ptlib/filepath.h -include/ptlib/unix/ptlib/icmpsock.h -include/ptlib/unix/ptlib/ipdsock.h -include/ptlib/unix/ptlib/ipsock.h -include/ptlib/unix/ptlib/mutex.h -include/ptlib/unix/ptlib/pdirect.h -include/ptlib/unix/ptlib/pipechan.h -include/ptlib/unix/ptlib/pmachdep.h -include/ptlib/unix/ptlib/pprocess.h -include/ptlib/unix/ptlib/ptime.h -include/ptlib/unix/ptlib/ptlib.inl -include/ptlib/unix/ptlib/remconn.h -include/ptlib/unix/ptlib/semaphor.h -include/ptlib/unix/ptlib/serchan.h -include/ptlib/unix/ptlib/sfile.h -include/ptlib/unix/ptlib/socket.h -include/ptlib/unix/ptlib/sound.h -include/ptlib/unix/ptlib/svcproc.h -include/ptlib/unix/ptlib/syncpoint.h -include/ptlib/unix/ptlib/tcpsock.h -include/ptlib/unix/ptlib/textfile.h -include/ptlib/unix/ptlib/thread.h -include/ptlib/unix/ptlib/timeint.h -include/ptlib/unix/ptlib/timer.h -include/ptlib/unix/ptlib/udpsock.h -include/ptlib/unix/ptlib/videoio.h +include/ptlib/vconvert.h +include/ptlib/vfakeio.h +include/ptlib/video.h include/ptlib/videoio.h +include/ptlib/videoio1394dc.h lib/libpt.a lib/libpt.la lib/libpt.so lib/libpt.so.1 -lib/libpt.so.1.1 +lib/libpt.so.1.4 share/pwlib/make/common.mak +share/pwlib/make/defaultgui.mak +share/pwlib/make/gui.mak share/pwlib/make/lib.mak +share/pwlib/make/motif.mak share/pwlib/make/ptlib.mak +share/pwlib/make/pwlib.mak +share/pwlib/make/qt.mak share/pwlib/make/unix.mak +share/pwlib/make/xlib.mak @dirrm share/pwlib/make @dirrm share/pwlib @dirrm include/ptlib/unix/ptlib diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo index 481c7151f7b..cbe3350a434 100644 --- a/devel/pwlib/distinfo +++ b/devel/pwlib/distinfo @@ -1,15 +1,13 @@ -$NetBSD: distinfo,v 1.4 2002/02/19 04:24:36 jmc Exp $ +$NetBSD: distinfo,v 1.5 2002/12/01 18:31:41 jdolecek Exp $ -SHA1 (pwlib_min_1.1pl17.tar.gz) = 85008dde337b9d03b24e9441dcbc19906b1bb163 -Size (pwlib_min_1.1pl17.tar.gz) = 606093 bytes -SHA1 (patch-aa) = 7ee7cb8840f979150818ce143607a08a8f8b81b9 -SHA1 (patch-ab) = 7e458854415708c7c35c9039d68f74d84b2107c9 -SHA1 (patch-ac) = 376d32495c2b1bf711680aa967403099c7db3e94 -SHA1 (patch-ad) = 1b59a8281c465b82334e1454bd7861402d590ae6 -SHA1 (patch-ae) = b2b7f21bdef6a05d17da564bc99c3c6bdf3b949f -SHA1 (patch-af) = a2ddeef36b1f7d280a39270902b45ae5fb6bebf1 -SHA1 (patch-ag) = 1607f6e50c73ca0cd017c93b87ad97ef8873a492 -SHA1 (patch-ah) = 9119804a6229a50a0cecdc5d2c5c5ae0aa3c29d6 -SHA1 (patch-ai) = 029e5f77e17f080c06545c9c14b5f65a9aca2e03 -SHA1 (patch-aj) = 263f1479719e8b216a36796cd06fbf267235527d -SHA1 (patch-ak) = baf989b0000b96fe6ed862d9571388b57c091b79 +SHA1 (pwlib_1.4.4.tar.gz) = 5432ba3e4771fb281283161bb956b5a19e5200c7 +Size (pwlib_1.4.4.tar.gz) = 907721 bytes +SHA1 (patch-aa) = 13d2e40664a725bf59569d837df54c06d707eda2 +SHA1 (patch-ab) = 9da2c47c9c8b09ac0f7f74171f1ff5895075b39f +SHA1 (patch-ac) = 07fa4e45663840e273e21b8f240ec749fff4a13a +SHA1 (patch-ae) = 02d323e53908049146c4b389e2b2d32ebf2c4a61 +SHA1 (patch-af) = e410a5e918e4e957ad8902b29f0a2f385c116bde +SHA1 (patch-ag) = a2a7e8929c125f827c4e078f4a578497cbaff94b +SHA1 (patch-ai) = 40902c75b1a5fe06e3ca47f360f2349d2684f9e4 +SHA1 (patch-aj) = 93e039bb60c5cb75abb916e2797c644b67a6b9b0 +SHA1 (patch-al) = 29256c9f08e9e76779676651f4dd9569a747ced0 diff --git a/devel/pwlib/patches/patch-aa b/devel/pwlib/patches/patch-aa index 76d5e63e684..423555bd3b7 100644 --- a/devel/pwlib/patches/patch-aa +++ b/devel/pwlib/patches/patch-aa @@ -1,49 +1,71 @@ -$NetBSD: patch-aa,v 1.2 2002/02/08 06:29:43 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2002/12/01 18:31:42 jdolecek Exp $ ---- make/unix.mak.orig Mon Jun 26 07:17:20 2000 -+++ make/unix.mak -@@ -497,14 +497,7 @@ +--- make/unix.mak.orig Tue Nov 12 12:56:46 2002 ++++ make/unix.mak Sun Dec 1 15:11:09 2002 +@@ -433,7 +433,7 @@ + + + ifndef PWLIBDIR +-PWLIBDIR = $(HOME)/pwlib ++PWLIBDIR = @PREFIX@ + endif + + ############################################################################### +@@ -819,19 +819,15 @@ + + P_PTHREADS := 1 + +-ifeq ($(MACHTYPE),x86) +-STDCCFLAGS += -m486 +-endif +- STDCCFLAGS += -DP_NETBSD LDLIBS += -lossaudio --ifdef P_PTHREADS + ifdef P_PTHREADS -STDCCFLAGS += -I/usr/pkg/pthreads/include -LDFLAGS += -L/usr/pkg/pthreads/lib -LDLIBS += -lpthread -CC := /usr/pkg/pthreads/bin/pgcc -CPLUS := /usr/pkg/pthreads/bin/pg++ --endif -- -+P_SHAREDLIB := 1 ++# need to put $(PREFIX)/include after library includes, so that ++# the build wouldn't pick up potential intalled pwlib headers ++# from $(PREFIX) ++STDCCFLAGS += -I$(UNIX_INC_DIR) -I$(PWLIBDIR)/include -I@PTHREADS_PREFIX@/include ++LDFLAGS += -L@PTHREADS_PREFIX@/lib -lpthread + endif + P_USE_RANLIB := 1 +@@ -1222,7 +1218,7 @@ + endif - endif # NetBSD -@@ -708,13 +701,14 @@ - ifeq ($(P_SHAREDLIB),0) - LIB_SUFFIX = a - else + ifeq ($(P_SHAREDLIB),1) -LIB_SUFFIX = so +LIB_SUFFIX = la - endif - - ifndef LIB_TYPE + else + LIB_SUFFIX = a + ifndef DEBUG +@@ -1234,8 +1230,9 @@ LIB_TYPE = endif +INSTALL_DIR = ${PREFIX} ifndef INSTALL_DIR - INSTALL_DIR = /usr/local +-INSTALL_DIR = /usr/local ++INSTALL_DIR = /usr/pkg endif -@@ -785,7 +779,7 @@ + + ifndef INSTALLBIN_DIR +@@ -1303,7 +1300,7 @@ PW_LIBDIR = $(PWLIBDIR)/lib # set name of the PT library -PTLIB_BASE = pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX) +PTLIB_BASE = pt PTLIB_FILE = lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX) - PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJ_SUFFIX) + PT_OBJBASE = obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX) PT_OBJDIR = $(PW_LIBDIR)/$(PT_OBJBASE) -@@ -851,6 +845,6 @@ +@@ -1432,6 +1429,6 @@ # add library directory to library path and include the library LDFLAGS += -L$(PW_LIBDIR) diff --git a/devel/pwlib/patches/patch-ab b/devel/pwlib/patches/patch-ab index 5ea7ff785e1..fa25e346c92 100644 --- a/devel/pwlib/patches/patch-ab +++ b/devel/pwlib/patches/patch-ab @@ -1,47 +1,32 @@ -$NetBSD: patch-ab,v 1.3 2002/02/08 06:29:43 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2002/12/01 18:31:42 jdolecek Exp $ ---- make/lib.mak.orig Thu May 18 21:26:31 2000 -+++ make/lib.mak -@@ -53,36 +53,18 @@ - LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION) - LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER)$(BUILD_TYPE) +--- make/lib.mak.orig Thu Oct 17 15:44:27 2002 ++++ make/lib.mak Sat Nov 30 20:35:47 2002 +@@ -146,20 +146,16 @@ + LD = $(CPLUS) + endif --$(LIBDIR)/$(LIB_BASENAME): $(LIBDIR)/$(LIBNAME_PAT) -- @rm -f $(LIBDIR)/$(LIB_BASENAME) -- ln -s $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_BASENAME) -- @rm -f $(LIBDIR)/$(LIBNAME_MAJ) -- ln -s $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIBNAME_MAJ) -- @rm -f $(LIBDIR)/$(LIBNAME_MIN) -- ln -s $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIBNAME_MIN) -- --$(LIBDIR)/$(LIBNAME_PAT): $(OBJS) -+$(LIBDIR)/$(LIB_BASENAME): $(OBJS) +- $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT) +- cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME) +- cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ) +- cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN) ++ ENDLDLIBS += -L$(PREFIX)/lib -lpthread -lpth -lossaudio + +- $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE) ++ $(LIBDIR)/$(LIB_FILENAME): $(OBJS) @if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi -- gcc -shared -Wl,-soname,$(LIB_BASENAME).1 -o $(LIBDIR)/$(LIBNAME_PAT) $(OBJS) -+ $(LIBTOOL) --tag=CXX $(CPLUS) -o $(LIBDIR)/$(LIB_BASENAME) \ -+ $(OBJS:.o=.lo) -rpath $(INSTALLLIB_DIR) \ +- $(LD) $(LDSOOPTS) -o $(LIBDIR)/$(LIBNAME_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(ENDLDLIBS) ++ @LIBTOOL@ --tag=CXX $(CPLUS) -o $(LIBDIR)/$(LIB_FILENAME) \ ++ $(OBJS:.o=.lo) $(EXTLIBS) $(ENDLDLIBS) -rpath $(INSTALLLIB_DIR) \ + -version-info $(MAJOR_VERSION):$(MINOR_VERSION) - CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_BASENAME) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN) - --install: $(LIBDIR)/$(LIBNAME_PAT) +- install: $(LIBDIR)/$(LIBNAME_PAT) - $(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT) -- ln -s $(INSTALLLIB_DIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_BASENAME) -- ln -s $(INSTALLLIB_DIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ) -- ln -s $(INSTALLLIB_DIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN) -- --else -+install: $(LIBDIR)/$(LIB_BASENAME) -+ $(LIBTOOL) $(BSD_INSTALL_DATA) $(LIBDIR)/$(LIB_BASENAME) $(INSTALLLIB_DIR) - --$(LIBDIR)/$(LIB_BASENAME): $(OBJS) -- @if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi --ifdef P_USE_RANLIB -- $(AR) rc $(LIBDIR)/$(LIB_BASENAME) $(OBJS) -- $(RANLIB) $(LIBDIR)/$(LIB_BASENAME) - else -- $(AR) rcs $(LIBDIR)/$(LIB_BASENAME) $(OBJS) --endif +- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_BASENAME) +- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ) +- ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN) ++ install: $(LIBDIR)/$(LIB_FILENAME) ++ @LIBTOOL@ $(BSD_INSTALL_DATA) $(LIBDIR)/$(LIB_FILENAME) $(INSTALLLIB_DIR) - CLEAN_FILES += $(LIBDIR)/$(LIB_BASENAME) + endif # P_SHAREDLIB diff --git a/devel/pwlib/patches/patch-ac b/devel/pwlib/patches/patch-ac index b743f1efb3a..6168cbc2994 100644 --- a/devel/pwlib/patches/patch-ac +++ b/devel/pwlib/patches/patch-ac @@ -1,36 +1,21 @@ -$NetBSD: patch-ac,v 1.3 2002/02/08 06:29:44 jlam Exp $ +$NetBSD: patch-ac,v 1.4 2002/12/01 18:31:42 jdolecek Exp $ ---- make/common.mak.orig Tue Apr 25 20:40:48 2000 -+++ make/common.mak -@@ -148,11 +148,11 @@ - # - $(OBJDIR)/%.o : %.cxx - @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi -- $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ +--- ./src/ptlib/common/getdate.y.orig Fri Feb 15 00:47:26 2002 ++++ ./src/ptlib/common/getdate.y Sun Aug 18 23:09:15 2002 +@@ -18,6 +18,7 @@ + /* SUPPRESS 288 on yyerrlab *//* Label unused */ - $(OBJDIR)/%.o : %.c - @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi -- $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CC $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ - # - # create list of object files -@@ -213,7 +213,7 @@ - endif ++#include + #include + #include + #include +@@ -105,7 +106,7 @@ + #define VARIABLE ((struct Variables*)parseParam) - $(TARGET): $(OBJS) $(TARGET_LIBS) -- $(CPLUS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS) -+ $(LIBTOOL) --tag=CXX $(CPLUS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ $(LDLIBS) - ifdef DEBUG +-#define YYPURE 1 ++#define YYPURE 0 + #define YYLEX_PARAM VARIABLE->yyInput + #define YYPARSE_PARAM parseParam -@@ -238,7 +238,7 @@ - ifndef INSTALL_OVERRIDE - - install: $(TARGET) -- $(INSTALL) $(TARGET) $(INSTALLBIN_DIR) -+ $(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR) - endif - - # ifdef PROG diff --git a/devel/pwlib/patches/patch-ad b/devel/pwlib/patches/patch-ad deleted file mode 100644 index 572e6203682..00000000000 --- a/devel/pwlib/patches/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2000/08/25 16:03:42 mjl Exp $ - ---- Makefile.orig Wed Aug 23 23:38:10 2000 -+++ Makefile Wed Aug 23 23:53:35 2000 -@@ -130,6 +130,10 @@ - bothdepend : - $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) bothdepend ;) - -+install : -+ $(MAKE) -C src/ptlib/$(TARGETDIR) install -+ $(MAKE) -C tools/asnparser install -+ - ptlib: - $(MAKE) -C src/ptlib/$(TARGETDIR) both - diff --git a/devel/pwlib/patches/patch-ae b/devel/pwlib/patches/patch-ae index 10b05ed964b..f1d83c26a95 100644 --- a/devel/pwlib/patches/patch-ae +++ b/devel/pwlib/patches/patch-ae @@ -1,14 +1,16 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/08/25 16:03:42 mjl Exp $ +$NetBSD: patch-ae,v 1.2 2002/12/01 18:31:42 jdolecek Exp $ ---- make/ptlib.mak.orig Thu Aug 24 20:11:07 2000 -+++ make/ptlib.mak Thu Aug 24 20:11:41 2000 -@@ -38,7 +38,7 @@ - PWLIBDIR=$(HOME)/pwlib - endif +--- ./src/ptlib/unix/switch.cxx.orig Sat Aug 11 17:38:43 2001 ++++ ./src/ptlib/unix/switch.cxx Sun Aug 18 23:09:15 2002 +@@ -82,8 +82,10 @@ + #endif + #endif --include $(PWLIBDIR)/make/unix.mak --include $(PWLIBDIR)/make/common.mak -+include $(PWLIBDIR)/share/pwlib/make/unix.mak -+include $(PWLIBDIR)/share/pwlib/make/common.mak +-#if defined(P_FREEBSD) || defined(P_OPENBSD) ++#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) + #define SET_STACK context[0]._jb[2] = (int)stackTop-16; ++#include ++#define USE_MMAP MAP_ANON | MAP_PRIVATE + #endif - # End of ptlib.mak + #ifdef __BEOS__ diff --git a/devel/pwlib/patches/patch-af b/devel/pwlib/patches/patch-af index b308160d23a..0f122c4619a 100644 --- a/devel/pwlib/patches/patch-af +++ b/devel/pwlib/patches/patch-af @@ -1,46 +1,37 @@ -$NetBSD: patch-af,v 1.1.1.1 2000/08/25 16:03:42 mjl Exp $ +$NetBSD: patch-af,v 1.2 2002/12/01 18:31:42 jdolecek Exp $ ---- include/ptlib/unix/ptlib/pmachdep.h.orig Thu Aug 24 21:41:27 2000 -+++ include/ptlib/unix/ptlib/pmachdep.h Thu Aug 24 21:50:46 2000 -@@ -196,28 +196,33 @@ - /////////////////////////////////////////////////////////////////////////////// - #elif defined(P_NETBSD) - --#if defined(P_PTHREADS) --#define _THREAD_SAFE --#define P_THREAD_SAFE_CLIB -- --#include --#include /* for pthread's h_errno */ --#endif -- - #include - #include - #include - #include - #include - #include -+#include - #include - #include - #include - #include -+#include - #include - #include - #include -+#include - #include -+#include -+ -+#if defined(P_PTHREADS) -+#define _THREAD_SAFE -+#define P_THREAD_SAFE_CLIB -+ -+#include -+#include /* for pthread's h_errno */ -+#endif -+ - - #define HAS_IFREQ +--- ./src/ptlib/unix/Makefile.orig Wed Aug 14 17:18:54 2002 ++++ ./src/ptlib/unix/Makefile Sun Aug 18 23:09:15 2002 +@@ -512,26 +512,26 @@ + + $(OBJDIR)/regcomp.o: $(COMMON_SRC_DIR)/regex/regcomp.c +- $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $< ++ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $< + + $(OBJDIR)/regexec.o: $(COMMON_SRC_DIR)/regex/regexec.c +- $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $< ++ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $< + + $(OBJDIR)/regerror.o: $(COMMON_SRC_DIR)/regex/regerror.c +- $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $< ++ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $< + + $(OBJDIR)/regfree.o: $(COMMON_SRC_DIR)/regex/regfree.c +- $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $< ++ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(DEBUG_FLAG) $(OPTCCFLAGS) -c -DPOSIX_MISTAKE -I$(COMMON_SRC_DIR)/regex -o $@ -c $< + + + ifdef REQUIRES_SEPARATE_SWITCH + $(OBJDIR)/switch.o: ./switch.cxx + @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi +- $(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CXX $(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ + endif + + $(OBJDIR)/getdate.tab.o: $(GETDATE_SOURCE) +- $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ ++ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ + + $(DEPDIR)/getdate.tab.dep: $(GETDATE_SOURCE) + $(CC) $(STDCCFLAGS) -M $< >> $@ diff --git a/devel/pwlib/patches/patch-ag b/devel/pwlib/patches/patch-ag index 3dfd2f0418f..ee70aa37add 100644 --- a/devel/pwlib/patches/patch-ag +++ b/devel/pwlib/patches/patch-ag @@ -1,13 +1,42 @@ -$NetBSD: patch-ag,v 1.1 2000/08/28 22:29:34 mjl Exp $ +$NetBSD: patch-ag,v 1.2 2002/12/01 18:31:42 jdolecek Exp $ ---- src/ptlib/unix/oss.cxx.orig Mon Aug 28 23:30:16 2000 -+++ src/ptlib/unix/oss.cxx Mon Aug 28 23:30:52 2000 -@@ -287,7 +287,7 @@ - - PString PSoundChannel::GetDefaultDevice(Directions /*dir*/) - { -- return "/dev/dsp"; -+ return "/dev/audio"; - } - +--- src/ptlib/unix/oss.cxx.orig Sun Dec 1 17:31:20 2002 ++++ src/ptlib/unix/oss.cxx Sun Dec 1 17:35:35 2002 +@@ -485,6 +485,7 @@ + // there are also entries for /dev/dsp0.0 dsp0.1 dsp0.2 and dsp0.3 + // We will ignore these N.M devices. ++#ifndef P_NETBSD + // Look for dsp + if (filename == "dsp") { + dsp.SetAt(0, devname); +@@ -497,6 +498,20 @@ + dsp.SetAt(cardnum+1, devname); + } + } ++#else ++ // Look for dsp ++ if (filename == "audio") { ++ dsp.SetAt(0, devname); ++ } ++ // Look for audioN. Insert at position cardnum + 1 ++ if ((filename.GetLength() > 5) && (filename.Left(5) == "audio")) { ++ PString numbers = filename.Mid(3); // get everything after 'audio' ++ if (IsNumericString(numbers)) { ++ PINDEX cardnum = numbers.AsInteger(); ++ dsp.SetAt(cardnum+1, devname); ++ } ++ } ++#endif + // Look for mixer + if (filename == "mixer") { + mixer.SetAt(0, devname); +@@ -586,6 +601,8 @@ + // present, probe /dev for sound devices and return the first detected device. + if (PFile::Exists("/dev/dsp")) { + return "/dev/dsp"; ++ } else if (PFile::Exists("/dev/audio")) { ++ return "/dev/audio"; + } else { + // return the first dsp device detected + PStringArray devicenames; diff --git a/devel/pwlib/patches/patch-ah b/devel/pwlib/patches/patch-ah deleted file mode 100644 index ad9a7385226..00000000000 --- a/devel/pwlib/patches/patch-ah +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2000/08/28 22:29:35 mjl Exp $ - ---- src/ptlib/unix/switch.cxx.orig Mon Aug 28 23:27:44 2000 -+++ src/ptlib/unix/switch.cxx Mon Aug 28 23:29:00 2000 -@@ -79,8 +79,10 @@ - #endif - #endif - --#if defined(P_FREEBSD) || defined(P_OPENBSD) -+#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) - #define SET_STACK context[0]._jb[2] = (int)stackTop-16; -+#include -+#define USE_MMAP MAP_ANON | MAP_PRIVATE - #endif - - #ifdef __BEOS__ diff --git a/devel/pwlib/patches/patch-ai b/devel/pwlib/patches/patch-ai index cb8cad143c0..bb238ee5669 100644 --- a/devel/pwlib/patches/patch-ai +++ b/devel/pwlib/patches/patch-ai @@ -1,21 +1,36 @@ -$NetBSD: patch-ai,v 1.1 2002/02/08 06:29:44 jlam Exp $ +$NetBSD: patch-ai,v 1.2 2002/12/01 18:31:42 jdolecek Exp $ ---- src/ptlib/common/getdate.y.orig Sun Jul 11 22:37:23 1999 -+++ src/ptlib/common/getdate.y -@@ -18,6 +18,7 @@ - /* SUPPRESS 288 on yyerrlab *//* Label unused */ +--- make/common.mak.orig Thu Oct 10 06:43:44 2002 ++++ make/common.mak Sat Nov 30 16:46:15 2002 +@@ -261,11 +261,11 @@ + # + $(OBJDIR)/%.o : %.cxx + @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi +- $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ @LIBTOOL@ --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ + $(OBJDIR)/%.o : %.c + @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi +- $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ ++ @LIBTOOL@ --tag=CC $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@ -+#include - #include - #include - #include -@@ -99,7 +100,7 @@ - #define VARIABLE ((struct Variables*)parseParam) + # + # create list of object files +@@ -328,7 +328,7 @@ + # directory + @if [ ! -L $(OBJDIR)/lib ] ; then cd $(OBJDIR); ln -s $(PW_LIBDIR) lib; fi + endif +- $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS) ++ @LIBTOOL@ --tag=CXX $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS) + ifeq ($(OSTYPE),VxWorks) + $(LD) --split-by-reloc 65535 -r $(OBJS) -o $@ + endif +@@ -356,7 +356,7 @@ + ifndef INSTALL_OVERRIDE + install: $(TARGET) +- $(INSTALL) $(TARGET) $(INSTALLBIN_DIR) ++ @LIBTOOL@ $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR) + endif --#define YYPURE -+#define YYPURE 0 - #define YYLEX_PARAM VARIABLE->yyInput - #define YYPARSE_PARAM parseParam - + # ifdef PROG diff --git a/devel/pwlib/patches/patch-aj b/devel/pwlib/patches/patch-aj index 725a01b7ff7..957bd0b9c7e 100644 --- a/devel/pwlib/patches/patch-aj +++ b/devel/pwlib/patches/patch-aj @@ -1,32 +1,14 @@ -$NetBSD: patch-aj,v 1.1 2002/02/08 06:29:44 jlam Exp $ +$NetBSD: patch-aj,v 1.2 2002/12/01 18:31:42 jdolecek Exp $ ---- src/ptlib/unix/Makefile.orig Fri Feb 8 00:37:01 2002 -+++ src/ptlib/unix/Makefile -@@ -340,23 +340,23 @@ - ifdef REQUIRES_SEPARATE_SWITCH - $(OBJDIR)/switch.o: ./switch.cxx - @if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi -- $(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CXX $(CPLUS) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ +--- ./make/ptlib.mak.orig Wed Dec 2 03:37:31 1998 ++++ ./make/ptlib.mak Sun Aug 18 23:07:47 2002 +@@ -38,7 +38,7 @@ + PWLIBDIR=$(HOME)/pwlib endif - CLEAN_FILES := $(CLEAN_FILES) $(LIBDIR)/$(PTLIB_FILE) $(GETDATE_SOURCE) +-include $(PWLIBDIR)/make/unix.mak +-include $(PWLIBDIR)/make/common.mak ++include $(PWLIBDIR)/share/pwlib/make/unix.mak ++include $(PWLIBDIR)/share/pwlib/make/common.mak - $(OBJDIR)/regex.o: ../../../src/ptlib/common/regex.cxx -- $(CPLUS) -DREGEX_MALLOC -D__STDC__ -DSTDC_HEADERS $(CFLAGS) $(STDCCFLAGS) -c -w $< -o $@ -+ $(LIBTOOL) --tag=CXX $(CPLUS) -DREGEX_MALLOC -D__STDC__ -DSTDC_HEADERS $(CFLAGS) $(STDCCFLAGS) -c -w $< -o $@ - - $(OBJDIR)/getdate.tab.o: $(GETDATE_SOURCE) -- $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ - - $(DEPDIR)/getdate.tab.dep: $(GETDATE_SOURCE) - $(CC) $(STDCCFLAGS) -M $< >> $@ - - ifeq ($(OSTYPE),beos) - $(OBJDIR)/resample.o: $(BEAUDIO_SRC_DIR)/resample.c -- $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ -+ $(LIBTOOL) --tag=CC $(CC) $(CFLAGS) $(STDCCFLAGS) -c $< -o $@ - endif - - $(GETDATE_SOURCE): $(COMMON_SRC_DIR)/getdate.y + # End of ptlib.mak diff --git a/devel/pwlib/patches/patch-ak b/devel/pwlib/patches/patch-ak deleted file mode 100644 index df3096d4ae9..00000000000 --- a/devel/pwlib/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2002/02/19 04:24:37 jmc Exp $ - ---- tools/asnparser/Makefile.orig Tue Feb 19 03:50:29 2002 -+++ tools/asnparser/Makefile Tue Feb 19 03:48:02 2002 -@@ -50,6 +50,8 @@ - - include $(PWLIBDIR)/make/ptlib.mak - -+CFLAGS=-O0 -+ - asn_grammar.cxx: asn_grammar.y - @if [ ! -d $(OBJDIR) ] ; then mkdir $(OBJDIR) ; fi - bison -t -v -d -o $* $< diff --git a/devel/pwlib/patches/patch-al b/devel/pwlib/patches/patch-al new file mode 100644 index 00000000000..30e78e9efab --- /dev/null +++ b/devel/pwlib/patches/patch-al @@ -0,0 +1,30 @@ +$NetBSD: patch-al,v 1.1 2002/12/01 18:32:37 jdolecek Exp $ + +--- src/ptlib/unix/tlibthrd.cxx.orig Sun Dec 1 14:18:03 2002 ++++ src/ptlib/unix/tlibthrd.cxx Sun Dec 1 14:18:10 2002 +@@ -818,18 +818,20 @@ + void PThread::Sleep(const PTimeInterval & timeout) + { + PTime lastTime; +- PTime targetTime = lastTime + timeout; +- do { ++ PTime targetTime = PTime() + timeout; ++ ++ sched_yield(); ++ lastTime = PTime(); ++ ++ while (lastTime < targetTime) { + P_timeval tval = targetTime - lastTime; + if (select(0, NULL, NULL, NULL, tval) < 0 && errno != EINTR) + break; + +-#ifndef P_NETBSD + pthread_testcancel(); +-#endif /* P_NETBSD */ + + lastTime = PTime(); +- } while (lastTime < targetTime); ++ } + } + + -- cgit v1.2.3