diff options
107 files changed, 14 insertions, 7788 deletions
@@ -9605,3 +9605,17 @@ databases/puppetdb3|databases/puppetdb4|2017-11-03|Has expired: End of life upst net/libsocketcpp||2017-11-06|Has expired: Uses gets(3) security/py-btchip|security/py-btchip-python|2017-11-07|Rename to reflect official Python modules naming scheme devel/pear-PPW||2017-11-09|Has expired: Project is EoL +lang/ats||2017-11-11|Has expired: Unmaintained, outdated, needs lots of refreshment +games/lordsawar||2017-11-11|Has expired: Broken for more than 6 months +databases/elixir-ecto_migrate||2017-11-11|Has expired: Broken for more than 6 months +audio/gspeakers||2017-11-11|Has expired: Broken for more than 6 months +net/p5-Filesys-SmbClient||2017-11-11|Has expired: Broken for more than 6 months +audio/tclmidi||2017-11-11|Has expired: Broken for more than 6 months +security/py-xmlsec||2017-11-11|Has expired: Broken for more than 6 months +security/samba-virusfilter||2017-11-11|Has expired: Broken for more than 6 months +textproc/ocaml-pxp||2017-11-11|Has expired: Broken for more than 6 months +audio/sooperlooper||2017-11-11|Has expired: Broken for more than 6 months +devel/dwarves||2017-11-11|Has expired: Broken for more than 6 months +devel/cl-cffi-sbcl||2017-11-11|Has expired: Broken for more than 6 months +devel/pinba_engine||2017-11-11|Has expired: Broken for more than 6 months +devel/py-event||2017-11-11|Has expired: Broken for more than 6 months diff --git a/audio/Makefile b/audio/Makefile index 6df20038732c..94bd1615ca44 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -238,7 +238,6 @@ SUBDIR += grip SUBDIR += gsm SUBDIR += gsound - SUBDIR += gspeakers SUBDIR += gstreamer-plugins-a52dec SUBDIR += gstreamer-plugins-amrnb SUBDIR += gstreamer-plugins-amrwbdec @@ -751,7 +750,6 @@ SUBDIR += solfege SUBDIR += sonata SUBDIR += sonic-visualiser - SUBDIR += sooperlooper SUBDIR += sound-juicer SUBDIR += soundconverter SUBDIR += soundgrab @@ -793,7 +791,6 @@ SUBDIR += tap-plugins SUBDIR += tap-plugins-lv2 SUBDIR += tcd - SUBDIR += tclmidi SUBDIR += teamspeak3-server SUBDIR += tempest_for_eliza SUBDIR += terminatorx diff --git a/audio/gspeakers/Makefile b/audio/gspeakers/Makefile deleted file mode 100644 index 0a2fa3145302..000000000000 --- a/audio/gspeakers/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Created by: Vincent Tantardini <vinc@freebsd-fr.org> -# $FreeBSD$ -# $MCom: ports/audio/gspeakers/Makefile,v 1.6 2007/05/30 17:08:11 mezz Exp $ - -PORTNAME= gspeakers -PORTVERSION= 0.11 -PORTREVISION= 16 -CATEGORIES= audio -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Gnome-based loudspeaker design program - -BROKEN= Does not build with recent sigc++20 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -LIB_DEPENDS= libgtkmm-2.4.so:x11-toolkits/gtkmm24 - -USES= autoreconf gmake pkgconfig -USE_GNOME= gnomeprefix libxml2 -GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -CFLAGS+= -O0 - -OPTIONS_DEFINE= SPICE -SPICE_DESC= Use spice instead of gnucap - -SPICE_RUN_DEPENDS= spice3:cad/spice -SPICE_RUN_DEPENDS_OFF= gnucap:cad/gnucap - -post-extract: - @${FIND} ${WRKSRC} -type l -delete - -post-patch: - @${REINPLACE_CMD} -e 's|$$(datadir)/pixmaps|$$(pkgdatadir)/pixmaps|g' \ - ${WRKSRC}/pixmaps/Makefile.am - @${REINPLACE_CMD} -e 's|-Wall -O0|@CXXFLAGS@|g' \ - ${WRKSRC}/src/Makefile.am - @${REINPLACE_CMD} -e 's|$$(datadir)/xml|$$(pkgdatadir)/xml|g' \ - ${WRKSRC}/xml/Makefile.am - @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ - ${WRKSRC}/src/*.cc ${WRKSRC}/src/cellitemcrossover.h - -.include <bsd.port.mk> diff --git a/audio/gspeakers/distinfo b/audio/gspeakers/distinfo deleted file mode 100644 index 96bee0014c9b..000000000000 --- a/audio/gspeakers/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (gspeakers-0.11.tar.gz) = fe5941f9e17b57d47581b56afb47c35957bc1c1e254a2675a2ad913a9625dc3f -SIZE (gspeakers-0.11.tar.gz) = 546406 diff --git a/audio/gspeakers/pkg-descr b/audio/gspeakers/pkg-descr deleted file mode 100644 index 3240f1941ce2..000000000000 --- a/audio/gspeakers/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Gspeakers is a loudspeaker enclosure and crossovernetwork designer -for the GNOME2 desktop. - -WWW: http://gspeakers.sourceforge.net/ diff --git a/audio/gspeakers/pkg-plist b/audio/gspeakers/pkg-plist deleted file mode 100644 index d618c8380855..000000000000 --- a/audio/gspeakers/pkg-plist +++ /dev/null @@ -1,54 +0,0 @@ -bin/gspeakers -share/gnome/apps/Utilities/gspeakers.desktop -share/gspeakers/pixmaps/append_enclosure_24.png -share/gspeakers/pixmaps/append_plot_enclosure_24.png -share/gspeakers/pixmaps/delete_crossover_16.png -share/gspeakers/pixmaps/delete_crossover_24.png -share/gspeakers/pixmaps/delete_driver_16.png -share/gspeakers/pixmaps/delete_driver_24.png -share/gspeakers/pixmaps/delete_enclosure_16.png -share/gspeakers/pixmaps/delete_enclosure_24.png -share/gspeakers/pixmaps/delete_plot_16.png -share/gspeakers/pixmaps/delete_plot_24.png -share/gspeakers/pixmaps/driver_small.png -share/gspeakers/pixmaps/filter_small.png -share/gspeakers/pixmaps/measure_small.png -share/gspeakers/pixmaps/open_xml_16.png -share/gspeakers/pixmaps/open_xml_24.png -share/gspeakers/pixmaps/opt_enclosure_16.png -share/gspeakers/pixmaps/opt_enclosure_24.png -share/gspeakers/pixmaps/plot_16.png -share/gspeakers/pixmaps/save_as_xml_16.png -share/gspeakers/pixmaps/save_as_xml_24.png -share/gspeakers/pixmaps/save_xml_16.png -share/gspeakers/pixmaps/save_xml_24.png -share/gspeakers/pixmaps/speaker_small.png -share/gspeakers/pixmaps/stock_menu_about.png -share/gspeakers/pixmaps/stock_new_crossover_16.png -share/gspeakers/pixmaps/stock_new_crossover_copy_16.png -share/gspeakers/pixmaps/stock_new_crossover_copy_24.png -share/gspeakers/pixmaps/stock_new_crossover_xml_16.png -share/gspeakers/pixmaps/stock_new_crossover_xml_24.png -share/gspeakers/pixmaps/stock_new_driver_16.png -share/gspeakers/pixmaps/stock_new_driver_24.png -share/gspeakers/pixmaps/stock_new_driver_xml_16.png -share/gspeakers/pixmaps/stock_new_driver_xml_24.png -share/gspeakers/pixmaps/stock_new_enclosure_16.png -share/gspeakers/pixmaps/stock_new_enclosure_24.png -share/gspeakers/pixmaps/stock_new_enclosure_copy_16.png -share/gspeakers/pixmaps/stock_new_enclosure_copy_24.png -share/gspeakers/pixmaps/stock_new_enclosure_xml_16.png -share/gspeakers/pixmaps/stock_new_enclosure_xml_24.png -share/gspeakers/pixmaps/stock_plot_crossover_16.png -share/gspeakers/pixmaps/stock_plot_crossover_24.png -share/gspeakers/xml/box1.xml -share/gspeakers/xml/crossover1.xml -share/gspeakers/xml/morelmdt32s.frf -share/gspeakers/xml/peerles115dt-26-72sf.frf -share/gspeakers/xml/seasl14rcyp.frf -share/gspeakers/xml/seasl21rn4xp.frf -share/gspeakers/xml/seast14rcyph.frf -share/gspeakers/xml/vifa.xml -share/gspeakers/xml/vifad27tg-05-06.frf -share/gspeakers/xml/vifap21wo-20-08.frf -share/pixmaps/gspeakers.png diff --git a/audio/sooperlooper/Makefile b/audio/sooperlooper/Makefile deleted file mode 100644 index abde15c1d52f..000000000000 --- a/audio/sooperlooper/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# Created by: mathias.picker@gmx.de -# $FreeBSD$ - -PORTNAME= sooperlooper -PORTVERSION= 1.7.3 -PORTREVISION= 2 -CATEGORIES= audio -MASTER_SITES= http://essej.net/sooperlooper/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Live audio looping sampler - -LICENSE= GPLv2 - -BROKEN= Does not build with newer libsigc++20 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -BUILD_DEPENDS= ladspa>0:audio/ladspa -LIB_DEPENDS= libjack.so:audio/jack \ - liblo.so:audio/liblo \ - libsamplerate.so:audio/libsamplerate \ - libsigc-2.0.so:devel/libsigc++20 \ - libsndfile.so:audio/libsndfile \ - librubberband.so:audio/rubberband \ - libvamp-sdk.so:audio/vamp-plugin-sdk \ - libfftw3.so:math/fftw3 -RUN_DEPENDS= ladspa>0:audio/ladspa - -USES= gmake localbase ncurses pkgconfig -USE_GNOME= libxml2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes - -CFLAGS+= -Wno-error=write-strings - -OPTIONS_DEFINE= ALSA WXGTK -OPTIONS_DEFAULT= WXGTK -OPTIONS_SUB= yes - -ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_CONFIGURE_ENV_OFF= ac_cv_header_alsa_asoundlib_h=no -WXGTK_USE= WX=3.0 -WXGTK_CONFIGURE_ON= --with-wxconfig-path=${WX_CONFIG} -WXGTK_CONFIGURE_OFF= --without-gui -WXGTK_DESKTOP_ENTRIES= "SooperLooper" "" "${DATADIR}/sl_logo.xpm" "slgui" \ - "AudioVideo;Audio;Player;GTK;" "" - -post-patch: - @${FIND} ${WRKSRC} -name "configure" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|$$OPT_FLAGS|$$CXXFLAGS| ; \ - /^CXXFLAGS/s|-g|$$CXXFLAGS| ; \ - s|-fo-merge-constants||' - -post-install-WXGTK-on: - ${INSTALL_DATA} ${WRKSRC}/src/gui/pixmaps/sl_logo.xpm ${STAGEDIR}${DATADIR} - -.include <bsd.port.mk> diff --git a/audio/sooperlooper/distinfo b/audio/sooperlooper/distinfo deleted file mode 100644 index c95634d90b28..000000000000 --- a/audio/sooperlooper/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (sooperlooper-1.7.3.tar.gz) = 7a7dbdedb5dab28fb1f98ba5827d88df4c7327909ab87f6def167517786f4f58 -SIZE (sooperlooper-1.7.3.tar.gz) = 732406 diff --git a/audio/sooperlooper/files/patch-libs_pbd_ftw.cc b/audio/sooperlooper/files/patch-libs_pbd_ftw.cc deleted file mode 100644 index 765396c9905d..000000000000 --- a/audio/sooperlooper/files/patch-libs_pbd_ftw.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/pbd/ftw.cc.orig 2012-05-15 13:18:56 UTC -+++ libs/pbd/ftw.cc -@@ -33,7 +33,7 @@ - #include <sys/types.h> /* Because fts(3) says so */ - #include <sys/stat.h> - #include <fts.h> --#include <alloca.h> -+#include <cstdlib> - - #include <unistd.h> /* We want strcpy */ - diff --git a/audio/sooperlooper/files/patch-libs_pbd_pathscanner.cc b/audio/sooperlooper/files/patch-libs_pbd_pathscanner.cc deleted file mode 100644 index 34fba65589aa..000000000000 --- a/audio/sooperlooper/files/patch-libs_pbd_pathscanner.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- libs/pbd/pathscanner.cc.orig 2012-05-15 13:18:56 UTC -+++ libs/pbd/pathscanner.cc -@@ -21,6 +21,7 @@ - #include <cstdlib> - #include <cstdio> - #include <cstring> -+#include <climits> - #include <vector> - #include <dirent.h> - diff --git a/audio/sooperlooper/pkg-descr b/audio/sooperlooper/pkg-descr deleted file mode 100644 index c2f283e74a62..000000000000 --- a/audio/sooperlooper/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -SooperLooper is a live looping sampler capable of immediate loop -recording, overdubbing, multiplying, reversing and more. It allows for -multiple simultaneous multi-channel loops limited only by your computer's -available memory. - -WWW: http://essej.net/sooperlooper/ diff --git a/audio/sooperlooper/pkg-plist b/audio/sooperlooper/pkg-plist deleted file mode 100644 index 24c3b84de775..000000000000 --- a/audio/sooperlooper/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/slconsole -%%WXGTK%%bin/slgui -bin/slregister -bin/sooperlooper -%%DATADIR%%/presets/bcf2000.slb -%%DATADIR%%/presets/edp4.slb -%%DATADIR%%/presets/midiwizard.slb -%%DATADIR%%/presets/oxy8.slb -%%WXGTK%%%%DATADIR%%/sl_logo.xpm diff --git a/audio/tclmidi/Makefile b/audio/tclmidi/Makefile deleted file mode 100644 index 79c09742ccea..000000000000 --- a/audio/tclmidi/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# Created by: Andreas Kohout <shanee@augusta.de> -# $FreeBSD$ - -PORTNAME= tclmidi -PORTVERSION= 3.1 -PORTREVISION= 1 -CATEGORIES= audio -MASTER_SITES= http://ringtail.its.monash.edu.au/pub/midi/PROGRAMS/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= Language designed for creating and editing standard MIDI files - -BROKEN= does not fetch, upstream gone -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -USES+= tcl uidfix -MAKE_ENV= TCL_INCLUDEDIR="${TCL_INCLUDEDIR}" TCL_LIBDIR="${TCL_LIBDIR}" -MAKE_ENV+= TCLSH=${TCLSH} FILESDIR="${FILESDIR}" MAN="${MAN1} ${MANN}" -PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message -MAKEFILE= ${FILESDIR}/BSDmakefile - -post-patch: - ${FIND} ${WRKSRC} -type f | ${XARGS} \ - ${REINPLACE_CMD} -e 's|iostream.h|iostream|g; s|iomanip.h|iomanip|g' - -post-build: - cd ${WRKSRC} && echo pkg_mkIndex . tclmidi31.so | ${TCLSH} - -pre-su-install: -.for s in mplay mrec minfo midtotcl - ${SED} 's|/usr/local/bin/tclsh|${TCLSH}|' \ - < ${WRKSRC}/${s}.dist > ${STAGEDIR}${PREFIX}/bin/${s} - ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/${s} -.endfor - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/tclmidi - ${INSTALL_DATA} ${WRKSRC}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/tclmidi - -.include <bsd.port.mk> diff --git a/audio/tclmidi/distinfo b/audio/tclmidi/distinfo deleted file mode 100644 index 5067b742e292..000000000000 --- a/audio/tclmidi/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (tclmidi-3.1.tar.gz) = 7da611e4b98aceae996029a00f408e8c6ed4718afc167b7c1a63b881fd9fce4e -SIZE (tclmidi-3.1.tar.gz) = 214458 diff --git a/audio/tclmidi/files/BSDmakefile b/audio/tclmidi/files/BSDmakefile deleted file mode 100644 index d6ded61b0493..000000000000 --- a/audio/tclmidi/files/BSDmakefile +++ /dev/null @@ -1,36 +0,0 @@ -SRCS= MidiDev.cxx TclmDr75.cxx ChanPres.cxx Event.cxx MChanPrf.cxx \ - MCopy.cxx MCue.cxx MEOT.cxx MEvent.cxx MInstNam.cxx MKey.cxx \ - MLyric.cxx MMarker.cxx MPortNum.cxx MSMPTE.cxx MSeqNam.cxx \ - MSeqNum.cxx MSeqSpec.cxx MTempo.cxx MText.cxx MTime.cxx \ - NormEvnt.cxx NoteOff.cxx NoteOn.cxx KeyPres.cxx Param.cxx \ - PitchWhl.cxx Program.cxx SysEx.cxx MUnknown.cxx EvntUtil.cxx \ - Note.cxx GusPatch.cxx SMFUtils.cxx SMFHead.cxx SMFTrack.cxx \ - EvntTree.cxx Song.cxx - -SRCS+= TclmIntp.cxx tclmCmd.cxx tclmEvnt.cxx tclmPlay.cxx \ - tclmPtch.cxx tclmUtil.cxx - -MAN= mplay.1 mrec.1 tclmidi.1 minfo.1 midtotcl.1 \ - midiconf.n midievnt.n midifree.n midiget.n midigrep.n \ - midimake.n midimerg.n midiplay.n midiput.n midiread.n \ - midirec.n midirew.n midisplt.n midistop.n midiwait.n \ - midiwrit.n midivers.n midimove.n midicopy.n mididel.n \ - miditrck.n mididev.n miditime.n midifeat.n - -SRCS+= rb.c list.c -SHLIB_NAME= tclmidi31.so -MANDIR= ${PREFIX}/man/man -LIBDIR= ${PREFIX}/lib/tclmidi -LDADD= -lstdc++ - -SUBDIRS=events device patch smf song rb -INCLUDES= -I${TCL_INCLUDEDIR} ${SUBDIRS:S/^/-I/} -CFLAGS+= ${INCLUDES} -CXXFLAGS+= -Wall -Wno-deprecated ${INCLUDES} -I${FILESDIR} -CXXFLAGS+= -DHAVE_UNISTD_H -DHAVE_SYS_FILIO_H -DHAVE_SYS_TIME_H -NO_WERROR= yes - -.PATH: ${SUBDIRS} man -WARNS= 5 - -.include <bsd.lib.mk> diff --git a/audio/tclmidi/files/patch-Makefile.ins b/audio/tclmidi/files/patch-Makefile.ins deleted file mode 100644 index 39cdd3df4cfc..000000000000 --- a/audio/tclmidi/files/patch-Makefile.ins +++ /dev/null @@ -1,133 +0,0 @@ ---- Makefile.in.orig 1996-10-10 03:32:36 UTC -+++ Makefile.in -@@ -11,7 +11,7 @@ SCRIPTS = midtotcl minfo mplay mrec - - # The directory containing the Tcl library archive file appropriate - # for this version of Tk: --TCL_BIN_DIR = @TCL_BIN_DIR@ -+TCL_BIN_DIR = ${TCL_LIBDIR} - - #---------------------------------------------------------------- - # The information below is modified by the configure script when -@@ -35,8 +35,9 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - - CFLAGS = @CFLAGS@ @DEFS@ --CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} \ -+CC_SWITCHES = @CFLAGS@ @DEFS@ ${SHLIB_CFLAGS} -I${TCL_GENERIC_DIR} \ - -Idevice -Ievents -Irb -Ipatch -Ismf -Isong -I. -+CXX_SWITCHES= ${CC_SWITCHES} ${CXXFLAGS} - - TCLMFILES = tclmCmd.o tclmUtil.o tclmEvnt.o tclmPlay.o tclmPtch.o TclmIntp.o - TCLMFILES_SRC = tclmCmd.cxx tclmUtil.cxx tclmEvnt.cxx tclmPlay.cxx \ -@@ -61,7 +62,7 @@ pkgIndex.tcl: $(PROJ_LIB_NAME) - @echo 'pkg_mkIndex . $(PROJ_LIB_NAME)' | @TCLSH_PATH@ - - .cxx.o: -- @CXX@ -c $(CC_SWITCHES) $< -+ @CXX@ -c $(CXX_SWITCHES) $< - - $(PROJ_LIB_NAME): events/objs smf/objs \ - song/objs device/objs patch/objs rb/objs $(TCLMFILES) -@@ -101,7 +102,7 @@ midtotcl: midtotcl.dist - - install: $(PROJ_LIB_NAME) $(SCRIPTS) - -mkdir -p $(prefix)$(libdir)/tclmidi -- @INSTALL_DATA@ $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi -+ @INSTALL_DATA@ -s $(PROJ_LIB_NAME) $(prefix)$(libdir)/tclmidi - echo 'pkg_mkIndex $(prefix)$(libdir)/tclmidi \ - $(PROJECT)*${SHLIB_SUFFIX}' | @TCLSH_PATH@ - cd man; $(MAKE) install -@@ -128,7 +129,7 @@ depend: - sed "/[#]# Dependancies/,$$$$d" < Makefile > Makefile.tmp - echo >> Makefile.tmp - echo "##" "Dependancies" >> Makefile.tmp -- @CXX@ -M $(CC_SWITCHES) $(TCLMFILES_SRC) >> Makefile.tmp -+ @CXX@ -M $(CXX_SWITCHES) $(TCLMFILES_SRC) >> Makefile.tmp - cp Makefile.tmp Makefile - rm Makefile.tmp - ---- device/Makefile.in.orig 1996-10-10 03:32:40 UTC -+++ device/Makefile.in -@@ -17,6 +17,7 @@ CFLAGS = @CFLAGS@ @DEFS@ - CC_SWITCHES = @CFLAGS@ @DEFS@ -I${TCL_GENERIC_DIR} ${SHLIB_CFLAGS} \ - -I$(srcdir)/../events -I$(srcdir)/../rb -I$(srcdir)/../patch \ - -I$(srcdir)/../smf -I$(srcdir)/../song -I$(srcdir)/.. -I$(srcdir) -+CXX_SWITCHES= ${CC_SWITCHES} ${CXXFLAGS} - - DEVICEFILES = MidiDev.o TclmDr75.o - DEVICEFILES_SRC = MidiDev.cxx TclmDr75.cxx -@@ -24,7 +25,7 @@ DEVICEFILES_SRC = MidiDev.cxx TclmDr75.c - .SUFFIXES: .cxx $(SUFFIXES) - - .cxx.o: -- @CXX@ -c $(CC_SWITCHES) $< -+ @CXX@ -c $(CXX_SWITCHES) $< - - objs: $(DEVICEFILES) - for f in $(DEVICEFILES) ; do echo device/$$f ; done > objs -@@ -33,7 +34,7 @@ depend: - sed "/[#]# Dependancies/,$$$$d" < Makefile > Makefile.tmp - echo >> Makefile.tmp - echo "##" "Dependancies" >> Makefile.tmp -- @CXX@ -M $(CC_SWITCHES) $(DEVICEFILES_SRC) >> Makefile.tmp -+ @CXX@ -M $(CXX_SWITCHES) $(DEVICEFILES_SRC) >> Makefile.tmp - cp Makefile.tmp Makefile - rm Makefile.tmp - ---- events/Makefile.in.orig 1996-10-10 03:32:42 UTC -+++ events/Makefile.in -@@ -16,6 +16,7 @@ VPATH = @srcdir@ - CFLAGS = @CFLAGS@ @DEFS@ - CC_SWITCHES = @CFLAGS@ @DEFS@ -I${TCL_GENERIC_DIR} ${SHLIB_CFLAGS} \ - -I$(srcdir)/../smf -I$(srcdir)/../song -I$(srcdir)/.. -I$(srcdir) -+CXX_SWITCHES = ${CC_SWITCHES} ${CXXFLAGS} - - EVENTFILES = ChanPres.o Event.o MChanPrf.o MCopy.o MCue.o \ - MEOT.o MEvent.o MInstNam.o MKey.o MLyric.o \ -@@ -35,7 +36,7 @@ EVENTFILES_SRC = ChanPres.cxx Event.cxx - .SUFFIXES: .cxx $(SUFFIXES) - - .cxx.o: -- @CXX@ -c $(CC_SWITCHES) $< -+ @CXX@ -c $(CXX_SWITCHES) $< - - objs: $(EVENTFILES) - for f in $(EVENTFILES) ; do echo events/$$f ; done > objs -@@ -44,7 +45,7 @@ depend: - sed "/[#]# Dependancies/,$$$$d" < Makefile > Makefile.tmp - echo >> Makefile.tmp - echo "##" "Dependancies" >> Makefile.tmp -- @CXX@ -M $(CC_SWITCHES) $(EVENTFILES_SRC) >> Makefile.tmp -+ @CXX@ -M $(CXX_SWITCHES) $(EVENTFILES_SRC) >> Makefile.tmp - cp Makefile.tmp Makefile - rm Makefile.tmp - ---- patch/Makefile.in.orig 1996-10-10 03:32:43 UTC -+++ patch/Makefile.in -@@ -16,6 +16,7 @@ VPATH = @srcdir@ - CFLAGS = @CFLAGS@ @DEFS@ - CC_SWITCHES = @CFLAGS@ @DEFS@ -I${TCL_GENERIC_DIR} ${SHLIB_CFLAGS} \ - -I. -I.. -+CXX_SWITCHES = ${CC_SWITCHES} ${CXXFLAGS} - - PATCHFILES = GusPatch.o - PATCHFILES_SRC = GusPatch.cxx -@@ -23,7 +24,7 @@ PATCHFILES_SRC = GusPatch.cxx - .SUFFIXES: .cxx $(SUFFIXES) - - .cxx.o: -- @CXX@ -c $(CC_SWITCHES) $< -+ @CXX@ -c $(CXX_SWITCHES) $< - - objs: $(PATCHFILES) - for f in $(PATCHFILES) ; do echo patch/$$f ; done > objs -@@ -32,7 +33,7 @@ depend: - sed "/[#]# Dependancies/,$$$$d" < Makefile > Makefile.tmp - echo >> Makefile.tmp - echo "##" "Dependancies" >> Makefile.tmp -- @CXX@ -M $(CC_SWITCHES) $(PATCHFILES_SRC) >> Makefile.tmp -+ @CXX@ -M $(CXX_SWITCHES) $(PATCHFILES_SRC) >> Makefile.tmp - cp Makefile.tmp Makefile - rm Makefile.tmp - diff --git a/audio/tclmidi/files/patch-TclmIntp.cxx b/audio/tclmidi/files/patch-TclmIntp.cxx deleted file mode 100644 index 528a8a6c37ae..000000000000 --- a/audio/tclmidi/files/patch-TclmIntp.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- TclmIntp.cxx.orig 1996-07-28 19:09:03 UTC -+++ TclmIntp.cxx -@@ -37,8 +37,7 @@ - #endif - #include "TclmIntp.h" - --TclmInterp::TclmInterp() : current_song(0), current_dev(0), current_patch(0), -- next_event(0) -+TclmInterp::TclmInterp() : current_song(0), current_dev(0), current_patch(0) - { - - Tcl_InitHashTable(&song_ht, TCL_STRING_KEYS); diff --git a/audio/tclmidi/files/patch-TclmIntp.h b/audio/tclmidi/files/patch-TclmIntp.h deleted file mode 100644 index dcecbffbab5a..000000000000 --- a/audio/tclmidi/files/patch-TclmIntp.h +++ /dev/null @@ -1,9 +0,0 @@ ---- TclmIntp.h.orig 1996-07-28 18:53:08 UTC -+++ TclmIntp.h -@@ -64,6 +64,5 @@ private: - int current_song; - int current_dev; - int current_patch; -- Event *next_event; - }; - #endif diff --git a/audio/tclmidi/files/patch-configure b/audio/tclmidi/files/patch-configure deleted file mode 100644 index c813021d7fe8..000000000000 --- a/audio/tclmidi/files/patch-configure +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.orig 1996-10-11 02:57:27 UTC -+++ configure -@@ -1604,7 +1604,7 @@ if eval "test \"`echo '$ac_cv_header_'$a - # Greg figured out how to use gcc instead of ld.. - # -lgcc can be found in /usr/lib/gcc-lib/i486-linux/2.7.0/ - # or something similar. -- SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc" -+ SHLIB_LD_CXX="-lg++ -lstdc++ -lgcc" - DL_OBJS="tclLoadDld.o" - DL_LIBS="-ldld" - LD_FLAGS="" -@@ -1727,12 +1727,12 @@ fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - -- SHLIB_LD_CXX="-Bstatic -lg++ -lstdc++ -lgcc 2> /dev/null" -+ SHLIB_LD_CXX="-lstdc++ -lgcc 2> /dev/null" - - else - echo "$ac_t""no" 1>&6 - -- SHLIB_LD_CXX="-Bstatic -lg++ -lgcc 2> /dev/null" -+ SHLIB_LD_CXX="-lg++ -lgcc 2> /dev/null" - - fi - diff --git a/audio/tclmidi/files/patch-modern b/audio/tclmidi/files/patch-modern deleted file mode 100644 index dd065e6adbdc..000000000000 --- a/audio/tclmidi/files/patch-modern +++ /dev/null @@ -1,2145 +0,0 @@ ---- events/ChanPres.h 1996-02-18 19:57:20.000000000 -0500 -+++ events/ChanPres.h 2012-04-07 14:08:43.000000000 -0400 -@@ -44,7 +44,7 @@ - {return (new ChannelPressureEvent(*this));} - - virtual EventType GetType(void) const {return (CHANNELPRESSURE);} -- virtual char *GetTypeStr(void) const {return ("ChannelPressureEvent");} -+ virtual const char *GetTypeStr(void) const {return ("ChannelPressureEvent");} - virtual char *GetEventStr(void) const; - int GetPressure(void) const { - if (GetWildcard(wc_pressure)) ---- events/Event.h 1996-07-28 14:51:08.000000000 -0400 -+++ events/Event.h 2012-04-11 01:04:43.000000000 -0400 -@@ -81,12 +81,13 @@ - else - return (time); - } -+ virtual ~Event() {}; - virtual EventType GetType(void) const {return (NOTYPE);} -- virtual char *GetTypeStr(void) const {return ("NoType");} -+ virtual const char *GetTypeStr(void) const {return ("NoType");} - virtual char *GetEventStr(void) const; - Event *GetNextEvent(void) const {return (next_event);} - Event *GetPrevEvent(void) const {return (prev_event);} -- const EventTreeNode *GetEventTreeNode(void) const {return (node);} -+ EventTreeNode *GetEventTreeNode(void) const {return (node);} - - void SetTime(unsigned long t) { - if (t == WC_TIME) -@@ -96,7 +97,7 @@ - } - void SetNextEvent(Event *n) {next_event = n;} - void SetPrevEvent(Event *p) {prev_event = p;} -- void SetEventTreeNode(const EventTreeNode *n) {node = n;} -+ void SetEventTreeNode(EventTreeNode *n) {node = n;} - - Event &operator=(const Event &e); - int operator==(const Event &e) const; -@@ -120,6 +121,6 @@ - static const unsigned long wc_time; - Event *next_event; - Event *prev_event; -- const EventTreeNode *node; -+ EventTreeNode *node; - }; - #endif ---- events/KeyPres.h 1996-02-18 19:57:26.000000000 -0500 -+++ events/KeyPres.h 2012-04-07 14:08:43.000000000 -0400 -@@ -45,7 +45,7 @@ - virtual Event *Dup(void) const {return (new KeyPressureEvent(*this));} - - virtual EventType GetType(void) const {return (KEYPRESSURE);} -- virtual char *GetTypeStr(void) const {return ("KeyPressureEvent");} -+ virtual const char *GetTypeStr(void) const {return ("KeyPressureEvent");} - virtual char *GetEventStr(void) const; - int GetPitch(void) const { - if (GetWildcard(wc_pitch)) ---- events/MChanPrf.cxx 1996-07-28 15:09:16.000000000 -0400 -+++ events/MChanPrf.cxx 2012-04-07 15:41:59.000000000 -0400 -@@ -74,7 +74,7 @@ - MetaChannelPrefixEvent::~MetaChannelPrefixEvent() - { - -- delete data; -+ delete[] data; - } - - void -@@ -82,7 +82,7 @@ - { - - if (data != 0) -- delete data; -+ delete[] data; - if (dat == WC_DATA || len == WC_LENGTH) { - SetWildcard(wc_data); - data = 0; -@@ -101,7 +101,7 @@ - - (MetaEvent)*this = (MetaEvent)e; - if (data != 0) -- delete data; -+ delete[] data; - if (e.GetWildcard(wc_data)) { - data = 0; - length = -1; -@@ -129,7 +129,7 @@ - buf.setf(ios::showbase | ios::internal); - for (i = 0; i < length; i++) - buf << " " << hex << setw(4) << setfill('0') << -- (int)data[i]; -+ (intptr_t)data[i]; - } - buf << ends; - delete tbuf; -@@ -142,7 +142,7 @@ - const unsigned char *ptr; - - if (data != 0) -- delete data; -+ delete[] data; - if ((length = t.GetVarValue()) == -1) - return ("Incomplete MetaChannelPrefixEvent - bad length"); - data = new unsigned char[length]; ---- events/MChanPrf.h 1996-02-18 19:57:29.000000000 -0500 -+++ events/MChanPrf.h 2012-04-07 14:36:23.000000000 -0400 -@@ -46,7 +46,7 @@ - {return (new MetaChannelPrefixEvent(*this));} - - virtual EventType GetType(void) const {return (METACHANNELPREFIX);} -- virtual char *GetTypeStr(void) const -+ virtual const char *GetTypeStr(void) const - {return ("MetaChannelPrefixEvent");} - virtual char *GetEventStr(void) const; - const unsigned char *GetData(void) const { ---- events/MCopy.h 1996-02-12 19:25:36.000000000 -0500 -+++ events/MCopy.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - virtual Event *Dup(void) const {return (new MetaCopyrightEvent(*this));} - - virtual EventType GetType(void) const {return (METACOPYRIGHT);} -- virtual char *GetTypeStr(void) const {return ("MetaCopyrightEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaCopyrightEvent");} - virtual char *GetEventStr(void) const; - - MetaCopyrightEvent &operator=(const MetaCopyrightEvent &e); ---- events/MCue.h 1996-02-12 19:25:37.000000000 -0500 -+++ events/MCue.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - virtual Event *Dup(void) const {return (new MetaCueEvent(*this));} - - virtual EventType GetType(void) const {return (METACUE);} -- virtual char *GetTypeStr(void) const {return ("MetaCueEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaCueEvent");} - virtual char *GetEventStr(void) const; - - MetaCueEvent &operator=(const MetaCueEvent &e); ---- events/MEOT.h 1996-02-12 19:25:38.000000000 -0500 -+++ events/MEOT.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - {return (new MetaEndOfTrackEvent(*this));} - - virtual EventType GetType(void) const {return (METAENDOFTRACK);} -- virtual char *GetTypeStr(void) const {return ("MetaEndOfTrackEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaEndOfTrackEvent");} - virtual char *GetEventStr(void) const; - - MetaEndOfTrackEvent &operator=(const MetaEndOfTrackEvent &e); ---- events/MEvent.h 1996-02-12 19:25:39.000000000 -0500 -+++ events/MEvent.h 2012-04-07 14:08:43.000000000 -0400 -@@ -42,7 +42,7 @@ - virtual Event *Dup(void) const {return (new MetaEvent(*this));} - - virtual EventType GetType(void) const {return (META);} -- virtual char *GetTypeStr(void) const {return ("MetaEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaEvent");} - virtual char *GetEventStr(void) const; - - MetaEvent &operator=(const MetaEvent &e); ---- events/MInstNam.h 1996-02-12 19:25:39.000000000 -0500 -+++ events/MInstNam.h 2012-04-07 14:08:43.000000000 -0400 -@@ -45,7 +45,7 @@ - {return (new MetaInstrumentNameEvent(*this));} - - virtual EventType GetType(void) const {return (METAINSTRUMENTNAME);} -- virtual char *GetTypeStr(void) const {return ("MetaInstrumentName");} -+ virtual const char *GetTypeStr(void) const {return ("MetaInstrumentName");} - virtual char *GetEventStr(void) const; - - MetaInstrumentNameEvent &operator=(const MetaInstrumentNameEvent &e); ---- events/MKey.cxx 1996-07-28 15:09:19.000000000 -0400 -+++ events/MKey.cxx 2012-04-07 15:51:06.000000000 -0400 -@@ -396,7 +396,7 @@ - badkey = 1; - } - -- delete keystr; -+ delete[] keystr; - if (badkey) - *match = 0; - else -@@ -409,21 +409,13 @@ - StrToMode(const char *str, int *match) - { - Mode mode; -- char *modestr; -- int i, modelen; -- -- modelen = strlen(str); -- modestr = new char[modelen + 1]; -- for (i = 0; i < modelen; i++) -- modestr[i] = tolower(str[i]); -- modestr[i] = '\0'; - - *match = 1; -- if (strcmp(modestr, "minor") == 0) -+ if (strcasecmp(str, "minor") == 0) - mode = MODE_MINOR; -- else if (strcmp(modestr, "major") == 0) -+ else if (strcasecmp(str, "major") == 0) - mode = MODE_MAJOR; -- else if (strcmp(modestr, "*") == 0) -+ else if (strcasecmp(str, "*") == 0) - mode = MODE_WC; - else { - mode = MODE_MAJOR; ---- events/MKey.h 1996-02-18 19:57:33.000000000 -0500 -+++ events/MKey.h 2012-04-07 14:08:43.000000000 -0400 -@@ -57,7 +57,7 @@ - virtual Event *Dup(void) const {return (new MetaKeyEvent(*this));} - - virtual EventType GetType(void) const {return (METAKEY);} -- virtual char *GetTypeStr(void) const {return ("MetaKeyEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaKeyEvent");} - virtual char *GetEventStr(void) const; - Key GetKey(void) const { - if (GetWildcard(wc_key)) ---- events/MLyric.h 1996-02-12 19:25:41.000000000 -0500 -+++ events/MLyric.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - virtual Event *Dup(void) const {return (new MetaLyricEvent(*this));} - - virtual EventType GetType(void) const {return (METALYRIC);} -- virtual char *GetTypeStr(void) const {return ("MetaLyricEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaLyricEvent");} - virtual char *GetEventStr(void) const; - - MetaLyricEvent &operator=(const MetaLyricEvent &e); ---- events/MMarker.h 1996-02-12 19:25:42.000000000 -0500 -+++ events/MMarker.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - virtual Event *Dup(void) const {return (new MetaMarkerEvent(*this));} - - virtual EventType GetType(void) const {return (METAMARKER);} -- virtual char *GetTypeStr(void) const {return ("MetaMarkerEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaMarkerEvent");} - virtual char *GetEventStr(void) const; - - MetaMarkerEvent &operator=(const MetaMarkerEvent &e); ---- events/MPortNum.h 1996-02-18 19:57:36.000000000 -0500 -+++ events/MPortNum.h 2012-04-07 14:08:43.000000000 -0400 -@@ -44,7 +44,7 @@ - {return (new MetaPortNumberEvent(*this));} - - virtual EventType GetType(void) const {return (METAPORTNUMBER);} -- virtual char *GetTypeStr(void) const -+ virtual const char *GetTypeStr(void) const - {return ("MetaPortNumberEvent");} - virtual char *GetEventStr(void) const; - int GetPort(void) const { ---- events/MSMPTE.h 1996-02-18 19:57:40.000000000 -0500 -+++ events/MSMPTE.h 2012-04-07 14:08:43.000000000 -0400 -@@ -42,7 +42,7 @@ - virtual Event *Dup(void) const {return (new MetaSMPTEEvent(*this));} - - virtual EventType GetType(void) const {return (METASMPTE);} -- virtual char *GetTypeStr(void) const {return ("MetaSMPTEEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaSMPTEEvent");} - virtual char *GetEventStr(void) const; - int GetHour(void) const { - if (GetWildcard(wc_hour)) ---- events/MSeqNam.h 1996-02-12 19:25:44.000000000 -0500 -+++ events/MSeqNam.h 2012-04-07 14:08:43.000000000 -0400 -@@ -44,7 +44,7 @@ - {return (new MetaSequenceNameEvent(*this));} - - virtual EventType GetType(void) const {return (METASEQUENCENAME);} -- virtual char *GetTypeStr(void) const {return ("MetaSequenceNameEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaSequenceNameEvent");} - virtual char *GetEventStr(void) const; - - MetaSequenceNameEvent &operator=(const MetaSequenceNameEvent &e); ---- events/MSeqNum.h 1996-02-18 19:57:43.000000000 -0500 -+++ events/MSeqNum.h 2012-04-07 14:08:43.000000000 -0400 -@@ -44,7 +44,7 @@ - {return (new MetaSequenceNumberEvent(*this));} - - virtual EventType GetType(void) const {return (METASEQUENCENUMBER);} -- virtual char *GetTypeStr(void) const -+ virtual const char *GetTypeStr(void) const - {return ("MetaSequenceNumberEvent");} - virtual char *GetEventStr(void) const; - long GetNumber(void) const { ---- events/MSeqSpec.cxx 1996-07-28 15:09:24.000000000 -0400 -+++ events/MSeqSpec.cxx 2012-04-07 15:47:09.000000000 -0400 -@@ -74,7 +74,7 @@ - MetaSequencerSpecificEvent::~MetaSequencerSpecificEvent() - { - -- delete data; -+ delete[] data; - } - - void -@@ -82,7 +82,7 @@ - { - - if (data != 0) -- delete data; -+ delete[] data; - if (dat == WC_DATA || len == WC_LENGTH) { - SetWildcard(wc_data); - data = 0; -@@ -102,7 +102,7 @@ - - (MetaEvent)*this = (MetaEvent)e; - if (data != 0) -- delete data; -+ delete[] data; - if (e.GetWildcard(wc_data)) { - data = 0; - length = -1; -@@ -144,7 +144,7 @@ - const unsigned char *ptr; - - if (data != 0) -- delete data; -+ delete[] data; - if ((length = t.GetVarValue()) == -1) - return ("Incomplete MetaSequenceSpecificEvent - bad length"); - data = new unsigned char[length]; ---- events/MSeqSpec.h 1996-02-18 19:57:45.000000000 -0500 -+++ events/MSeqSpec.h 2012-04-07 14:08:43.000000000 -0400 -@@ -46,7 +46,7 @@ - {return (new MetaSequencerSpecificEvent(*this));} - - virtual EventType GetType(void) const {return (METASEQUENCERSPECIFIC);} -- virtual char *GetTypeStr(void) const -+ virtual const char *GetTypeStr(void) const - {return ("MetaSequencerSpecificEvent");} - virtual char *GetEventStr(void) const; - const unsigned char *GetData(void) const { ---- events/MTempo.h 1996-02-18 19:57:49.000000000 -0500 -+++ events/MTempo.h 2012-04-07 14:08:43.000000000 -0400 -@@ -42,7 +42,7 @@ - virtual Event *Dup(void) const {return (new MetaTempoEvent(*this));} - - virtual EventType GetType(void) const {return (METATEMPO);} -- virtual char *GetTypeStr(void) const {return ("MetaTempoEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaTempoEvent");} - virtual char *GetEventStr(void) const; - short GetTempo(void) const { - if (GetWildcard(wc_tempo)) ---- events/MText.cxx 1996-07-28 15:09:25.000000000 -0400 -+++ events/MText.cxx 2012-04-07 15:46:17.000000000 -0400 -@@ -83,14 +83,14 @@ - MetaTextEvent::~MetaTextEvent() - { - -- delete string; -+ delete[] string; - } - - void - MetaTextEvent::SetString(const char *str) - { - -- delete string; -+ delete[] string; - if (str == WC_STRING) { - string = 0; - length = -1; -@@ -110,7 +110,7 @@ - - (MetaEvent)*this = (MetaEvent)e; - length = e.length; -- delete string; -+ delete[] string; - if (e.GetWildcard(wc_string)) { - string = 0; - return (*this); -@@ -144,7 +144,7 @@ - const unsigned char *ptr; - - if (string != 0) -- delete string; -+ delete[] string; - if ((length = t.GetVarValue()) == -1) - return ("Incomplete MetaTextEvent - bad length"); - string = new char[length + 1]; ---- events/MText.h 1996-02-18 19:57:52.000000000 -0500 -+++ events/MText.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - virtual Event *Dup(void) const {return (new MetaTextEvent(*this));} - - virtual EventType GetType(void) const {return (METATEXT);} -- virtual char *GetTypeStr(void) const {return ("MetaTextEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaTextEvent");} - virtual char *GetEventStr(void) const; - const char *GetString(void) const { - if (GetWildcard(wc_string)) ---- events/MTime.h 1996-02-18 19:57:55.000000000 -0500 -+++ events/MTime.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - virtual Event *Dup(void) const {return (new MetaTimeEvent(*this));} - - virtual EventType GetType(void) const {return (METATIME);} -- virtual char *GetTypeStr(void) const {return ("MetaTimeEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaTimeEvent");} - virtual char *GetEventStr(void) const; - int GetNumerator(void) const { - if (GetWildcard(wc_numerator)) ---- events/MUnknown.cxx 1996-07-28 15:09:26.000000000 -0400 -+++ events/MUnknown.cxx 2012-04-07 15:48:00.000000000 -0400 -@@ -86,14 +86,14 @@ - MetaUnknownEvent::~MetaUnknownEvent() - { - -- delete data; -+ delete[] data; - } - - void - MetaUnknownEvent::SetData(const unsigned char *dat, long len) - { - -- delete data; -+ delete[] data; - if (dat == WC_DATA || len == WC_LENGTH) { - SetWildcard(wc_data); - data = 0; -@@ -111,7 +111,7 @@ - { - - (MetaEvent)*this = (MetaEvent)e; -- delete data; -+ delete[] data; - type = e.type; - if (e.GetWildcard(wc_data)) { - data = 0; -@@ -158,7 +158,7 @@ - const unsigned char *ptr; - - if (data != 0) -- delete data; -+ delete[] data; - if ((length = t.GetVarValue()) == -1) - return ("Incomplete MetaUnknownEvent - bad length"); - data = new unsigned char[length]; ---- events/MUnknown.h 1996-02-25 18:09:15.000000000 -0500 -+++ events/MUnknown.h 2012-04-07 14:08:43.000000000 -0400 -@@ -45,7 +45,7 @@ - virtual Event *Dup(void) const {return (new MetaUnknownEvent(*this));} - - virtual EventType GetType(void) const {return (METAUNKNOWN);} -- virtual char *GetTypeStr(void) const {return ("MetaUnknownEvent");} -+ virtual const char *GetTypeStr(void) const {return ("MetaUnknownEvent");} - virtual char *GetEventStr(void) const; - const unsigned char *GetData(void) const { - if (GetWildcard(wc_data)) ---- events/NormEvnt.h 1996-02-18 19:58:01.000000000 -0500 -+++ events/NormEvnt.h 2012-04-07 14:08:43.000000000 -0400 -@@ -42,7 +42,7 @@ - virtual Event *Dup(void) const {return (new NormalEvent(*this));} - - virtual EventType GetType(void) const {return (NORMAL);} -- virtual char *GetTypeStr(void) const {return ("NormalEvent");} -+ virtual const char *GetTypeStr(void) const {return ("NormalEvent");} - virtual char *GetEventStr(void) const; - int GetChannel(void) const { - if (GetWildcard(wc_channel)) ---- events/Note.h 1996-02-25 18:09:19.000000000 -0500 -+++ events/Note.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - virtual Event *Dup(void) const {return (new NoteEvent(*this));} - - virtual EventType GetType(void) const {return (NOTE);} -- virtual char *GetTypeStr(void) const {return ("NoteEvent");} -+ virtual const char *GetTypeStr(void) const {return ("NoteEvent");} - virtual char *GetEventStr(void) const; - int GetPitch(void) const { - if (GetWildcard(wc_pitch)) ---- events/NoteOff.h 1996-02-18 19:58:07.000000000 -0500 -+++ events/NoteOff.h 2012-04-07 14:08:43.000000000 -0400 -@@ -43,7 +43,7 @@ - virtual Event *Dup(void) const {return (new NoteOffEvent(*this));} - - virtual EventType GetType(void) const {return (NOTEOFF);} -- virtual char *GetTypeStr(void) const {return ("NoteOffEvent");} -+ virtual const char *GetTypeStr(void) const {return ("NoteOffEvent");} - virtual char *GetEventStr(void) const; - - NoteOffEvent &operator=(const NoteOffEvent &e); ---- events/NoteOn.h 1996-02-25 18:09:22.000000000 -0500 -+++ events/NoteOn.h 2012-04-07 14:08:43.000000000 -0400 -@@ -45,7 +45,7 @@ - virtual Event *Dup(void) const {return (new NoteOnEvent(*this));} - - virtual EventType GetType(void) const {return (NOTEON);} -- virtual char *GetTypeStr(void) const {return ("NoteOnEvent");} -+ virtual const char *GetTypeStr(void) const {return ("NoteOnEvent");} - virtual char *GetEventStr(void) const; - - unsigned long GetDuration(void) const { ---- events/Param.h 1996-02-18 19:58:13.000000000 -0500 -+++ events/Param.h 2012-04-07 14:08:43.000000000 -0400 -@@ -42,7 +42,7 @@ - virtual Event *Dup(void) const {return (new ParameterEvent(*this));} - - virtual EventType GetType(void) const {return (PARAMETER);} -- virtual char *GetTypeStr(void) const {return ("ParameterEvent");} -+ virtual const char *GetTypeStr(void) const {return ("ParameterEvent");} - virtual char *GetEventStr(void) const; - int GetParameter(void) const { - if (GetWildcard(wc_parameter)) ---- events/PitchWhl.h 1996-02-18 19:58:16.000000000 -0500 -+++ events/PitchWhl.h 2012-04-07 14:08:43.000000000 -0400 -@@ -42,7 +42,7 @@ - virtual Event *Dup(void) const {return (new PitchWheelEvent(*this));} - - virtual EventType GetType(void) const {return (PITCHWHEEL);} -- virtual char *GetTypeStr(void) const {return ("PitchWheelEvent");} -+ virtual const char *GetTypeStr(void) const {return ("PitchWheelEvent");} - virtual char *GetEventStr(void) const; - long GetValue(void) const { - if (GetWildcard(wc_value)) ---- events/Program.h 1996-02-18 19:58:19.000000000 -0500 -+++ events/Program.h 2012-04-07 14:08:43.000000000 -0400 -@@ -42,7 +42,7 @@ - virtual Event *Dup(void) const {return (new ProgramEvent(*this));} - - virtual EventType GetType(void) const {return (PROGRAM);} -- virtual char *GetTypeStr(void) const {return ("ProgramEvent");} -+ virtual const char *GetTypeStr(void) const {return ("ProgramEvent");} - virtual char *GetEventStr(void) const; - int GetValue(void) const { - if (GetWildcard(wc_value)) ---- events/SysEx.cxx 1996-07-28 15:09:30.000000000 -0400 -+++ events/SysEx.cxx 2012-04-07 15:44:56.000000000 -0400 -@@ -81,7 +81,7 @@ - SystemExclusiveEvent::~SystemExclusiveEvent() - { - -- delete data; -+ delete[] data; - } - - void -@@ -89,7 +89,7 @@ - { - - if (data != 0) -- delete data; -+ delete[] data; - if (len == WC_LENGTH || dat == WC_DATA) { - SetWildcard(wc_data); - data = 0; -@@ -107,7 +107,7 @@ - - (Event)*this = (Event)e; - if (data != 0) -- delete data; -+ delete[] data; - continued = e.continued; - length = e.length; - if (e.GetWildcard(wc_data)) { -@@ -148,7 +148,7 @@ - const unsigned char *ptr; - - if (data != 0) -- delete data; -+ delete[] data; - if ((length = t.GetVarValue()) == -1) - return ("Incomplete SystemExclusiveEvent - bad length"); - data = new unsigned char[length]; ---- events/SysEx.h 1996-02-18 19:58:22.000000000 -0500 -+++ events/SysEx.h 2012-04-07 14:08:43.000000000 -0400 -@@ -46,7 +46,7 @@ - {return (new SystemExclusiveEvent(*this));} - - virtual EventType GetType(void) const {return (SYSTEMEXCLUSIVE);} -- virtual char *GetTypeStr(void) const {return ("SystemExclusiveEvent");} -+ virtual const char *GetTypeStr(void) const {return ("SystemExclusiveEvent");} - virtual char *GetEventStr(void) const; - const unsigned char *GetData(void) const { - if (GetWildcard(wc_data)) ---- smf/SMFUtils.cxx 1996-08-04 23:47:36.000000000 -0400 -+++ smf/SMFUtils.cxx 2012-04-07 14:08:43.000000000 -0400 -@@ -59,7 +59,7 @@ - } - - long --MWrite(int fd, char *data, long len) -+MWrite(int fd, const char *data, long len) - { - int num_written; - int total_written; -@@ -96,7 +96,7 @@ - } - - long --MWrite(Tcl_Channel channel, char *data, long len) -+MWrite(Tcl_Channel channel, const char *data, long len) - { - int num_written; - int total_written; -@@ -116,7 +116,7 @@ - - - long --VarToFix(unsigned char *var, int *len) -+VarToFix(const unsigned char *var, int *len) - { - long fix; - ---- smf/SMFUtils.h 1996-08-04 23:47:36.000000000 -0400 -+++ smf/SMFUtils.h 2012-04-07 14:08:43.000000000 -0400 -@@ -147,9 +147,9 @@ - - - extern long MRead(int fd, char *data, long len); --extern long MWrite(int fd, char *data, long len); -+extern long MWrite(int fd, const char *data, long len); - extern long MRead(Tcl_Channel channel, char *data, long len); --extern long MWrite(Tcl_Channel channel, char *data, long len); --extern long VarToFix(unsigned char *var, int *len); -+extern long MWrite(Tcl_Channel channel, const char *data, long len); -+extern long VarToFix(const unsigned char *var, int *len); - extern int FixToVar(long fix, unsigned char *var); - #endif ---- song/Song.cxx 1996-08-04 23:47:39.000000000 -0400 -+++ song/Song.cxx 2012-04-11 01:02:09.000000000 -0400 -@@ -51,7 +51,7 @@ - } - for (i = 0; i < s.num_tracks; i++) { - tracks[i] = new EventTree(*s.tracks[i]); -- assert(tracks[1] != 0); -+ assert(tracks[i] != 0); - } - } - -@@ -102,7 +102,7 @@ - - for (i = 0; i < num_tracks; i++) - delete tracks[i]; -- delete tracks; -+ delete[] tracks; - } - - Event * ---- tclmEvnt.cxx 1996-07-29 20:14:11.000000000 -0400 -+++ tclmEvnt.cxx 2012-04-07 15:42:14.000000000 -0400 -@@ -44,6 +44,9 @@ - #include "tclmidi.h" - #include "tclmEvnt.h" - -+#define SET_CONST_RESULT(string) \ -+ Tcl_SetResult(interp, (char *)(void *)string, TCL_STATIC) -+ - void - Tclm_PrintEvent(ostream &buf, Event *e) - { -@@ -148,7 +151,7 @@ - buf << "* " << str << ends; - else - buf << e->GetTime() << " " << str << ends; -- delete str; -+ delete[] str; - } - - char * -@@ -552,13 +555,9 @@ - } - - char * --Tclm_PrintMetaEndOfTrack(MetaEndOfTrackEvent *e) -+Tclm_PrintMetaEndOfTrack(MetaEndOfTrackEvent *) - { - ostrstream buf; -- MetaEndOfTrackEvent *dummy; -- -- // shut up a warning -- dummy = e; - - buf << "MetaEndOfTrack" << ends; - return (buf.str()); -@@ -722,11 +721,11 @@ - } - - Event * --Tclm_ParseEvent(Tcl_Interp *interp, char *str) -+Tclm_ParseEvent(Tcl_Interp *interp, const char *str) - { - Event *event; -- Event *(*pfunc)(Tcl_Interp *, long, int, char **); -- char **argv, **aptr;; -+ Event *(*pfunc)(Tcl_Interp *, long, int, const char **); -+ const char **argv, **aptr; - char *name; - long time; - int argc, i, length; -@@ -852,18 +851,19 @@ - } - event = pfunc(interp, time, argc, argv); - Tcl_Ckfree((char *)aptr); -- delete name; -+ delete[] name; - return (event); - } - - Event * --Tclm_ParseNoteOff(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseNoteOff(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int channel, pitch, velocity; - - if (argc != 3 && argc != 4) { -- Tcl_SetResult(interp, "bad event: should be \"time NoteOff " -- "channel pitch ?velocity?\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time NoteOff " -+ "channel pitch ?velocity?\""); - return (0); - } - -@@ -886,13 +886,14 @@ - } - - Event * --Tclm_ParseNoteOn(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseNoteOn(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int channel, pitch, velocity; - - if (argc != 4) { -- Tcl_SetResult(interp, "bad event: should be \"time NoteOn " -- "channel pitch velocity\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time NoteOn " -+ "channel pitch velocity\""); - return (0); - } - -@@ -913,7 +914,8 @@ - } - - Event * --Tclm_ParseNote(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseNote(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - NoteOnEvent *event; - NoteOffEvent *off; -@@ -921,8 +923,8 @@ - int channel, pitch, velocity; - - if (argc != 5) { -- Tcl_SetResult(interp, "bad event: should be \"time Note " -- "channel pitch velocity duration\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time Note " -+ "channel pitch velocity duration\""); - return (0); - } - -@@ -964,13 +966,14 @@ - } - - Event * --Tclm_ParseKeyPressure(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseKeyPressure(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int channel, pitch, pressure; - - if (argc != 4) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time KeyPressure channel pitch pressure\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time KeyPressure channel pitch pressure\""); - return (0); - } - -@@ -991,13 +994,14 @@ - } - - Event * --Tclm_ParseParameter(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseParameter(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int channel, parameter, value; - - if (argc != 4) { -- Tcl_SetResult(interp, "bad event: should be \"time Parameter " -- "channel parameter value\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time Parameter " -+ "channel parameter value\""); - return (0); - } - -@@ -1018,13 +1022,14 @@ - } - - Event * --Tclm_ParseProgram(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseProgram(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int channel, value; - - if (argc != 3) { -- Tcl_SetResult(interp, "bad event: should be \"time Program " -- "channel value\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time Program " -+ "channel value\""); - return (0); - } - -@@ -1041,13 +1046,14 @@ - } - - Event * --Tclm_ParseChannelPressure(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseChannelPressure(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int channel, pressure; - - if (argc != 3) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time ChannelPressure channel pressure\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time ChannelPressure channel pressure\""); - return (0); - } - -@@ -1064,14 +1070,15 @@ - } - - Event * --Tclm_ParsePitchWheel(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParsePitchWheel(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int channel; - long value; - - if (argc != 3) { -- Tcl_SetResult(interp, "bad event: should be \"time PitchWheel " -- "channel value\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time PitchWheel " -+ "channel value\""); - return (0); - } - -@@ -1088,19 +1095,19 @@ - } - - Event * --Tclm_ParseSystemExclusive(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseSystemExclusive(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { -- char **str; -+ const char **str; - SystemExclusiveEvent *event; - unsigned char *data; -- long len; -+ int len; - int i, val; - - if ((argc != 2 && argc != 3) || (argc == 3 && strncmp(argv[1], "cont", - 4) != 0)) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time SystemExclusive ?continued? {data ?data ...?}\"", -- TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time SystemExclusive ?continued? {data ?data ...?}\""); - return (0); - } - -@@ -1111,7 +1118,7 @@ - event = new SystemExclusiveEvent(time, data, len); - return (event); - } -- if (Tcl_SplitList(interp, argv[1], (int *)&len, &str) != TCL_OK) -+ if (Tcl_SplitList(interp, argv[1], &len, &str) != TCL_OK) - return (0); - } else { - if (strcmp(argv[2], "*") == 0) { -@@ -1121,7 +1128,7 @@ - event->SetContinued(1); - return (event); - } -- if (Tcl_SplitList(interp, argv[2], (int *)&len, &str) != TCL_OK) -+ if (Tcl_SplitList(interp, argv[2], &len, &str) != TCL_OK) - return (0); - } - -@@ -1139,20 +1146,20 @@ - event = new SystemExclusiveEvent(time, data, len); - if (argc == 3) - event->SetContinued(1); -- delete data; -+ delete[] data; - - return (event); - } - - Event * - Tclm_ParseMetaSequenceNumber(Tcl_Interp *interp, long time, int argc, -- char **argv) -+ const char **argv) - { - long num; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time MetaSequenceNumber number\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time MetaSequenceNumber number\""); - return (0); - } - -@@ -1165,13 +1172,14 @@ - } - - Event * --Tclm_ParseMetaText(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaText(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - const char *t; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaText " -- "string\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaText " -+ "string\""); - return (0); - } - if (strcmp(argv[1], "*") == 0) -@@ -1183,13 +1191,14 @@ - } - - Event * --Tclm_ParseMetaCopyright(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaCopyright(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - const char *t; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time MetaCopyright string\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time MetaCopyright string\""); - return (0); - } - -@@ -1203,13 +1212,13 @@ - - Event * - Tclm_ParseMetaSequenceName(Tcl_Interp *interp, long time, int argc, -- char **argv) -+ const char **argv) - { - const char *t; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time MetaSequenceName string\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time MetaSequenceName string\""); - return (0); - } - -@@ -1223,13 +1232,13 @@ - - Event * - Tclm_ParseMetaInstrumentName(Tcl_Interp *interp, long time, int argc, -- char **argv) -+ const char **argv) - { - const char *t; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time MetaInstrumentName string\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time MetaInstrumentName string\""); - return (0); - } - -@@ -1242,13 +1251,14 @@ - } - - Event * --Tclm_ParseMetaLyric(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaLyric(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - const char *t; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaLyric " -- "string\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaLyric " -+ "string\""); - return (0); - } - -@@ -1261,13 +1271,14 @@ - } - - Event * --Tclm_ParseMetaMarker(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaMarker(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - const char *t; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaMarker " -- "string\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaMarker " -+ "string\""); - return (0); - } - -@@ -1280,13 +1291,14 @@ - } - - Event * --Tclm_ParseMetaCue(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaCue(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - const char *t; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaCue " -- "string\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaCue " -+ "string\""); - return (0); - } - -@@ -1300,17 +1312,17 @@ - - Event * - Tclm_ParseMetaChannelPrefix(Tcl_Interp *interp, long time, int argc, -- char **argv) -+ const char **argv) - { -- char **str; -+ const char **str; - MetaChannelPrefixEvent *event; - unsigned char *data; -- long len; -+ int len; - int i, val; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time MetaChannelPrefix {data ?data ...?}\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time MetaChannelPrefix {data ?data ...?}\""); - return (0); - } - -@@ -1319,7 +1331,7 @@ - len = MetaChannelPrefixEvent::WC_LENGTH; - return (new MetaChannelPrefixEvent(time, data, len)); - } -- if (Tcl_SplitList(interp, argv[1], (int *)&len, &str) != TCL_OK) -+ if (Tcl_SplitList(interp, argv[1], &len, &str) != TCL_OK) - return (0); - - data = new unsigned char[len]; -@@ -1334,19 +1346,20 @@ - - Tcl_Ckfree((char *)str); - event = new MetaChannelPrefixEvent(time, data, len); -- delete data; -+ delete[] data; - - return (event); - } - - Event * --Tclm_ParseMetaPortNumber(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaPortNumber(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int port; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time MetaPortNumber port\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time MetaPortNumber port\""); - return (0); - } - -@@ -1359,16 +1372,13 @@ - } - - Event * --Tclm_ParseMetaEndOfTrack(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaEndOfTrack(Tcl_Interp *interp, long time, int argc, -+ const char **) - { -- char *dummy; -- -- // shut up a warning -- dummy = argv[0]; - - if (argc != 1) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time MetaEndOfTrack\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time MetaEndOfTrack\""); - return (0); - } - -@@ -1376,13 +1386,14 @@ - } - - Event * --Tclm_ParseMetaTempo(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaTempo(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int tempo; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaTempo " -- "tempo\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaTempo " -+ "tempo\""); - return (0); - } - -@@ -1395,13 +1406,14 @@ - } - - Event * --Tclm_ParseMetaSMPTE(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaSMPTE(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int hour, minute, second, frame, fractional_frame; - - if (argc != 6) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaSMPTE " -- "hour minute second frame fractional_frame\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaSMPTE " -+ "hour minute second frame fractional_frame\""); - return (0); - } - -@@ -1431,14 +1443,14 @@ - } - - Event * --Tclm_ParseMetaTime(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaTime(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - int numerator, denominator, clocks, thirty_seconds; - - if (argc != 5) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaTime " -- "numerator denominator clocks/beat 32nds/quarter\"", -- TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaTime " -+ "numerator denominator clocks/beat 32nds/quarter\""); - return (0); - } - -@@ -1464,15 +1476,16 @@ - } - - Event * --Tclm_ParseMetaKey(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaKey(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { - Key key; - Mode mode; - int match; - - if (argc != 3) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaKey " -- "key mode\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaKey " -+ "key mode\""); - return (0); - } - -@@ -1500,18 +1513,17 @@ - - Event * - Tclm_ParseMetaSequencerSpecific(Tcl_Interp *interp, long time, int argc, -- char **argv) -+ const char **argv) - { -- char **str; -+ const char **str; - MetaSequencerSpecificEvent *event; - unsigned char *data; -- long len; -+ int len; - int i, val; - - if (argc != 2) { -- Tcl_SetResult(interp, "bad event: should be " -- "\"time MetaSequencerSpecific {data ?data ...?}\"", -- TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be " -+ "\"time MetaSequencerSpecific {data ?data ...?}\""); - return (0); - } - -@@ -1520,7 +1532,7 @@ - len = MetaSequencerSpecificEvent::WC_LENGTH; - return (new MetaSequencerSpecificEvent(time, data, len)); - } -- if (Tcl_SplitList(interp, argv[1], (int *)&len, &str) != TCL_OK) -+ if (Tcl_SplitList(interp, argv[1], &len, &str) != TCL_OK) - return (0); - - data = new unsigned char[len]; -@@ -1535,23 +1547,24 @@ - - Tcl_Ckfree((char *)str); - event = new MetaSequencerSpecificEvent(time, data, len); -- delete data; -+ delete[] data; - - return (event); - } - - Event * --Tclm_ParseMetaUnknown(Tcl_Interp *interp, long time, int argc, char **argv) -+Tclm_ParseMetaUnknown(Tcl_Interp *interp, long time, int argc, -+ const char **argv) - { -- char **str; -+ const char **str; - MetaUnknownEvent *event; - unsigned char *data; -- long len; -+ int len; - int i, type, val; - - if (argc != 3) { -- Tcl_SetResult(interp, "bad event: should be \"time MetaUnknown " -- "type {data ?data ...?}\"", TCL_STATIC); -+ SET_CONST_RESULT("bad event: should be \"time MetaUnknown " -+ "type {data ?data ...?}\""); - return (0); - } - -@@ -1565,7 +1578,7 @@ - len = MetaUnknownEvent::WC_LENGTH; - return (new MetaUnknownEvent(time, data, len, type)); - } -- if (Tcl_SplitList(interp, argv[2], (int *)&len, &str) != TCL_OK) -+ if (Tcl_SplitList(interp, argv[2], &len, &str) != TCL_OK) - return (0); - - data = new unsigned char[len]; -@@ -1580,7 +1593,7 @@ - - Tcl_Ckfree((char *)str); - event = new MetaUnknownEvent(time, data, len, type); -- delete data; -+ delete[] data; - - return (event); - } ---- tclmEvnt.h 1996-02-12 19:25:00.000000000 -0500 -+++ tclmEvnt.h 2012-04-07 14:08:43.000000000 -0400 -@@ -61,57 +61,57 @@ - extern char *Tclm_PrintMetaKey(MetaKeyEvent *e); - extern char *Tclm_PrintMetaSequencerSpecific(MetaSequencerSpecificEvent *e); - extern char *Tclm_PrintMetaUnknown(MetaUnknownEvent *e); --extern Event *Tclm_ParseEvent(Tcl_Interp *interp, char *str); -+extern Event *Tclm_ParseEvent(Tcl_Interp *interp, const char *str); - extern Event *Tclm_ParseNoteOff(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseNoteOn(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseNote(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseKeyPressure(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseParameter(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseProgram(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseChannelPressure(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParsePitchWheel(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseSystemExclusive(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaSequenceNumber(Tcl_Interp *interp, long time, -- int argc, char **argv); -+ int argc, const char **argv); - extern Event *Tclm_ParseMetaText(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaCopyright(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaSequenceName(Tcl_Interp *interp, long time, -- int argc, char **argv); -+ int argc, const char **argv); - extern Event *Tclm_ParseMetaInstrumentName(Tcl_Interp *interp, long time, -- int argc, char **argv); -+ int argc, const char **argv); - extern Event *Tclm_ParseMetaLyric(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaMarker(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaCue(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaChannelPrefix(Tcl_Interp *interp, long time, -- int argc, char **argv); -+ int argc, const char **argv); - extern Event *Tclm_ParseMetaPortNumber(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaEndOfTrack(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaTempo(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaSMPTE(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaTime(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaKey(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - extern Event *Tclm_ParseMetaSequencerSpecific(Tcl_Interp *interp, long time, -- int argc, char **argv); -+ int argc, const char **argv); - extern Event *Tclm_ParseMetaUnknown(Tcl_Interp *interp, long time, int argc, -- char **argv); -+ const char **argv); - #endif ---- tclmPtch.cxx 1996-08-04 23:47:13.000000000 -0400 -+++ tclmPtch.cxx 2012-04-07 14:08:43.000000000 -0400 -@@ -37,10 +37,8 @@ - #include "tclmidi.h" - #include "TclmIntp.h" - --static int Tclm_PatchRead(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_PatchFree(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); -+static Tcl_CmdProc Tclm_PatchRead; -+static Tcl_CmdProc Tclm_PatchFree; - - int - Tclm_PatchInit(Tcl_Interp *interp, TclmInterp *tclm_interp) -@@ -53,7 +51,7 @@ - - int - Tclm_PatchRead(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - Tcl_Channel channel; - int mode; -@@ -96,7 +94,7 @@ - - int - Tclm_PatchFree(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - ---- song/EvntTree.cxx.orig 1996-08-05 05:47:38.000000000 +0200 -+++ song/EvntTree.cxx 2013-05-14 11:22:45.000000000 +0200 -@@ -611,7 +611,7 @@ - for (j = 0; j < num_found; j++) - new_found[j] = found[j]; - new_found[j] = e; -- delete found; -+ delete[] found; - found = new_found; - num_found++; - } -@@ -631,7 +631,7 @@ - for (j = 0; j < num_found; j++) - new_found[j] = found[j]; - new_found[j] = e; -- delete found; -+ delete[] found; - found = new_found; - num_found++; - } -@@ -735,6 +735,7 @@ - assert(new_event != 0); - place = rb_insert_b(place, (char *)time, (char *)new_event); - } -+ - curr_event = new_event; - new_event->SetEventTreeNode(place); - return (new_event); -@@ -746,7 +747,7 @@ - Event *e, *events, *prev; - EventTreeNode *n, *next_n; - -- n = (EventTreeNode *)event.GetEventTreeNode(); -+ n = event.GetEventTreeNode(); - if (n != 0) { - e = &event; - prev = e->GetPrevEvent(); -@@ -785,6 +786,9 @@ - } - - } -+ if (e->GetNextEvent() == 0 || -+ (prev && prev->GetEventTreeNode() != n)) -+ rb_delete_node(n); - } else { - // This is the only event in the node - if (curr_event == e) { -@@ -818,7 +822,7 @@ - /* get each event in order and delete it */ - while ((e = NextEvent()) != 0) - DeleteEvent(*e); -- -+ - /* then free head */ - free(head); - head = 0; ---- tclmPlay.cxx.orig 1996-08-05 05:47:12.000000000 +0200 -+++ tclmPlay.cxx 2013-06-05 15:46:23.000000000 +0200 -@@ -43,30 +43,24 @@ - #include "TclmDr75.h" - #endif - -+#define SET_CONST_RESULT(string) \ -+ Tcl_SetResult(interp, (char *)(void *)string, TCL_STATIC) -+ - #if defined(HAVE_SYS_MIDIIOCTL_H) - static const int DeviceConfigured = 1; - #else - static const int DeviceConfigured = 0; - #endif - --static int Tclm_MidiPlay(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiRecord(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiStop(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiWait(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiDevice(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiTime(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiFeature(ClientData client_data, Tcl_Interp *interp, -- int argc, char **argv); --static int Tclm_MidiSend(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiRecv(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); -+static Tcl_CmdProc Tclm_MidiPlay; -+static Tcl_CmdProc Tclm_MidiRecord; -+static Tcl_CmdProc Tclm_MidiStop; -+static Tcl_CmdProc Tclm_MidiWait; -+static Tcl_CmdProc Tclm_MidiDevice; -+static Tcl_CmdProc Tclm_MidiTime; -+static Tcl_CmdProc Tclm_MidiFeature; -+static Tcl_CmdProc Tclm_MidiSend; -+static Tcl_CmdProc Tclm_MidiRecv; - - int - Tclm_PlayInit(Tcl_Interp *interp, TclmInterp *tclm_interp) -@@ -89,7 +83,7 @@ - - int - Tclm_MidiPlay(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *song; -@@ -130,13 +124,13 @@ - dev->GetError(), 0); - return (TCL_ERROR); - } -- Tcl_SetResult(interp, "1", TCL_STATIC); -+ SET_CONST_RESULT("1"); - return (TCL_OK); - } - - int - Tclm_MidiRecord(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *rsong, *psong; -@@ -185,13 +179,13 @@ - dev->GetError(), 0); - return (TCL_ERROR); - } -- Tcl_SetResult(interp, "1", TCL_STATIC); -+ SET_CONST_RESULT("1"); - return (TCL_OK); - } - - int - Tclm_MidiStop(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - MidiDevice *dev; -@@ -214,13 +208,13 @@ - dev->GetError(), 0); - return (TCL_ERROR); - } -- Tcl_SetResult(interp, "1", TCL_STATIC); -+ SET_CONST_RESULT("1"); - return (TCL_OK); - } - - int - Tclm_MidiWait(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - MidiDevice *dev; -@@ -241,19 +235,20 @@ - "to stop\n", dev->GetError(), 0); - return (TCL_ERROR); - } -- Tcl_SetResult(interp, "1", TCL_STATIC); -+ SET_CONST_RESULT("1"); - return (TCL_OK); - } - - int - Tclm_MidiDevice(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - MidiDevice *dev; - ostrstream *buf; - unsigned short mask; -- char *dev_key, *str, **sub_argv; -+ const char *dev_key, **sub_argv; -+ char *str; - int con, i, imask, j, mt, sub_argc, value; - - tclm_interp = (TclmInterp *)client_data; -@@ -293,7 +288,7 @@ - dev = 0; - #endif - if (dev == 0) { -- Tcl_SetResult(interp, "Out of memory", TCL_STATIC); -+ SET_CONST_RESULT("Out of memory"); - return (TCL_ERROR); - } - if (!dev->Open(argv[1])) { -@@ -303,8 +298,7 @@ - } - dev_key = tclm_interp->AddDevice(dev); - if (dev_key == 0) { -- Tcl_SetResult(interp, "Couldn't add device", -- TCL_STATIC); -+ SET_CONST_RESULT("Couldn't add device"); - return (TCL_ERROR); - } - Tcl_AppendResult(interp, dev_key, 0); -@@ -317,13 +311,13 @@ - return (TCL_ERROR); - if (strcmp(sub_argv[0], "close") == 0) { - if (i != argc - 1) { -- Tcl_SetResult(interp, "Can't perform ops after " -- "closing device", TCL_STATIC); -+ SET_CONST_RESULT("Can't perform ops after " -+ "closing device"); - return (TCL_ERROR); - } - if (dev_key == 0) { -- Tcl_SetResult(interp, "Can't close until after " -- "device has been opened", TCL_STATIC); -+ SET_CONST_RESULT("Can't close until after " -+ "device has been opened"); - return (TCL_ERROR); - } - tclm_interp->DeleteDevice(dev_key); -@@ -465,7 +459,7 @@ - - int - Tclm_MidiTime(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - ostrstream tbuf; - unsigned long t; -@@ -498,11 +492,11 @@ - - int - Tclm_MidiFeature(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - MidiDevice *dev; -- char **sub_argv; -+ const char **sub_argv; - int i, sub_argc; - - if (argc < 3) { -@@ -542,7 +536,7 @@ - - int - Tclm_MidiSend(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - MidiDevice *dev; -@@ -564,7 +558,7 @@ - - events = new Event *[argc - 2]; - if (events == 0) { -- Tcl_SetResult(interp, "Out of memory", TCL_STATIC); -+ SET_CONST_RESULT("Out of memory"); - return (TCL_ERROR); - } - num_events = 0; -@@ -584,9 +578,8 @@ - num_events++; - } - } else { -- if (strlen(interp->result) == 0) { -- Tcl_SetResult(interp, "Out of memory", -- TCL_STATIC); -+ if (strlen(Tcl_GetStringResult(interp)) == 0) { -+ SET_CONST_RESULT("Out of memory"); - return (TCL_ERROR); - } - } -@@ -603,7 +596,7 @@ - - int - Tclm_MidiRecv(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - ostrstream *buf; - TclmInterp *tclm_interp; ---- tclmCmd.cxx.orig 1996-08-05 05:47:12.000000000 +0200 -+++ tclmCmd.cxx 2013-06-05 15:46:37.000000000 +0200 -@@ -41,39 +41,27 @@ - #include "tclmEvnt.h" - #include "patchlvl.h" - --static int Tclm_MidiMake(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiFree(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiRead(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiWrite(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiConfig(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiRewind(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiGet(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiPut(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiDelete(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiMerge(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiSplit(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiCopy(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv); --static int Tclm_MidiVersion(ClientData client_data, Tcl_Interp *interp, -- int argc, char **argv); --static int Tclm_MidiTrack(ClientData client_data, Tcl_Interp *interp, -- int argc, char **argv); --static int Tclm_MidiGrep(ClientData client_data, Tcl_Interp *interp, -- int argc, char **argv); -+static Tcl_CmdProc Tclm_MidiMake; -+static Tcl_CmdProc Tclm_MidiFree; -+static Tcl_CmdProc Tclm_MidiRead; -+static Tcl_CmdProc Tclm_MidiWrite; -+static Tcl_CmdProc Tclm_MidiConfig; -+static Tcl_CmdProc Tclm_MidiRewind; -+static Tcl_CmdProc Tclm_MidiGet; -+static Tcl_CmdProc Tclm_MidiPut; -+static Tcl_CmdProc Tclm_MidiDelete; -+static Tcl_CmdProc Tclm_MidiMerge; -+static Tcl_CmdProc Tclm_MidiSplit; -+static Tcl_CmdProc Tclm_MidiCopy; -+static Tcl_CmdProc Tclm_MidiVersion; -+static Tcl_CmdProc Tclm_MidiTrack; -+static Tcl_CmdProc Tclm_MidiGrep; - static int Tclm_GetTrack(TclmInterp *tclm_interp, Tcl_Interp *interp, - const char *str, Song **song, int *track); - -+#define SET_CONST_RESULT(string) \ -+ Tcl_SetResult(interp, (char *)(void *)string, TCL_STATIC) -+ - - /* - * DllEntryPoint -- -@@ -98,8 +86,7 @@ - - ti = new TclmInterp; - if (ti == 0) { -- Tcl_SetResult(interp, "Out of memory in Tclmidi_Init", -- TCL_STATIC); -+ SET_CONST_RESULT("Out of memory in Tclmidi_Init"); - return (TCL_ERROR); - } - Tcl_CreateCommand(interp, "midimake", Tclm_MidiMake, ti, 0); -@@ -129,7 +116,7 @@ - - int - Tclm_MidiMake(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *s; -@@ -145,13 +132,13 @@ - s = new Song; - key = tclm_interp->AddSong(s); - Tcl_SetResult(interp, key, TCL_VOLATILE); -- delete key; -+ delete[] key; - return (TCL_OK); - } - - int - Tclm_MidiFree(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - -@@ -171,7 +158,7 @@ - - int - Tclm_MidiRead(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - Tcl_Channel channel; - int mode; -@@ -211,7 +198,7 @@ - - int - Tclm_MidiWrite(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *song; -@@ -250,12 +237,13 @@ - - int - Tclm_MidiConfig(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - ostrstream *buf; - TclmInterp *tclm_interp; - Song *song; -- char *str, **sub_argv; -+ char *str; -+ const char **sub_argv; - int i, sub_argc, value; - - if (argc < 2) { -@@ -338,8 +326,8 @@ - } - break; - default: -- Tcl_SetResult(interp, "wrong # args: should be " -- "{format|division|tracks ?value?}", TCL_STATIC); -+ SET_CONST_RESULT("wrong # args: should be " -+ "{format|division|tracks ?value?}"); - return (TCL_ERROR); - break; - } -@@ -350,7 +338,7 @@ - - int - Tclm_MidiRewind(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *song; -@@ -380,7 +368,7 @@ - - int - Tclm_MidiGet(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - ostrstream *buf; - long time; -@@ -421,7 +409,7 @@ - printable = 0; - while (!printable) { - if ((e = song->NextEvent(track)) == 0) { -- Tcl_SetResult(interp, "EOT", TCL_STATIC); -+ SET_CONST_RESULT("EOT"); - printable = 1; - } else { - buf = new ostrstream; -@@ -432,7 +420,7 @@ - TCL_VOLATILE); - printable = 1; - } -- delete str; -+ delete[] str; - delete buf; - } - } -@@ -440,7 +428,7 @@ - printable = 0; - while (!printable) { - if ((e = song->PrevEvent(track)) == 0) { -- Tcl_SetResult(interp, "EOT", TCL_STATIC); -+ SET_CONST_RESULT("EOT"); - printable = 1; - } else { - buf = new ostrstream; -@@ -459,7 +447,7 @@ - if (Tcl_GetLong(interp, argv[3], &time) != TCL_OK) - return (TCL_ERROR); - if ((events = song->GetEvents((short)track, time)) == 0) -- Tcl_SetResult(interp, "EOT", TCL_STATIC); -+ SET_CONST_RESULT("EOT"); - else { - for (e = events; e != 0; e = e->GetNextEvent()) { - buf = new ostrstream; -@@ -477,7 +465,7 @@ - - int - Tclm_MidiPut(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *song; -@@ -513,18 +501,17 @@ - } - - if ((event = Tclm_ParseEvent(interp, argv[3])) == 0) { -- if (strlen(interp->result) == 0) -- Tcl_SetResult(interp, "No more memory", TCL_STATIC); -+ if (strlen(Tcl_GetStringResult(interp)) == 0) -+ SET_CONST_RESULT("No more memory"); - return (TCL_ERROR); - } - if (event->IsWildcard()) { -- Tcl_SetResult(interp, "Can't put wildcard events in a song", -- TCL_STATIC); -+ SET_CONST_RESULT("Can't put wildcard events in a song"); - return (TCL_ERROR); - } - new_e1 = song->PutEvent(track, *event); - if (new_e1 == 0) { -- Tcl_SetResult(interp, "Couldn't put event", TCL_STATIC); -+ SET_CONST_RESULT("Couldn't put event"); - return (TCL_ERROR); - } - // check to see if it has a note off too -@@ -534,8 +521,7 @@ - if (np != 0) { - new_e2 = (NoteEvent *)song->PutEvent(track, *np); - if (new_e2 == 0) { -- Tcl_SetResult(interp, "Couldn't put event", -- TCL_STATIC); -+ SET_CONST_RESULT("Couldn't put event"); - return (TCL_ERROR); - } - ((NoteEvent *)new_e1)->SetNotePair(new_e2); -@@ -549,7 +535,7 @@ - - int - Tclm_MidiDelete(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *song; -@@ -592,17 +578,16 @@ - if (Tcl_GetLong(interp, argv[5], (long *)&end) != TCL_OK) - return (TCL_ERROR); - if (!song->DeleteRange(track, start, end)) { -- Tcl_SetResult(interp, "couldn't delete range", -- TCL_STATIC); -+ SET_CONST_RESULT("couldn't delete range"); - return (TCL_ERROR); - } -- Tcl_SetResult(interp, "1", TCL_STATIC); -+ SET_CONST_RESULT("1"); - return (TCL_OK); - } - - if ((event = Tclm_ParseEvent(interp, argv[3])) == 0) { -- if (strlen(interp->result) == 0) -- Tcl_SetResult(interp, "No more memory", TCL_STATIC); -+ if (strlen(Tcl_GetStringResult(interp)) == 0) -+ SET_CONST_RESULT("No more memory"); - return (TCL_ERROR); - } - // If this is a NoteOn/NoteOff pair, get real NoteOff from tree -@@ -616,7 +601,7 @@ - for (e = events; e != 0 && !(*event == *e); - e = e->GetNextEvent()); - if (e == 0) { -- Tcl_SetResult(interp, "0", TCL_STATIC); -+ SET_CONST_RESULT("0"); - delete ((NoteEvent *)event)->GetNotePair(); - delete event; - return (TCL_OK); -@@ -625,7 +610,7 @@ - // find real NoteOff pair and delete it - note_off = ((NoteEvent *)e)->GetNotePair(); - if (!song->DeleteEvent(track, *note_off)) { -- Tcl_SetResult(interp, "0", TCL_STATIC); -+ SET_CONST_RESULT("0"); - delete ((NoteEvent *)event)->GetNotePair(); - delete event; - return (TCL_OK); -@@ -633,7 +618,7 @@ - delete ((NoteEvent *)event)->GetNotePair(); - } - if (!song->DeleteEvent(track, *event)) { -- Tcl_SetResult(interp, "0", TCL_STATIC); -+ SET_CONST_RESULT("0"); - if (event->GetType() == NOTEON && - ((NoteEvent *)event)->GetNotePair() != 0) - delete ((NoteEvent *)event)->GetNotePair(); -@@ -641,13 +626,13 @@ - return (TCL_OK); - } - delete event; -- Tcl_SetResult(interp, "1", TCL_STATIC); -+ SET_CONST_RESULT("1"); - return (TCL_OK); - } - - int - Tclm_MidiMerge(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *dest_song, *src_song; -@@ -680,7 +665,7 @@ - - int - Tclm_MidiSplit(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *src_song, *meta_song, *normal_song; -@@ -715,7 +700,7 @@ - - int - Tclm_MidiCopy(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - EventTree *tmp_track; -@@ -748,6 +733,7 @@ - scalar = (double)dest_song->GetDivision() / src_song->GetDivision(); - - tmp_track = src_song->GetRange(src_track, sstart, send); -+fprintf(stderr, "Got tmp_track as %p\n", tmp_track); - if (tmp_track == 0) { - Tcl_AppendResult(interp, "Couldn't get range from: ", argv[3], - " to ", argv[4], 0); -@@ -757,20 +743,23 @@ - if (!src_song->DeleteRange(src_track, sstart, send)) { - Tcl_AppendResult(interp, "Couldn't remove events " - "from source track", 0); -+ delete tmp_track; - return (TCL_ERROR); - } - } - if (!dest_song->Add(dest_track, *tmp_track, dstart, scalar)) { - Tcl_AppendResult(interp, "Couldn't add range", 0); -+ delete tmp_track; - return (TCL_ERROR); - } -+fprintf(stderr, "Deleting tmp_track %p\n", tmp_track); - delete tmp_track; - return (TCL_OK); - } - - int - Tclm_MidiVersion(ClientData client_data, Tcl_Interp *interp, int argc, -- char *argv[]) -+ const char *argv[]) - { - ClientData *dummy; - -@@ -782,13 +771,13 @@ - argv[0], "\"", 0); - return (TCL_ERROR); - } -- Tcl_SetResult(interp, (char *)TCLMIDI_VERSION, TCL_STATIC); -+ SET_CONST_RESULT(TCLMIDI_VERSION); - return (TCL_OK); - } - - int - Tclm_MidiTrack(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *song; -@@ -848,7 +837,7 @@ - - int - Tclm_MidiGrep(ClientData client_data, Tcl_Interp *interp, int argc, -- char **argv) -+ const char **argv) - { - TclmInterp *tclm_interp; - Song *song; -@@ -857,6 +846,7 @@ - NoteEvent *np; - ostrstream *buf; - char *str; -+ int result; - - if (argc < 4) { - Tcl_AppendResult(interp, "wrong # args: should be \"", -@@ -888,16 +878,15 @@ - num_events = argc - 3; - events = new Event *[num_events]; - if (events == 0) { -- Tcl_SetResult(interp, "No more memory", TCL_STATIC); -+ SET_CONST_RESULT("No more memory"); - return (TCL_ERROR); - } - for (i = 0; i < num_events; i++) { - // parse events - events[i] = Tclm_ParseEvent(interp, argv[i + 3]); - if (events[i] == 0) { -- if (strlen(interp->result) == 0) -- Tcl_SetResult(interp, "No more memory", -- TCL_STATIC); -+ if (strlen(Tcl_GetStringResult(interp)) == 0) -+ SET_CONST_RESULT("No more memory"); - i--; - for (; i >= 0; i--) { - if (events[i]->GetType() == NOTEON) { -@@ -913,9 +902,11 @@ - } - } - if (!song->Grep(track, events, num_events, &matched, &num_matched)) { -- Tcl_SetResult(interp, "midigrep failed", TCL_STATIC); -- return (TCL_ERROR); -- } -+ SET_CONST_RESULT("midigrep failed"); -+ result = TCL_ERROR; -+ } else -+ result = TCL_OK; -+ - for (i = 0; i < num_events; i++) { - if (events[i]->GetType() == NOTEON) { - np = ((NoteEvent *)events[i])->GetNotePair(); -@@ -924,33 +915,33 @@ - } - delete events[i]; - } -- delete events; -+ delete[] events; - for (i = 0; i < num_matched; i++) { - buf = new ostrstream; - Tclm_PrintEvent(*buf, matched[i]); - str = buf->str(); - if (str != 0 && str[0] != '\0') - Tcl_AppendElement(interp, str); -- delete str; -+ delete[] str; - delete buf; - } -- delete matched; -+ delete[] matched; -+ return (result); - return (TCL_OK); - } - -- - int - Tclm_GetTrack(TclmInterp *tclm_interp, Tcl_Interp *interp, const char *str, - Song **song, int *track) - { -- char **sub_argv; -+ const char **sub_argv; - int sub_argc; - -- if (Tcl_SplitList(interp, (char *)str, &sub_argc, &sub_argv) != TCL_OK) -+ if (Tcl_SplitList(interp, str, &sub_argc, &sub_argv) != TCL_OK) - return (TCL_ERROR); - if (sub_argc != 2) { -- Tcl_SetResult(interp, "bad track designation: " -- "should be \"{MidiID Track}\"", TCL_STATIC); -+ SET_CONST_RESULT("bad track designation: " -+ "should be \"{MidiID Track}\""); - Tcl_Ckfree((char *)sub_argv); - return (TCL_ERROR); - } diff --git a/audio/tclmidi/files/patch-rb b/audio/tclmidi/files/patch-rb deleted file mode 100644 index 1d9107628373..000000000000 --- a/audio/tclmidi/files/patch-rb +++ /dev/null @@ -1,456 +0,0 @@ ---- rb/rb.h 1994-12-05 16:57:58.000000000 -0500 -+++ rb/rb.h 2012-04-07 13:21:08.000000000 -0400 -@@ -34,38 +34,38 @@ - } v; - } *Rb_node; - --#ifndef __P --#if defined(__STDC__) || defined(__cplusplus) --#define __P(protos) protos --#else --#define __P(protos) () --#endif --#endif -- -+#ifndef EXTERN - #ifdef __cplusplus - #define EXTERN extern "C" - #else - #define EXTERN extern - #endif -+#endif - --EXTERN Rb_node make_rb __P(()); --EXTERN Rb_node rb_insert_b __P((Rb_node node, char *key, char *value)); -- --EXTERN Rb_node rb_find_key __P((Rb_node tree, char *key)); --EXTERN Rb_node rb_find_ikey __P((Rb_node tree, int ikey)); --EXTERN Rb_node rb_find_ukey __P((Rb_node tree, unsigned long ukey)); --EXTERN Rb_node rb_find_gkey __P((Rb_node tree, char *key, int (*fxn)())); -- --EXTERN Rb_node rb_find_key_n __P((Rb_node tree, char *key, int *found)); --EXTERN Rb_node rb_find_ikey_n __P((Rb_node tree, int ikey, int *found)); --EXTERN Rb_node rb_find_ukey_n __P((Rb_node tree, unsigned long ukey, -- int *found)); --EXTERN Rb_node rb_find_gkey_n __P((Rb_node tree, char *key, int (*fxn)(), -- int *found)); --EXTERN void rb_delete_node __P((Rb_node node)); --EXTERN void rb_free_tree __P((Rb_node node)); /* Deletes and frees an entire tree */ --EXTERN char *rb_val __P((Rb_node node)); /* Returns node->v.val -+typedef int (*Rb_cmp)(const char *key1, const char *key2); -+EXTERN Rb_node make_rb(void); -+EXTERN Rb_node rb_insert_b(Rb_node node, char *key, char *value); -+ -+EXTERN Rb_node rb_find_key(Rb_node tree, const char *key); -+EXTERN Rb_node rb_find_ikey(Rb_node tree, int ikey); -+EXTERN Rb_node rb_find_ukey(Rb_node tree, unsigned long ukey); -+EXTERN Rb_node rb_find_gkey(Rb_node tree, const char *key, Rb_cmp); -+ -+EXTERN Rb_node rb_find_key_n(Rb_node tree, const char *key, int *found); -+EXTERN Rb_node rb_find_ikey_n(Rb_node tree, int ikey, int *found); -+EXTERN Rb_node rb_find_ukey_n(Rb_node tree, unsigned long ukey, -+ int *found); -+EXTERN Rb_node rb_find_gkey_n(Rb_node tree, const char *key, Rb_cmp, -+ int *found); -+EXTERN void rb_delete_node(Rb_node node); -+EXTERN void rb_free_tree(Rb_node node); /* Deletes and frees an entire tree */ -+EXTERN char *rb_val(Rb_node node); /* Returns node->v.val - (this is to shut lint up */ -+EXTERN void rb_print_tree(const struct rb_node * const t, int level); -+EXTERN void rb_iprint_tree(const struct rb_node * const t, int level); -+EXTERN void rb_uprint_tree(const struct rb_node * const t, int level); -+EXTERN int rb_nblack(const struct rb_node *t); -+EXTERN int rb_plength(const struct rb_node *t); - - #define rb_insert_a(n, k, v) rb_insert_b(n->c.list.flink, k, v) - #define rb_insert(t, k, v) rb_insert_b(rb_find_key(t, k), k, v) -@@ -84,5 +84,5 @@ - #define rb_traverse(ptr, lst) \ - for(ptr = rb_first(lst); ptr != nil(lst); ptr = rb_next(ptr)) - --EXTERN void recolor __P(()); --EXTERN void single_rotate __P(()); -+EXTERN void recolor(Rb_node); -+EXTERN void single_rotate(Rb_node, int); ---- rb/rb.c 1994-12-05 16:57:57.000000000 -0500 -+++ rb/rb.c 2012-04-07 13:22:05.000000000 -0400 -@@ -37,10 +37,8 @@ - setnormal(new);\ - } - --void --mk_new_int(l, r, p, il) -- Rb_node l, r, p; -- int il; -+static void -+mk_new_int(Rb_node l, Rb_node r, Rb_node p, int il) - { - Rb_node new; - -@@ -71,9 +69,8 @@ - } - - --Rb_node --lprev(n) -- Rb_node n; -+static Rb_node -+lprev(Rb_node n) - { - if (ishead(n)) - return (n); -@@ -85,9 +82,8 @@ - return (n->p.parent); - } - --Rb_node --rprev(n) -- Rb_node n; -+static Rb_node -+rprev(Rb_node n) - { - if (ishead(n)) - return (n); -@@ -109,24 +105,20 @@ - head->c.list.flink = head; - head->c.list.blink = head; - head->p.root = head; -- head->k.key = ""; -+ /* head->k.key = ""; */ - head->v.val = NULL; - sethead(head); - return (head); - } - - Rb_node --rb_find_key_n(n, key, fnd) -- Rb_node n; -- char *key; -- int *fnd; -+rb_find_key_n(Rb_node n, const char *key, int *fnd) - { - int cmp; - - *fnd = 0; - if (!ishead(n)) { -- fprintf(stderr, "rb_find_key_n called on non-head 0x%x\n", -- (int)n); -+ fprintf(stderr, "%s called on non-head %p\n", __func__, n); - exit(1); - } - if (n->p.root == n) -@@ -156,9 +148,7 @@ - } - - Rb_node --rb_find_key(n, key) -- Rb_node n; -- char *key; -+rb_find_key(Rb_node n, const char *key) - { - int fnd; - -@@ -173,8 +163,7 @@ - { - *fnd = 0; - if (!ishead(n)) { -- fprintf(stderr, "rb_find_ikey_n called on non-head 0x%x\n", -- (int)n); -+ fprintf(stderr, "%s called on non-head %p\n", __func__, n); - exit(1); - } - if (n->p.root == n) -@@ -208,8 +197,7 @@ - - *fnd = 0; - if (!ishead(n)) { -- fprintf(stderr, "rb_find_ukey_n called on non-head 0x%x\n", -- (int)n); -+ fprintf(stderr, "%s called on non-head %p\n", __func__, n); - exit(1); - } - if (n->p.root == n) -@@ -255,18 +243,13 @@ - } - - Rb_node --rb_find_gkey_n(n, key, fxn, fnd) -- Rb_node n; -- char *key; -- int (*fxn)(); -- int *fnd; -+rb_find_gkey_n(Rb_node n, const char *key, Rb_cmp fxn, int *fnd) - { - int cmp; - - *fnd = 0; - if (!ishead(n)) { -- fprintf(stderr, "rb_find_key_n called on non-head 0x%x\n", -- (int)n); -+ fprintf(stderr, "%s called on non-head %p\n", __func__, n); - exit(1); - } - if (n->p.root == n) -@@ -296,20 +279,15 @@ - } - - Rb_node --rb_find_gkey(n, key, fxn) -- Rb_node n; -- char *key; -- int (*fxn)(); -+rb_find_gkey(Rb_node n, const char *key, Rb_cmp fxn) - { - int fnd; - - return (rb_find_gkey_n(n, key, fxn, &fnd)); - } -+ - Rb_node --rb_insert_b(n, key, val) -- Rb_node n; -- char *key; -- char *val; -+rb_insert_b(Rb_node n, char *key, char *val) - { - Rb_node newleft, newright, newnode, p; - -@@ -346,8 +324,7 @@ - } - - void --recolor(n) -- Rb_node n; -+recolor(Rb_node n) - { - Rb_node p, gp, s; - int done = 0; -@@ -392,9 +369,7 @@ - } - - void --single_rotate(y, l) -- Rb_node y; -- int l; -+single_rotate(Rb_node y, int l) - { - int rl, ir; - Rb_node x, yp; -@@ -440,20 +415,17 @@ - } - - void --rb_delete_node(n) -- Rb_node n; -+rb_delete_node(Rb_node n) - { - Rb_node s, p, gp; - char ir; - - if (isint(n)) { -- fprintf(stderr, "Cannot delete an internal node: 0x%x\n", -- (int)n); -+ fprintf(stderr, "Cannot delete an internal node: %p\n", n); - exit(1); - } - if (ishead(n)) { -- fprintf(stderr, "Cannot delete the head of an rb_tree: 0x%x\n", -- (int)n); -+ fprintf(stderr, "Cannot delete the head of an rb_tree: %p\n", n); - exit(1); - } - delete_item((List)n); /* Delete it from the list */ -@@ -579,120 +551,112 @@ - } - - void --rb_print_tree(t, level) -- Rb_node t; -- int level; -+rb_print_tree(const struct rb_node * const t, int level) - { - int i; - - if (ishead(t) && t->p.parent == t) { -- printf("tree 0x%x is empty\n", -- (int)t); -+ printf("tree %p is empty\n", t); - } else if (ishead(t)) { -- printf("Head: 0x%x. Root = 0x%x\n", (int)t, (int)t->p.root); -+ printf("Head: %p. Root = %p\n", t, t->p.root); - rb_print_tree(t->p.root, 0); - } else { - if (isext(t)) { - for (i = 0; i < level; i++) - putchar(' '); -- printf("Ext node 0x%x: %c,%c: p=0x%x, k=%s\n", (int)t, -+ printf("Ext node %p: %c,%c: p=%p, k=%s\n", t, - isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -- (int)t->p.parent, t->k.key); -+ t->p.parent, t->k.key); - } else { - rb_print_tree(t->c.child.left, level + 2); - rb_print_tree(t->c.child.right, level + 2); - for (i = 0; i < level; i++) - putchar(' '); -- printf("Int node 0x%x: %c,%c: l=0x%x, r=0x%x, p=0x%x, lr=(%s,%s)\n", -- (int)t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -- (int)t->c.child.left, (int)t->c.child.right, -- (int)t->p.parent, t->k.lext->k.key, -+ printf("Int node %p: %c,%c: l=%p, r=%p, p=%p, lr=(%s,%s)\n", -+ t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -+ t->c.child.left, t->c.child.right, -+ t->p.parent, t->k.lext->k.key, - t->v.rext->k.key); - } - } - } - - void --rb_iprint_tree(t, level) -- Rb_node t; -- int level; -+rb_iprint_tree(const struct rb_node * const t, int level) - { - int i; - - if (ishead(t) && t->p.parent == t) { -- printf("tree 0x%x is empty\n", (int)t); -+ printf("tree %p is empty\n", t); - } else if (ishead(t)) { -- printf("Head: 0x%x. Root = 0x%x, < = 0x%x, > = 0x%x\n", -- (int)t, (int)t->p.root, (int)t->c.list.blink, -- (int)t->c.list.flink); -+ printf("Head: %p. Root = %p, < = %p, > = %p\n", -+ t, t->p.root, t->c.list.blink, -+ t->c.list.flink); - rb_iprint_tree(t->p.root, 0); - } else { - if (isext(t)) { - for (i = 0; i < level; i++) - putchar(' '); -- printf("Ext node 0x%x: %c,%c: p=0x%x, <=0x%x, >=0x%x k=%d\n", -- (int)t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -- (int)t->p.parent, (int)t->c.list.blink, -- (int)t->c.list.flink, t->k.ikey); -+ printf("Ext node %p: %c,%c: p=%p, <=%p, >=%p k=%d\n", -+ t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -+ t->p.parent, t->c.list.blink, -+ t->c.list.flink, t->k.ikey); - } else { - rb_iprint_tree(t->c.child.left, level + 2); - rb_iprint_tree(t->c.child.right, level + 2); - for (i = 0; i < level; i++) - putchar(' '); -- printf("Int node 0x%x: %c,%c: l=0x%x, r=0x%x, p=0x%x, lr=(%d,%d)\n", -- (int)t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -- (int)t->c.child.left, (int)t->c.child.right, -- (int)t->p.parent, t->k.lext->k.ikey, -+ printf("Int node %p: %c,%c: l=%p, r=%p, p=%p, lr=(%d,%d)\n", -+ t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -+ t->c.child.left, t->c.child.right, -+ t->p.parent, t->k.lext->k.ikey, - t->v.rext->k.ikey); - } - } - } - - void --rb_uprint_tree(t, level) -- Rb_node t; -- int level; -+rb_uprint_tree(const struct rb_node * const t, int level) - { - int i; - if (ishead(t) && t->p.parent == t) { -- printf("tree 0x%x is empty\n", (int)t); -+ printf("tree %p is empty\n", t); - } else if (ishead(t)) { -- printf("Head: 0x%x. Root = 0x%x, < = 0x%x, > = 0x%x\n", -- (int)t, (int)t->p.root, (int)t->c.list.blink, -- (int)t->c.list.flink); -+ printf("Head: %p. Root = %p, < = %p, > = %p\n", -+ t, t->p.root, t->c.list.blink, -+ t->c.list.flink); - rb_uprint_tree(t->p.root, 0); - } else { - if (isext(t)) { - for (i = 0; i < level; i++) - putchar(' '); -- printf("Ext node 0x%x: %c,%c: p=0x%x, <=0x%x, >=0x%x k=%lu\n", -- (int)t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -- (int)t->p.parent, (int)t->c.list.blink, -- (int)t->c.list.flink, t->k.ukey); -+ printf("Ext node %p: %c,%c: p=%p, <=%p, >=%p k=%lu\n", -+ t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -+ t->p.parent, t->c.list.blink, -+ t->c.list.flink, t->k.ukey); - } else { - rb_uprint_tree(t->c.child.left, level + 2); - rb_uprint_tree(t->c.child.right, level + 2); - for (i = 0; i < level; i++) - putchar(' '); -- printf("Int node 0x%x: %c,%c: l=0x%x, r=0x%x, p=0x%x, lr=(%lu,%lu)\n", -- (int)t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -- (int)t->c.child.left, (int)t->c.child.right, -- (int)t->p.parent, t->k.lext->k.ukey, -+ printf("Int node %p: %c,%c: l=%p, r=%p, p=%p, lr=(%lu,%lu)\n", -+ t, isred(t) ? 'R' : 'B', isleft(t) ? 'l' : 'r', -+ t->c.child.left, t->c.child.right, -+ t->p.parent, t->k.lext->k.ukey, - t->v.rext->k.ukey); - } - } - } - - int --rb_nblack(n) -- Rb_node(n); -+rb_nblack(const struct rb_node *n) - { - int nb; - - if (ishead(n) || isint(n)) { - fprintf(stderr, -- "ERROR: rb_nblack called on a non-external node 0x%x\n", -- (int)n); -+ "ERROR: %s called on a non-external node %p\n", -+ __func__, n); - exit(1); - } - nb = 0; -@@ -705,15 +669,14 @@ - } - - int --rb_plength(n) -- Rb_node(n); -+rb_plength(const struct rb_node *n) - { - int pl; - - if (ishead(n) || isint(n)) { - fprintf(stderr, -- "ERROR: rb_plength called on a non-external node 0x%x\n", -- (int)n); -+ "ERROR: %s called on a non-external node %p\n", -+ __func__, n); - exit(1); - } - pl = 0; -@@ -725,13 +688,11 @@ - } - - void --rb_free_tree(n) -- Rb_node(n); -+rb_free_tree(Rb_node n) - { - - if (!ishead(n)) { -- fprintf(stderr, -- "ERROR: Rb_free_tree called on a non-head node\n"); -+ fprintf(stderr, "%s called on non-head %p\n", __func__, n); - exit(1); - } - while (rb_first(n) != nil(n)) { diff --git a/audio/tclmidi/files/patch-smf_Makefile.in b/audio/tclmidi/files/patch-smf_Makefile.in deleted file mode 100644 index 1039412dd897..000000000000 --- a/audio/tclmidi/files/patch-smf_Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ ---- smf/Makefile.in.orig 1996-10-10 03:32:53 UTC -+++ smf/Makefile.in -@@ -14,7 +14,9 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - - CFLAGS = @CFLAGS@ @DEFS@ --CC_SWITCHES = @CFLAGS@ @DEFS@ -I${TCL_GENERIC_DIR} ${SHLIB_CFLAGS} -+CC_SWITCHES = @CFLAGS@ @DEFS@ -I${TCL_GENERIC_DIR} ${SHLIB_CFLAGS} \ -+ -I$(srcdir)/../smf -I$(srcdir)/../song -I$(srcdir)/.. -I$(srcdir) -+CXX_SWITCHES= ${CC_SWITCHES} ${CXXFLAGS} - - SMFFILES = SMFUtils.o SMFHead.o SMFTrack.o - SMFFILES_SRC = SMFUtils.cxx SMFHead.cxx SMFTrack.cxx -@@ -22,7 +24,7 @@ SMFFILES_SRC = SMFUtils.cxx SMFHead.cxx - .SUFFIXES: .cxx $(SUFFIXES) - - .cxx.o: -- @CXX@ -c $(CC_SWITCHES) $< -+ @CXX@ -c $(CXX_SWITCHES) $< - - objs: $(SMFFILES) - for f in $(SMFFILES) ; do echo smf/$$f ; done > objs -@@ -31,7 +33,7 @@ depend: - sed "/[#]# Dependancies/,$$$$d" < Makefile > Makefile.tmp - echo >> Makefile.tmp - echo "##" "Dependancies" >> Makefile.tmp -- @CXX@ -M $(CC_SWITCHES) $(SMFFILES_SRC) >> Makefile.tmp -+ @CXX@ -M $(CXX_SWITCHES) $(SMFFILES_SRC) >> Makefile.tmp - cp Makefile.tmp Makefile - rm Makefile.tmp - diff --git a/audio/tclmidi/files/patch-smf_SMFHead.cxx b/audio/tclmidi/files/patch-smf_SMFHead.cxx deleted file mode 100644 index 5f5d03b0a8b7..000000000000 --- a/audio/tclmidi/files/patch-smf_SMFHead.cxx +++ /dev/null @@ -1,13 +0,0 @@ ---- smf/SMFHead.cxx.orig 1996-08-05 03:47:35 UTC -+++ smf/SMFHead.cxx -@@ -160,8 +160,8 @@ SMFHead::Write(Tcl_Channel channel) cons - return (1); - } - --ostream & --operator<<(ostream &os, const SMFHead &h) -+std::ostream & -+operator<<(std::ostream &os, const SMFHead &h) - { - - os << "Format: " << h.format << " Num. Tracks: " << h.num_tracks diff --git a/audio/tclmidi/files/patch-smf_SMFHead.h b/audio/tclmidi/files/patch-smf_SMFHead.h deleted file mode 100644 index c913ffc57b0d..000000000000 --- a/audio/tclmidi/files/patch-smf_SMFHead.h +++ /dev/null @@ -1,15 +0,0 @@ ---- smf/SMFHead.h.orig 1996-08-05 03:47:35 UTC -+++ smf/SMFHead.h -@@ -34,10 +34,10 @@ - extern "C" { - #include <tcl.h> - } --#include <iostream.h> -+#include <iostream> - - class SMFHead { -- friend ostream &operator<<(ostream &os, const SMFHead &h); -+ friend std::ostream &operator<<(std::ostream &os, const SMFHead &h); - public: - SMFHead(); - SMFHead(short form, short num, short div); diff --git a/audio/tclmidi/files/patch-smf_SMFTrack.cxx b/audio/tclmidi/files/patch-smf_SMFTrack.cxx deleted file mode 100644 index 37944d6a0f3c..000000000000 --- a/audio/tclmidi/files/patch-smf_SMFTrack.cxx +++ /dev/null @@ -1,12 +0,0 @@ ---- smf/SMFTrack.cxx.orig 1996-08-05 03:47:36 UTC -+++ smf/SMFTrack.cxx -@@ -355,7 +355,8 @@ SMFTrack::IncreaseSize(long len) - ostream & - operator<<(ostream &os, const SMFTrack &t) - { -- long i, prev_flags; -+ std::ios_base::fmtflags prev_flags; -+ long i; - int prev_width; - unsigned char *ptr; - diff --git a/audio/tclmidi/files/patch-song_Makefile.in b/audio/tclmidi/files/patch-song_Makefile.in deleted file mode 100644 index f0ff02970f63..000000000000 --- a/audio/tclmidi/files/patch-song_Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- song/Makefile.in.orig 1996-10-10 03:32:55 UTC -+++ song/Makefile.in -@@ -15,7 +15,8 @@ VPATH = @srcdir@ - - CFLAGS = @CFLAGS@ @DEFS@ - CC_SWITCHES = @CFLAGS@ @DEFS@ -I${TCL_GENERIC_DIR} ${SHLIB_CFLAGS} \ -- -I$(srcdir)/../events -I$(srcdir)/../rb -I$(srcdir)/../smf -I$(srcdir) -+ -I$(srcdir)/../events -I$(srcdir)/../rb -I$(srcdir)/../smf -I$(srcdir)/.. -I$(srcdir) -+CXX_SWITCHES = ${CC_SWITCHES} ${CXXFLAGS} - - SONGFILES = EvntTree.o Song.o - SONGFILES_SRC = EvntTree.cxx Song.cxx -@@ -23,7 +24,7 @@ SONGFILES_SRC = EvntTree.cxx Song.cxx - .SUFFIXES: .cxx $(SUFFIXES) - - .cxx.o: -- @CXX@ -c $(CC_SWITCHES) $< -+ @CXX@ -c $(CXX_SWITCHES) $< - - objs: $(SONGFILES) - for f in $(SONGFILES) ; do echo song/$$f ; done > objs -@@ -32,7 +33,7 @@ depend: - sed "/[#]# Dependancies/,$$$$d" < Makefile > Makefile.tmp - echo >> Makefile.tmp - echo "##" "Dependancies" >> Makefile.tmp -- @CXX@ -M $(CC_SWITCHES) $(SONGFILES_SRC) >> Makefile.tmp -+ @CXX@ -M $(CXX_SWITCHES) $(SONGFILES_SRC) >> Makefile.tmp - cp Makefile.tmp Makefile - rm Makefile.tmp - diff --git a/audio/tclmidi/files/patch-tclmUtil.cxx b/audio/tclmidi/files/patch-tclmUtil.cxx deleted file mode 100644 index f0ebd5511152..000000000000 --- a/audio/tclmidi/files/patch-tclmUtil.cxx +++ /dev/null @@ -1,30 +0,0 @@ ---- tclmUtil.cxx.orig 1996-07-28 19:09:06 UTC -+++ tclmUtil.cxx -@@ -31,8 +31,8 @@ - extern "C" { - #include <tcl.h> - } --#include <iostream.h> --#include <iomanip.h> -+#include <iostream> -+#include <iomanip> - #include <stdlib.h> - #include <ctype.h> - #include <string.h> -@@ -99,12 +99,12 @@ Tclm_ParseDataByte(Tcl_Interp *interp, c - } - - void --Tclm_PrintData(ostream &buf, const unsigned char *data, long length) -+Tclm_PrintData(std::ostream &buf, const unsigned char *data, long length) - { - long i; - -- buf.setf(ios::showbase | ios::internal); -- buf << hex << setw(4) << setfill('0') << (int)data[0]; -+ buf.setf(std::ios::showbase | std::ios::internal); -+ buf << std::hex << std::setw(4) << std::setfill('0') << (int)data[0]; - for (i = 1; i < length; i++) -- buf << " " << hex << setw(4) << setfill('0') << (int)data[i]; -+ buf << " " << std::hex << std::setw(4) << std::setfill('0') << (int)data[i]; - } diff --git a/audio/tclmidi/files/pkg-message.in b/audio/tclmidi/files/pkg-message.in deleted file mode 100644 index e0ed1ea1ddfe..000000000000 --- a/audio/tclmidi/files/pkg-message.in +++ /dev/null @@ -1,6 +0,0 @@ -IMPORTANT: -Now you should add %%PREFIX%%/lib/tclmidi to your -TCLLIBPATH environment variable! - -For example (with [t]csh: -setenv TCLLIBPATH "%%PREFIX%%/lib/tclmidi %%PREFIX%%/lib/tcl8.0" diff --git a/audio/tclmidi/files/strstream.h b/audio/tclmidi/files/strstream.h deleted file mode 100644 index 75480ede00a8..000000000000 --- a/audio/tclmidi/files/strstream.h +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (C) 2004 Free Software Foundation, Inc. -// -// This file is NOT an official part of the GNU ISO C++ Library. This -// library is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// As a special exception, you may use this file as part of a free software -// library without restriction. Specifically, if other files instantiate -// templates or use macros or inline functions from this file, or you compile -// this file and link it with other files to produce an executable, this -// file does not by itself cause the resulting executable to be covered by -// the GNU General Public License. This exception does not however -// invalidate any other reasons why the executable file might be covered by -// the GNU General Public License. - -#ifndef _CPP_BACKWARD_STRSTREAM_H -#define _CPP_BACKWARD_STRSTREAM_H 1 - -// Backward warning isn't needed here, you'll get it from strstream anyway. -//#include "backward_warning.h" -#include <strstream> - -using std::strstreambuf; -using std::istrstream; -using std::ostrstream; -using std::strstream; -using namespace std; - -#endif - -// Local Variables: -// mode:C++ -// End: diff --git a/audio/tclmidi/pkg-descr b/audio/tclmidi/pkg-descr deleted file mode 100644 index a2d3f9c4b6b4..000000000000 --- a/audio/tclmidi/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Tclmidi is language designed for creating and editing standard -MIDI files. With the proper device interface it will also play -and record MIDI files. Since tclmidi is a language supporting -function calls, recursion and conditionals, you can use these -features for editing, sequencing and writing complex scripts. -The brave might even want to try their hand at algorithmic -composition. diff --git a/audio/tclmidi/pkg-plist b/audio/tclmidi/pkg-plist deleted file mode 100644 index 71943d2edb9e..000000000000 --- a/audio/tclmidi/pkg-plist +++ /dev/null @@ -1,35 +0,0 @@ -bin/midtotcl -bin/minfo -bin/mplay -bin/mrec -lib/tclmidi/pkgIndex.tcl -lib/tclmidi/tclmidi31.so -man/man1/midtotcl.1.gz -man/man1/minfo.1.gz -man/man1/mplay.1.gz -man/man1/mrec.1.gz -man/man1/tclmidi.1.gz -man/mann/midiconf.n.gz -man/mann/midicopy.n.gz -man/mann/mididel.n.gz -man/mann/mididev.n.gz -man/mann/midievnt.n.gz -man/mann/midifeat.n.gz -man/mann/midifree.n.gz -man/mann/midiget.n.gz -man/mann/midigrep.n.gz -man/mann/midimake.n.gz -man/mann/midimerg.n.gz -man/mann/midimove.n.gz -man/mann/midiplay.n.gz -man/mann/midiput.n.gz -man/mann/midiread.n.gz -man/mann/midirec.n.gz -man/mann/midirew.n.gz -man/mann/midisplt.n.gz -man/mann/midistop.n.gz -man/mann/miditime.n.gz -man/mann/miditrck.n.gz -man/mann/midivers.n.gz -man/mann/midiwait.n.gz -man/mann/midiwrit.n.gz diff --git a/databases/Makefile b/databases/Makefile index c8cbc756fb30..e15ca6e18a2e 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -57,7 +57,6 @@ SUBDIR += elixir-calecto SUBDIR += elixir-db_connection SUBDIR += elixir-ecto - SUBDIR += elixir-ecto_migrate SUBDIR += elixir-exredis SUBDIR += elixir-geo SUBDIR += elixir-mariaex diff --git a/databases/elixir-ecto_migrate/Makefile b/databases/elixir-ecto_migrate/Makefile deleted file mode 100644 index df74df81f1b9..000000000000 --- a/databases/elixir-ecto_migrate/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $FreeBSD$ - -PORTNAME= ecto_migrate -PORTVERSION= 0.6.3 -DISTVERSIONPREFIX= v -CATEGORIES= databases -PKGNAMEPREFIX= elixir- - -MAINTAINER= olgeni@FreeBSD.org -COMMENT= Automatic migrations for Ecto - -LICENSE= APACHE20 - -BROKEN= Does not build with latest Ecto -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -USES= elixir -USE_GITHUB= yes -GH_ACCOUNT= xerions - -MIX_BUILD_DEPS= databases/elixir-ecto -MIX_RUN_DEPS:= ${MIX_BUILD_DEPS} -MIX_REWRITE= yes - -.include <bsd.port.mk> diff --git a/databases/elixir-ecto_migrate/distinfo b/databases/elixir-ecto_migrate/distinfo deleted file mode 100644 index 4f395fc244f1..000000000000 --- a/databases/elixir-ecto_migrate/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (xerions-ecto_migrate-v0.6.3_GH0.tar.gz) = 182c2945b34ae497ead267148ecf6c189a4183957dbdc6cb0cfb5ee0e0b1d9e5 -SIZE (xerions-ecto_migrate-v0.6.3_GH0.tar.gz) = 7834 diff --git a/databases/elixir-ecto_migrate/pkg-descr b/databases/elixir-ecto_migrate/pkg-descr deleted file mode 100644 index 161b1ee117f0..000000000000 --- a/databases/elixir-ecto_migrate/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Automatic migrations for Ecto. - -WWW: https://github.com/xerions/ecto_migrate diff --git a/databases/elixir-ecto_migrate/pkg-plist b/databases/elixir-ecto_migrate/pkg-plist deleted file mode 100644 index 4b334f9641ac..000000000000 --- a/databases/elixir-ecto_migrate/pkg-plist +++ /dev/null @@ -1,15 +0,0 @@ -lib/elixir/lib/ecto_migrate/ebin/Elixir.Ecto.Migration.Auto.Field.beam -lib/elixir/lib/ecto_migrate/ebin/Elixir.Ecto.Migration.Auto.Index.beam -lib/elixir/lib/ecto_migrate/ebin/Elixir.Ecto.Migration.Auto.beam -lib/elixir/lib/ecto_migrate/ebin/Elixir.Ecto.Migration.SystemTable.Index.Migration.beam -lib/elixir/lib/ecto_migrate/ebin/Elixir.Ecto.Migration.SystemTable.Index.beam -lib/elixir/lib/ecto_migrate/ebin/Elixir.Ecto.Migration.SystemTable.Migration.beam -lib/elixir/lib/ecto_migrate/ebin/Elixir.Ecto.Migration.SystemTable.beam -lib/elixir/lib/ecto_migrate/ebin/Elixir.EctoMigrate.beam -lib/elixir/lib/ecto_migrate/ebin/ecto_migrate.app -lib/elixir/lib/ecto_migrate/lib/ecto/migration/auto.ex -lib/elixir/lib/ecto_migrate/lib/ecto/migration/auto/field.ex -lib/elixir/lib/ecto_migrate/lib/ecto/migration/auto/index.ex -lib/elixir/lib/ecto_migrate/lib/ecto/migration/system_table.ex -lib/elixir/lib/ecto_migrate/lib/ecto_migrate.ex -%%PORTDOCS%%%%DOCSDIR%%/README.md diff --git a/devel/Makefile b/devel/Makefile index 97bc8f7c1725..35159e326116 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -296,7 +296,6 @@ SUBDIR += cl-alexandria-sbcl SUBDIR += cl-asdf SUBDIR += cl-cffi - SUBDIR += cl-cffi-sbcl SUBDIR += cl-infix SUBDIR += cl-infix-sbcl SUBDIR += cl-port @@ -475,7 +474,6 @@ SUBDIR += dulwich SUBDIR += duplo SUBDIR += dwarfdump - SUBDIR += dwarves SUBDIR += dxa65 SUBDIR += dyncall SUBDIR += e00compr @@ -4068,7 +4066,6 @@ SUBDIR += pig SUBDIR += pijul SUBDIR += piklab - SUBDIR += pinba_engine SUBDIR += pipestatus SUBDIR += pire SUBDIR += pit @@ -4377,7 +4374,6 @@ SUBDIR += py-epdb SUBDIR += py-epsilon SUBDIR += py-evdev - SUBDIR += py-event SUBDIR += py-exam SUBDIR += py-extras SUBDIR += py-extremes diff --git a/devel/cl-cffi-sbcl/Makefile b/devel/cl-cffi-sbcl/Makefile deleted file mode 100644 index 936528195b4e..000000000000 --- a/devel/cl-cffi-sbcl/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# $FreeBSD$ - -PORTNAME= cffi -PORTVERSION= 0.16.1 -CATEGORIES= devel lisp -PKGNAMEPREFIX= cl- -DISTFILES= # none - -MAINTAINER= olgeni@FreeBSD.org -COMMENT= Portable foreign function interface for Common Lisp - -BROKEN= does not build with new sbcl 1.13 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -BUILD_DEPENDS= cl-cffi>=0:devel/cl-cffi \ - cl-alexandria-sbcl>=0:devel/cl-alexandria-sbcl \ - cl-trivial-features-sbcl>=0:devel/cl-trivial-features-sbcl \ - cl-babel-sbcl>=0:converters/cl-babel-sbcl -RUN_DEPENDS:= ${BUILD_DEPENDS} - -USE_ASDF_FASL= yes -FASL_TARGET= sbcl -FASL_BUILD= yes -ASDF_MODULES= cffi cffi-grovel cffi-uffi-compat - -.include "${.CURDIR}/../../devel/cl-asdf/bsd.cl-asdf.mk" -.include <bsd.port.mk> diff --git a/devel/cl-cffi-sbcl/pkg-descr b/devel/cl-cffi-sbcl/pkg-descr deleted file mode 100644 index 523ae4a8b94d..000000000000 --- a/devel/cl-cffi-sbcl/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -CFFI, the Common Foreign Function Interface, purports to be a -portable foreign function interface for Common Lisp. The CFFI library -is composed of a Lisp-implementation-specific backend in the CFFI-SYS -package, and a portable frontend in the CFFI package. - -The CFFI-SYS backend package defines a low-level interface to the -native FFI support in the Lisp implementation. It offers operators -for allocating and dereferencing foreign memory, calling foreign -functions, and loading shared libraries. The CFFI frontend provides -a declarative interface for defining foreign functions, structures, -typedefs, enumerated types, etc. It is implemented in portable ANSI -CL making use of the low-level operators exported by CFFI-SYS. - -This package is compiled with SBCL. - -WWW: http://common-lisp.net/project/cffi/ diff --git a/devel/dwarves/Makefile b/devel/dwarves/Makefile deleted file mode 100644 index ba84dfe1757a..000000000000 --- a/devel/dwarves/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# Created by: Conrad Meyer <cem@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= dwarves -PORTVERSION= 1.10.20160713 -PORTREVISION= 1 -CATEGORIES= devel -#MASTER_SITES= https://fedorapeople.org/~acme/dwarves/ -MASTER_SITES= http://repo.or.cz/dwarves.git/snapshot/ -DISTFILES= b52386d041fac2dc6decf3a9e8e85385784a2de9.tar.gz -# git: http://repo.or.cz/dwarves.git -# ML: http://news.gmane.org/gmane.comp.debugging.dwarves - -MAINTAINER= cem@FreeBSD.org -COMMENT= Debugging Information Manipulation Tools - -LICENSE= GPLv2 -LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING - -BROKEN= does not build (/usr/local/include/libelf.h:308:8: error: unknown type name 'Elf32_Chdr') -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -LIB_DEPENDS= libargp.so:devel/argp-standalone \ - libdw.so:devel/elfutils -PATCH_DEPENDS= gnulib>=0:devel/gnulib - -WRKSRC= ${WRKDIR}/dwarves-b52386d - -USES= cmake:outsource localbase shebangfix tar:bzip2 -USE_LDCONFIG= yes - -SHEBANG_FILES= ostra/ostra-cg - -post-patch: - @${CP} -a \ - ${LOCALBASE}/share/gnulib/lib/gettext.h \ - ${LOCALBASE}/share/gnulib/lib/obstack.c \ - ${LOCALBASE}/share/gnulib/lib/obstack.h \ - ${WRKSRC}/ - @${REINPLACE_CMD} -e 's|_GL_ATTRIBUTE_PURE|__attribute__((__pure__))|g' \ - ${WRKSRC}/obstack.h ${WRKSRC}/obstack.c - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 1200000 -IGNORE= requires FreeBSD 12.0 (ElfNN_Chdr) -.endif - -.include <bsd.port.post.mk> diff --git a/devel/dwarves/distinfo b/devel/dwarves/distinfo deleted file mode 100644 index b16de50f7b9b..000000000000 --- a/devel/dwarves/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1468476328 -SHA256 (b52386d041fac2dc6decf3a9e8e85385784a2de9.tar.gz) = 7c86a956b273f26c2c3300db787de11a9e240b8e81a016cbb11e9c488e8fe248 -SIZE (b52386d041fac2dc6decf3a9e8e85385784a2de9.tar.gz) = 132977 diff --git a/devel/dwarves/files/patch-CMakeLists.txt b/devel/dwarves/files/patch-CMakeLists.txt deleted file mode 100644 index 2e7dde2fc181..000000000000 --- a/devel/dwarves/files/patch-CMakeLists.txt +++ /dev/null @@ -1,66 +0,0 @@ ---- CMakeLists.txt.orig 2016-06-30 19:30:28 UTC -+++ CMakeLists.txt -@@ -31,11 +31,14 @@ add_definitions(-D_GNU_SOURCE -DDWARVES_ - find_package(DWARF REQUIRED) - find_package(ZLIB REQUIRED) - --_set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${__LIB}" "libdir") -+# For argp-standalone -+find_library(ARGP argp ${LOCALBASE}/lib) -+ -+_set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/lib${__LIB}" "libdir") - - set(dwarves_LIB_SRCS dwarves.c dwarves_fprintf.c gobuffer strings - ctf_encoder.c ctf_loader.c libctf.c dwarf_loader.c -- dutil.c elf_symtab.c rbtree.c) -+ dutil.c elf_symtab.c rbtree.c obstack.c) - add_library(dwarves SHARED ${dwarves_LIB_SRCS}) - set_target_properties(dwarves PROPERTIES VERSION 1.0.0 SOVERSION 1) - set_target_properties(dwarves PROPERTIES INTERFACE_LINK_LIBRARIES "") -@@ -53,11 +56,11 @@ target_link_libraries(dwarves_reorganize - - set(codiff_SRCS codiff.c) - add_executable(codiff ${codiff_SRCS}) --target_link_libraries(codiff dwarves) -+target_link_libraries(codiff dwarves ${ARGP}) - - set(ctracer_SRCS ctracer.c) - add_executable(ctracer ${ctracer_SRCS}) --target_link_libraries(ctracer dwarves dwarves_emit dwarves_reorganize ${ELF_LIBRARY}) -+target_link_libraries(ctracer dwarves dwarves_emit dwarves_reorganize ${ELF_LIBRARY} ${ARGP}) - - set(dtagnames_SRCS dtagnames.c) - add_executable(dtagnames ${dtagnames_SRCS}) -@@ -65,19 +68,19 @@ target_link_libraries(dtagnames dwarves) - - set(pahole_SRCS pahole.c) - add_executable(pahole ${pahole_SRCS}) --target_link_libraries(pahole dwarves dwarves_reorganize) -+target_link_libraries(pahole dwarves dwarves_reorganize ${ARGP}) - - set(pdwtags_SRCS pdwtags.c) - add_executable(pdwtags ${pdwtags_SRCS}) --target_link_libraries(pdwtags dwarves) -+target_link_libraries(pdwtags dwarves ${ARGP}) - - set(pglobal_SRCS pglobal.c) - add_executable(pglobal ${pglobal_SRCS}) --target_link_libraries(pglobal dwarves) -+target_link_libraries(pglobal dwarves ${ARGP}) - - set(pfunct_SRCS pfunct.c ) - add_executable(pfunct ${pfunct_SRCS}) --target_link_libraries(pfunct dwarves dwarves_emit ${ELF_LIBRARY}) -+target_link_libraries(pfunct dwarves dwarves_emit ${ELF_LIBRARY} ${ARGP}) - - set(prefcnt_SRCS prefcnt.c) - add_executable(prefcnt ${prefcnt_SRCS}) -@@ -89,7 +92,7 @@ target_link_libraries(scncopy dwarves ${ - - set(syscse_SRCS syscse.c) - add_executable(syscse ${syscse_SRCS}) --target_link_libraries(syscse dwarves) -+target_link_libraries(syscse dwarves ${ARGP}) - - install(TARGETS codiff ctracer dtagnames pahole pdwtags - pfunct pglobal prefcnt scncopy syscse RUNTIME DESTINATION diff --git a/devel/dwarves/files/patch-ctf__loader.c b/devel/dwarves/files/patch-ctf__loader.c deleted file mode 100644 index 00778a231220..000000000000 --- a/devel/dwarves/files/patch-ctf__loader.c +++ /dev/null @@ -1,10 +0,0 @@ ---- ctf_loader.c.orig 2016-06-30 19:30:28 UTC -+++ ctf_loader.c -@@ -11,7 +11,6 @@ - #include <unistd.h> - #include <stdlib.h> - #include <stddef.h> --#include <malloc.h> - #include <string.h> - #include <limits.h> - #include <libgen.h> diff --git a/devel/dwarves/files/patch-dtagnames.c b/devel/dwarves/files/patch-dtagnames.c deleted file mode 100644 index 51c5df50141d..000000000000 --- a/devel/dwarves/files/patch-dtagnames.c +++ /dev/null @@ -1,37 +0,0 @@ ---- dtagnames.c.orig 2016-06-30 19:30:28 UTC -+++ dtagnames.c -@@ -9,16 +9,33 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> -+ -+/* For mallctl */ -+#include <err.h> -+#include <errno.h> -+#include <malloc_np.h> - - #include "dwarves.h" - #include "dutil.h" - - static void print_malloc_stats(void) - { -+#if 0 - struct mallinfo m = mallinfo(); - - fprintf(stderr, "size: %u\n", m.uordblks); -+#else -+ size_t allocated, olen; -+ int rc; -+ -+ olen = sizeof(allocated); -+ rc = mallctl("stats.allocated", &allocated, &olen, NULL, 0); -+ if (rc != 0) { -+ errno = rc; -+ err(1, "mallctl stats.allocated"); -+ } -+ fprintf(stderr, "size: %zu\n", allocated); -+#endif - } - - static int class__tag_name(struct tag *tag, struct cu *cu __unused, diff --git a/devel/dwarves/files/patch-dutil.h b/devel/dwarves/files/patch-dutil.h deleted file mode 100644 index 5b413fe052dc..000000000000 --- a/devel/dwarves/files/patch-dutil.h +++ /dev/null @@ -1,30 +0,0 @@ ---- dutil.h.orig 2016-06-30 19:30:28 UTC -+++ dutil.h -@@ -15,7 +15,17 @@ - #include <stddef.h> - #include <elf.h> - #include <gelf.h> -+#if 0 - #include <asm/bitsperlong.h> -+#else -+# if __SIZEOF_LONG__ == 8 -+# define __BITS_PER_LONG 64 -+# elif __SIZEOF_LONG__ == 4 -+# define __BITS_PER_LONG 32 -+# else -+# error What are you -+# endif -+#endif - #include "rbtree.h" - - #define BITS_PER_LONG __BITS_PER_LONG -@@ -28,7 +38,9 @@ - #define __pure __attribute__ ((pure)) - #endif - -+#ifndef roundup - #define roundup(x,y) ((((x) + ((y) - 1)) / (y)) * (y)) -+#endif - - static inline __attribute__((const)) bool is_power_of_2(unsigned long n) - { diff --git a/devel/dwarves/files/patch-dwarves.c b/devel/dwarves/files/patch-dwarves.c deleted file mode 100644 index 5f64a8e51005..000000000000 --- a/devel/dwarves/files/patch-dwarves.c +++ /dev/null @@ -1,11 +0,0 @@ ---- dwarves.c.orig 2016-06-30 19:30:28 UTC -+++ dwarves.c -@@ -16,6 +16,8 @@ - #include <fcntl.h> - #include <fnmatch.h> - #include <libelf.h> -+/* For PATH_MAX */ -+#include <limits.h> - #include <search.h> - #include <stdio.h> - #include <stdlib.h> diff --git a/devel/dwarves/files/patch-dwarves__fprintf.c b/devel/dwarves/files/patch-dwarves__fprintf.c deleted file mode 100644 index 6e9285066880..000000000000 --- a/devel/dwarves/files/patch-dwarves__fprintf.c +++ /dev/null @@ -1,27 +0,0 @@ ---- dwarves_fprintf.c.orig 2016-06-30 19:30:28 UTC -+++ dwarves_fprintf.c -@@ -9,6 +9,9 @@ - published by the Free Software Foundation. - */ - -+/* For CACHE_LINE_SIZE */ -+#include <sys/param.h> -+ - #include <dwarf.h> - #include <errno.h> - #include <stdio.h> -@@ -1699,7 +1702,14 @@ void cus__print_error_msg(const char *pr - void dwarves__fprintf_init(uint16_t user_cacheline_size) - { - if (user_cacheline_size == 0) { -+#if 0 - long sys_cacheline_size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -+#else -+ /* -+ * CEM: Ideally we could get this programmatically. -+ */ -+ long sys_cacheline_size = CACHE_LINE_SIZE; -+#endif - - if (sys_cacheline_size > 0) - cacheline_size = sys_cacheline_size; diff --git a/devel/dwarves/files/patch-elf__symtab.c b/devel/dwarves/files/patch-elf__symtab.c deleted file mode 100644 index ae7a090678d0..000000000000 --- a/devel/dwarves/files/patch-elf__symtab.c +++ /dev/null @@ -1,12 +0,0 @@ ---- elf_symtab.c.orig 2016-06-30 19:30:28 UTC -+++ elf_symtab.c -@@ -7,8 +7,8 @@ - published by the Free Software Foundation. - */ - --#include <malloc.h> - #include <stdio.h> -+#include <stdlib.h> - #include <string.h> - - #include "dutil.h" diff --git a/devel/dwarves/files/patch-exitfail.h b/devel/dwarves/files/patch-exitfail.h deleted file mode 100644 index 86a7a4b2ff0f..000000000000 --- a/devel/dwarves/files/patch-exitfail.h +++ /dev/null @@ -1,5 +0,0 @@ ---- exitfail.h.orig 2016-07-14 06:29:38 UTC -+++ exitfail.h -@@ -0,0 +1,2 @@ -+#pragma once -+#define exit_failure EXIT_FAILURE diff --git a/devel/dwarves/files/patch-libctf.c b/devel/dwarves/files/patch-libctf.c deleted file mode 100644 index 0434118d4590..000000000000 --- a/devel/dwarves/files/patch-libctf.c +++ /dev/null @@ -1,12 +0,0 @@ ---- libctf.c.orig 2016-06-30 19:30:28 UTC -+++ libctf.c -@@ -1,7 +1,8 @@ -+#include <sys/stat.h> -+ - #include <fcntl.h> - #include <gelf.h> - #include <limits.h> --#include <malloc.h> - #include <errno.h> - #include <stdio.h> - #include <stdlib.h> diff --git a/devel/dwarves/files/patch-pdwtags.c b/devel/dwarves/files/patch-pdwtags.c deleted file mode 100644 index 78b457831278..000000000000 --- a/devel/dwarves/files/patch-pdwtags.c +++ /dev/null @@ -1,10 +0,0 @@ ---- pdwtags.c.orig 2016-06-30 19:30:28 UTC -+++ pdwtags.c -@@ -9,7 +9,6 @@ - #include <argp.h> - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> - - #include "dwarves.h" - #include "dutil.h" diff --git a/devel/dwarves/files/patch-pglobal.c b/devel/dwarves/files/patch-pglobal.c deleted file mode 100644 index c443daf6827c..000000000000 --- a/devel/dwarves/files/patch-pglobal.c +++ /dev/null @@ -1,38 +0,0 @@ ---- pglobal.c.orig 2016-06-30 19:30:28 UTC -+++ pglobal.c -@@ -8,7 +8,6 @@ - */ - - #include <argp.h> --#include <malloc.h> - #include <search.h> - #include <stdio.h> - #include <stdlib.h> -@@ -92,7 +91,7 @@ static void extvar__add(const struct var - nodep = tsearch(gvar, &tree, extvar__compare); - if (nodep == NULL) - oom("tsearch"); -- else if (*nodep != gvar) -+ else if (*nodep != gvar) { - if (gvar->var->declaration) { - gvar->next = (*nodep)->next; - (*nodep)->next = gvar; -@@ -100,6 +99,7 @@ static void extvar__add(const struct var - gvar->next = *nodep; - *nodep = gvar; - } -+ } - } - } - -@@ -315,7 +315,10 @@ int main(int argc, char *argv[]) - twalk(tree, function_action__walk); - } - -+#if 0 -+ /* Our search.h doesn't implement tdestroy; leak for now. */ - tdestroy(tree, free_node); -+#endif - rc = EXIT_SUCCESS; - out_cus_delete: - cus__delete(cus); diff --git a/devel/dwarves/files/patch-prefcnt.c b/devel/dwarves/files/patch-prefcnt.c deleted file mode 100644 index 0dc76204a97a..000000000000 --- a/devel/dwarves/files/patch-prefcnt.c +++ /dev/null @@ -1,16 +0,0 @@ ---- prefcnt.c.orig 2016-06-30 19:30:28 UTC -+++ prefcnt.c -@@ -66,9 +66,11 @@ static void refcnt_tag(struct tag *tag, - - tag->visited = 1; - -- if (tag__is_struct(tag) || tag__is_union(tag)) -- type__for_each_member(tag__type(tag), member) -+ if (tag__is_struct(tag) || tag__is_union(tag)) { -+ type__for_each_member(tag__type(tag), member) { - refcnt_member(member, cu); -+ } -+ } - } - - static void refcnt_lexblock(const struct lexblock *lexblock, const struct cu *cu) diff --git a/devel/dwarves/files/patch-strings.c b/devel/dwarves/files/patch-strings.c deleted file mode 100644 index 387ffcaa5a86..000000000000 --- a/devel/dwarves/files/patch-strings.c +++ /dev/null @@ -1,13 +0,0 @@ ---- strings.c.orig 2016-06-30 19:30:28 UTC -+++ strings.c -@@ -39,7 +39,10 @@ void strings__delete(struct strings *str - { - if (strs == NULL) - return; -+#if 0 -+ /* Our search.h doesn't implement tdestroy; leak for now. */ - tdestroy(strs->tree, do_nothing); -+#endif - __gobuffer__delete(&strs->gb); - free(strs); - } diff --git a/devel/dwarves/pkg-descr b/devel/dwarves/pkg-descr deleted file mode 100644 index 4c10b9b55bc5..000000000000 --- a/devel/dwarves/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -Dwarves is a set of tools that use the debugging information inserted in ELF -binaries by compilers such as GCC, used by well known debuggers such as GDB, -and more recent ones such as systemtap. - -Utilities in the dwarves suite include pahole, that can be used to find -alignment holes in structs and classes in languages such as C, C++, but not -limited to these. - -It also extracts other information such as CPU cacheline alignment, helping -pack those structures to achieve more cache hits. - -A diff like tool, codiff can be used to compare the effects changes in source -code generate on the resulting binaries. - -Another tool is pfunct, that can be used to find all sorts of information about -functions, inlines, decisions made by the compiler about inlining, etc. - -WWW: http://acmel.wordpress.com/ diff --git a/devel/dwarves/pkg-plist b/devel/dwarves/pkg-plist deleted file mode 100644 index 93766df97ca7..000000000000 --- a/devel/dwarves/pkg-plist +++ /dev/null @@ -1,34 +0,0 @@ -bin/codiff -bin/ctracer -bin/dtagnames -bin/ostra-cg -bin/pahole -bin/pdwtags -bin/pfunct -bin/pglobal -bin/prefcnt -bin/scncopy -bin/syscse -include/dwarves/dutil.h -include/dwarves/dwarves.h -include/dwarves/dwarves_emit.h -include/dwarves/dwarves_reorganize.h -include/dwarves/gobuffer.h -include/dwarves/list.h -include/dwarves/rbtree.h -include/dwarves/strings.h -lib/libdwarves.so -lib/libdwarves.so.1 -lib/libdwarves.so.1.0.0 -lib/libdwarves_emit.so -lib/libdwarves_emit.so.1 -lib/libdwarves_emit.so.1.0.0 -lib/libdwarves_reorganize.so -lib/libdwarves_reorganize.so.1 -lib/libdwarves_reorganize.so.1.0.0 -%%DATADIR%%/runtime/Makefile -%%DATADIR%%/runtime/ctracer_relay.c -%%DATADIR%%/runtime/ctracer_relay.h -%%DATADIR%%/runtime/linux.blacklist.cu -%%DATADIR%%/runtime/python/ostra.py -share/man/man1/pahole.1 diff --git a/devel/pinba_engine/Makefile b/devel/pinba_engine/Makefile deleted file mode 100644 index cc9953be0dea..000000000000 --- a/devel/pinba_engine/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# Created by: raven428 <raven428@gmail.com> -# $FreeBSD$ - -PORTNAME= pinba_engine -PORTVERSION= 2011.08.18 -PORTREVISION= 10 -CATEGORIES= devel - -MAINTAINER= raven428@gmail.com -COMMENT= Mysql-engine part of statistics server for PHP - -BUILD_DEPENDS= ${LOCALBASE}/include/google/protobuf/descriptor.h:devel/protobuf \ - ${LOCALBASE}/include/event.h:devel/libevent \ - ${LOCALBASE}/include/Judy.h:devel/judy \ - ${LOCALBASE}/lib/mysql/plugin:${_MYSQL_SERVER} \ - ${NONEXISTENT}:${_MYSQL_SERVER}:configure \ - bison:devel/bison \ - cmake:devel/cmake -LIB_DEPENDS= libprotobuf.so:devel/protobuf - -BROKEN= fails to configure (error: Failed to find required header file include/mysql_version.h) -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -USE_GITHUB= yes -GH_ACCOUNT= tony2001 -GH_TAGNAME= 3a0cb51 - -USE_MYSQL= yes -IGNORE_WITH_MYSQL= 50 - -MYSQL_WRKSRC= $$(cd ${PORTSDIR}/${_MYSQL_SERVER} && ${MAKE} -V WRKSRC) - -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= autoreconf gmake libtool -USE_LDCONFIG= ${PREFIX}/lib/mysql/plugin - -CONFIGURE_ARGS= --disable-static \ - --with-mysql=${MYSQL_WRKSRC} \ - --libdir=${PREFIX}/lib/mysql/plugin -CFLAGS+= -I${LOCALBASE}/include/mysql - -SUB_FILES= pkg-message -PORTDOCS= NEWS TODO README - -BROKEN_aarch64= Fails to configure: failed to find required header file include/mysql_version.h - -post-install: - @${MKDIR} ${STAGEDIR}${DATADIR} - @${INSTALL} ${WRKSRC}/default_tables.sql ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR} - -.include <bsd.port.mk> diff --git a/devel/pinba_engine/distinfo b/devel/pinba_engine/distinfo deleted file mode 100644 index bb92c3822959..000000000000 --- a/devel/pinba_engine/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (tony2001-pinba_engine-2011.08.18-3a0cb51_GH0.tar.gz) = f538abf886e8cc21885436d399f4eeb866e4a291f81df3a76fce244f0e9f8f8c -SIZE (tony2001-pinba_engine-2011.08.18-3a0cb51_GH0.tar.gz) = 50018 diff --git a/devel/pinba_engine/files/patch-src__ha_pinba.cc b/devel/pinba_engine/files/patch-src__ha_pinba.cc deleted file mode 100644 index 3c991903d75a..000000000000 --- a/devel/pinba_engine/files/patch-src__ha_pinba.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- ./src/ha_pinba.cc.orig 2011-07-26 18:52:53.000000000 +0400 -+++ ./src/ha_pinba.cc 2011-08-27 18:58:00.000000000 +0400 -@@ -45,6 +45,10 @@ - - #include "ha_pinba.h" - -+#ifdef PINBA_ENGINE_HAVE_PTHREAD_SETAFFINITY_NP -+#include <pthread_np.h> -+#endif -+ - #ifdef PINBA_ENGINE_MYSQL_VERSION_5_5 - # define pinba_free(a, b) my_free(a) - #else -@@ -427,13 +431,13 @@ - unsigned long mask; - - mask = 1; -- pthread_setaffinity_np(collector_thread, sizeof(mask), (cpu_set_t *)&mask); -+ pthread_setaffinity_np(collector_thread, sizeof(mask), (cpuset_t *)&mask); - - mask = 2; -- pthread_setaffinity_np(data_thread, sizeof(mask), (cpu_set_t *)&mask); -+ pthread_setaffinity_np(data_thread, sizeof(mask), (cpuset_t *)&mask); - - mask = 4; -- pthread_setaffinity_np(stats_thread, sizeof(mask), (cpu_set_t *)&mask); -+ pthread_setaffinity_np(stats_thread, sizeof(mask), (cpuset_t *)&mask); - #endif - } - -@@ -452,6 +456,7 @@ - int error = 0; - DBUG_ENTER("pinba_engine_shutdown"); - -+ pthread_detach(collector_thread); - pthread_cancel(collector_thread); - pthread_join(collector_thread, NULL); - diff --git a/devel/pinba_engine/files/pkg-message.in b/devel/pinba_engine/files/pkg-message.in deleted file mode 100644 index 39857182ce32..000000000000 --- a/devel/pinba_engine/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ -After you've installed the plugin, you need to enable it in MySQL. -To do this log in to the MySQL console (as root) and execute the -following: -mysql> INSTALL PLUGIN pinba SONAME 'libpinba_engine.so'; - -We'd also suggest you to create a separate database, this way: -mysql> CREATE DATABASE pinba; - -And then create the default tables: -mysql -D pinba < %%DATADIR%%/default_tables.sql diff --git a/devel/pinba_engine/pkg-descr b/devel/pinba_engine/pkg-descr deleted file mode 100644 index edc9b7d410e4..000000000000 --- a/devel/pinba_engine/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -Pinba is a statistics server for PHP using MySQL as a read-only -interface. - -It accumulates and processes data sent over UDP by multiple PHP -processes and displays statistics in a nice human-readable form of -simple "reports", also providing a read-only interface to the raw -data to enable generation of more sophisticated reports. - -With the Pinba extension, users can also measure particular parts -of the code using timers with arbitrary tags. - -Pinba is not a debugging tool in the common sense, since you're not -supposed to do debugging on production servers, but its main goal -is to help developers to locate bottlenecks in realtime and direct -their attention to the code that really needs it. - -WWW: http://pinba.org/ diff --git a/devel/pinba_engine/pkg-plist b/devel/pinba_engine/pkg-plist deleted file mode 100644 index 6351283ecd0c..000000000000 --- a/devel/pinba_engine/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -lib/mysql/plugin/libpinba_engine.so -lib/mysql/plugin/libpinba_engine.so.0 -lib/mysql/plugin/libpinba_engine.so.0.0.0 -%%DATADIR%%/default_tables.sql diff --git a/devel/py-event/Makefile b/devel/py-event/Makefile deleted file mode 100644 index 043bd08b0c40..000000000000 --- a/devel/py-event/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Created by: Alexander Botero-Lowry <alexbl@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= event -DISTVERSIONPREFIX= PYEVENT_ -DISTVERSION= 0_3 -PORTREVISION= 11 -CATEGORIES= devel net python -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Python bindings for libevent - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE - -LIB_DEPENDS= libevent.so:devel/libevent - -USE_GITHUB= yes -GH_ACCOUNT= jaraco -GH_PROJECT= pyevent - -BROKEN= fails to build with libevent 2.1 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -USES= python -USE_PYTHON= distutils autoplist - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/event.so - -.include <bsd.port.mk> diff --git a/devel/py-event/distinfo b/devel/py-event/distinfo deleted file mode 100644 index b22e12424270..000000000000 --- a/devel/py-event/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (jaraco-pyevent-PYEVENT_0_3_GH0.tar.gz) = 99e26d36cfdcbc7c67668b200f4f4144d02e005a2863b7ab9b71f63fc616725c -SIZE (jaraco-pyevent-PYEVENT_0_3_GH0.tar.gz) = 30393 diff --git a/devel/py-event/files/patch-event.c b/devel/py-event/files/patch-event.c deleted file mode 100644 index 0c4847247ac1..000000000000 --- a/devel/py-event/files/patch-event.c +++ /dev/null @@ -1,2403 +0,0 @@ ---- event.c.orig 2005-09-12 03:44:04 UTC -+++ event.c -@@ -1,47 +1,69 @@ --/* Generated by Pyrex 0.9.3 on Sun Sep 11 23:51:17 2005 */ -+/* Generated by Pyrex 0.9.8.5 on Tue Dec 15 11:56:37 2009 */ - -+#define PY_SSIZE_T_CLEAN - #include "Python.h" - #include "structmember.h" - #ifndef PY_LONG_LONG - #define PY_LONG_LONG LONG_LONG - #endif -+#if PY_VERSION_HEX < 0x02050000 -+ typedef int Py_ssize_t; -+ #define PY_SSIZE_T_MAX INT_MAX -+ #define PY_SSIZE_T_MIN INT_MIN -+ #define PyInt_FromSsize_t(z) PyInt_FromLong(z) -+ #define PyInt_AsSsize_t(o) PyInt_AsLong(o) -+#endif -+#if !defined(WIN32) && !defined(MS_WINDOWS) -+ #ifndef __stdcall -+ #define __stdcall -+ #endif -+ #ifndef __cdecl -+ #define __cdecl -+ #endif -+#endif -+#ifdef __cplusplus -+#define __PYX_EXTERN_C extern "C" -+#else -+#define __PYX_EXTERN_C extern -+#endif -+#include <math.h> - #include "event.h" - - --typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/ --typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/ --static PyObject *__Pyx_UnpackItem(PyObject *, int); /*proto*/ --static int __Pyx_EndUnpack(PyObject *, int); /*proto*/ --static int __Pyx_PrintItem(PyObject *); /*proto*/ --static int __Pyx_PrintNewline(void); /*proto*/ --static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ --static void __Pyx_ReRaise(void); /*proto*/ --static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/ --static PyObject *__Pyx_GetExcValue(void); /*proto*/ --static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name); /*proto*/ --static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/ --static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], int nargs, PyObject **args2, PyObject **kwds2); /*proto*/ --static void __Pyx_WriteUnraisable(char *name); /*proto*/ --static void __Pyx_AddTraceback(char *funcname); /*proto*/ --static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size); /*proto*/ --static int __Pyx_SetVtable(PyObject *dict, void *vtable); /*proto*/ --static int __Pyx_GetVtable(PyObject *dict, void *vtabptr); /*proto*/ --static PyObject *__Pyx_CreateClass(PyObject *bases, PyObject *dict, PyObject *name, char *modname); /*proto*/ --static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/ --static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/ --static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/ -+typedef struct {PyObject **p; int i; char *s; long n;} __Pyx_StringTabEntry; /*proto*/ - - static PyObject *__pyx_m; - static PyObject *__pyx_b; - static int __pyx_lineno; - static char *__pyx_filename; --staticforward char **__pyx_f; -+static char **__pyx_f; - - static char __pyx_mdoc[] = "event library\n\nThis module provides a mechanism to execute a function when a\nspecific event on a file handle, file descriptor, or signal occurs,\nor after a given time has passed.\n"; - -+static void __Pyx_WriteUnraisable(char *name); /*proto*/ -+ -+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/ -+ -+static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/ -+ -+static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], Py_ssize_t nargs, PyObject **args2, PyObject **kwds2, char rqd_kwds[]); /*proto*/ -+ -+static PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i); /*proto*/ -+ -+static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ -+ -+static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/ -+ -+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/ -+ -+static void __Pyx_AddTraceback(char *funcname); /*proto*/ -+ - /* Declarations from event */ - --staticforward PyTypeObject __pyx_type_5event_event; -+ -+/* Declarations from implementation of event */ -+ -+typedef void (*__pyx_t_5event_event_handler)(int,short,void *); - - struct __pyx_obj_5event_event { - PyObject_HEAD -@@ -54,115 +76,155 @@ struct __pyx_obj_5event_event { - struct timeval tv; - }; - --staticforward PyTypeObject __pyx_type_5event_read; -- - struct __pyx_obj_5event_read { - struct __pyx_obj_5event_event __pyx_base; - }; - --staticforward PyTypeObject __pyx_type_5event_write; -- - struct __pyx_obj_5event_write { - struct __pyx_obj_5event_event __pyx_base; - }; - --staticforward PyTypeObject __pyx_type_5event_signal; -- - struct __pyx_obj_5event_signal { - struct __pyx_obj_5event_event __pyx_base; - }; - --staticforward PyTypeObject __pyx_type_5event_timeout; -- - struct __pyx_obj_5event_timeout { - struct __pyx_obj_5event_event __pyx_base; - }; - -+ -+ -+ -+ -+ - static PyTypeObject *__pyx_ptype_5event_event = 0; - static PyTypeObject *__pyx_ptype_5event_read = 0; - static PyTypeObject *__pyx_ptype_5event_write = 0; - static PyTypeObject *__pyx_ptype_5event_signal = 0; - static PyTypeObject *__pyx_ptype_5event_timeout = 0; --static PyObject *__pyx_k9; --static short __pyx_k10; --static PyObject *__pyx_k11; --static PyObject *__pyx_k12; --static float __pyx_k13; --static PyObject *__pyx_k14; --static int (__pyx_f_5event___event_sigcb(void)); /*proto*/ --static void (__pyx_f_5event___event_handler(int ,short ,void (*))); /*proto*/ --static void (__pyx_f_5event___simple_event_handler(int ,short ,void (*))); /*proto*/ -- --/* Implementation of event */ -+static void __pyx_f_5event___event_handler(int,short,void *); /*proto*/ -+static void __pyx_f_5event___simple_event_handler(int,short,void *); /*proto*/ - --static char (__pyx_k1[]) = "Dug Song <dugsong@monkey.org>"; --static char (__pyx_k2[]) = "Martin Murray <mmurray@monkey.org>"; --static char (__pyx_k3[]) = "Copyright (c) 2004 Dug Song"; --static char (__pyx_k4[]) = "Copyright (c) 2003 Martin Murray"; --static char (__pyx_k6[]) = "http://monkey.org/~dugsong/pyevent/"; --static char (__pyx_k7[]) = "0.3"; -+static char __pyx_k1[] = "__callback"; -+static char __pyx_k2[] = "__simple_callback"; -+static char __pyx_k3[] = "fileno"; -+static char __pyx_k4[] = "sys"; -+static char __pyx_k5[] = "exc_info"; -+static char __pyx_k6[] = "__event_exc"; -+static char __pyx_k7[] = "EV_SIGNAL"; -+static char __pyx_k8[] = "EV_READ"; -+static char __pyx_k9[] = "EV_WRITE"; -+static char __pyx_k10[] = "EV_TIMEOUT"; -+static char __pyx_k11[] = "pending"; -+static char __pyx_k12[] = "delete"; -+static char __pyx_k13[] = "<event flags=0x%x, handle=%s, callback=%s, arg=%s>"; -+static char __pyx_k14[] = "__init__"; -+static char __pyx_k15[] = "simple"; -+static char __pyx_k16[] = "add"; -+static char __pyx_k17[] = "EV_PERSIST"; -+static char __pyx_k18[] = "Dug Song <dugsong@monkey.org>"; -+static char __pyx_k19[] = "Martin Murray <mmurray@monkey.org>"; -+static char __pyx_k20[] = "__author__"; -+static char __pyx_k21[] = "Copyright (c) 2004 Dug Song"; -+static char __pyx_k22[] = "Copyright (c) 2003 Martin Murray"; -+static char __pyx_k23[] = "__copyright__"; -+static char __pyx_k24[] = "BSD"; -+static char __pyx_k25[] = "__license__"; -+static char __pyx_k26[] = "http://monkey.org/~dugsong/pyevent/"; -+static char __pyx_k27[] = "__url__"; -+static char __pyx_k28[] = "0.3"; -+static char __pyx_k29[] = "__version__"; -+static char __pyx_k30[] = "init"; - -+static PyObject *__pyx_n_BSD; -+static PyObject *__pyx_n_EV_PERSIST; -+static PyObject *__pyx_n_EV_READ; -+static PyObject *__pyx_n_EV_SIGNAL; -+static PyObject *__pyx_n_EV_TIMEOUT; -+static PyObject *__pyx_n_EV_WRITE; - static PyObject *__pyx_n___author__; -+static PyObject *__pyx_n___callback; - static PyObject *__pyx_n___copyright__; -+static PyObject *__pyx_n___event_exc; -+static PyObject *__pyx_n___init__; - static PyObject *__pyx_n___license__; -+static PyObject *__pyx_n___simple_callback; - static PyObject *__pyx_n___url__; - static PyObject *__pyx_n___version__; --static PyObject *__pyx_n_sys; --static PyObject *__pyx_n_EV_TIMEOUT; --static PyObject *__pyx_n_EV_READ; --static PyObject *__pyx_n_EV_WRITE; --static PyObject *__pyx_n_EV_SIGNAL; --static PyObject *__pyx_n_EV_PERSIST; --static PyObject *__pyx_n___event_exc; -+static PyObject *__pyx_n_add; -+static PyObject *__pyx_n_delete; -+static PyObject *__pyx_n_exc_info; -+static PyObject *__pyx_n_fileno; - static PyObject *__pyx_n_init; --static PyObject *__pyx_n_dispatch; --static PyObject *__pyx_n_loop; --static PyObject *__pyx_n_abort; --static PyObject *__pyx_n_BSD; --static PyObject *__pyx_n_False; -+static PyObject *__pyx_n_pending; -+static PyObject *__pyx_n_simple; -+static PyObject *__pyx_n_sys; - --static PyObject *__pyx_k1p; --static PyObject *__pyx_k2p; --static PyObject *__pyx_k3p; --static PyObject *__pyx_k4p; --static PyObject *__pyx_k6p; --static PyObject *__pyx_k7p; -+static PyObject *__pyx_k13p; -+static PyObject *__pyx_k18p; -+static PyObject *__pyx_k19p; -+static PyObject *__pyx_k21p; -+static PyObject *__pyx_k22p; -+static PyObject *__pyx_k26p; -+static PyObject *__pyx_k28p; - --static int __pyx_f_5event___event_sigcb(void) { -- int __pyx_r; -+static __Pyx_StringTabEntry __pyx_string_tab[] = { -+ {&__pyx_n_BSD, 1, __pyx_k24, sizeof(__pyx_k24)}, -+ {&__pyx_n_EV_PERSIST, 1, __pyx_k17, sizeof(__pyx_k17)}, -+ {&__pyx_n_EV_READ, 1, __pyx_k8, sizeof(__pyx_k8)}, -+ {&__pyx_n_EV_SIGNAL, 1, __pyx_k7, sizeof(__pyx_k7)}, -+ {&__pyx_n_EV_TIMEOUT, 1, __pyx_k10, sizeof(__pyx_k10)}, -+ {&__pyx_n_EV_WRITE, 1, __pyx_k9, sizeof(__pyx_k9)}, -+ {&__pyx_n___author__, 1, __pyx_k20, sizeof(__pyx_k20)}, -+ {&__pyx_n___callback, 1, __pyx_k1, sizeof(__pyx_k1)}, -+ {&__pyx_n___copyright__, 1, __pyx_k23, sizeof(__pyx_k23)}, -+ {&__pyx_n___event_exc, 1, __pyx_k6, sizeof(__pyx_k6)}, -+ {&__pyx_n___init__, 1, __pyx_k14, sizeof(__pyx_k14)}, -+ {&__pyx_n___license__, 1, __pyx_k25, sizeof(__pyx_k25)}, -+ {&__pyx_n___simple_callback, 1, __pyx_k2, sizeof(__pyx_k2)}, -+ {&__pyx_n___url__, 1, __pyx_k27, sizeof(__pyx_k27)}, -+ {&__pyx_n___version__, 1, __pyx_k29, sizeof(__pyx_k29)}, -+ {&__pyx_n_add, 1, __pyx_k16, sizeof(__pyx_k16)}, -+ {&__pyx_n_delete, 1, __pyx_k12, sizeof(__pyx_k12)}, -+ {&__pyx_n_exc_info, 1, __pyx_k5, sizeof(__pyx_k5)}, -+ {&__pyx_n_fileno, 1, __pyx_k3, sizeof(__pyx_k3)}, -+ {&__pyx_n_init, 1, __pyx_k30, sizeof(__pyx_k30)}, -+ {&__pyx_n_pending, 1, __pyx_k11, sizeof(__pyx_k11)}, -+ {&__pyx_n_simple, 1, __pyx_k15, sizeof(__pyx_k15)}, -+ {&__pyx_n_sys, 1, __pyx_k4, sizeof(__pyx_k4)}, -+ {&__pyx_k13p, 0, __pyx_k13, sizeof(__pyx_k13)}, -+ {&__pyx_k18p, 0, __pyx_k18, sizeof(__pyx_k18)}, -+ {&__pyx_k19p, 0, __pyx_k19, sizeof(__pyx_k19)}, -+ {&__pyx_k21p, 0, __pyx_k21, sizeof(__pyx_k21)}, -+ {&__pyx_k22p, 0, __pyx_k22, sizeof(__pyx_k22)}, -+ {&__pyx_k26p, 0, __pyx_k26, sizeof(__pyx_k26)}, -+ {&__pyx_k28p, 0, __pyx_k28, sizeof(__pyx_k28)}, -+ {0, 0, 0, 0} -+}; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":66 */ -- __pyx_r = (-1); -- goto __pyx_L0; -+static PyObject *__pyx_d1; -+static short __pyx_d2; -+static PyObject *__pyx_d3; -+static PyObject *__pyx_d4; -+static float __pyx_d5; -+static PyObject *__pyx_d6; - -- __pyx_r = 0; -- goto __pyx_L0; -- __pyx_L1:; -- __Pyx_WriteUnraisable("event.__event_sigcb"); -- __pyx_L0:; -- return __pyx_r; --} - --static PyObject *__pyx_n___callback; -+/* Implementation of event */ - --static void __pyx_f_5event___event_handler(int __pyx_v_fd,short __pyx_v_evtype,void (*__pyx_v_arg)) { -+static void __pyx_f_5event___event_handler(int __pyx_v_fd,short __pyx_v_evtype,void *__pyx_v_arg) { - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; - PyObject *__pyx_3 = 0; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":69 */ -- __pyx_1 = (PyObject *)__pyx_v_arg; -- Py_INCREF(__pyx_1); -- __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n___callback); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} -+ __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arg), __pyx_n___callback); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;} -+ __pyx_2 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;} -+ __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;} -+ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); -+ __pyx_2 = 0; -+ __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} -- __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} -- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); -- __pyx_1 = 0; -- __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} -- Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; -- Py_DECREF(__pyx_1); __pyx_1 = 0; -+ Py_DECREF(__pyx_2); __pyx_2 = 0; - - goto __pyx_L0; - __pyx_L1:; -@@ -173,26 +235,19 @@ static void __pyx_f_5event___event_handl - __pyx_L0:; - } - --static PyObject *__pyx_n___simple_callback; -- --static void __pyx_f_5event___simple_event_handler(int __pyx_v_fd,short __pyx_v_evtype,void (*__pyx_v_arg)) { -+static void __pyx_f_5event___simple_event_handler(int __pyx_v_fd,short __pyx_v_evtype,void *__pyx_v_arg) { - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; - PyObject *__pyx_3 = 0; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":72 */ -- __pyx_1 = (PyObject *)__pyx_v_arg; -- Py_INCREF(__pyx_1); -- __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n___simple_callback); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} -+ __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arg), __pyx_n___simple_callback); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} -+ __pyx_2 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} -+ __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} -+ PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); -+ __pyx_2 = 0; -+ __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} -- __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} -- PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); -- __pyx_1 = 0; -- __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; goto __pyx_L1;} -- Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; -- Py_DECREF(__pyx_1); __pyx_1 = 0; -+ Py_DECREF(__pyx_2); __pyx_2 = 0; - - goto __pyx_L0; - __pyx_L1:; -@@ -203,10 +258,6 @@ static void __pyx_f_5event___simple_even - __pyx_L0:; - } - --static PyObject *__pyx_n_isinstance; --static PyObject *__pyx_n_int; --static PyObject *__pyx_n_fileno; -- - static int __pyx_f_5event_5event___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static int __pyx_f_5event_5event___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyObject *__pyx_v_callback = 0; -@@ -214,18 +265,17 @@ static int __pyx_f_5event_5event___init_ - short __pyx_v_evtype; - PyObject *__pyx_v_handle = 0; - PyObject *__pyx_v_simple = 0; -- void ((*__pyx_v_handler)(int ,short ,void (*))); -+ __pyx_t_5event_event_handler __pyx_v_handler; - int __pyx_r; - PyObject *__pyx_1 = 0; - int __pyx_2; - int __pyx_3; - PyObject *__pyx_4 = 0; -- PyObject *__pyx_5 = 0; - static char *__pyx_argnames[] = {"callback","arg","evtype","handle","simple",0}; -- __pyx_v_arg = __pyx_k9; -- __pyx_v_evtype = __pyx_k10; -- __pyx_v_handle = __pyx_k11; -- __pyx_v_simple = __pyx_k12; -+ __pyx_v_arg = __pyx_d1; -+ __pyx_v_evtype = __pyx_d2; -+ __pyx_v_handle = __pyx_d3; -+ __pyx_v_simple = __pyx_d4; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|OhOO", __pyx_argnames, &__pyx_v_callback, &__pyx_v_arg, &__pyx_v_evtype, &__pyx_v_handle, &__pyx_v_simple)) return -1; - Py_INCREF(__pyx_v_self); - Py_INCREF(__pyx_v_callback); -@@ -233,78 +283,57 @@ static int __pyx_f_5event_5event___init_ - Py_INCREF(__pyx_v_handle); - Py_INCREF(__pyx_v_simple); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":96 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":93 */ - Py_INCREF(__pyx_v_callback); - Py_DECREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->callback); - ((struct __pyx_obj_5event_event *)__pyx_v_self)->callback = __pyx_v_callback; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":97 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":94 */ - Py_INCREF(__pyx_v_arg); - Py_DECREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->args); - ((struct __pyx_obj_5event_event *)__pyx_v_self)->args = __pyx_v_arg; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":98 */ -- __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":95 */ -+ __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; goto __pyx_L1;} - Py_DECREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->evtype); - ((struct __pyx_obj_5event_event *)__pyx_v_self)->evtype = __pyx_1; - __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":99 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":96 */ - Py_INCREF(__pyx_v_handle); - Py_DECREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->handle); - ((struct __pyx_obj_5event_event *)__pyx_v_self)->handle = __pyx_v_handle; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":100 */ -- __pyx_2 = PyObject_IsTrue(__pyx_v_simple); if (__pyx_2 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":97 */ -+ __pyx_2 = PyObject_IsTrue(__pyx_v_simple); if (__pyx_2 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; goto __pyx_L1;} - if (__pyx_2) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":101 */ - __pyx_v_handler = __pyx_f_5event___simple_event_handler; - goto __pyx_L2; - } - /*else*/ { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":103 */ - __pyx_v_handler = __pyx_f_5event___event_handler; - } - __pyx_L2:; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":104 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":101 */ - __pyx_2 = (__pyx_v_evtype == 0); - if (__pyx_2) { -- __pyx_3 = PyObject_IsTrue(__pyx_v_handle); if (__pyx_3 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; goto __pyx_L1;} -+ __pyx_3 = PyObject_IsTrue(__pyx_v_handle); if (__pyx_3 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; goto __pyx_L1;} - __pyx_2 = (!__pyx_3); - } - if (__pyx_2) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":105 */ -- evtimer_set((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_v_handler,((void (*))__pyx_v_self)); -+ evtimer_set((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_v_handler,((void *)__pyx_v_self)); - goto __pyx_L3; - } - /*else*/ { - -- /* "/Users/dugsong/projects/pyevent/event.pyx":107 */ -- __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;} -- __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;} -- __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;} -- Py_INCREF(__pyx_v_handle); -- PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_handle); -- PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); -- __pyx_4 = 0; -- __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;} -- Py_DECREF(__pyx_1); __pyx_1 = 0; -- Py_DECREF(__pyx_5); __pyx_5 = 0; -- __pyx_3 = PyObject_IsTrue(__pyx_4); if (__pyx_3 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; goto __pyx_L1;} -- Py_DECREF(__pyx_4); __pyx_4 = 0; -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":104 */ -+ __pyx_3 = PyObject_IsInstance(__pyx_v_handle,((PyObject *)(&PyInt_Type))); if (__pyx_3 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; goto __pyx_L1;} - __pyx_2 = (!__pyx_3); - if (__pyx_2) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":108 */ -- __pyx_1 = PyObject_GetAttr(__pyx_v_handle, __pyx_n_fileno); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;} -- __pyx_5 = PyTuple_New(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;} -- __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; goto __pyx_L1;} -+ __pyx_1 = PyObject_GetAttr(__pyx_v_handle, __pyx_n_fileno); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; goto __pyx_L1;} -+ __pyx_4 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- Py_DECREF(__pyx_5); __pyx_5 = 0; - Py_DECREF(__pyx_v_handle); - __pyx_v_handle = __pyx_4; - __pyx_4 = 0; -@@ -312,9 +341,9 @@ static int __pyx_f_5event_5event___init_ - } - __pyx_L4:; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":109 */ -- __pyx_3 = PyInt_AsLong(__pyx_v_handle); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 109; goto __pyx_L1;} -- event_set((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_3,__pyx_v_evtype,__pyx_v_handler,((void (*))__pyx_v_self)); -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":106 */ -+ __pyx_3 = PyInt_AsLong(__pyx_v_handle); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; goto __pyx_L1;} -+ event_set((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_3,__pyx_v_evtype,__pyx_v_handler,((void *)__pyx_v_self)); - } - __pyx_L3:; - -@@ -323,7 +352,6 @@ static int __pyx_f_5event_5event___init_ - __pyx_L1:; - Py_XDECREF(__pyx_1); - Py_XDECREF(__pyx_4); -- Py_XDECREF(__pyx_5); - __Pyx_AddTraceback("event.event.__init__"); - __pyx_r = -1; - __pyx_L0:; -@@ -335,51 +363,41 @@ static int __pyx_f_5event_5event___init_ - return __pyx_r; - } - --static PyObject *__pyx_n_exc_info; -- - static PyObject *__pyx_f_5event_5event___simple_callback(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static PyObject *__pyx_f_5event_5event___simple_callback(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - short __pyx_v_evtype; -- extern int event_gotsig; -- extern int ((*event_sigcb)(void)); - PyObject *__pyx_r; - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; - int __pyx_3; - PyObject *__pyx_4 = 0; -- int __pyx_5; -- short __pyx_6; -+ PyObject *__pyx_5 = 0; -+ PyObject *__pyx_6 = 0; -+ int __pyx_7; -+ short __pyx_8; - static char *__pyx_argnames[] = {"evtype",0}; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "h", __pyx_argnames, &__pyx_v_evtype)) return 0; - Py_INCREF(__pyx_v_self); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":115 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":110 */ - /*try:*/ { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":116 */ -- __pyx_1 = PySequence_Tuple(((struct __pyx_obj_5event_event *)__pyx_v_self)->args); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L2;} -- __pyx_2 = PyObject_CallObject(((struct __pyx_obj_5event_event *)__pyx_v_self)->callback, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L2;} -+ __pyx_1 = PySequence_Tuple(((struct __pyx_obj_5event_event *)__pyx_v_self)->args); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L2;} -+ __pyx_2 = PyObject_CallObject(((struct __pyx_obj_5event_event *)__pyx_v_self)->callback, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L2;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- if (PyObject_Cmp(__pyx_2, Py_None, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L2;} -+ if (PyObject_Cmp(__pyx_2, Py_None, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; goto __pyx_L2;} - __pyx_3 = __pyx_3 != 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; - if (__pyx_3) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":117 */ - __pyx_3 = ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec; - if (!__pyx_3) { - __pyx_3 = ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_usec; - } - if (__pyx_3) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":118 */ - event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),(&((struct __pyx_obj_5event_event *)__pyx_v_self)->tv)); - goto __pyx_L5; - } - /*else*/ { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":120 */ -- event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),0); -+ event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),NULL); - } - __pyx_L5:; - goto __pyx_L4; -@@ -391,73 +409,65 @@ static PyObject *__pyx_f_5event_5event__ - Py_XDECREF(__pyx_1); __pyx_1 = 0; - Py_XDECREF(__pyx_2); __pyx_2 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":121 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":116 */ - /*except:*/ { - __Pyx_AddTraceback("event.__simple_callback"); -- __pyx_1 = __Pyx_GetExcValue(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;} -- Py_DECREF(__pyx_1); __pyx_1 = 0; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":122 */ -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;} -- __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_exc_info); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;} -- Py_DECREF(__pyx_2); __pyx_2 = 0; -- __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;} -- __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;} -+ if (__Pyx_GetException(&__pyx_1, &__pyx_2, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; goto __pyx_L1;} -+ __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; goto __pyx_L1;} -+ __pyx_6 = PyObject_GetAttr(__pyx_5, __pyx_n_exc_info); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; goto __pyx_L1;} -+ Py_DECREF(__pyx_5); __pyx_5 = 0; -+ __pyx_5 = PyObject_CallObject(__pyx_6, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; goto __pyx_L1;} -+ Py_DECREF(__pyx_6); __pyx_6 = 0; -+ if (PyObject_SetAttr(__pyx_m, __pyx_n___event_exc, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; goto __pyx_L1;} -+ Py_DECREF(__pyx_5); __pyx_5 = 0; - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; -- if (PyObject_SetAttr(__pyx_m, __pyx_n___event_exc, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; goto __pyx_L1;} - Py_DECREF(__pyx_4); __pyx_4 = 0; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":123 */ -- event_sigcb = __pyx_f_5event___event_sigcb; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":124 */ -- event_gotsig = 1; - goto __pyx_L3; - } - __pyx_L3:; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":126 */ -- __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;} -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;} -- __pyx_4 = PyNumber_And(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":119 */ -+ __pyx_6 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 119; goto __pyx_L1;} -+ __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 119; goto __pyx_L1;} -+ __pyx_1 = PyNumber_And(__pyx_6, __pyx_5); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 119; goto __pyx_L1;} -+ Py_DECREF(__pyx_6); __pyx_6 = 0; -+ Py_DECREF(__pyx_5); __pyx_5 = 0; -+ __pyx_7 = PyObject_IsTrue(__pyx_1); if (__pyx_7 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 119; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- Py_DECREF(__pyx_2); __pyx_2 = 0; -- __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L1;} -- Py_DECREF(__pyx_4); __pyx_4 = 0; -- __pyx_3 = (!__pyx_5); -+ __pyx_3 = (!__pyx_7); - if (__pyx_3) { -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} -- __pyx_4 = PyNumber_Or(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} -- Py_DECREF(__pyx_1); __pyx_1 = 0; -+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} -+ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} -+ __pyx_6 = PyNumber_Or(__pyx_2, __pyx_4); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} -- __pyx_2 = PyNumber_Or(__pyx_4, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} - Py_DECREF(__pyx_4); __pyx_4 = 0; -+ __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} -+ __pyx_1 = PyNumber_Or(__pyx_6, __pyx_5); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} -+ Py_DECREF(__pyx_6); __pyx_6 = 0; -+ Py_DECREF(__pyx_5); __pyx_5 = 0; -+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} -+ __pyx_4 = PyNumber_Or(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} -- __pyx_1 = PyNumber_Or(__pyx_2, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; -+ __pyx_8 = PyInt_AsLong(__pyx_4); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} - Py_DECREF(__pyx_4); __pyx_4 = 0; -- __pyx_6 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} -- Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_3 = (!event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_6,0)); -+ __pyx_3 = (!event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_8,NULL)); - } - if (__pyx_3) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":128 */ - Py_DECREF(__pyx_v_self); - goto __pyx_L6; - } - __pyx_L6:; - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -+ __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); - Py_XDECREF(__pyx_2); - Py_XDECREF(__pyx_4); -+ Py_XDECREF(__pyx_5); -+ Py_XDECREF(__pyx_6); - __Pyx_AddTraceback("event.event.__simple_callback"); - __pyx_r = 0; - __pyx_L0:; -@@ -468,24 +478,22 @@ static PyObject *__pyx_f_5event_5event__ - static PyObject *__pyx_f_5event_5event___callback(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static PyObject *__pyx_f_5event_5event___callback(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - short __pyx_v_evtype; -- extern int event_gotsig; -- extern int ((*event_sigcb)(void)); - PyObject *__pyx_r; - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; - PyObject *__pyx_3 = 0; -- short __pyx_4; -- int __pyx_5; -+ PyObject *__pyx_4 = 0; -+ PyObject *__pyx_5 = 0; -+ short __pyx_6; -+ int __pyx_7; - static char *__pyx_argnames[] = {"evtype",0}; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "h", __pyx_argnames, &__pyx_v_evtype)) return 0; - Py_INCREF(__pyx_v_self); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":134 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":125 */ - /*try:*/ { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":135 */ -- __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; goto __pyx_L2;} -- __pyx_2 = PyTuple_New(4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; goto __pyx_L2;} -+ __pyx_1 = PyInt_FromLong(__pyx_v_evtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L2;} -+ __pyx_2 = PyTuple_New(4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L2;} - Py_INCREF(__pyx_v_self); - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_self); - Py_INCREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->handle); -@@ -494,7 +502,7 @@ static PyObject *__pyx_f_5event_5event__ - Py_INCREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->args); - PyTuple_SET_ITEM(__pyx_2, 3, ((struct __pyx_obj_5event_event *)__pyx_v_self)->args); - __pyx_1 = 0; -- __pyx_1 = PyObject_CallObject(((struct __pyx_obj_5event_event *)__pyx_v_self)->callback, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 135; goto __pyx_L2;} -+ __pyx_1 = PyObject_CallObject(((struct __pyx_obj_5event_event *)__pyx_v_self)->callback, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; goto __pyx_L2;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_1); __pyx_1 = 0; - } -@@ -503,63 +511,55 @@ static PyObject *__pyx_f_5event_5event__ - Py_XDECREF(__pyx_2); __pyx_2 = 0; - Py_XDECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":136 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":127 */ - /*except:*/ { - __Pyx_AddTraceback("event.__callback"); -- __pyx_2 = __Pyx_GetExcValue(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; goto __pyx_L1;} -- Py_DECREF(__pyx_2); __pyx_2 = 0; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":137 */ -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;} -- __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_exc_info); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;} -- Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_1 = PyTuple_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;} -- __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;} -+ if (__Pyx_GetException(&__pyx_2, &__pyx_1, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; goto __pyx_L1;} -+ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_sys); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; goto __pyx_L1;} -+ __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_exc_info); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; goto __pyx_L1;} -+ Py_DECREF(__pyx_4); __pyx_4 = 0; -+ __pyx_4 = PyObject_CallObject(__pyx_5, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; goto __pyx_L1;} -+ Py_DECREF(__pyx_5); __pyx_5 = 0; -+ if (PyObject_SetAttr(__pyx_m, __pyx_n___event_exc, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; goto __pyx_L1;} -+ Py_DECREF(__pyx_4); __pyx_4 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_1); __pyx_1 = 0; -- if (PyObject_SetAttr(__pyx_m, __pyx_n___event_exc, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 137; goto __pyx_L1;} - Py_DECREF(__pyx_3); __pyx_3 = 0; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":138 */ -- event_sigcb = __pyx_f_5event___event_sigcb; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":139 */ -- event_gotsig = 1; - goto __pyx_L3; - } - __pyx_L3:; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":140 */ -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;} -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;} -- __pyx_3 = PyNumber_Or(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;} -- Py_DECREF(__pyx_2); __pyx_2 = 0; -- Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;} -- __pyx_1 = PyNumber_Or(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;} -- Py_DECREF(__pyx_3); __pyx_3 = 0; -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":129 */ -+ __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} -+ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} -+ __pyx_2 = PyNumber_Or(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} -+ Py_DECREF(__pyx_5); __pyx_5 = 0; -+ Py_DECREF(__pyx_4); __pyx_4 = 0; -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} -+ __pyx_3 = PyNumber_Or(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; -- __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;} -- __pyx_2 = PyNumber_Or(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -+ __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} -+ __pyx_4 = PyNumber_Or(__pyx_3, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} - Py_DECREF(__pyx_3); __pyx_3 = 0; -- __pyx_4 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; goto __pyx_L1;} -- Py_DECREF(__pyx_2); __pyx_2 = 0; -- __pyx_5 = (!event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_4,0)); -- if (__pyx_5) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":141 */ -+ Py_DECREF(__pyx_5); __pyx_5 = 0; -+ __pyx_6 = PyInt_AsLong(__pyx_4); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} -+ Py_DECREF(__pyx_4); __pyx_4 = 0; -+ __pyx_7 = (!event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_6,NULL)); -+ if (__pyx_7) { - Py_DECREF(__pyx_v_self); - goto __pyx_L4; - } - __pyx_L4:; - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -+ __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); - Py_XDECREF(__pyx_2); - Py_XDECREF(__pyx_3); -+ Py_XDECREF(__pyx_4); -+ Py_XDECREF(__pyx_5); - __Pyx_AddTraceback("event.event.__callback"); - __pyx_r = 0; - __pyx_L0:; -@@ -578,64 +578,62 @@ static PyObject *__pyx_f_5event_5event_a - short __pyx_4; - int __pyx_5; - static char *__pyx_argnames[] = {"timeout",0}; -- __pyx_v_timeout = __pyx_k13; -+ __pyx_v_timeout = __pyx_d5; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|f", __pyx_argnames, &__pyx_v_timeout)) return 0; - Py_INCREF(__pyx_v_self); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":150 */ -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;} -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;} -- __pyx_3 = PyNumber_Or(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":139 */ -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;} -+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;} -+ __pyx_3 = PyNumber_Or(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;} -- __pyx_2 = PyNumber_Or(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;} -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;} -+ __pyx_2 = PyNumber_Or(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;} - Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;} -- __pyx_1 = PyNumber_Or(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;} -+ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;} -+ __pyx_1 = PyNumber_Or(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; -- __pyx_4 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; goto __pyx_L1;} -+ __pyx_4 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_5 = (!event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_4,0)); -+ __pyx_5 = (!event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_4,NULL)); - if (__pyx_5) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":152 */ - Py_INCREF(__pyx_v_self); - goto __pyx_L2; - } - __pyx_L2:; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":153 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":142 */ - ((struct __pyx_obj_5event_event *)__pyx_v_self)->timeout = __pyx_v_timeout; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":154 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":143 */ - __pyx_5 = (__pyx_v_timeout >= 0.0); - if (__pyx_5) { - -- /* "/Users/dugsong/projects/pyevent/event.pyx":155 */ -- ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec = ((long )__pyx_v_timeout); -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":144 */ -+ ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec = ((unsigned int)__pyx_v_timeout); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":156 */ -- ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_usec = ((__pyx_v_timeout - ((float )((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec)) * 1000000.0); -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":145 */ -+ ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_usec = (((long)(__pyx_v_timeout - ((float)((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec))) * 1000000); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":157 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":146 */ - event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),(&((struct __pyx_obj_5event_event *)__pyx_v_self)->tv)); - goto __pyx_L3; - } - /*else*/ { - -- /* "/Users/dugsong/projects/pyevent/event.pyx":159 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":148 */ - ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_sec = 0; - ((struct __pyx_obj_5event_event *)__pyx_v_self)->tv.tv_usec = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":160 */ -- event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),0); -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":149 */ -+ event_add((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),NULL); - } - __pyx_L3:; - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -+ __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); -@@ -659,29 +657,27 @@ static PyObject *__pyx_f_5event_5event_p - static char *__pyx_argnames[] = {0}; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; - Py_INCREF(__pyx_v_self); -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":164 */ -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -- __pyx_3 = PyNumber_Or(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_TIMEOUT); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} -+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} -+ __pyx_3 = PyNumber_Or(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -- __pyx_2 = PyNumber_Or(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} -+ __pyx_2 = PyNumber_Or(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} - Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -- __pyx_1 = PyNumber_Or(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -+ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} -+ __pyx_1 = PyNumber_Or(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; -- __pyx_4 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -+ __pyx_4 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- __pyx_2 = PyInt_FromLong(event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_4,0)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} -+ __pyx_2 = PyInt_FromLong(event_pending((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev),__pyx_4,NULL)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; goto __pyx_L1;} - __pyx_r = __pyx_2; - __pyx_2 = 0; - goto __pyx_L0; - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -+ __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); -@@ -694,45 +690,37 @@ static PyObject *__pyx_f_5event_5event_p - return __pyx_r; - } - --static PyObject *__pyx_n_pending; -- - static PyObject *__pyx_f_5event_5event_delete(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static char __pyx_doc_5event_5event_delete[] = "Remove event from the event queue."; - static PyObject *__pyx_f_5event_5event_delete(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyObject *__pyx_r; - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; -- PyObject *__pyx_3 = 0; -- int __pyx_4; -+ int __pyx_3; - static char *__pyx_argnames[] = {0}; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; - Py_INCREF(__pyx_v_self); -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":168 */ -- __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_pending); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;} -- __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;} -- __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;} -+ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_pending); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; goto __pyx_L1;} -+ __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -+ __pyx_3 = PyObject_IsTrue(__pyx_2); if (__pyx_3 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 157; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; -- __pyx_4 = PyObject_IsTrue(__pyx_3); if (__pyx_4 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;} -- Py_DECREF(__pyx_3); __pyx_3 = 0; -- if (__pyx_4) { -+ if (__pyx_3) { - -- /* "/Users/dugsong/projects/pyevent/event.pyx":169 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":158 */ - event_del((&((struct __pyx_obj_5event_event *)__pyx_v_self)->ev)); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":170 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":159 */ - Py_DECREF(__pyx_v_self); - goto __pyx_L2; - } - __pyx_L2:; - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -+ __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); - Py_XDECREF(__pyx_2); -- Py_XDECREF(__pyx_3); - __Pyx_AddTraceback("event.event.delete"); - __pyx_r = 0; - __pyx_L0:; -@@ -740,47 +728,33 @@ static PyObject *__pyx_f_5event_5event_d - return __pyx_r; - } - --static PyObject *__pyx_n_delete; -- - static void __pyx_f_5event_5event___dealloc__(PyObject *__pyx_v_self); /*proto*/ - static void __pyx_f_5event_5event___dealloc__(PyObject *__pyx_v_self) { - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; -- PyObject *__pyx_3 = 0; - Py_INCREF(__pyx_v_self); -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":173 */ -- __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_delete); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;} -- __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;} -- __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;} -+ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_delete); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; goto __pyx_L1;} -+ __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; -- Py_DECREF(__pyx_3); __pyx_3 = 0; - - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); - Py_XDECREF(__pyx_2); -- Py_XDECREF(__pyx_3); - __Pyx_AddTraceback("event.event.__dealloc__"); - __pyx_L0:; - Py_DECREF(__pyx_v_self); - } - --static PyObject *__pyx_k15p; -- --static char (__pyx_k15[]) = "<event flags=0x%x, handle=%s, callback=%s, arg=%s>"; -- - static PyObject *__pyx_f_5event_5event___repr__(PyObject *__pyx_v_self); /*proto*/ - static PyObject *__pyx_f_5event_5event___repr__(PyObject *__pyx_v_self) { - PyObject *__pyx_r; - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; - Py_INCREF(__pyx_v_self); -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":176 */ -- __pyx_1 = PyInt_FromLong(((struct __pyx_obj_5event_event *)__pyx_v_self)->ev.ev_flags); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 177; goto __pyx_L1;} -- __pyx_2 = PyTuple_New(4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 177; goto __pyx_L1;} -+ __pyx_1 = PyInt_FromLong(((struct __pyx_obj_5event_event *)__pyx_v_self)->ev.ev_flags); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;} -+ __pyx_2 = PyTuple_New(4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;} - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1); - Py_INCREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->handle); - PyTuple_SET_ITEM(__pyx_2, 1, ((struct __pyx_obj_5event_event *)__pyx_v_self)->handle); -@@ -789,13 +763,13 @@ static PyObject *__pyx_f_5event_5event__ - Py_INCREF(((struct __pyx_obj_5event_event *)__pyx_v_self)->args); - PyTuple_SET_ITEM(__pyx_2, 3, ((struct __pyx_obj_5event_event *)__pyx_v_self)->args); - __pyx_1 = 0; -- __pyx_1 = PyNumber_Remainder(__pyx_k15p, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;} -+ __pyx_1 = PyNumber_Remainder(__pyx_k13p, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_r = __pyx_1; - __pyx_1 = 0; - goto __pyx_L0; - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -+ __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); -@@ -807,11 +781,6 @@ static PyObject *__pyx_f_5event_5event__ - return __pyx_r; - } - --static PyObject *__pyx_n___init__; --static PyObject *__pyx_n_simple; --static PyObject *__pyx_n_add; -- -- - static int __pyx_f_5event_4read___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static int __pyx_f_5event_4read___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyObject *__pyx_v_handle = 0; -@@ -823,7 +792,7 @@ static int __pyx_f_5event_4read___init__ - PyObject *__pyx_3 = 0; - PyObject *__pyx_4 = 0; - static char *__pyx_argnames[] = {"handle","callback",0}; -- if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 2, &__pyx_v_args, 0) < 0) return -1; -+ if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 2, &__pyx_v_args, 0, 0) < 0) return -1; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_handle, &__pyx_v_callback)) { - Py_XDECREF(__pyx_args); - Py_XDECREF(__pyx_kwds); -@@ -834,11 +803,11 @@ static int __pyx_f_5event_4read___init__ - Py_INCREF(__pyx_v_handle); - Py_INCREF(__pyx_v_callback); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":193 */ -- __pyx_1 = PyObject_GetAttr(((PyObject*)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;} -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;} -- __pyx_3 = PyTuple_New(5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;} -- Py_INCREF((PyObject *)__pyx_v_self); -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":182 */ -+ __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} -+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_READ); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} -+ __pyx_3 = PyTuple_New(5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} -+ Py_INCREF(__pyx_v_self); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_self); - Py_INCREF(__pyx_v_callback); - PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_callback); -@@ -848,28 +817,26 @@ static int __pyx_f_5event_4read___init__ - Py_INCREF(__pyx_v_handle); - PyTuple_SET_ITEM(__pyx_3, 4, __pyx_v_handle); - __pyx_2 = 0; -- __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;} -- __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;} -- if (PyDict_SetItem(__pyx_2, __pyx_n_simple, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;} -+ __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} -+ __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} -+ if (PyDict_SetItem(__pyx_2, __pyx_n_simple, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} - Py_DECREF(__pyx_4); __pyx_4 = 0; -- __pyx_4 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; goto __pyx_L1;} -+ __pyx_4 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_4); __pyx_4 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":194 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":183 */ - Py_INCREF(__pyx_v_args); - Py_DECREF(((struct __pyx_obj_5event_read *)__pyx_v_self)->__pyx_base.args); - ((struct __pyx_obj_5event_read *)__pyx_v_self)->__pyx_base.args = __pyx_v_args; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":195 */ -- __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;} -- __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;} -- __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":184 */ -+ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; goto __pyx_L1;} -+ __pyx_3 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; -- Py_DECREF(__pyx_2); __pyx_2 = 0; - - __pyx_r = 0; - goto __pyx_L0; -@@ -890,7 +857,6 @@ static int __pyx_f_5event_4read___init__ - return __pyx_r; - } - -- - static int __pyx_f_5event_5write___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static int __pyx_f_5event_5write___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyObject *__pyx_v_handle = 0; -@@ -902,7 +868,7 @@ static int __pyx_f_5event_5write___init_ - PyObject *__pyx_3 = 0; - PyObject *__pyx_4 = 0; - static char *__pyx_argnames[] = {"handle","callback",0}; -- if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 2, &__pyx_v_args, 0) < 0) return -1; -+ if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 2, &__pyx_v_args, 0, 0) < 0) return -1; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_handle, &__pyx_v_callback)) { - Py_XDECREF(__pyx_args); - Py_XDECREF(__pyx_kwds); -@@ -913,11 +879,11 @@ static int __pyx_f_5event_5write___init_ - Py_INCREF(__pyx_v_handle); - Py_INCREF(__pyx_v_callback); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":211 */ -- __pyx_1 = PyObject_GetAttr(((PyObject*)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;} -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;} -- __pyx_3 = PyTuple_New(5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;} -- Py_INCREF((PyObject *)__pyx_v_self); -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":200 */ -+ __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;} -+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_WRITE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;} -+ __pyx_3 = PyTuple_New(5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;} -+ Py_INCREF(__pyx_v_self); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_self); - Py_INCREF(__pyx_v_callback); - PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_callback); -@@ -927,28 +893,26 @@ static int __pyx_f_5event_5write___init_ - Py_INCREF(__pyx_v_handle); - PyTuple_SET_ITEM(__pyx_3, 4, __pyx_v_handle); - __pyx_2 = 0; -- __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;} -- __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;} -- if (PyDict_SetItem(__pyx_2, __pyx_n_simple, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;} -+ __pyx_2 = PyDict_New(); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;} -+ __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;} -+ if (PyDict_SetItem(__pyx_2, __pyx_n_simple, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;} - Py_DECREF(__pyx_4); __pyx_4 = 0; -- __pyx_4 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; goto __pyx_L1;} -+ __pyx_4 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_4); __pyx_4 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":212 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":201 */ - Py_INCREF(__pyx_v_args); - Py_DECREF(((struct __pyx_obj_5event_write *)__pyx_v_self)->__pyx_base.args); - ((struct __pyx_obj_5event_write *)__pyx_v_self)->__pyx_base.args = __pyx_v_args; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":213 */ -- __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;} -- __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;} -- __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":202 */ -+ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 202; goto __pyx_L1;} -+ __pyx_3 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 202; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; -- Py_DECREF(__pyx_2); __pyx_2 = 0; - - __pyx_r = 0; - goto __pyx_L0; -@@ -969,7 +933,6 @@ static int __pyx_f_5event_5write___init_ - return __pyx_r; - } - -- - static int __pyx_f_5event_6signal___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static int __pyx_f_5event_6signal___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyObject *__pyx_v_sig = 0; -@@ -981,7 +944,7 @@ static int __pyx_f_5event_6signal___init - PyObject *__pyx_3 = 0; - PyObject *__pyx_4 = 0; - static char *__pyx_argnames[] = {"sig","callback",0}; -- if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 2, &__pyx_v_args, 0) < 0) return -1; -+ if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 2, &__pyx_v_args, 0, 0) < 0) return -1; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_sig, &__pyx_v_callback)) { - Py_XDECREF(__pyx_args); - Py_XDECREF(__pyx_kwds); -@@ -992,15 +955,15 @@ static int __pyx_f_5event_6signal___init - Py_INCREF(__pyx_v_sig); - Py_INCREF(__pyx_v_callback); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":230 */ -- __pyx_1 = PyObject_GetAttr(((PyObject*)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;} -- __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;} -- __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_EV_PERSIST); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;} -- __pyx_4 = PyNumber_Or(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":219 */ -+ __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;} -+ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n_EV_SIGNAL); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;} -+ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_EV_PERSIST); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;} -+ __pyx_4 = PyNumber_Or(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; -- __pyx_2 = PyTuple_New(5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;} -- Py_INCREF((PyObject *)__pyx_v_self); -+ __pyx_2 = PyTuple_New(5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;} -+ Py_INCREF(__pyx_v_self); - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_self); - Py_INCREF(__pyx_v_callback); - PyTuple_SET_ITEM(__pyx_2, 1, __pyx_v_callback); -@@ -1010,28 +973,26 @@ static int __pyx_f_5event_6signal___init - Py_INCREF(__pyx_v_sig); - PyTuple_SET_ITEM(__pyx_2, 4, __pyx_v_sig); - __pyx_4 = 0; -- __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;} -- __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; goto __pyx_L1;} -- if (PyDict_SetItem(__pyx_3, __pyx_n_simple, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;} -+ __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;} -+ __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;} -+ if (PyDict_SetItem(__pyx_3, __pyx_n_simple, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;} - Py_DECREF(__pyx_4); __pyx_4 = 0; -- __pyx_4 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; goto __pyx_L1;} -+ __pyx_4 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_4); __pyx_4 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":232 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":221 */ - Py_INCREF(__pyx_v_args); - Py_DECREF(((struct __pyx_obj_5event_signal *)__pyx_v_self)->__pyx_base.args); - ((struct __pyx_obj_5event_signal *)__pyx_v_self)->__pyx_base.args = __pyx_v_args; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":233 */ -- __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;} -- __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;} -- __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":222 */ -+ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;} -+ __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; -- Py_DECREF(__pyx_3); __pyx_3 = 0; - - __pyx_r = 0; - goto __pyx_L0; -@@ -1052,7 +1013,6 @@ static int __pyx_f_5event_6signal___init - return __pyx_r; - } - -- - static int __pyx_f_5event_7timeout___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static int __pyx_f_5event_7timeout___init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - PyObject *__pyx_v_secs = 0; -@@ -1064,7 +1024,7 @@ static int __pyx_f_5event_7timeout___ini - PyObject *__pyx_3 = 0; - PyObject *__pyx_4 = 0; - static char *__pyx_argnames[] = {"secs","callback",0}; -- if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 2, &__pyx_v_args, 0) < 0) return -1; -+ if (__Pyx_GetStarArgs(&__pyx_args, &__pyx_kwds, __pyx_argnames, 2, &__pyx_v_args, 0, 0) < 0) return -1; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO", __pyx_argnames, &__pyx_v_secs, &__pyx_v_callback)) { - Py_XDECREF(__pyx_args); - Py_XDECREF(__pyx_kwds); -@@ -1075,36 +1035,36 @@ static int __pyx_f_5event_7timeout___ini - Py_INCREF(__pyx_v_secs); - Py_INCREF(__pyx_v_callback); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":249 */ -- __pyx_1 = PyObject_GetAttr(((PyObject*)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;} -- __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;} -- Py_INCREF((PyObject *)__pyx_v_self); -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":238 */ -+ __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_ptype_5event_event), __pyx_n___init__); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; goto __pyx_L1;} -+ __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; goto __pyx_L1;} -+ Py_INCREF(__pyx_v_self); - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_self); - Py_INCREF(__pyx_v_callback); - PyTuple_SET_ITEM(__pyx_2, 1, __pyx_v_callback); - Py_INCREF(__pyx_v_args); - PyTuple_SET_ITEM(__pyx_2, 2, __pyx_v_args); -- __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;} -- __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;} -- if (PyDict_SetItem(__pyx_3, __pyx_n_simple, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;} -+ __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; goto __pyx_L1;} -+ __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; goto __pyx_L1;} -+ if (PyDict_SetItem(__pyx_3, __pyx_n_simple, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; goto __pyx_L1;} - Py_DECREF(__pyx_4); __pyx_4 = 0; -- __pyx_4 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 249; goto __pyx_L1;} -+ __pyx_4 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_4); __pyx_4 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":250 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":239 */ - Py_INCREF(__pyx_v_args); - Py_DECREF(((struct __pyx_obj_5event_timeout *)__pyx_v_self)->__pyx_base.args); - ((struct __pyx_obj_5event_timeout *)__pyx_v_self)->__pyx_base.args = __pyx_v_args; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":251 */ -- __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} -- __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":240 */ -+ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; goto __pyx_L1;} -+ __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; goto __pyx_L1;} - Py_INCREF(__pyx_v_secs); - PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_secs); -- __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} -+ __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; -@@ -1134,16 +1094,9 @@ static PyObject *__pyx_f_5event_init(PyO - PyObject *__pyx_r; - static char *__pyx_argnames[] = {0}; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":255 */ - event_init(); - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -- goto __pyx_L0; -- __pyx_L1:; -- __Pyx_AddTraceback("event.init"); -- __pyx_r = 0; -- __pyx_L0:; -+ __pyx_r = Py_None; Py_INCREF(Py_None); - return __pyx_r; - } - -@@ -1156,52 +1109,42 @@ static PyObject *__pyx_f_5event_dispatch - PyObject *__pyx_3 = 0; - PyObject *__pyx_4 = 0; - PyObject *__pyx_5 = 0; -- PyObject *__pyx_6 = 0; - static char *__pyx_argnames[] = {0}; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":260 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":249 */ - event_dispatch(); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":261 */ -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___event_exc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; goto __pyx_L1;} -- __pyx_2 = PyObject_IsTrue(__pyx_1); if (__pyx_2 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":250 */ -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___event_exc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; goto __pyx_L1;} -+ __pyx_2 = PyObject_IsTrue(__pyx_1); if (__pyx_2 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 250; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - if (__pyx_2) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":262 */ -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___event_exc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -- __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -- __pyx_4 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___event_exc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} -+ __pyx_3 = __Pyx_GetItemInt(__pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- Py_DECREF(__pyx_3); __pyx_3 = 0; -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___event_exc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -- __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -- __pyx_5 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___event_exc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} -+ __pyx_4 = __Pyx_GetItemInt(__pyx_1, 1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -- Py_DECREF(__pyx_3); __pyx_3 = 0; -- __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___event_exc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -- __pyx_3 = PyInt_FromLong(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -- __pyx_6 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -+ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___event_exc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} -+ __pyx_5 = __Pyx_GetItemInt(__pyx_1, 2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; -+ __Pyx_Raise(__pyx_3, __pyx_4, __pyx_5); - Py_DECREF(__pyx_3); __pyx_3 = 0; -- __Pyx_Raise(__pyx_4, __pyx_5, __pyx_6); - Py_DECREF(__pyx_4); __pyx_4 = 0; - Py_DECREF(__pyx_5); __pyx_5 = 0; -- Py_DECREF(__pyx_6); __pyx_6 = 0; -- {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; goto __pyx_L1;} -+ {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; goto __pyx_L1;} - goto __pyx_L2; - } - __pyx_L2:; - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -+ __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - Py_XDECREF(__pyx_1); - Py_XDECREF(__pyx_3); - Py_XDECREF(__pyx_4); - Py_XDECREF(__pyx_5); -- Py_XDECREF(__pyx_6); - __Pyx_AddTraceback("event.dispatch"); - __pyx_r = 0; - __pyx_L0:; -@@ -1216,27 +1159,25 @@ static PyObject *__pyx_f_5event_loop(PyO - PyObject *__pyx_r; - int __pyx_1; - static char *__pyx_argnames[] = {"nonblock",0}; -- __pyx_v_nonblock = __pyx_k14; -+ __pyx_v_nonblock = __pyx_d6; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_nonblock)) return 0; - Py_INCREF(__pyx_v_nonblock); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":267 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":256 */ - __pyx_v_flags = EVLOOP_ONCE; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":268 */ -- __pyx_1 = PyObject_IsTrue(__pyx_v_nonblock); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 268; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":257 */ -+ __pyx_1 = PyObject_IsTrue(__pyx_v_nonblock); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 257; goto __pyx_L1;} - if (__pyx_1) { -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":269 */ - __pyx_v_flags = (EVLOOP_ONCE | EVLOOP_NONBLOCK); - goto __pyx_L2; - } - __pyx_L2:; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":270 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":259 */ - event_loop(__pyx_v_flags); - -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -+ __pyx_r = Py_None; Py_INCREF(Py_None); - goto __pyx_L0; - __pyx_L1:; - __Pyx_AddTraceback("event.loop"); -@@ -1249,78 +1190,23 @@ static PyObject *__pyx_f_5event_loop(PyO - static PyObject *__pyx_f_5event_abort(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ - static char __pyx_doc_5event_abort[] = "Abort event dispatch loop."; - static PyObject *__pyx_f_5event_abort(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { -- extern int event_gotsig; -- extern int ((*event_sigcb)(void)); - PyObject *__pyx_r; - static char *__pyx_argnames[] = {0}; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":276 */ -- event_sigcb = __pyx_f_5event___event_sigcb; -- -- /* "/Users/dugsong/projects/pyevent/event.pyx":277 */ -- event_gotsig = 1; -- -- __pyx_r = Py_None; Py_INCREF(__pyx_r); -- goto __pyx_L0; -- __pyx_L1:; -- __Pyx_AddTraceback("event.abort"); -- __pyx_r = 0; -- __pyx_L0:; -+ __pyx_r = Py_None; Py_INCREF(Py_None); - return __pyx_r; - } - --static __Pyx_InternTabEntry __pyx_intern_tab[] = { -- {&__pyx_n_BSD, "BSD"}, -- {&__pyx_n_EV_PERSIST, "EV_PERSIST"}, -- {&__pyx_n_EV_READ, "EV_READ"}, -- {&__pyx_n_EV_SIGNAL, "EV_SIGNAL"}, -- {&__pyx_n_EV_TIMEOUT, "EV_TIMEOUT"}, -- {&__pyx_n_EV_WRITE, "EV_WRITE"}, -- {&__pyx_n_False, "False"}, -- {&__pyx_n___author__, "__author__"}, -- {&__pyx_n___callback, "__callback"}, -- {&__pyx_n___copyright__, "__copyright__"}, -- {&__pyx_n___event_exc, "__event_exc"}, -- {&__pyx_n___init__, "__init__"}, -- {&__pyx_n___license__, "__license__"}, -- {&__pyx_n___simple_callback, "__simple_callback"}, -- {&__pyx_n___url__, "__url__"}, -- {&__pyx_n___version__, "__version__"}, -- {&__pyx_n_abort, "abort"}, -- {&__pyx_n_add, "add"}, -- {&__pyx_n_delete, "delete"}, -- {&__pyx_n_dispatch, "dispatch"}, -- {&__pyx_n_exc_info, "exc_info"}, -- {&__pyx_n_fileno, "fileno"}, -- {&__pyx_n_init, "init"}, -- {&__pyx_n_int, "int"}, -- {&__pyx_n_isinstance, "isinstance"}, -- {&__pyx_n_loop, "loop"}, -- {&__pyx_n_pending, "pending"}, -- {&__pyx_n_simple, "simple"}, -- {&__pyx_n_sys, "sys"}, -- {0, 0} --}; -- --static __Pyx_StringTabEntry __pyx_string_tab[] = { -- {&__pyx_k1p, __pyx_k1, sizeof(__pyx_k1)}, -- {&__pyx_k2p, __pyx_k2, sizeof(__pyx_k2)}, -- {&__pyx_k3p, __pyx_k3, sizeof(__pyx_k3)}, -- {&__pyx_k4p, __pyx_k4, sizeof(__pyx_k4)}, -- {&__pyx_k6p, __pyx_k6, sizeof(__pyx_k6)}, -- {&__pyx_k7p, __pyx_k7, sizeof(__pyx_k7)}, -- {&__pyx_k15p, __pyx_k15, sizeof(__pyx_k15)}, -- {0, 0, 0} --}; -- - static PyObject *__pyx_tp_new_5event_event(PyTypeObject *t, PyObject *a, PyObject *k) { -+ struct __pyx_obj_5event_event *p; - PyObject *o = (*t->tp_alloc)(t, 0); -- struct __pyx_obj_5event_event *p = (struct __pyx_obj_5event_event *)o; -- p->handle = Py_None; Py_INCREF(p->handle); -- p->evtype = Py_None; Py_INCREF(p->evtype); -- p->callback = Py_None; Py_INCREF(p->callback); -- p->args = Py_None; Py_INCREF(p->args); -+ if (!o) return 0; -+ p = ((struct __pyx_obj_5event_event *)o); -+ p->handle = Py_None; Py_INCREF(Py_None); -+ p->evtype = Py_None; Py_INCREF(Py_None); -+ p->callback = Py_None; Py_INCREF(Py_None); -+ p->args = Py_None; Py_INCREF(Py_None); - return o; - } - -@@ -1362,14 +1248,19 @@ static int __pyx_tp_traverse_5event_even - - static int __pyx_tp_clear_5event_event(PyObject *o) { - struct __pyx_obj_5event_event *p = (struct __pyx_obj_5event_event *)o; -- Py_XDECREF(p->handle); -- p->handle = Py_None; Py_INCREF(p->handle); -- Py_XDECREF(p->evtype); -- p->evtype = Py_None; Py_INCREF(p->evtype); -- Py_XDECREF(p->callback); -- p->callback = Py_None; Py_INCREF(p->callback); -- Py_XDECREF(p->args); -- p->args = Py_None; Py_INCREF(p->args); -+ PyObject *t; -+ t = p->handle; -+ p->handle = Py_None; Py_INCREF(Py_None); -+ Py_XDECREF(t); -+ t = p->evtype; -+ p->evtype = Py_None; Py_INCREF(Py_None); -+ Py_XDECREF(t); -+ t = p->callback; -+ p->callback = Py_None; Py_INCREF(Py_None); -+ Py_XDECREF(t); -+ t = p->args; -+ p->args = Py_None; Py_INCREF(Py_None); -+ Py_XDECREF(t); - return 0; - } - -@@ -1421,6 +1312,9 @@ static PyNumberMethods __pyx_tp_as_numbe - 0, /*nb_true_divide*/ - 0, /*nb_inplace_floor_divide*/ - 0, /*nb_inplace_true_divide*/ -+ #if Py_TPFLAGS_DEFAULT & Py_TPFLAGS_HAVE_INDEX -+ 0, /*nb_index*/ -+ #endif - }; - - static PySequenceMethods __pyx_tp_as_sequence_event = { -@@ -1449,7 +1343,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ - 0, /*bf_getcharbuffer*/ - }; - --statichere PyTypeObject __pyx_type_5event_event = { -+PyTypeObject __pyx_type_5event_event = { - PyObject_HEAD_INIT(0) - 0, /*ob_size*/ - "event.event", /*tp_name*/ -@@ -1500,28 +1394,14 @@ statichere PyTypeObject __pyx_type_5even - - static PyObject *__pyx_tp_new_5event_read(PyTypeObject *t, PyObject *a, PyObject *k) { - PyObject *o = __pyx_ptype_5event_event->tp_new(t, a, k); -- struct __pyx_obj_5event_read *p = (struct __pyx_obj_5event_read *)o; -+ if (!o) return 0; - return o; - } - - static void __pyx_tp_dealloc_5event_read(PyObject *o) { -- struct __pyx_obj_5event_read *p = (struct __pyx_obj_5event_read *)o; - __pyx_ptype_5event_event->tp_dealloc(o); - } - --static int __pyx_tp_traverse_5event_read(PyObject *o, visitproc v, void *a) { -- int e; -- struct __pyx_obj_5event_read *p = (struct __pyx_obj_5event_read *)o; -- __pyx_ptype_5event_event->tp_traverse(o, v, a); -- return 0; --} -- --static int __pyx_tp_clear_5event_read(PyObject *o) { -- struct __pyx_obj_5event_read *p = (struct __pyx_obj_5event_read *)o; -- __pyx_ptype_5event_event->tp_clear(o); -- return 0; --} -- - static struct PyMethodDef __pyx_methods_5event_read[] = { - {0, 0, 0, 0} - }; -@@ -1565,6 +1445,9 @@ static PyNumberMethods __pyx_tp_as_numbe - 0, /*nb_true_divide*/ - 0, /*nb_inplace_floor_divide*/ - 0, /*nb_inplace_true_divide*/ -+ #if Py_TPFLAGS_DEFAULT & Py_TPFLAGS_HAVE_INDEX -+ 0, /*nb_index*/ -+ #endif - }; - - static PySequenceMethods __pyx_tp_as_sequence_read = { -@@ -1593,7 +1476,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ - 0, /*bf_getcharbuffer*/ - }; - --statichere PyTypeObject __pyx_type_5event_read = { -+PyTypeObject __pyx_type_5event_read = { - PyObject_HEAD_INIT(0) - 0, /*ob_size*/ - "event.read", /*tp_name*/ -@@ -1616,8 +1499,8 @@ statichere PyTypeObject __pyx_type_5even - &__pyx_tp_as_buffer_read, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "read(handle, callback, *args) -> event object\n \n Simplified event interface:\n Create a new read event, and add it to the event queue.\n \n Arguments:\n\n handle -- file handle, descriptor, or socket\n callback -- user callback with (*args) prototype, which can return\n a non-None value to be rescheduled\n *args -- optional callback arguments\n ", /*tp_doc*/ -- __pyx_tp_traverse_5event_read, /*tp_traverse*/ -- __pyx_tp_clear_5event_read, /*tp_clear*/ -+ 0, /*tp_traverse*/ -+ 0, /*tp_clear*/ - 0, /*tp_richcompare*/ - 0, /*tp_weaklistoffset*/ - 0, /*tp_iter*/ -@@ -1644,28 +1527,14 @@ statichere PyTypeObject __pyx_type_5even - - static PyObject *__pyx_tp_new_5event_write(PyTypeObject *t, PyObject *a, PyObject *k) { - PyObject *o = __pyx_ptype_5event_event->tp_new(t, a, k); -- struct __pyx_obj_5event_write *p = (struct __pyx_obj_5event_write *)o; -+ if (!o) return 0; - return o; - } - - static void __pyx_tp_dealloc_5event_write(PyObject *o) { -- struct __pyx_obj_5event_write *p = (struct __pyx_obj_5event_write *)o; - __pyx_ptype_5event_event->tp_dealloc(o); - } - --static int __pyx_tp_traverse_5event_write(PyObject *o, visitproc v, void *a) { -- int e; -- struct __pyx_obj_5event_write *p = (struct __pyx_obj_5event_write *)o; -- __pyx_ptype_5event_event->tp_traverse(o, v, a); -- return 0; --} -- --static int __pyx_tp_clear_5event_write(PyObject *o) { -- struct __pyx_obj_5event_write *p = (struct __pyx_obj_5event_write *)o; -- __pyx_ptype_5event_event->tp_clear(o); -- return 0; --} -- - static struct PyMethodDef __pyx_methods_5event_write[] = { - {0, 0, 0, 0} - }; -@@ -1709,6 +1578,9 @@ static PyNumberMethods __pyx_tp_as_numbe - 0, /*nb_true_divide*/ - 0, /*nb_inplace_floor_divide*/ - 0, /*nb_inplace_true_divide*/ -+ #if Py_TPFLAGS_DEFAULT & Py_TPFLAGS_HAVE_INDEX -+ 0, /*nb_index*/ -+ #endif - }; - - static PySequenceMethods __pyx_tp_as_sequence_write = { -@@ -1737,7 +1609,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ - 0, /*bf_getcharbuffer*/ - }; - --statichere PyTypeObject __pyx_type_5event_write = { -+PyTypeObject __pyx_type_5event_write = { - PyObject_HEAD_INIT(0) - 0, /*ob_size*/ - "event.write", /*tp_name*/ -@@ -1760,8 +1632,8 @@ statichere PyTypeObject __pyx_type_5even - &__pyx_tp_as_buffer_write, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "write(handle, callback, *args) -> event object\n\n Simplified event interface:\n Create a new write event, and add it to the event queue.\n \n Arguments:\n\n handle -- file handle, descriptor, or socket\n callback -- user callback with (*args) prototype, which can return\n a non-None value to be rescheduled\n *args -- optional callback arguments\n ", /*tp_doc*/ -- __pyx_tp_traverse_5event_write, /*tp_traverse*/ -- __pyx_tp_clear_5event_write, /*tp_clear*/ -+ 0, /*tp_traverse*/ -+ 0, /*tp_clear*/ - 0, /*tp_richcompare*/ - 0, /*tp_weaklistoffset*/ - 0, /*tp_iter*/ -@@ -1788,28 +1660,14 @@ statichere PyTypeObject __pyx_type_5even - - static PyObject *__pyx_tp_new_5event_signal(PyTypeObject *t, PyObject *a, PyObject *k) { - PyObject *o = __pyx_ptype_5event_event->tp_new(t, a, k); -- struct __pyx_obj_5event_signal *p = (struct __pyx_obj_5event_signal *)o; -+ if (!o) return 0; - return o; - } - - static void __pyx_tp_dealloc_5event_signal(PyObject *o) { -- struct __pyx_obj_5event_signal *p = (struct __pyx_obj_5event_signal *)o; - __pyx_ptype_5event_event->tp_dealloc(o); - } - --static int __pyx_tp_traverse_5event_signal(PyObject *o, visitproc v, void *a) { -- int e; -- struct __pyx_obj_5event_signal *p = (struct __pyx_obj_5event_signal *)o; -- __pyx_ptype_5event_event->tp_traverse(o, v, a); -- return 0; --} -- --static int __pyx_tp_clear_5event_signal(PyObject *o) { -- struct __pyx_obj_5event_signal *p = (struct __pyx_obj_5event_signal *)o; -- __pyx_ptype_5event_event->tp_clear(o); -- return 0; --} -- - static struct PyMethodDef __pyx_methods_5event_signal[] = { - {0, 0, 0, 0} - }; -@@ -1853,6 +1711,9 @@ static PyNumberMethods __pyx_tp_as_numbe - 0, /*nb_true_divide*/ - 0, /*nb_inplace_floor_divide*/ - 0, /*nb_inplace_true_divide*/ -+ #if Py_TPFLAGS_DEFAULT & Py_TPFLAGS_HAVE_INDEX -+ 0, /*nb_index*/ -+ #endif - }; - - static PySequenceMethods __pyx_tp_as_sequence_signal = { -@@ -1881,7 +1742,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ - 0, /*bf_getcharbuffer*/ - }; - --statichere PyTypeObject __pyx_type_5event_signal = { -+PyTypeObject __pyx_type_5event_signal = { - PyObject_HEAD_INIT(0) - 0, /*ob_size*/ - "event.signal", /*tp_name*/ -@@ -1904,8 +1765,8 @@ statichere PyTypeObject __pyx_type_5even - &__pyx_tp_as_buffer_signal, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "signal(sig, callback, *args) -> event object\n\n Simplified event interface:\n Create a new signal event, and add it to the event queue.\n XXX - persistent event is added with EV_PERSIST, like signal_set()\n \n Arguments:\n\n sig -- signal number\n callback -- user callback with (*args) prototype, which can return\n a non-None value to be rescheduled\n *args -- optional callback arguments\n ", /*tp_doc*/ -- __pyx_tp_traverse_5event_signal, /*tp_traverse*/ -- __pyx_tp_clear_5event_signal, /*tp_clear*/ -+ 0, /*tp_traverse*/ -+ 0, /*tp_clear*/ - 0, /*tp_richcompare*/ - 0, /*tp_weaklistoffset*/ - 0, /*tp_iter*/ -@@ -1932,28 +1793,14 @@ statichere PyTypeObject __pyx_type_5even - - static PyObject *__pyx_tp_new_5event_timeout(PyTypeObject *t, PyObject *a, PyObject *k) { - PyObject *o = __pyx_ptype_5event_event->tp_new(t, a, k); -- struct __pyx_obj_5event_timeout *p = (struct __pyx_obj_5event_timeout *)o; -+ if (!o) return 0; - return o; - } - - static void __pyx_tp_dealloc_5event_timeout(PyObject *o) { -- struct __pyx_obj_5event_timeout *p = (struct __pyx_obj_5event_timeout *)o; - __pyx_ptype_5event_event->tp_dealloc(o); - } - --static int __pyx_tp_traverse_5event_timeout(PyObject *o, visitproc v, void *a) { -- int e; -- struct __pyx_obj_5event_timeout *p = (struct __pyx_obj_5event_timeout *)o; -- __pyx_ptype_5event_event->tp_traverse(o, v, a); -- return 0; --} -- --static int __pyx_tp_clear_5event_timeout(PyObject *o) { -- struct __pyx_obj_5event_timeout *p = (struct __pyx_obj_5event_timeout *)o; -- __pyx_ptype_5event_event->tp_clear(o); -- return 0; --} -- - static struct PyMethodDef __pyx_methods_5event_timeout[] = { - {0, 0, 0, 0} - }; -@@ -1997,6 +1844,9 @@ static PyNumberMethods __pyx_tp_as_numbe - 0, /*nb_true_divide*/ - 0, /*nb_inplace_floor_divide*/ - 0, /*nb_inplace_true_divide*/ -+ #if Py_TPFLAGS_DEFAULT & Py_TPFLAGS_HAVE_INDEX -+ 0, /*nb_index*/ -+ #endif - }; - - static PySequenceMethods __pyx_tp_as_sequence_timeout = { -@@ -2025,7 +1875,7 @@ static PyBufferProcs __pyx_tp_as_buffer_ - 0, /*bf_getcharbuffer*/ - }; - --statichere PyTypeObject __pyx_type_5event_timeout = { -+PyTypeObject __pyx_type_5event_timeout = { - PyObject_HEAD_INIT(0) - 0, /*ob_size*/ - "event.timeout", /*tp_name*/ -@@ -2048,8 +1898,8 @@ statichere PyTypeObject __pyx_type_5even - &__pyx_tp_as_buffer_timeout, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "timeout(secs, callback, *args) -> event object\n\n Simplified event interface:\n Create a new timer event, and add it to the event queue.\n\n Arguments:\n\n secs -- event timeout in seconds\n callback -- user callback with (*args) prototype, which can return\n a non-None value to be rescheduled\n *args -- optional callback arguments\n ", /*tp_doc*/ -- __pyx_tp_traverse_5event_timeout, /*tp_traverse*/ -- __pyx_tp_clear_5event_timeout, /*tp_clear*/ -+ 0, /*tp_traverse*/ -+ 0, /*tp_clear*/ - 0, /*tp_richcompare*/ - 0, /*tp_weaklistoffset*/ - 0, /*tp_iter*/ -@@ -2082,155 +1932,199 @@ static struct PyMethodDef __pyx_methods[ - {0, 0, 0, 0} - }; - --DL_EXPORT(void) initevent(void); /*proto*/ --DL_EXPORT(void) initevent(void) { -+static void __pyx_init_filenames(void); /*proto*/ -+ -+PyMODINIT_FUNC initevent(void); /*proto*/ -+PyMODINIT_FUNC initevent(void) { - PyObject *__pyx_1 = 0; - PyObject *__pyx_2 = 0; - PyObject *__pyx_3 = 0; - PyObject *__pyx_4 = 0; -- PyObject *__pyx_5 = 0; -- PyObject *__pyx_6 = 0; -+ __pyx_init_filenames(); - __pyx_m = Py_InitModule4("event", __pyx_methods, __pyx_mdoc, 0, PYTHON_API_VERSION); - if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; goto __pyx_L1;}; -+ Py_INCREF(__pyx_m); - __pyx_b = PyImport_AddModule("__builtin__"); - if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; goto __pyx_L1;}; - if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; goto __pyx_L1;}; -- if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; goto __pyx_L1;}; - if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; goto __pyx_L1;}; - __pyx_type_5event_event.tp_free = _PyObject_GC_Del; -- if (PyType_Ready(&__pyx_type_5event_event) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; goto __pyx_L1;} -- if (PyObject_SetAttrString(__pyx_m, "event", (PyObject *)&__pyx_type_5event_event) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; goto __pyx_L1;} -+ if (PyType_Ready(&__pyx_type_5event_event) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; goto __pyx_L1;} -+ if (PyObject_SetAttrString(__pyx_m, "event", (PyObject *)&__pyx_type_5event_event) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; goto __pyx_L1;} - __pyx_ptype_5event_event = &__pyx_type_5event_event; - __pyx_type_5event_read.tp_base = __pyx_ptype_5event_event; -- if (PyType_Ready(&__pyx_type_5event_read) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; goto __pyx_L1;} -- if (PyObject_SetAttrString(__pyx_m, "read", (PyObject *)&__pyx_type_5event_read) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; goto __pyx_L1;} -+ if (PyType_Ready(&__pyx_type_5event_read) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;} -+ if (PyObject_SetAttrString(__pyx_m, "read", (PyObject *)&__pyx_type_5event_read) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; goto __pyx_L1;} - __pyx_ptype_5event_read = &__pyx_type_5event_read; - __pyx_type_5event_write.tp_base = __pyx_ptype_5event_event; -- if (PyType_Ready(&__pyx_type_5event_write) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;} -- if (PyObject_SetAttrString(__pyx_m, "write", (PyObject *)&__pyx_type_5event_write) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; goto __pyx_L1;} -+ if (PyType_Ready(&__pyx_type_5event_write) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; goto __pyx_L1;} -+ if (PyObject_SetAttrString(__pyx_m, "write", (PyObject *)&__pyx_type_5event_write) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; goto __pyx_L1;} - __pyx_ptype_5event_write = &__pyx_type_5event_write; - __pyx_type_5event_signal.tp_base = __pyx_ptype_5event_event; -- if (PyType_Ready(&__pyx_type_5event_signal) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; goto __pyx_L1;} -- if (PyObject_SetAttrString(__pyx_m, "signal", (PyObject *)&__pyx_type_5event_signal) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; goto __pyx_L1;} -+ if (PyType_Ready(&__pyx_type_5event_signal) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;} -+ if (PyObject_SetAttrString(__pyx_m, "signal", (PyObject *)&__pyx_type_5event_signal) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;} - __pyx_ptype_5event_signal = &__pyx_type_5event_signal; - __pyx_type_5event_timeout.tp_base = __pyx_ptype_5event_event; -- if (PyType_Ready(&__pyx_type_5event_timeout) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; goto __pyx_L1;} -- if (PyObject_SetAttrString(__pyx_m, "timeout", (PyObject *)&__pyx_type_5event_timeout) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; goto __pyx_L1;} -+ if (PyType_Ready(&__pyx_type_5event_timeout) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;} -+ if (PyObject_SetAttrString(__pyx_m, "timeout", (PyObject *)&__pyx_type_5event_timeout) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;} - __pyx_ptype_5event_timeout = &__pyx_type_5event_timeout; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":18 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":18 */ - __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; goto __pyx_L1;} -- Py_INCREF(__pyx_k1p); -- PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k1p); -- Py_INCREF(__pyx_k2p); -- PyTuple_SET_ITEM(__pyx_1, 1, __pyx_k2p); -+ Py_INCREF(__pyx_k18p); -+ PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k18p); -+ Py_INCREF(__pyx_k19p); -+ PyTuple_SET_ITEM(__pyx_1, 1, __pyx_k19p); - if (PyObject_SetAttr(__pyx_m, __pyx_n___author__, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":20 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":20 */ - __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;} -- Py_INCREF(__pyx_k3p); -- PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k3p); -- Py_INCREF(__pyx_k4p); -- PyTuple_SET_ITEM(__pyx_1, 1, __pyx_k4p); -+ Py_INCREF(__pyx_k21p); -+ PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k21p); -+ Py_INCREF(__pyx_k22p); -+ PyTuple_SET_ITEM(__pyx_1, 1, __pyx_k22p); - if (PyObject_SetAttr(__pyx_m, __pyx_n___copyright__, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":22 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":22 */ - if (PyObject_SetAttr(__pyx_m, __pyx_n___license__, __pyx_n_BSD) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;} - -- /* "/Users/dugsong/projects/pyevent/event.pyx":23 */ -- if (PyObject_SetAttr(__pyx_m, __pyx_n___url__, __pyx_k6p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":23 */ -+ if (PyObject_SetAttr(__pyx_m, __pyx_n___url__, __pyx_k26p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; goto __pyx_L1;} - -- /* "/Users/dugsong/projects/pyevent/event.pyx":24 */ -- if (PyObject_SetAttr(__pyx_m, __pyx_n___version__, __pyx_k7p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":24 */ -+ if (PyObject_SetAttr(__pyx_m, __pyx_n___version__, __pyx_k28p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;} - -- /* "/Users/dugsong/projects/pyevent/event.pyx":26 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":26 */ - __pyx_1 = __Pyx_Import(__pyx_n_sys, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_sys, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":57 */ -- __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":57 */ -+ __pyx_1 = PyInt_FromLong(0x01); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_EV_TIMEOUT, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":58 */ -- __pyx_1 = PyInt_FromLong(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":58 */ -+ __pyx_1 = PyInt_FromLong(0x02); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_EV_READ, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":59 */ -- __pyx_1 = PyInt_FromLong(4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":59 */ -+ __pyx_1 = PyInt_FromLong(0x04); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_EV_WRITE, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":60 */ -- __pyx_1 = PyInt_FromLong(8); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":60 */ -+ __pyx_1 = PyInt_FromLong(0x08); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_EV_SIGNAL, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":61 */ -- __pyx_1 = PyInt_FromLong(16); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":61 */ -+ __pyx_1 = PyInt_FromLong(0x10); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n_EV_PERSIST, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":63 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":63 */ - if (PyObject_SetAttr(__pyx_m, __pyx_n___event_exc, Py_None) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; goto __pyx_L1;} - -- /* "/Users/dugsong/projects/pyevent/event.pyx":92 */ -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":89 */ - Py_INCREF(Py_None); -- __pyx_k9 = Py_None; -- __pyx_k10 = 0; -- __pyx_1 = PyInt_FromLong((-1)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; goto __pyx_L1;} -- __pyx_k11 = __pyx_1; -+ __pyx_d1 = Py_None; -+ __pyx_d2 = 0; -+ __pyx_1 = PyInt_FromLong((-1)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; goto __pyx_L1;} -+ __pyx_d3 = __pyx_1; - __pyx_1 = 0; -- __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; goto __pyx_L1;} -- __pyx_k12 = __pyx_2; -+ __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; goto __pyx_L1;} -+ __pyx_d4 = __pyx_2; - __pyx_2 = 0; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":143 */ -- __pyx_k13 = (-1); -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":132 */ -+ __pyx_d5 = (-1); - -- /* "/Users/dugsong/projects/pyevent/event.pyx":264 */ -- __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_False); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 264; goto __pyx_L1;} -- __pyx_k14 = __pyx_3; -- __pyx_3 = 0; -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":253 */ -+ Py_INCREF(Py_False); -+ __pyx_d6 = Py_False; - -- /* "/Users/dugsong/projects/pyevent/event.pyx":280 */ -- __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_init); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;} -- __pyx_5 = PyTuple_New(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;} -- __pyx_6 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; goto __pyx_L1;} -+ /* "/usr/home/clsung/cvsroot/ports/devel/py-event/work/pyevent-0.3/event.pyx":265 */ -+ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n_init); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;} -+ __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;} -+ Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_4); __pyx_4 = 0; -- Py_DECREF(__pyx_5); __pyx_5 = 0; -- Py_DECREF(__pyx_6); __pyx_6 = 0; - return; - __pyx_L1:; - Py_XDECREF(__pyx_1); - Py_XDECREF(__pyx_2); - Py_XDECREF(__pyx_3); - Py_XDECREF(__pyx_4); -- Py_XDECREF(__pyx_5); -- Py_XDECREF(__pyx_6); - __Pyx_AddTraceback("event"); - } - - static char *__pyx_filenames[] = { - "event.pyx", - }; --statichere char **__pyx_f = __pyx_filenames; - - /* Runtime support code */ - -+static void __pyx_init_filenames(void) { -+ __pyx_f = __pyx_filenames; -+} -+ -+static void __Pyx_WriteUnraisable(char *name) { -+ PyObject *old_exc, *old_val, *old_tb; -+ PyObject *ctx; -+ PyErr_Fetch(&old_exc, &old_val, &old_tb); -+ ctx = PyString_FromString(name); -+ PyErr_Restore(old_exc, old_val, old_tb); -+ if (!ctx) -+ ctx = Py_None; -+ PyErr_WriteUnraisable(ctx); -+} -+ -+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) { -+ PyThreadState *tstate = PyThreadState_Get(); -+ PyErr_Fetch(type, value, tb); -+ PyErr_NormalizeException(type, value, tb); -+ if (PyErr_Occurred()) -+ goto bad; -+ Py_INCREF(*type); -+ Py_INCREF(*value); -+ Py_INCREF(*tb); -+ Py_XDECREF(tstate->exc_type); -+ Py_XDECREF(tstate->exc_value); -+ Py_XDECREF(tstate->exc_traceback); -+ tstate->exc_type = *type; -+ tstate->exc_value = *value; -+ tstate->exc_traceback = *tb; -+ return 0; -+bad: -+ Py_XDECREF(*type); -+ Py_XDECREF(*value); -+ Py_XDECREF(*tb); -+ return -1; -+} -+ -+static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) { -+ PyObject *result; -+ result = PyObject_GetAttr(dict, name); -+ if (!result) -+ PyErr_SetObject(PyExc_NameError, name); -+ return result; -+} -+ - static int __Pyx_GetStarArgs( - PyObject **args, - PyObject **kwds, - char *kwd_list[], -- int nargs, -+ Py_ssize_t nargs, - PyObject **args2, -- PyObject **kwds2) -+ PyObject **kwds2, -+ char rqd_kwds[]) - { - PyObject *x = 0, *args1 = 0, *kwds1 = 0; -+ int i; -+ char **p; - - if (args2) - *args2 = 0; -@@ -2241,25 +2135,37 @@ static int __Pyx_GetStarArgs( - args1 = PyTuple_GetSlice(*args, 0, nargs); - if (!args1) - goto bad; -- *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_Size(*args)); -+ *args2 = PyTuple_GetSlice(*args, nargs, PyTuple_GET_SIZE(*args)); - if (!*args2) - goto bad; - } -+ else if (PyTuple_GET_SIZE(*args) > nargs) { -+ int m = nargs; -+ int n = PyTuple_GET_SIZE(*args); -+ PyErr_Format(PyExc_TypeError, -+ "function takes at most %d positional arguments (%d given)", -+ m, n); -+ goto bad; -+ } - else { - args1 = *args; - Py_INCREF(args1); - } - -+ if (rqd_kwds && !*kwds) -+ for (i = 0, p = kwd_list; *p; i++, p++) -+ if (rqd_kwds[i]) -+ goto missing_kwarg; -+ - if (kwds2) { - if (*kwds) { -- char **p; - kwds1 = PyDict_New(); -- if (!kwds) -+ if (!kwds1) - goto bad; - *kwds2 = PyDict_Copy(*kwds); - if (!*kwds2) - goto bad; -- for (p = kwd_list; *p; p++) { -+ for (i = 0, p = kwd_list; *p; i++, p++) { - x = PyDict_GetItemString(*kwds, *p); - if (x) { - if (PyDict_SetItemString(kwds1, *p, x) < 0) -@@ -2267,6 +2173,8 @@ static int __Pyx_GetStarArgs( - if (PyDict_DelItemString(*kwds2, *p) < 0) - goto bad; - } -+ else if (rqd_kwds && rqd_kwds[i]) -+ goto missing_kwarg; - } - } - else { -@@ -2278,101 +2186,43 @@ static int __Pyx_GetStarArgs( - else { - kwds1 = *kwds; - Py_XINCREF(kwds1); -+ if (rqd_kwds && *kwds) -+ for (i = 0, p = kwd_list; *p; i++, p++) -+ if (rqd_kwds[i] && !PyDict_GetItemString(*kwds, *p)) -+ goto missing_kwarg; - } - - *args = args1; - *kwds = kwds1; - return 0; -+missing_kwarg: -+ PyErr_Format(PyExc_TypeError, -+ "required keyword argument '%s' is missing", *p); - bad: - Py_XDECREF(args1); - Py_XDECREF(kwds1); -- if (*args2) -+ if (args2) { - Py_XDECREF(*args2); -- if (*kwds2) -+ } -+ if (kwds2) { - Py_XDECREF(*kwds2); -+ } - return -1; - } - --static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) { -- PyObject *__import__ = 0; -- PyObject *empty_list = 0; -- PyObject *module = 0; -- PyObject *global_dict = 0; -- PyObject *empty_dict = 0; -- PyObject *list; -- __import__ = PyObject_GetAttrString(__pyx_b, "__import__"); -- if (!__import__) -- goto bad; -- if (from_list) -- list = from_list; -+static PyObject *__Pyx_GetItemInt(PyObject *o, Py_ssize_t i) { -+ PyTypeObject *t = o->ob_type; -+ PyObject *r; -+ if (t->tp_as_sequence && t->tp_as_sequence->sq_item) -+ r = PySequence_GetItem(o, i); - else { -- empty_list = PyList_New(0); -- if (!empty_list) -- goto bad; -- list = empty_list; -- } -- global_dict = PyModule_GetDict(__pyx_m); -- if (!global_dict) -- goto bad; -- empty_dict = PyDict_New(); -- if (!empty_dict) -- goto bad; -- module = PyObject_CallFunction(__import__, "OOOO", -- name, global_dict, empty_dict, list); --bad: -- Py_XDECREF(empty_list); -- Py_XDECREF(__import__); -- Py_XDECREF(empty_dict); -- return module; --} -- --static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name) { -- PyObject *result; -- result = PyObject_GetAttr(dict, name); -- if (!result) -- PyErr_SetObject(PyExc_NameError, name); -- return result; --} -- --static void __Pyx_WriteUnraisable(char *name) { -- PyObject *old_exc, *old_val, *old_tb; -- PyObject *ctx; -- PyErr_Fetch(&old_exc, &old_val, &old_tb); -- ctx = PyString_FromString(name); -- PyErr_Restore(old_exc, old_val, old_tb); -- if (!ctx) -- ctx = Py_None; -- PyErr_WriteUnraisable(ctx); --} -- --static PyObject *__Pyx_GetExcValue(void) { -- PyObject *type = 0, *value = 0, *tb = 0; -- PyObject *result = 0; -- PyThreadState *tstate = PyThreadState_Get(); -- PyErr_Fetch(&type, &value, &tb); -- PyErr_NormalizeException(&type, &value, &tb); -- if (PyErr_Occurred()) -- goto bad; -- if (!value) { -- value = Py_None; -- Py_INCREF(value); -+ PyObject *j = PyInt_FromLong(i); -+ if (!j) -+ return 0; -+ r = PyObject_GetItem(o, j); -+ Py_DECREF(j); - } -- Py_XDECREF(tstate->exc_type); -- Py_XDECREF(tstate->exc_value); -- Py_XDECREF(tstate->exc_traceback); -- tstate->exc_type = type; -- tstate->exc_value = value; -- tstate->exc_traceback = tb; -- result = value; -- Py_XINCREF(result); -- type = 0; -- value = 0; -- tb = 0; --bad: -- Py_XDECREF(type); -- Py_XDECREF(value); -- Py_XDECREF(tb); -- return result; -+ return r; - } - - static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) { -@@ -2394,39 +2244,40 @@ static void __Pyx_Raise(PyObject *type, - value = Py_None; - Py_INCREF(value); - } -- /* Next, repeatedly, replace a tuple exception with its first item */ -- while (PyTuple_Check(type) && PyTuple_Size(type) > 0) { -- PyObject *tmp = type; -- type = PyTuple_GET_ITEM(type, 0); -- Py_INCREF(type); -- Py_DECREF(tmp); -- } -- if (PyString_Check(type)) -- ; -- else if (PyClass_Check(type)) -- ; /*PyErr_NormalizeException(&type, &value, &tb);*/ -- else if (PyInstance_Check(type)) { -+ #if PY_VERSION_HEX < 0x02050000 -+ if (!PyClass_Check(type)) -+ #else -+ if (!PyType_Check(type)) -+ #endif -+ { - /* Raising an instance. The value should be a dummy. */ - if (value != Py_None) { - PyErr_SetString(PyExc_TypeError, -- "instance exception may not have a separate value"); -+ "instance exception may not have a separate value"); - goto raise_error; - } -- else { -- /* Normalize to raise <class>, <instance> */ -- Py_DECREF(value); -- value = type; -- type = (PyObject*) ((PyInstanceObject*)type)->in_class; -+ /* Normalize to raise <class>, <instance> */ -+ Py_DECREF(value); -+ value = type; -+ #if PY_VERSION_HEX < 0x02050000 -+ if (PyInstance_Check(type)) { -+ type = (PyObject*) ((PyInstanceObject*)type)->in_class; -+ Py_INCREF(type); -+ } -+ else { -+ PyErr_SetString(PyExc_TypeError, -+ "raise: exception must be an old-style class or instance"); -+ goto raise_error; -+ } -+ #else -+ type = (PyObject*) type->ob_type; - Py_INCREF(type); -- } -- } -- else { -- /* Not something you can raise. You get an exception -- anyway, just not what you specified :-) */ -- PyErr_Format(PyExc_TypeError, -- "exceptions must be strings, classes, or " -- "instances, not %s", type->ob_type->tp_name); -- goto raise_error; -+ if (!PyType_IsSubtype((PyTypeObject *)type, (PyTypeObject *)PyExc_BaseException)) { -+ PyErr_SetString(PyExc_TypeError, -+ "raise: exception class must be a subclass of BaseException"); -+ goto raise_error; -+ } -+ #endif - } - PyErr_Restore(type, value, tb); - return; -@@ -2437,24 +2288,49 @@ raise_error: - return; - } - --static int __Pyx_InternStrings(__Pyx_InternTabEntry *t) { -+static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) { - while (t->p) { -- *t->p = PyString_InternFromString(t->s); -+ *t->p = PyString_FromStringAndSize(t->s, t->n - 1); - if (!*t->p) - return -1; -+ if (t->i) -+ PyString_InternInPlace(t->p); - ++t; - } - return 0; - } - --static int __Pyx_InitStrings(__Pyx_StringTabEntry *t) { -- while (t->p) { -- *t->p = PyString_FromStringAndSize(t->s, t->n - 1); -- if (!*t->p) -- return -1; -- ++t; -+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) { -+ PyObject *__import__ = 0; -+ PyObject *empty_list = 0; -+ PyObject *module = 0; -+ PyObject *global_dict = 0; -+ PyObject *empty_dict = 0; -+ PyObject *list; -+ __import__ = PyObject_GetAttrString(__pyx_b, "__import__"); -+ if (!__import__) -+ goto bad; -+ if (from_list) -+ list = from_list; -+ else { -+ empty_list = PyList_New(0); -+ if (!empty_list) -+ goto bad; -+ list = empty_list; - } -- return 0; -+ global_dict = PyModule_GetDict(__pyx_m); -+ if (!global_dict) -+ goto bad; -+ empty_dict = PyDict_New(); -+ if (!empty_dict) -+ goto bad; -+ module = PyObject_CallFunction(__import__, "OOOO", -+ name, global_dict, empty_dict, list); -+bad: -+ Py_XDECREF(empty_list); -+ Py_XDECREF(__import__); -+ Py_XDECREF(empty_dict); -+ return module; - } - - #include "compile.h" diff --git a/devel/py-event/files/patch-event.pyx b/devel/py-event/files/patch-event.pyx deleted file mode 100644 index a08ea048c03e..000000000000 --- a/devel/py-event/files/patch-event.pyx +++ /dev/null @@ -1,65 +0,0 @@ ---- event.pyx.orig 2005-09-12 03:44:04 UTC -+++ event.pyx -@@ -62,9 +62,6 @@ EV_PERSIST = 0x10 - - __event_exc = None - --cdef int __event_sigcb(): -- return -1 -- - cdef void __event_handler(int fd, short evtype, void *arg): - (<object>arg).__callback(evtype) - -@@ -109,8 +106,6 @@ cdef class event: - event_set(&self.ev, handle, evtype, handler, <void *>self) - - def __simple_callback(self, short evtype): -- cdef extern int event_gotsig -- cdef extern int (*event_sigcb)() - global __event_exc - try: - if self.callback(*self.args) != None: -@@ -120,23 +115,17 @@ cdef class event: - event_add(&self.ev, NULL) - except: - __event_exc = sys.exc_info() -- event_sigcb = __event_sigcb -- event_gotsig = 1 - # XXX - account for event.signal() EV_PERSIST - if not (evtype & EV_SIGNAL) and \ - not event_pending(&self.ev, EV_READ|EV_WRITE|EV_SIGNAL|EV_TIMEOUT, NULL): - Py_DECREF(self) - - def __callback(self, short evtype): -- cdef extern int event_gotsig -- cdef extern int (*event_sigcb)() - global __event_exc - try: - self.callback(self, self.handle, evtype, self.args) - except: - __event_exc = sys.exc_info() -- event_sigcb = __event_sigcb -- event_gotsig = 1 - if not event_pending(&self.ev, EV_READ|EV_WRITE|EV_SIGNAL|EV_TIMEOUT, NULL): - Py_DECREF(self) - -@@ -153,7 +142,7 @@ cdef class event: - self.timeout = timeout - if timeout >= 0.0: - self.tv.tv_sec = <long>timeout -- self.tv.tv_usec = (timeout - <float>self.tv.tv_sec) * 1000000.0 -+ self.tv.tv_usec = <long>(timeout - <float>self.tv.tv_sec) * 1000000 - event_add(&self.ev, &self.tv) - else: - self.tv.tv_sec = self.tv.tv_usec = 0 -@@ -271,10 +260,6 @@ def loop(nonblock=False): - - def abort(): - """Abort event dispatch loop.""" -- cdef extern int event_gotsig -- cdef extern int (*event_sigcb)() -- event_sigcb = __event_sigcb -- event_gotsig = 1 - - # XXX - make sure event queue is always initialized. - init() diff --git a/devel/py-event/pkg-descr b/devel/py-event/pkg-descr deleted file mode 100644 index 3c4aa4f34389..000000000000 --- a/devel/py-event/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Python Bindings for libevent - -WWW: https://github.com/jaraco/pyevent diff --git a/games/Makefile b/games/Makefile index 00ccf043178e..78de3f13a71e 100644 --- a/games/Makefile +++ b/games/Makefile @@ -576,7 +576,6 @@ SUBDIR += lmarbles SUBDIR += lmpc SUBDIR += lolcat - SUBDIR += lordsawar SUBDIR += lpairs SUBDIR += lskat SUBDIR += ltris diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile deleted file mode 100644 index f5a403a4dac0..000000000000 --- a/games/lordsawar/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $FreeBSD$ - -PORTNAME= lordsawar -PORTVERSION= 0.3.1 -PORTREVISION= 2 -CATEGORIES= games -MASTER_SITES= SAVANNAH - -MAINTAINER= ports@FreeBSD.org -COMMENT= Warlords II clone - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN= Doesn't build after cairomm was updated to 1.12. -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -USES= compiler:c++11-lib gettext gmake libarchive pkgconfig shebangfix -USE_GNOME= gtkmm30 intltool libxslt -USE_GSTREAMER= mm -USE_CXXSTD= c++11 -INSTALLS_ICONS= yes -GNU_CONFIGURE= yes -SHEBANG_FILES= create-lw-file -bash_CMD= /bin/sh - -BROKEN_aarch64= Fails to build: runaway process - -.include <bsd.port.mk> diff --git a/games/lordsawar/distinfo b/games/lordsawar/distinfo deleted file mode 100644 index f2c8bb93df7a..000000000000 --- a/games/lordsawar/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1477596930 -SHA256 (lordsawar-0.3.1.tar.gz) = 9bc75c4c14953e9d70bd4c130a1b8803aac681b97c7616c657241c1e4fe864ab -SIZE (lordsawar-0.3.1.tar.gz) = 26112514 diff --git a/games/lordsawar/files/patch-src_MapRenderer.cpp b/games/lordsawar/files/patch-src_MapRenderer.cpp deleted file mode 100644 index 4a1a56aa0335..000000000000 --- a/games/lordsawar/files/patch-src_MapRenderer.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/MapRenderer.cpp.orig 2015-06-10 18:06:19 UTC -+++ src/MapRenderer.cpp -@@ -72,7 +72,7 @@ void MapRenderer::render_tile(Vector<int - } - else - { -- if (style->getImage() == false) -+ if (!style->getImage()) - { - printf ("pic for style %d for tile %d at %d,%d is null\n", - style->getType(), mtile->getType(), tile.x, tile.y); diff --git a/games/lordsawar/files/patch-src__LocationList.h b/games/lordsawar/files/patch-src__LocationList.h deleted file mode 100644 index e03ad2771696..000000000000 --- a/games/lordsawar/files/patch-src__LocationList.h +++ /dev/null @@ -1,17 +0,0 @@ ---- src/LocationList.h.orig 2010-05-11 08:50:34 UTC -+++ src/LocationList.h -@@ -74,8 +74,14 @@ - for (int j = 0; j < s; j++) - { - Vector<int> pos = t->getPos() + Vector<int>(i,j); -+#if defined(_LIBCPP_VERSION) -+ typename PositionMap::const_iterator it = d_object.find(pos); -+ if (it != d_object.end()) -+ d_object.erase(it); -+#else - if (d_object.find(pos) != d_object.end()) - d_object.erase(d_object.find(pos)); -+#endif - } - delete t; - } diff --git a/games/lordsawar/files/patch-src__armyproto.cpp b/games/lordsawar/files/patch-src__armyproto.cpp deleted file mode 100644 index 4908051084e5..000000000000 --- a/games/lordsawar/files/patch-src__armyproto.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/armyproto.cpp.orig 2011-02-12 19:13:14 UTC -+++ src/armyproto.cpp -@@ -34,7 +34,7 @@ - - ArmyProto::ArmyProto(const ArmyProto& a) - :ArmyProtoBase(a), d_id(a.d_id), d_defends_ruins(a.d_defends_ruins), -- d_awardable(a.d_awardable), d_image_name(a.d_image_name), -+ d_awardable(a.d_awardable), - d_gender(a.d_gender) - { - for (unsigned int c = Shield::WHITE; c <= Shield::NEUTRAL; c++) diff --git a/games/lordsawar/files/patch-src__setlist.h b/games/lordsawar/files/patch-src__setlist.h deleted file mode 100644 index 692ded785f6b..000000000000 --- a/games/lordsawar/files/patch-src__setlist.h +++ /dev/null @@ -1,26 +0,0 @@ ---- src/setlist.h.orig 2015-07-03 20:03:50 UTC -+++ src/setlist.h -@@ -35,7 +35,11 @@ public: - SetList(Glib::ustring ext){extension=ext;}; - ~SetList() - { -+#if defined(_LIBCPP_VERSION) -+ for (typename SetList<T>::iterator it = this->begin(); it != this->end(); -+#else - for (class SetList<T>::iterator it = this->begin(); it != this->end(); -+#endif - it++) - delete (*it); - }; -@@ -62,7 +66,11 @@ public: - - bool contains(Glib::ustring name) const - { -+#if defined(_LIBCPP_VERSION) -+ for (typename SetList<T>::const_iterator it = this->begin(); -+#else - for (class SetList<T>::const_iterator it = this->begin(); -+#endif - it != this->end(); it++) - if ((*it)->getName() == name) - return true; diff --git a/games/lordsawar/files/patch-src_gui_stack-army-button.cpp b/games/lordsawar/files/patch-src_gui_stack-army-button.cpp deleted file mode 100644 index bb3a815d245d..000000000000 --- a/games/lordsawar/files/patch-src_gui_stack-army-button.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gui/stack-army-button.cpp.orig 2015-06-20 22:48:43 UTC -+++ src/gui/stack-army-button.cpp -@@ -146,7 +146,7 @@ void StackArmyButton::fill_army_button() - { - bool greyed_out = false; - Stack *active_stack = p->getActivestack(); -- if (active_stack->getArmyById(d_army->getId()) == false) -+ if (!active_stack->getArmyById(d_army->getId())) - greyed_out = true; - army_image->property_pixbuf() = - gc->getCircledArmyPic(p->getArmyset(), d_army->getTypeId(), diff --git a/games/lordsawar/pkg-descr b/games/lordsawar/pkg-descr deleted file mode 100644 index 1dd075c6e713..000000000000 --- a/games/lordsawar/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -A turn-based strategy game where up to 8 players strive for control -of as many cities as possible. Produce new armies in cities to -conquer nearby cities. Using the income from those cities, make -more armies to take more cities. Send a hero to a temple to get a -quest, or maybe search a nearby ruin instead. Play with others or -against the computer. - -WWW: http://www.nongnu.org/lordsawar/ diff --git a/games/lordsawar/pkg-plist b/games/lordsawar/pkg-plist deleted file mode 100644 index 2edd72ac78b1..000000000000 --- a/games/lordsawar/pkg-plist +++ /dev/null @@ -1,248 +0,0 @@ -bin/lordsawar -bin/lordsawar-editor -bin/lordsawar-game-host-client -bin/lordsawar-game-host-server -bin/lordsawar-game-list-client -bin/lordsawar-game-list-server -bin/lordsawar-import -bin/lordsawar-upgrade-file -man/man6/lordsawar-editor.6.gz -man/man6/lordsawar-game-host-client.6.gz -man/man6/lordsawar-game-host-server.6.gz -man/man6/lordsawar-game-list-client.6.gz -man/man6/lordsawar-game-list-server.6.gz -man/man6/lordsawar-import.6.gz -man/man6/lordsawar.6.gz -share/appdata/lordsawar-appdata.xml -share/applications/lordsawar-editor.desktop -share/applications/lordsawar.desktop -share/icons/hicolor/32x32/apps/lordsawar-editor.png -share/icons/hicolor/32x32/apps/lordsawar.png -share/icons/hicolor/64x64/apps/lordsawar-editor.png -share/icons/hicolor/64x64/apps/lordsawar.png -share/locale/ca/LC_MESSAGES/lordsawar.mo -share/locale/da/LC_MESSAGES/lordsawar.mo -share/locale/de/LC_MESSAGES/lordsawar.mo -share/locale/hu/LC_MESSAGES/lordsawar.mo -share/locale/nl/LC_MESSAGES/lordsawar.mo -share/locale/pl/LC_MESSAGES/lordsawar.mo -%%DATADIR%%/army/bigdefault.lwa -%%DATADIR%%/army/default.lwa -%%DATADIR%%/army/duel.lwa -%%DATADIR%%/citynames.xml -%%DATADIR%%/citysets/bigdefault.lwc -%%DATADIR%%/citysets/bigdol.lwc -%%DATADIR%%/citysets/default.lwc -%%DATADIR%%/citysets/dol.lwc -%%DATADIR%%/glade/about-dialog.ui -%%DATADIR%%/glade/army-bonus-dialog.ui -%%DATADIR%%/glade/army-gains-level-dialog.ui -%%DATADIR%%/glade/army-info-window.ui -%%DATADIR%%/glade/buy-production-dialog.ui -%%DATADIR%%/glade/city-defeated-dialog.ui -%%DATADIR%%/glade/city-info-window.ui -%%DATADIR%%/glade/city-looted-dialog.ui -%%DATADIR%%/glade/city-pillaged-dialog.ui -%%DATADIR%%/glade/city-raze-dialog.ui -%%DATADIR%%/glade/city-razed-dialog.ui -%%DATADIR%%/glade/city-rename-dialog.ui -%%DATADIR%%/glade/city-sacked-dialog.ui -%%DATADIR%%/glade/city-window.ui -%%DATADIR%%/glade/destination-dialog.ui -%%DATADIR%%/glade/diplomacy-dialog.ui -%%DATADIR%%/glade/diplomacy-report-dialog.ui -%%DATADIR%%/glade/disband-stack-dialog.ui -%%DATADIR%%/glade/editor/armyset-info-dialog.ui -%%DATADIR%%/glade/editor/armyset-window.ui -%%DATADIR%%/glade/editor/backpack-editor-dialog.ui -%%DATADIR%%/glade/editor/city-editor-dialog.ui -%%DATADIR%%/glade/editor/cityset-info-dialog.ui -%%DATADIR%%/glade/editor/cityset-window.ui -%%DATADIR%%/glade/editor/editor-quit-dialog.ui -%%DATADIR%%/glade/editor/editor-splash-window.ui -%%DATADIR%%/glade/editor/fight-order-editor-dialog.ui -%%DATADIR%%/glade/editor/hero-editor-dialog.ui -%%DATADIR%%/glade/editor/image-editor-dialog.ui -%%DATADIR%%/glade/editor/itemlist-dialog.ui -%%DATADIR%%/glade/editor/main-window.ui -%%DATADIR%%/glade/editor/map-info-dialog.ui -%%DATADIR%%/glade/editor/masked-image-editor-dialog.ui -%%DATADIR%%/glade/editor/new-map-dialog.ui -%%DATADIR%%/glade/editor/players-dialog.ui -%%DATADIR%%/glade/editor/reward-editor-dialog.ui -%%DATADIR%%/glade/editor/reward-list-dialog.ui -%%DATADIR%%/glade/editor/road-editor-tip.ui -%%DATADIR%%/glade/editor/ruin-editor-dialog.ui -%%DATADIR%%/glade/editor/select-army-dialog.ui -%%DATADIR%%/glade/editor/select-hidden-ruin-dialog.ui -%%DATADIR%%/glade/editor/select-item-dialog.ui -%%DATADIR%%/glade/editor/select-reward-dialog.ui -%%DATADIR%%/glade/editor/shieldset-info-dialog.ui -%%DATADIR%%/glade/editor/shieldset-window.ui -%%DATADIR%%/glade/editor/signpost-editor-dialog.ui -%%DATADIR%%/glade/editor/smallmap-editor-dialog.ui -%%DATADIR%%/glade/editor/stack-editor-dialog.ui -%%DATADIR%%/glade/editor/switch-sets-dialog.ui -%%DATADIR%%/glade/editor/temple-editor-dialog.ui -%%DATADIR%%/glade/editor/tile-preview-dialog.ui -%%DATADIR%%/glade/editor/tile-size-editor-dialog.ui -%%DATADIR%%/glade/editor/tileset-explosion-picture-editor-dialog.ui -%%DATADIR%%/glade/editor/tileset-flag-editor-dialog.ui -%%DATADIR%%/glade/editor/tileset-info-dialog.ui -%%DATADIR%%/glade/editor/tileset-selector-editor-dialog.ui -%%DATADIR%%/glade/editor/tileset-smallmap-building-colors-dialog.ui -%%DATADIR%%/glade/editor/tileset-window.ui -%%DATADIR%%/glade/editor/tilestyle-organizer-dialog.ui -%%DATADIR%%/glade/fight-order-dialog.ui -%%DATADIR%%/glade/fight-window.ui -%%DATADIR%%/glade/fighter.ui -%%DATADIR%%/glade/game-button-box-desktop.ui -%%DATADIR%%/glade/game-button-box-large-screen.ui -%%DATADIR%%/glade/game-button-box-netbook.ui -%%DATADIR%%/glade/game-loaded-dialog.ui -%%DATADIR%%/glade/game-lobby-dialog.ui -%%DATADIR%%/glade/game-options-dialog.ui -%%DATADIR%%/glade/game-over-dialog.ui -%%DATADIR%%/glade/game-preferences-dialog.ui -%%DATADIR%%/glade/game-quit-dialog.ui -%%DATADIR%%/glade/game-window.ui -%%DATADIR%%/glade/hero-brings-allies-dialog.ui -%%DATADIR%%/glade/hero-dialog.ui -%%DATADIR%%/glade/hero-levels-dialog.ui -%%DATADIR%%/glade/hero-offer-dialog.ui -%%DATADIR%%/glade/history-report-dialog.ui -%%DATADIR%%/glade/item-bonus-dialog.ui -%%DATADIR%%/glade/item-report-dialog.ui -%%DATADIR%%/glade/load-scenario-dialog.ui -%%DATADIR%%/glade/main-preferences-dialog.ui -%%DATADIR%%/glade/medal-awarded-dialog.ui -%%DATADIR%%/glade/military-advisor-dialog.ui -%%DATADIR%%/glade/new-network-game-dialog.ui -%%DATADIR%%/glade/new-profile-dialog.ui -%%DATADIR%%/glade/new-random-map-dialog.ui -%%DATADIR%%/glade/next-player-turn-dialog.ui -%%DATADIR%%/glade/pick-network-game-to-join-dialog.ui -%%DATADIR%%/glade/player-died-dialog.ui -%%DATADIR%%/glade/player-resign-completed-dialog.ui -%%DATADIR%%/glade/player-resign-dialog.ui -%%DATADIR%%/glade/preferences-dialog.ui -%%DATADIR%%/glade/quest-assigned-dialog.ui -%%DATADIR%%/glade/quest-expired-dialog.ui -%%DATADIR%%/glade/quest-report-dialog.ui -%%DATADIR%%/glade/report-dialog.ui -%%DATADIR%%/glade/ruin-report-dialog.ui -%%DATADIR%%/glade/ruin-rewarded-dialog.ui -%%DATADIR%%/glade/ruin-searched-dialog.ui -%%DATADIR%%/glade/ruinfight-finished-dialog.ui -%%DATADIR%%/glade/ruinfight-started-dialog.ui -%%DATADIR%%/glade/sage-dialog.ui -%%DATADIR%%/glade/signpost-change-dialog.ui -%%DATADIR%%/glade/splash-window.ui -%%DATADIR%%/glade/stack-army-button-desktop.ui -%%DATADIR%%/glade/stack-army-button-large-screen.ui -%%DATADIR%%/glade/stack-army-button-netbook.ui -%%DATADIR%%/glade/stack-info-dialog.ui -%%DATADIR%%/glade/stack-info-window.ui -%%DATADIR%%/glade/stack-tile-box-desktop.ui -%%DATADIR%%/glade/stack-tile-box-large-screen.ui -%%DATADIR%%/glade/stack-tile-box-netbook.ui -%%DATADIR%%/glade/status-box-desktop.ui -%%DATADIR%%/glade/status-box-large-screen.ui -%%DATADIR%%/glade/status-box-netbook.ui -%%DATADIR%%/glade/surrender-dialog.ui -%%DATADIR%%/glade/surrender-refused-dialog.ui -%%DATADIR%%/glade/temple-visit-dialog.ui -%%DATADIR%%/glade/treachery-dialog.ui -%%DATADIR%%/glade/triumphs-dialog.ui -%%DATADIR%%/glade/use-item-dialog.ui -%%DATADIR%%/glade/use-item-on-city-dialog.ui -%%DATADIR%%/glade/use-item-on-player-dialog.ui -%%DATADIR%%/heronames.xml -%%DATADIR%%/map/dol.map -%%DATADIR%%/map/duel.map -%%DATADIR%%/music/back1.ogg -%%DATADIR%%/music/battle.ogg -%%DATADIR%%/music/bless.ogg -%%DATADIR%%/music/defeat.ogg -%%DATADIR%%/music/hero.ogg -%%DATADIR%%/music/intro.ogg -%%DATADIR%%/music/music.xml -%%DATADIR%%/music/victory.ogg -%%DATADIR%%/ruinnames.xml -%%DATADIR%%/shield/default.lws -%%DATADIR%%/shield/dol.lws -%%DATADIR%%/shield/plain.lws -%%DATADIR%%/signposts.xml -%%DATADIR%%/templenames.xml -%%DATADIR%%/tilesets/bigdefault.lwt -%%DATADIR%%/tilesets/bigstark.lwt -%%DATADIR%%/tilesets/bigwesnoth.lwt -%%DATADIR%%/tilesets/default.lwt -%%DATADIR%%/tilesets/stark.lwt -%%DATADIR%%/tilesets/wesnoth.lwt -%%DATADIR%%/various/arrows-medium.png -%%DATADIR%%/various/arrows.png -%%DATADIR%%/various/bag.png -%%DATADIR%%/various/bigmedals.png -%%DATADIR%%/various/buttons-medium.png -%%DATADIR%%/various/buttons.png -%%DATADIR%%/various/castle_icon.ico -%%DATADIR%%/various/castle_icon.png -%%DATADIR%%/various/city_occupied.png -%%DATADIR%%/various/cursors.png -%%DATADIR%%/various/diplomacy-large.png -%%DATADIR%%/various/diplomacy-small.png -%%DATADIR%%/various/editor/button_12x12.png -%%DATADIR%%/various/editor/button_1x1.png -%%DATADIR%%/various/editor/button_2x2.png -%%DATADIR%%/various/editor/button_3x3.png -%%DATADIR%%/various/editor/button_6x6.png -%%DATADIR%%/various/editor/button_bag.png -%%DATADIR%%/various/editor/button_blank.png -%%DATADIR%%/various/editor/button_bridge.png -%%DATADIR%%/various/editor/button_castle.png -%%DATADIR%%/various/editor/button_erase.png -%%DATADIR%%/various/editor/button_move.png -%%DATADIR%%/various/editor/button_port.png -%%DATADIR%%/various/editor/button_road.png -%%DATADIR%%/various/editor/button_ruin.png -%%DATADIR%%/various/editor/button_selector.png -%%DATADIR%%/various/editor/button_signpost.png -%%DATADIR%%/various/editor/button_stack.png -%%DATADIR%%/various/editor/button_temple.png -%%DATADIR%%/various/hero-inactive.png -%%DATADIR%%/various/hero-newlevel-female.png -%%DATADIR%%/various/hero-newlevel-male.png -%%DATADIR%%/various/hero.png -%%DATADIR%%/various/items/items.xml -%%DATADIR%%/various/lordsawar_logo.png -%%DATADIR%%/various/medals_mask.png -%%DATADIR%%/various/movebonus.png -%%DATADIR%%/various/parley_offered.png -%%DATADIR%%/various/parley_refused.png -%%DATADIR%%/various/prodshieldset-medium.png -%%DATADIR%%/various/prodshieldset.png -%%DATADIR%%/various/recruit_female.png -%%DATADIR%%/various/recruit_male.png -%%DATADIR%%/various/ruin_1.png -%%DATADIR%%/various/ruin_2.png -%%DATADIR%%/various/ship.png -%%DATADIR%%/various/smallcity.png -%%DATADIR%%/various/smalldefense.png -%%DATADIR%%/various/smallexploredruin.png -%%DATADIR%%/various/smallincome.png -%%DATADIR%%/various/smallruinedcity.png -%%DATADIR%%/various/smalltemple.png -%%DATADIR%%/various/smalltreasury.png -%%DATADIR%%/various/smallunexploredruin.png -%%DATADIR%%/various/smallunexploredstronghold.png -%%DATADIR%%/various/smallupkeep.png -%%DATADIR%%/various/splash_screen.jpg -%%DATADIR%%/various/tileset_icon.ico -%%DATADIR%%/various/tileset_icon.png -%%DATADIR%%/various/tilestyles.png -%%DATADIR%%/various/waypoints.png -%%DATADIR%%/various/win.png -%%DATADIR%%/various/xslt/as-0.2.1-0.3.0.xsl -%%DATADIR%%/various/xslt/gs-0.2.0-0.2.1.xsl -%%DATADIR%%/various/xslt/pbm-0.2.0-0.2.1.xsl diff --git a/lang/Makefile b/lang/Makefile index 30a6e456561b..9b67914b40c9 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -14,7 +14,6 @@ SUBDIR += asis SUBDIR += asn1c SUBDIR += atlast - SUBDIR += ats SUBDIR += awka SUBDIR += bas2tap SUBDIR += basic256 diff --git a/lang/ats/Makefile b/lang/ats/Makefile deleted file mode 100644 index 41d29995b87a..000000000000 --- a/lang/ats/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw> -# $FreeBSD$ - -PORTNAME= ats -PORTVERSION= ${ATS_VER} -PORTREVISION= 1 -CATEGORIES= lang -MASTER_SITES= SF/${PORTNAME}-lang/${PORTNAME}-lang/${ATS_IMPL}-${PORTVERSION} -DISTNAME= ${PORTNAME}-lang-${ATS_IMPL}-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Language with a type system rooted in the Applied Type System - -DEPRECATED= Unmaintained, outdated, needs lots of refreshment -EXPIRATION_DATE= 2017-11-04 - -ONLY_FOR_ARCHS= i386 amd64 -USES= gmake tar:tgz -GNU_CONFIGURE= yes -CFLAGS+= -I${LOCALBASE}/include \ - -L${LOCALBASE}/lib - -MAKE_JOBS_UNSAFE=yes -PORTDOCS= FAQ.txt -PORTEXAMPLES= AUP INTRO KernighanRitchie MISC MULTICORE TEST - -OPTIONS_DEFINE= GMP PCRE DOCS EXAMPLES -OPTIONS_DEFAULT= GMP PCRE -GMP_LIB_DEPENDS= libgmp.so:math/gmp -PCRE_LIB_DEPENDS= libpcre.so:devel/pcre - -.include <bsd.port.pre.mk> - -.if ${ARCH} == amd64 -PLIST_SUB+= LIBDIR="lib64" -.else -PLIST_SUB+= LIBDIR="lib" -.endif - -post-patch: - ${SED} -i '' -e 's/gcc/${CC}/' \ - ${WRKSRC}/ccomp/runtime/GCATS/Makefile \ - ${WRKSRC}/utils/scripts/Makefile \ - ${WRKSRC}/libatsdoc/Makefile - ${SED} -i '' -e 's/ATSCCOMP_def "gcc"/ATSCCOMP_def "${CC}"/' \ - ${WRKSRC}/utils/scripts/basics.dats - ${SED} -i '' -e 's/argv_p = "gcc"/argv_p = "${CC}"/' \ - -e 's/execvp("gcc", argv)/execvp("${CC}", argv)/' \ - ${WRKSRC}/utils/scripts/atslib.dats - -post-configure: -.if empty(PORT_OPTIONS:MGMP) - ${SED} -i '' -e '/HAVE_GMP_H/d' ${WRKSRC}/config.h -.endif -.if empty(PORT_OPTIONS:MPCRE) - ${SED} -i '' -e '/HAVE_PCRE_H/d' ${WRKSRC}/config.h -.endif - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${ATS_LIBDIR_REL}/bin/* - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && \ - ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/doc/EXAMPLE && \ - ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR} - ${FIND} ${STAGEDIR}${EXAMPLESDIR} -name Makefile \ - -exec ${SED} -i '' -e 's|^ATSUSRQ=.*|ATSUSRQ="${PREFIX}"|' {} \; - -.include "bsd.ats.mk" -.include <bsd.port.post.mk> diff --git a/lang/ats/bsd.ats.mk b/lang/ats/bsd.ats.mk deleted file mode 100644 index 9a46bc3220ef..000000000000 --- a/lang/ats/bsd.ats.mk +++ /dev/null @@ -1,56 +0,0 @@ -ATS_IMPL= anairiats -ATS_VER= 0.2.9 - -ATS_LIBDIR_REL= lib/ats-${ATS_IMPL}-${ATS_VER} -ATS_LIBDIR= ${LOCALBASE}/${ATS_LIBDIR_REL} - -PLIST_SUB+= ATS_LIBDIR="${ATS_LIBDIR_REL}" - -.if defined(ATS_CTRB) - -PKGNAMEPREFIX= ${ATS_CTRBPREFIX} -ATS_CTRBPREFIX= ats-contrib- -ATS_CTRBEXAMPLEDIR= ${PREFIX}/share/examples/${ATS_CTRBPREFIX}${PORTNAME} - -FETCH_DEPENDS+= ${NONEXISTENT}:lang/ats:patch -BUILD_DEPENDS+= ${LOCALBASE}/bin/atscc:lang/ats - -USES= gmake -MAKE_ENV+= ATSHOME=${ATS_LIBDIR} ATSHOMERELOC=ATS-${ATS_VER} -MAKE_ARGS+= -C contrib/${ATS_CTRB} - -ATS_WRKSRC= cd ${PORTSDIR}/lang/ats; ${MAKE} -V WRKSRC - -do-extract: - ${MKDIR} ${WRKDIR} - ${LN} -sf $$(${ATS_WRKSRC}) ${WRKDIR}/${DISTNAME} - -pre-build: - ${SED} -i '' \ - -e 's/^ATSCC=\(.*\)/ATSCC=\1 $$(CFLAGS) -IATS./' \ - ${BUILD_WRKSRC}/contrib/${ATS_CTRB}/Makefile - ${LN} -sf ${BUILD_WRKSRC}/contrib ${BUILD_WRKSRC}/contrib/${ATS_CTRB}/ - -do-install: - ${MKDIR} ${ATS_LIBDIR}/contrib - cd ${INSTALL_WRKSRC}/contrib && \ - ${RM} ${ATS_CTRB}/contrib && \ - ${COPYTREE_SHARE} ${ATS_CTRB} ${ATS_LIBDIR}/contrib -.if !defined(NOPORTEXAMPLES) && defined(ATS_CTRBEXAMPLE) - ${MKDIR} ${ATS_CTRBEXAMPLEDIR} - cd ${INSTALL_WRKSRC}/doc/EXAMPLE/${ATS_CTRBEXAMPLE} && \ - ${COPYTREE_SHARE} . ${ATS_CTRBEXAMPLEDIR} - ${FIND} ${ATS_CTRBEXAMPLEDIR} -name Makefile \ - -exec ${SED} -i '' \ - -e 's|^ATSUSRQ=.*|ATSUSRQ="${ATS_LIBDIR}"|' \ - -e 's|^ATSLIBQ=.*|ATSLIBQ="${ATS_LIBDIR}"|' {} \; -.endif - -post-install-script: - @${FIND} -ds ${ATS_LIBDIR}/contrib/${ATS_CTRB} -type f -print | \ - ${SED} -e 's|^${LOCALBASE}/||' >> ${TMPPLIST} -.if !defined(NOPORTEXAMPLES) && defined(ATS_CTRBEXAMPLE) - @${FIND} -ds ${ATS_CTRBEXAMPLEDIR} -type f -print | \ - ${SED} -E -e 's|^${PREFIX}/?||' >> ${TMPPLIST} -.endif -.endif diff --git a/lang/ats/distinfo b/lang/ats/distinfo deleted file mode 100644 index f81abea4dc70..000000000000 --- a/lang/ats/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (ats-lang-anairiats-0.2.9.tgz) = 44bbf49f7bea0e411c5a24ae0ea3ecf1d771886b6bd19ea6798badb01f1512fd -SIZE (ats-lang-anairiats-0.2.9.tgz) = 2466767 diff --git a/lang/ats/files/patch-Makefile b/lang/ats/files/patch-Makefile deleted file mode 100644 index f6db4d0638cc..000000000000 --- a/lang/ats/files/patch-Makefile +++ /dev/null @@ -1,86 +0,0 @@ ---- Makefile.orig 2013-01-24 10:49:41.547037509 +0800 -+++ Makefile 2013-01-24 10:55:14.781718163 +0800 -@@ -59,12 +59,6 @@ - autoheader $< - touch $@ - --configure: configure.ac $(SRC_CONFIG_FILES) -- aclocal -- automake --add-missing --foreign || true -- autoconf -- touch $(BUILT_CONFIG_FILES) -- - -include config.mk - - ###### -@@ -92,7 +86,7 @@ - cd $(abs_top_srcdir) - [ -d $(DESTDIR)/$(bindir) ] || $(MKDIR_P) $(DESTDIR)/$(bindir) - $(MKDIR_P) $(DESTDIR)$(ATSNEWHOME)/bin -- find ccomp contrib doc libats libc prelude -type d \ -+ find ccomp libats libatsdoc libc prelude -type d \ - -exec $(MKDIR_P) $(DESTDIR)$(ATSNEWHOME)/\{} \; \ - -print - -@@ -100,7 +94,7 @@ - # - # recursively install all files in the list except .svn control files. - # -- for d in ccomp/runtime contrib doc libats libc prelude; do \ -+ for d in ccomp/runtime libats libatsdoc libc prelude; do \ - cd $(abs_top_srcdir) && \ - $(INSTALL) -d $(DESTDIR)$(ATSNEWHOME)/"$$d" && \ - find "$$d" -name .svn -prune -o -type f \ -@@ -140,6 +134,8 @@ - done - - install:: install_files -+ find $(DESTDIR)$(ATSNEWHOME) -depth -type d -empty -delete -+ find $(DESTDIR)$(ATSNEWHOME) -type f -name '*.orig' -delete - - ###### - -@@ -155,8 +151,7 @@ - ccomp/runtime/GCATS/gc_mt.o \ - atsopt1_gc \ - bin/atslex \ -- bin/atsdoc \ -- contrib -+ bin/atsdoc - @echo "ATS/Anairiats has been built up successfully!" - @echo "The value of ATSHOME for this build is \"$(ATSHOME)\"." - @echo "The value of ATSHOMERELOC for this build is \"$(ATSHOMERELOC)\"." -@@ -217,23 +212,23 @@ - - .libfiles_local: .libfiles ; $(CC) -E -P -x c -o $@ $< - libfiles: .libfiles_local -- $(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats -- $(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats_lex -- $(ATSLIB) $(ATS_PROOFCHECK) -O2 --libats_smlbas -+ $(ATSLIB) $(ATS_PROOFCHECK) $(CFLAGS) --libats -+ $(ATSLIB) $(ATS_PROOFCHECK) $(CFLAGS) --libats_lex -+ $(ATSLIB) $(ATS_PROOFCHECK) $(CFLAGS) --libats_smlbas - - lib32files: .libfiles_local -- $(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats -- $(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats_lex -- $(ATSLIB) $(ATS_PROOFCHECK) -m32 -O2 --libats_smlbas -+ $(ATSLIB) $(ATS_PROOFCHECK) -m32 $(CFLAGS) --libats -+ $(ATSLIB) $(ATS_PROOFCHECK) -m32 $(CFLAGS) --libats_lex -+ $(ATSLIB) $(ATS_PROOFCHECK) -m32 $(CFLAGS) --libats_smlbas - - lib64files: .libfiles_local -- $(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats -- $(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats_lex -- $(ATSLIB) $(ATS_PROOFCHECK) -m64 -O2 --libats_smlbas -+ $(ATSLIB) $(ATS_PROOFCHECK) -m64 $(CFLAGS) --libats -+ $(ATSLIB) $(ATS_PROOFCHECK) -m64 $(CFLAGS) --libats_lex -+ $(ATSLIB) $(ATS_PROOFCHECK) -m64 $(CFLAGS) --libats_smlbas - - .libfiles_mt_local: .libfiles_mt ; $(CC) -E -P -x c -o $@ $< - libfiles_mt: .libfiles_mt_local -- $(ATSLIB) $(ATS_PROOFCHECK) -D_ATS_MULTITHREAD -O2 --libats_mt -+ $(ATSLIB) $(ATS_PROOFCHECK) -D_ATS_MULTITHREAD $(CFLAGS) --libats_mt - - libatsdoca: ; $(MAKE) -C libatsdoc - diff --git a/lang/ats/files/patch-Makefile__bootstrap b/lang/ats/files/patch-Makefile__bootstrap deleted file mode 100644 index df5c27b77f54..000000000000 --- a/lang/ats/files/patch-Makefile__bootstrap +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile_bootstrap.orig 2011-10-06 21:17:51.000000000 +0800 -+++ Makefile_bootstrap 2011-10-06 21:18:13.000000000 +0800 -@@ -78,7 +78,7 @@ - - BOOTSTRAP1=1 - ifdef BOOTSTRAP1 --ATSCCFLAGS=-I$(ATSHOMEQ) -I$(ATSRUNTIME) -O2 -g -+ATSCCFLAGS=-I$(ATSHOMEQ) -I$(ATSRUNTIME) $(CFLAGS) - endif - - LIBGMP= diff --git a/lang/ats/files/patch-ccomp_runtime_GCATS_gcats1__misc.dats b/lang/ats/files/patch-ccomp_runtime_GCATS_gcats1__misc.dats deleted file mode 100644 index 19b0db5a1fa9..000000000000 --- a/lang/ats/files/patch-ccomp_runtime_GCATS_gcats1__misc.dats +++ /dev/null @@ -1,10 +0,0 @@ ---- ccomp/runtime/GCATS/gcats1_misc.dats.orig 2012-05-23 14:32:51.606718510 +0800 -+++ ccomp/runtime/GCATS/gcats1_misc.dats 2012-05-23 14:33:22.846718098 +0800 -@@ -55,6 +55,7 @@ - // - // dir=1/-1 : upward/downward - // -+static int gc_stack_dir_get_inner (int *some_ptr) __attribute__((noinline)); - static - int gc_stack_dir_get_inner (int *some_ptr) { - int some_int ; diff --git a/lang/ats/files/patch-config.mk.in b/lang/ats/files/patch-config.mk.in deleted file mode 100644 index 3dedddf550f9..000000000000 --- a/lang/ats/files/patch-config.mk.in +++ /dev/null @@ -1,11 +0,0 @@ ---- config.mk.in.orig 2012-09-06 15:37:58.253921955 +0800 -+++ config.mk.in 2012-09-06 15:38:09.939751074 +0800 -@@ -2,7 +2,7 @@ - PACKAGE_TARNAME := @PACKAGE_TARNAME@ - PACKAGE_VERSION := @PACKAGE_VERSION@ - --abs_top_srcdir := @abs_top_srcdir@ -+abs_top_srcdir := $(realpath @abs_top_srcdir@) - prefix := @prefix@ - exec_prefix := @exec_prefix@ - bindir := @bindir@ diff --git a/lang/ats/files/patch-libatsdoc_Makefile b/lang/ats/files/patch-libatsdoc_Makefile deleted file mode 100644 index cfbacbe06a88..000000000000 --- a/lang/ats/files/patch-libatsdoc_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- libatsdoc/Makefile.orig 2012-09-06 15:39:38.797921223 +0800 -+++ libatsdoc/Makefile 2012-09-06 15:40:12.166571629 +0800 -@@ -43,7 +43,7 @@ - ###### - - all:: Makefile_out --all:: ; make -f Makefile_out -+all:: ; $(MAKE) -f Makefile_out - all:: cleanall - - ###### diff --git a/lang/ats/pkg-descr b/lang/ats/pkg-descr deleted file mode 100644 index ff3e20355ea0..000000000000 --- a/lang/ats/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -ATS is a statically typed programming language -that unifies implementation with formal specification. -It is equipped with a highly expressive type system rooted in -the framework Applied Type System, which gives the language its name. -In particular, both dependent types and linear types are available in ATS. - -WWW: http://www.ats-lang.org/ diff --git a/lang/ats/pkg-plist b/lang/ats/pkg-plist deleted file mode 100644 index e323464042ff..000000000000 --- a/lang/ats/pkg-plist +++ /dev/null @@ -1,436 +0,0 @@ -bin/atscc -bin/atsdoc -bin/atslex -bin/atslib -bin/atsopt -bin/atspack -%%ATS_LIBDIR%%/INSTALL -%%ATS_LIBDIR%%/VERSION.txt -%%ATS_LIBDIR%%/bin/atscc -%%ATS_LIBDIR%%/bin/atsdoc -%%ATS_LIBDIR%%/bin/atslex -%%ATS_LIBDIR%%/bin/atslib -%%ATS_LIBDIR%%/bin/atsopt -%%ATS_LIBDIR%%/bin/atspack -%%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libats.a -%%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libats_lex.a -%%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libats_mt.a -%%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libats_smlbas.a -%%ATS_LIBDIR%%/ccomp/%%LIBDIR%%/libatsdoc.a -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/Makefile -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/README -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gc.o -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gc_mt.o -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1.cats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1.sats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_all.cats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_autops.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_chunk.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_collecting.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_freeitmlst.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_globalentry.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_main.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_manops.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_marking.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_master.hats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_misc.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_multithread.dats -%%ATS_LIBDIR%%/ccomp/runtime/GCATS/gcats1_top.dats -%%ATS_LIBDIR%%/ccomp/runtime/ats_basics.h -%%ATS_LIBDIR%%/ccomp/runtime/ats_bootstrap.c -%%ATS_LIBDIR%%/ccomp/runtime/ats_config.h -%%ATS_LIBDIR%%/ccomp/runtime/ats_exception.h -%%ATS_LIBDIR%%/ccomp/runtime/ats_memory.h -%%ATS_LIBDIR%%/ccomp/runtime/ats_prelude.c -%%ATS_LIBDIR%%/ccomp/runtime/ats_prelude_gcats.c -%%ATS_LIBDIR%%/ccomp/runtime/ats_prelude_gcbdw.c -%%ATS_LIBDIR%%/ccomp/runtime/ats_prelude_ngc.c -%%ATS_LIBDIR%%/ccomp/runtime/ats_types.h -%%ATS_LIBDIR%%/config.h -%%ATS_LIBDIR%%/libats/CATS/fmatrix.cats -%%ATS_LIBDIR%%/libats/CATS/genarrays.cats -%%ATS_LIBDIR%%/libats/CATS/hashtable_chain.cats -%%ATS_LIBDIR%%/libats/CATS/intinf.cats -%%ATS_LIBDIR%%/libats/CATS/linbitvec.cats -%%ATS_LIBDIR%%/libats/CATS/linordset_randbst.cats -%%ATS_LIBDIR%%/libats/CATS/linqueue_arr.cats -%%ATS_LIBDIR%%/libats/CATS/linqueue_lst.cats -%%ATS_LIBDIR%%/libats/CATS/linstack_arr.cats -%%ATS_LIBDIR%%/libats/CATS/lockptr_spin.cats -%%ATS_LIBDIR%%/libats/CATS/lockref_spin.cats -%%ATS_LIBDIR%%/libats/CATS/parworkshop.cats -%%ATS_LIBDIR%%/libats/CATS/regexp.cats -%%ATS_LIBDIR%%/libats/CATS/slseg.cats -%%ATS_LIBDIR%%/libats/CATS/vector.cats -%%ATS_LIBDIR%%/libats/DATS/biarray.dats -%%ATS_LIBDIR%%/libats/DATS/bimatrix.dats -%%ATS_LIBDIR%%/libats/DATS/fmatrix.dats -%%ATS_LIBDIR%%/libats/DATS/freelst.dats -%%ATS_LIBDIR%%/libats/DATS/funarray_braun.dats -%%ATS_LIBDIR%%/libats/DATS/fundeque_fingertree.dats -%%ATS_LIBDIR%%/libats/DATS/funheap_binomial.dats -%%ATS_LIBDIR%%/libats/DATS/funheap_braun.dats -%%ATS_LIBDIR%%/libats/DATS/funmap_avltree.dats -%%ATS_LIBDIR%%/libats/DATS/funmap_rbtree.dats -%%ATS_LIBDIR%%/libats/DATS/funmset_listord.dats -%%ATS_LIBDIR%%/libats/DATS/funralist_nested.dats -%%ATS_LIBDIR%%/libats/DATS/funset_avltree.dats -%%ATS_LIBDIR%%/libats/DATS/funset_listord.dats -%%ATS_LIBDIR%%/libats/DATS/genarrays.dats -%%ATS_LIBDIR%%/libats/DATS/gfarray.dats -%%ATS_LIBDIR%%/libats/DATS/gflist.dats -%%ATS_LIBDIR%%/libats/DATS/gflist_vt.dats -%%ATS_LIBDIR%%/libats/DATS/hashtable_chain.dats -%%ATS_LIBDIR%%/libats/DATS/hashtable_linprb.dats -%%ATS_LIBDIR%%/libats/DATS/ilistp.dats -%%ATS_LIBDIR%%/libats/DATS/intinf.dats -%%ATS_LIBDIR%%/libats/DATS/iterint.dats -%%ATS_LIBDIR%%/libats/DATS/linbitvec.dats -%%ATS_LIBDIR%%/libats/DATS/linheap_binomial.dats -%%ATS_LIBDIR%%/libats/DATS/linmap_avltree.dats -%%ATS_LIBDIR%%/libats/DATS/linmap_rbtree.dats -%%ATS_LIBDIR%%/libats/DATS/linmap_skiplist.dats -%%ATS_LIBDIR%%/libats/DATS/linordset_randbst.dats -%%ATS_LIBDIR%%/libats/DATS/linqueue_arr.dats -%%ATS_LIBDIR%%/libats/DATS/linqueue_lst.dats -%%ATS_LIBDIR%%/libats/DATS/linset_avltree.dats -%%ATS_LIBDIR%%/libats/DATS/linset_listord.dats -%%ATS_LIBDIR%%/libats/DATS/linstack_arr.dats -%%ATS_LIBDIR%%/libats/DATS/lockptr_spin.dats -%%ATS_LIBDIR%%/libats/DATS/lockref_spin.dats -%%ATS_LIBDIR%%/libats/DATS/parworkshop.dats -%%ATS_LIBDIR%%/libats/DATS/rarray.dats -%%ATS_LIBDIR%%/libats/DATS/refcount.dats -%%ATS_LIBDIR%%/libats/DATS/regexp.dats -%%ATS_LIBDIR%%/libats/DATS/vector.dats -%%ATS_LIBDIR%%/libats/SATS/biarray.sats -%%ATS_LIBDIR%%/libats/SATS/bimatrix.sats -%%ATS_LIBDIR%%/libats/SATS/fmatrix.sats -%%ATS_LIBDIR%%/libats/SATS/freelst.sats -%%ATS_LIBDIR%%/libats/SATS/funarray_braun.sats -%%ATS_LIBDIR%%/libats/SATS/fundeque_fingertree.sats -%%ATS_LIBDIR%%/libats/SATS/funheap_binomial.sats -%%ATS_LIBDIR%%/libats/SATS/funheap_braun.sats -%%ATS_LIBDIR%%/libats/SATS/funmap_avltree.sats -%%ATS_LIBDIR%%/libats/SATS/funmap_rbtree.sats -%%ATS_LIBDIR%%/libats/SATS/funmset_listord.sats -%%ATS_LIBDIR%%/libats/SATS/funralist_nested.sats -%%ATS_LIBDIR%%/libats/SATS/funset_avltree.sats -%%ATS_LIBDIR%%/libats/SATS/funset_listord.sats -%%ATS_LIBDIR%%/libats/SATS/genarrays.sats -%%ATS_LIBDIR%%/libats/SATS/gfarray.sats -%%ATS_LIBDIR%%/libats/SATS/gflist.sats -%%ATS_LIBDIR%%/libats/SATS/gflist_vt.sats -%%ATS_LIBDIR%%/libats/SATS/gftree.sats -%%ATS_LIBDIR%%/libats/SATS/hashtable_chain.sats -%%ATS_LIBDIR%%/libats/SATS/hashtable_linprb.sats -%%ATS_LIBDIR%%/libats/SATS/ilistp.sats -%%ATS_LIBDIR%%/libats/SATS/imsetp.sats -%%ATS_LIBDIR%%/libats/SATS/intinf.sats -%%ATS_LIBDIR%%/libats/SATS/iterint.sats -%%ATS_LIBDIR%%/libats/SATS/itreep.sats -%%ATS_LIBDIR%%/libats/SATS/linbitvec.sats -%%ATS_LIBDIR%%/libats/SATS/linheap_binomial.sats -%%ATS_LIBDIR%%/libats/SATS/linmap_avltree.sats -%%ATS_LIBDIR%%/libats/SATS/linmap_rbtree.sats -%%ATS_LIBDIR%%/libats/SATS/linmap_skiplist.sats -%%ATS_LIBDIR%%/libats/SATS/linordset_randbst.sats -%%ATS_LIBDIR%%/libats/SATS/linqueue_arr.sats -%%ATS_LIBDIR%%/libats/SATS/linqueue_lst.sats -%%ATS_LIBDIR%%/libats/SATS/linset_avltree.sats -%%ATS_LIBDIR%%/libats/SATS/linset_listord.sats -%%ATS_LIBDIR%%/libats/SATS/linstack_arr.sats -%%ATS_LIBDIR%%/libats/SATS/lockptr_spin.sats -%%ATS_LIBDIR%%/libats/SATS/lockref_spin.sats -%%ATS_LIBDIR%%/libats/SATS/optini.sats -%%ATS_LIBDIR%%/libats/SATS/parworkshop.sats -%%ATS_LIBDIR%%/libats/SATS/rarray.sats -%%ATS_LIBDIR%%/libats/SATS/refcount.sats -%%ATS_LIBDIR%%/libats/SATS/refcountr.sats -%%ATS_LIBDIR%%/libats/SATS/regexp.sats -%%ATS_LIBDIR%%/libats/SATS/sobjptr.sats -%%ATS_LIBDIR%%/libats/SATS/vector.sats -%%ATS_LIBDIR%%/libats/lex/lexing.dats -%%ATS_LIBDIR%%/libats/lex/lexing.sats -%%ATS_LIBDIR%%/libats/lex/tables.dats -%%ATS_LIBDIR%%/libats/ngc/CATS/deque_arr.cats -%%ATS_LIBDIR%%/libats/ngc/DATS/deque_arr.dats -%%ATS_LIBDIR%%/libats/ngc/DATS/dlist.dats -%%ATS_LIBDIR%%/libats/ngc/DATS/linmap_avltree.dats -%%ATS_LIBDIR%%/libats/ngc/DATS/linmap_pavltree.dats -%%ATS_LIBDIR%%/libats/ngc/DATS/slist.dats -%%ATS_LIBDIR%%/libats/ngc/SATS/deque_arr.sats -%%ATS_LIBDIR%%/libats/ngc/SATS/dlist.sats -%%ATS_LIBDIR%%/libats/ngc/SATS/linmap_avltree.sats -%%ATS_LIBDIR%%/libats/ngc/SATS/linmap_pavltree.sats -%%ATS_LIBDIR%%/libats/ngc/SATS/slist.sats -%%ATS_LIBDIR%%/libats/smlbas/.libfiles -%%ATS_LIBDIR%%/libats/smlbas/DATS/array.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/array2.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/bool.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/char.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/date.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/list.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/listPair.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/math.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/real.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/string.dats -%%ATS_LIBDIR%%/libats/smlbas/DATS/time.dats -%%ATS_LIBDIR%%/libats/smlbas/SATS/array.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/array2.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/bool.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/char.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/date.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/general.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/list.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/listPair.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/math.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/real.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/string.sats -%%ATS_LIBDIR%%/libats/smlbas/SATS/time.sats -%%ATS_LIBDIR%%/libatsdoc/CATS/libatsdoc_lexbuf.cats -%%ATS_LIBDIR%%/libatsdoc/CATS/libatsdoc_location.cats -%%ATS_LIBDIR%%/libatsdoc/CATS/libatsdoc_reader.cats -%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_atext.dats -%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_error.dats -%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_filename.dats -%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_lexbuf.dats -%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_location.dats -%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_reader.dats -%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_symbol.dats -%%ATS_LIBDIR%%/libatsdoc/DATS/libatsdoc_symmap.dats -%%ATS_LIBDIR%%/libatsdoc/Makefile -%%ATS_LIBDIR%%/libatsdoc/Makefile_inp -%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_atext.sats -%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_error.sats -%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_filename.sats -%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_lexbuf.sats -%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_location.sats -%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_reader.sats -%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_symbol.sats -%%ATS_LIBDIR%%/libatsdoc/SATS/libatsdoc_symmap.sats -%%ATS_LIBDIR%%/libatsdoc/dynloadall.dats -%%ATS_LIBDIR%%/libc/CATS/SIMD_v2df.cats -%%ATS_LIBDIR%%/libc/CATS/complex.cats -%%ATS_LIBDIR%%/libc/CATS/ctype.cats -%%ATS_LIBDIR%%/libc/CATS/curses.cats -%%ATS_LIBDIR%%/libc/CATS/dirent.cats -%%ATS_LIBDIR%%/libc/CATS/dlfcn.cats -%%ATS_LIBDIR%%/libc/CATS/errno.cats -%%ATS_LIBDIR%%/libc/CATS/fcntl.cats -%%ATS_LIBDIR%%/libc/CATS/float.cats -%%ATS_LIBDIR%%/libc/CATS/gmp.cats -%%ATS_LIBDIR%%/libc/CATS/grp.cats -%%ATS_LIBDIR%%/libc/CATS/math.cats -%%ATS_LIBDIR%%/libc/CATS/netdb.cats -%%ATS_LIBDIR%%/libc/CATS/printf.cats -%%ATS_LIBDIR%%/libc/CATS/pthread.cats -%%ATS_LIBDIR%%/libc/CATS/pthread_upbarr.cats -%%ATS_LIBDIR%%/libc/CATS/pthread_uplock.cats -%%ATS_LIBDIR%%/libc/CATS/pwd.cats -%%ATS_LIBDIR%%/libc/CATS/random.cats -%%ATS_LIBDIR%%/libc/CATS/sched.cats -%%ATS_LIBDIR%%/libc/CATS/signal.cats -%%ATS_LIBDIR%%/libc/CATS/stdarg.cats -%%ATS_LIBDIR%%/libc/CATS/stdio.cats -%%ATS_LIBDIR%%/libc/CATS/stdlib.cats -%%ATS_LIBDIR%%/libc/CATS/string.cats -%%ATS_LIBDIR%%/libc/CATS/strings.cats -%%ATS_LIBDIR%%/libc/CATS/termios.cats -%%ATS_LIBDIR%%/libc/CATS/time.cats -%%ATS_LIBDIR%%/libc/CATS/unistd.cats -%%ATS_LIBDIR%%/libc/CATS/unistd_pathconf.cats -%%ATS_LIBDIR%%/libc/CATS/unistd_sysconf.cats -%%ATS_LIBDIR%%/libc/CATS/utime.cats -%%ATS_LIBDIR%%/libc/DATS/complex.dats -%%ATS_LIBDIR%%/libc/DATS/dirent.dats -%%ATS_LIBDIR%%/libc/DATS/dlfcn.dats -%%ATS_LIBDIR%%/libc/DATS/errno.dats -%%ATS_LIBDIR%%/libc/DATS/fcntl.dats -%%ATS_LIBDIR%%/libc/DATS/gmp.dats -%%ATS_LIBDIR%%/libc/DATS/math.dats -%%ATS_LIBDIR%%/libc/DATS/printf.dats -%%ATS_LIBDIR%%/libc/DATS/pthread.dats -%%ATS_LIBDIR%%/libc/DATS/pthread_upbarr.dats -%%ATS_LIBDIR%%/libc/DATS/pthread_uplock.dats -%%ATS_LIBDIR%%/libc/DATS/random.dats -%%ATS_LIBDIR%%/libc/DATS/stdarg.dats -%%ATS_LIBDIR%%/libc/DATS/stdio.dats -%%ATS_LIBDIR%%/libc/DATS/stdlib.dats -%%ATS_LIBDIR%%/libc/DATS/string.dats -%%ATS_LIBDIR%%/libc/DATS/unistd.dats -%%ATS_LIBDIR%%/libc/HATS/float.hats -%%ATS_LIBDIR%%/libc/HATS/math.hats -%%ATS_LIBDIR%%/libc/SATS/SIMD_v2df.sats -%%ATS_LIBDIR%%/libc/SATS/complex.sats -%%ATS_LIBDIR%%/libc/SATS/ctype.sats -%%ATS_LIBDIR%%/libc/SATS/curses.sats -%%ATS_LIBDIR%%/libc/SATS/dirent.sats -%%ATS_LIBDIR%%/libc/SATS/dlfcn.sats -%%ATS_LIBDIR%%/libc/SATS/errno.sats -%%ATS_LIBDIR%%/libc/SATS/fcntl.sats -%%ATS_LIBDIR%%/libc/SATS/float.sats -%%ATS_LIBDIR%%/libc/SATS/gmp.sats -%%ATS_LIBDIR%%/libc/SATS/grp.sats -%%ATS_LIBDIR%%/libc/SATS/math.sats -%%ATS_LIBDIR%%/libc/SATS/netdb.sats -%%ATS_LIBDIR%%/libc/SATS/printf.sats -%%ATS_LIBDIR%%/libc/SATS/pthread.sats -%%ATS_LIBDIR%%/libc/SATS/pthread_upbarr.sats -%%ATS_LIBDIR%%/libc/SATS/pthread_uplock.sats -%%ATS_LIBDIR%%/libc/SATS/pwd.sats -%%ATS_LIBDIR%%/libc/SATS/random.sats -%%ATS_LIBDIR%%/libc/SATS/sched.sats -%%ATS_LIBDIR%%/libc/SATS/signal.sats -%%ATS_LIBDIR%%/libc/SATS/stdarg.sats -%%ATS_LIBDIR%%/libc/SATS/stdio.sats -%%ATS_LIBDIR%%/libc/SATS/stdlib.sats -%%ATS_LIBDIR%%/libc/SATS/string.sats -%%ATS_LIBDIR%%/libc/SATS/strings.sats -%%ATS_LIBDIR%%/libc/SATS/termios.sats -%%ATS_LIBDIR%%/libc/SATS/time.sats -%%ATS_LIBDIR%%/libc/SATS/unistd.sats -%%ATS_LIBDIR%%/libc/SATS/unistd_pathconf.sats -%%ATS_LIBDIR%%/libc/SATS/unistd_sysconf.sats -%%ATS_LIBDIR%%/libc/SATS/utime.sats -%%ATS_LIBDIR%%/libc/arpa/CATS/inet.cats -%%ATS_LIBDIR%%/libc/arpa/SATS/inet.sats -%%ATS_LIBDIR%%/libc/gdbm/CATS/datum.cats -%%ATS_LIBDIR%%/libc/gdbm/CATS/gdbm.cats -%%ATS_LIBDIR%%/libc/gdbm/CATS/ndbm.cats -%%ATS_LIBDIR%%/libc/gdbm/SATS/datum.sats -%%ATS_LIBDIR%%/libc/gdbm/SATS/gdbm.sats -%%ATS_LIBDIR%%/libc/gdbm/SATS/ndbm.sats -%%ATS_LIBDIR%%/libc/netinet/CATS/in.cats -%%ATS_LIBDIR%%/libc/netinet/SATS/in.sats -%%ATS_LIBDIR%%/libc/sys/CATS/poll.cats -%%ATS_LIBDIR%%/libc/sys/CATS/resource.cats -%%ATS_LIBDIR%%/libc/sys/CATS/select.cats -%%ATS_LIBDIR%%/libc/sys/CATS/sockaddr.cats -%%ATS_LIBDIR%%/libc/sys/CATS/socket.cats -%%ATS_LIBDIR%%/libc/sys/CATS/socket_in.cats -%%ATS_LIBDIR%%/libc/sys/CATS/socket_un.cats -%%ATS_LIBDIR%%/libc/sys/CATS/sockopt.cats -%%ATS_LIBDIR%%/libc/sys/CATS/stat.cats -%%ATS_LIBDIR%%/libc/sys/CATS/statvfs.cats -%%ATS_LIBDIR%%/libc/sys/CATS/time.cats -%%ATS_LIBDIR%%/libc/sys/CATS/types.cats -%%ATS_LIBDIR%%/libc/sys/CATS/un.cats -%%ATS_LIBDIR%%/libc/sys/CATS/utsname.cats -%%ATS_LIBDIR%%/libc/sys/CATS/wait.cats -%%ATS_LIBDIR%%/libc/sys/DATS/socket.dats -%%ATS_LIBDIR%%/libc/sys/DATS/socket_in.dats -%%ATS_LIBDIR%%/libc/sys/DATS/socket_un.dats -%%ATS_LIBDIR%%/libc/sys/DATS/stat.dats -%%ATS_LIBDIR%%/libc/sys/SATS/poll.sats -%%ATS_LIBDIR%%/libc/sys/SATS/resource.sats -%%ATS_LIBDIR%%/libc/sys/SATS/select.sats -%%ATS_LIBDIR%%/libc/sys/SATS/sockaddr.sats -%%ATS_LIBDIR%%/libc/sys/SATS/socket.sats -%%ATS_LIBDIR%%/libc/sys/SATS/socket_in.sats -%%ATS_LIBDIR%%/libc/sys/SATS/socket_un.sats -%%ATS_LIBDIR%%/libc/sys/SATS/sockopt.sats -%%ATS_LIBDIR%%/libc/sys/SATS/stat.sats -%%ATS_LIBDIR%%/libc/sys/SATS/statvfs.sats -%%ATS_LIBDIR%%/libc/sys/SATS/time.sats -%%ATS_LIBDIR%%/libc/sys/SATS/types.sats -%%ATS_LIBDIR%%/libc/sys/SATS/un.sats -%%ATS_LIBDIR%%/libc/sys/SATS/utsname.sats -%%ATS_LIBDIR%%/libc/sys/SATS/wait.sats -%%ATS_LIBDIR%%/prelude/CATS/array.cats -%%ATS_LIBDIR%%/prelude/CATS/basics.cats -%%ATS_LIBDIR%%/prelude/CATS/bool.cats -%%ATS_LIBDIR%%/prelude/CATS/byte.cats -%%ATS_LIBDIR%%/prelude/CATS/char.cats -%%ATS_LIBDIR%%/prelude/CATS/float.cats -%%ATS_LIBDIR%%/prelude/CATS/integer.cats -%%ATS_LIBDIR%%/prelude/CATS/integer_fixed.cats -%%ATS_LIBDIR%%/prelude/CATS/integer_ptr.cats -%%ATS_LIBDIR%%/prelude/CATS/lazy.cats -%%ATS_LIBDIR%%/prelude/CATS/lazy_vt.cats -%%ATS_LIBDIR%%/prelude/CATS/list.cats -%%ATS_LIBDIR%%/prelude/CATS/list_vt.cats -%%ATS_LIBDIR%%/prelude/CATS/matrix.cats -%%ATS_LIBDIR%%/prelude/CATS/option.cats -%%ATS_LIBDIR%%/prelude/CATS/pointer.cats -%%ATS_LIBDIR%%/prelude/CATS/printf.cats -%%ATS_LIBDIR%%/prelude/CATS/reference.cats -%%ATS_LIBDIR%%/prelude/CATS/sizetype.cats -%%ATS_LIBDIR%%/prelude/CATS/string.cats -%%ATS_LIBDIR%%/prelude/DATS/arith.dats -%%ATS_LIBDIR%%/prelude/DATS/array.dats -%%ATS_LIBDIR%%/prelude/DATS/array0.dats -%%ATS_LIBDIR%%/prelude/DATS/array_prf.dats -%%ATS_LIBDIR%%/prelude/DATS/basics.dats -%%ATS_LIBDIR%%/prelude/DATS/bool.dats -%%ATS_LIBDIR%%/prelude/DATS/dlist_vt.dats -%%ATS_LIBDIR%%/prelude/DATS/filebas.dats -%%ATS_LIBDIR%%/prelude/DATS/float.dats -%%ATS_LIBDIR%%/prelude/DATS/integer.dats -%%ATS_LIBDIR%%/prelude/DATS/lazy.dats -%%ATS_LIBDIR%%/prelude/DATS/lazy_vt.dats -%%ATS_LIBDIR%%/prelude/DATS/list.dats -%%ATS_LIBDIR%%/prelude/DATS/list0.dats -%%ATS_LIBDIR%%/prelude/DATS/list_vt.dats -%%ATS_LIBDIR%%/prelude/DATS/matrix.dats -%%ATS_LIBDIR%%/prelude/DATS/matrix0.dats -%%ATS_LIBDIR%%/prelude/DATS/memalign.dats -%%ATS_LIBDIR%%/prelude/DATS/option.dats -%%ATS_LIBDIR%%/prelude/DATS/option0.dats -%%ATS_LIBDIR%%/prelude/DATS/option_vt.dats -%%ATS_LIBDIR%%/prelude/DATS/pointer.dats -%%ATS_LIBDIR%%/prelude/DATS/printf.dats -%%ATS_LIBDIR%%/prelude/DATS/ptrarr.dats -%%ATS_LIBDIR%%/prelude/DATS/reference.dats -%%ATS_LIBDIR%%/prelude/DATS/sizetype.dats -%%ATS_LIBDIR%%/prelude/DATS/string.dats -%%ATS_LIBDIR%%/prelude/DATS/syndef.dats -%%ATS_LIBDIR%%/prelude/DATS/unsafe.dats -%%ATS_LIBDIR%%/prelude/DATS/vsubrw.dats -%%ATS_LIBDIR%%/prelude/HATS/lmacrodef.hats -%%ATS_LIBDIR%%/prelude/HATS/number.hats -%%ATS_LIBDIR%%/prelude/HATS/syndef.hats -%%ATS_LIBDIR%%/prelude/SATS/arith.sats -%%ATS_LIBDIR%%/prelude/SATS/array.sats -%%ATS_LIBDIR%%/prelude/SATS/array0.sats -%%ATS_LIBDIR%%/prelude/SATS/bool.sats -%%ATS_LIBDIR%%/prelude/SATS/byte.sats -%%ATS_LIBDIR%%/prelude/SATS/char.sats -%%ATS_LIBDIR%%/prelude/SATS/dlist_vt.sats -%%ATS_LIBDIR%%/prelude/SATS/extern.sats -%%ATS_LIBDIR%%/prelude/SATS/filebas.sats -%%ATS_LIBDIR%%/prelude/SATS/float.sats -%%ATS_LIBDIR%%/prelude/SATS/integer.sats -%%ATS_LIBDIR%%/prelude/SATS/integer_fixed.sats -%%ATS_LIBDIR%%/prelude/SATS/integer_ptr.sats -%%ATS_LIBDIR%%/prelude/SATS/lazy.sats -%%ATS_LIBDIR%%/prelude/SATS/lazy_vt.sats -%%ATS_LIBDIR%%/prelude/SATS/list.sats -%%ATS_LIBDIR%%/prelude/SATS/list0.sats -%%ATS_LIBDIR%%/prelude/SATS/list_vt.sats -%%ATS_LIBDIR%%/prelude/SATS/matrix.sats -%%ATS_LIBDIR%%/prelude/SATS/matrix0.sats -%%ATS_LIBDIR%%/prelude/SATS/memalign.sats -%%ATS_LIBDIR%%/prelude/SATS/memory.sats -%%ATS_LIBDIR%%/prelude/SATS/multiset.sats -%%ATS_LIBDIR%%/prelude/SATS/number.sats -%%ATS_LIBDIR%%/prelude/SATS/option.sats -%%ATS_LIBDIR%%/prelude/SATS/option0.sats -%%ATS_LIBDIR%%/prelude/SATS/option_vt.sats -%%ATS_LIBDIR%%/prelude/SATS/pointer.sats -%%ATS_LIBDIR%%/prelude/SATS/printf.sats -%%ATS_LIBDIR%%/prelude/SATS/ptrarr.sats -%%ATS_LIBDIR%%/prelude/SATS/reference.sats -%%ATS_LIBDIR%%/prelude/SATS/sizetype.sats -%%ATS_LIBDIR%%/prelude/SATS/string.sats -%%ATS_LIBDIR%%/prelude/SATS/syndef.sats -%%ATS_LIBDIR%%/prelude/SATS/unsafe.sats -%%ATS_LIBDIR%%/prelude/SATS/vsubrw.sats -%%ATS_LIBDIR%%/prelude/ats_main_prelude.dats -%%ATS_LIBDIR%%/prelude/basics_dyn.sats -%%ATS_LIBDIR%%/prelude/basics_sta.sats -%%ATS_LIBDIR%%/prelude/fixity.ats -%%ATS_LIBDIR%%/prelude/macrodef.sats -%%ATS_LIBDIR%%/prelude/params.hats -%%ATS_LIBDIR%%/prelude/params_system.hats -%%ATS_LIBDIR%%/prelude/sortdef.sats diff --git a/net/Makefile b/net/Makefile index 307708e70e81..0fe98cd59b86 100644 --- a/net/Makefile +++ b/net/Makefile @@ -556,7 +556,6 @@ SUBDIR += p5-Event-tcp SUBDIR += p5-File-Rsync SUBDIR += p5-File-RsyncP - SUBDIR += p5-Filesys-SmbClient SUBDIR += p5-Frontier-RPC SUBDIR += p5-Geo-IP SUBDIR += p5-Geo-IP-PurePerl diff --git a/net/p5-Filesys-SmbClient/Makefile b/net/p5-Filesys-SmbClient/Makefile deleted file mode 100644 index bd1c04997277..000000000000 --- a/net/p5-Filesys-SmbClient/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# Created by: Erwin Lansing <erwin@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= Filesys-SmbClient -PORTVERSION= 3.2 -PORTREVISION= 2 -CATEGORIES= net perl5 -MASTER_SITES= CPAN -PKGNAMEPREFIX= p5- - -MAINTAINER= perl@FreeBSD.org -COMMENT= Interface for access Samba filesystem with libsmclient.so - -BROKEN= no member named close in struct _SMBCCTX -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -BUILD_DEPENDS= p5-Test-Simple>=0:devel/p5-Test-Simple - -USES= perl5 samba:lib -USE_PERL5= configure - -post-patch: - @${REINPLACE_CMD} -i '' -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \ - -e 's!%%SAMBAINCLUDES%%!${SAMBAINCLUDES}!g' \ - -e 's!%%SAMBALIBS%%!${SAMBALIBS}!g' \ - ${WRKSRC}/Makefile.PL - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Filesys/SmbClient/SmbClient.so - -.include <bsd.port.mk> diff --git a/net/p5-Filesys-SmbClient/distinfo b/net/p5-Filesys-SmbClient/distinfo deleted file mode 100644 index 71994a4f6e6d..000000000000 --- a/net/p5-Filesys-SmbClient/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (Filesys-SmbClient-3.2.tar.gz) = a9f2f3d4675de76f9dcae2be40bda93495cd5fafb1bb6326d71833cea451bc6e -SIZE (Filesys-SmbClient-3.2.tar.gz) = 52010 diff --git a/net/p5-Filesys-SmbClient/files/patch-Makefile.PL b/net/p5-Filesys-SmbClient/files/patch-Makefile.PL deleted file mode 100644 index 83968e5fc36c..000000000000 --- a/net/p5-Filesys-SmbClient/files/patch-Makefile.PL +++ /dev/null @@ -1,45 +0,0 @@ ---- Makefile.PL.orig 2005-03-03 16:36:04.000000000 +0100 -+++ Makefile.PL 2009-02-16 13:07:09.000000000 +0100 -@@ -5,39 +5,11 @@ - # special flag for AIX - ($^O =~ m/AIX/i) ? ($ccfl = '-qcpluscmt') : ($ccfl = ''); - --# path libsmbclient.h --my $include = try_to_find("libsmbclient.h"); --$include = prompt("Where can I find libsmbclient.h ?", $include); --warn_user("$include/libsmbclient.h") if (!-r "$include/libsmbclient.h"); -- --# path libsmbclient.so --my $lib = try_to_find("libsmbclient.so"); --$lib = prompt("Where can I find libsmbclient.so ?",$lib); --warn_user("libsmbclient.so") if (!-r "$lib/libsmbclient.so"); -- --# tests demande ? --my $ans = -- prompt("Do you want make tests ?(you will be prompted for server / \n". -- "worgroup / share / user / password to make read write access.", -- "yes"); --if ($ans =~ /^y(es)?$/i) -- { -- my $server = prompt("Server ?","localhost"); -- my $share = prompt("Share ?","homes"); -- my $workgroup = prompt("Workgroup/Domain ?",""); -- my $user = prompt("Smb user ?",$ENV{'USER'}); -- my $pass = prompt("Smb password ?"); -- open(FILE,">.c") || warn "Can't create .c for test: $!\n"; -- print FILE $server,"\t",$share,"\t",$workgroup,"\t",$user,"\t",$pass; -- close FILE; -- } -- --# Trace for debug --$ans = prompt("Compile module with trace to STDERR ?", "no"); --if ($ans =~ /^y(es)?$/i) { $define = "-DVERBOSE"; } -+my $include = '%%SAMBAINCLUDES%%/'; -+my $lib = '%%SAMBALIBS%%/'; - - # Create config.h for alloca via configure --my $prefix = $include; -+my $prefix = '%%LOCALBASE%%'; - $prefix=$1 = $1 if $include=~m!(.*)include$!; - system("./configure --with-samba-prefix=$prefix") == 0 - or die "Can't run configure:$!\n"; diff --git a/net/p5-Filesys-SmbClient/pkg-descr b/net/p5-Filesys-SmbClient/pkg-descr deleted file mode 100644 index e109bcac113c..000000000000 --- a/net/p5-Filesys-SmbClient/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Provide interface to access routine defined -in libsmbclient.so - -If you want to use filehandle with this module, -you need Perl 5.6 or later. - -WWW: http://search.cpan.org/dist/Filesys-SmbClient/ diff --git a/net/p5-Filesys-SmbClient/pkg-plist b/net/p5-Filesys-SmbClient/pkg-plist deleted file mode 100644 index ba608967cf7a..000000000000 --- a/net/p5-Filesys-SmbClient/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -%%SITE_ARCH%%/auto/Filesys/SmbClient/SmbClient.so -%%SITE_ARCH%%/auto/Filesys/SmbClient/autosplit.ix -%%SITE_ARCH%%/Filesys/SmbClient.pm -%%PERL5_MAN3%%/Filesys::SmbClient.3.gz diff --git a/security/Makefile b/security/Makefile index 1d30fc8479ec..9dd9df31cfe5 100644 --- a/security/Makefile +++ b/security/Makefile @@ -975,7 +975,6 @@ SUBDIR += py-virustotal-api SUBDIR += py-volatility SUBDIR += py-vulndb - SUBDIR += py-xmlsec SUBDIR += py-yara SUBDIR += py-yubioath-desktop SUBDIR += py-zope.app.authentication @@ -1124,7 +1123,6 @@ SUBDIR += rubygem-webpush SUBDIR += s2n SUBDIR += safesh - SUBDIR += samba-virusfilter SUBDIR += samhain SUBDIR += samhain-client SUBDIR += samhain-server diff --git a/security/py-xmlsec/Makefile b/security/py-xmlsec/Makefile deleted file mode 100644 index e3a3d1edff7e..000000000000 --- a/security/py-xmlsec/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# Created by: ijliao -# $FreeBSD$ - -PORTNAME= xmlsec -PORTVERSION= 0.3.0 -PORTREVISION= 4 -CATEGORIES= security python -MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/430/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= py${PORTNAME}-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Python bindings for XML Security Library - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING - -BROKEN= does not build (x509.c:46:60: error: too many arguments to function call, expected 2, have 3) -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -LIB_DEPENDS= libxmlsec1.so:security/xmlsec1 -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2 - -USES= python:2 ssl -USE_PYTHON= distutils autoplist - -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} -PORTDOCS= * -PORTEXAMPLES= * - -OPTIONS_DEFINE= DOCS EXAMPLES - -post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/xmlsecmod.so - -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/docs/html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/) - -post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/) - -.include <bsd.port.mk> diff --git a/security/py-xmlsec/distinfo b/security/py-xmlsec/distinfo deleted file mode 100644 index f293db04aade..000000000000 --- a/security/py-xmlsec/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pyxmlsec-0.3.0.tar.gz) = 4ddb5a548fb44d77463cae11b8f3e77c4e8c0e84d5c562e146e752fc653e2c35 -SIZE (pyxmlsec-0.3.0.tar.gz) = 224312 diff --git a/security/py-xmlsec/files/patch-setup.py b/security/py-xmlsec/files/patch-setup.py deleted file mode 100644 index 073eab6bd794..000000000000 --- a/security/py-xmlsec/files/patch-setup.py +++ /dev/null @@ -1,53 +0,0 @@ ---- setup.py.orig Fri Feb 13 08:55:47 2004 -+++ setup.py Fri Feb 13 08:57:30 2004 -@@ -71,22 +71,22 @@ - - # the crypto engine name : openssl, gnutls or nss - xmlsec1_crypto = "openssl" --if 'build' in sys.argv: -- msg = '\nChoose a crypto engine :\n' \ -- ' 1. OpenSSL\n' \ -- ' 2. GnuTLS\n' \ -- ' 3. NSS\n' \ -- 'Your choice : ' -- reply = raw_input(msg) -- choice = None -- if reply: -- choice = reply[0] -- if choice == '1': -- xmlsec1_crypto = "openssl" -- elif choice == '2': -- xmlsec1_crypto = "gnutls" -- elif choice == '3': -- xmlsec1_crypto = "nss" -+#if 'build' in sys.argv: -+# msg = '\nChoose a crypto engine :\n' \ -+# ' 1. OpenSSL\n' \ -+# ' 2. GnuTLS\n' \ -+# ' 3. NSS\n' \ -+# 'Your choice : ' -+# reply = raw_input(msg) -+# choice = None -+# if reply: -+# choice = reply[0] -+# if choice == '1': -+# xmlsec1_crypto = "openssl" -+# elif choice == '2': -+# xmlsec1_crypto = "gnutls" -+# elif choice == '3': -+# xmlsec1_crypto = "nss" - - define_macros = [] - include_dirs = [] -@@ -104,7 +104,10 @@ - if flag[2:] not in include_dirs: - include_dirs.append(flag[2:]) - elif flag[:2] == "-D": -- t = tuple(flag[2:].split('=')) -+ t = flag[2:].split('=') -+ if (len(t) == 1): -+ t.append('1') -+ t = tuple(t) - if t not in define_macros: - define_macros.append(t) - else: diff --git a/security/py-xmlsec/pkg-descr b/security/py-xmlsec/pkg-descr deleted file mode 100644 index 72c8982acb38..000000000000 --- a/security/py-xmlsec/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -PyXMLSec is a set of Python bindings for the XML Security library (XMLSec). - -WWW: http://pyxmlsec.labs.libre-entreprise.org/ diff --git a/security/samba-virusfilter/Makefile b/security/samba-virusfilter/Makefile deleted file mode 100644 index d38cc9a6441e..000000000000 --- a/security/samba-virusfilter/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $FreeBSD$ - -PORTNAME= samba-virusfilter -PORTVERSION= 0.1.3 -PORTREVISION= 1 -CATEGORIES= security -MASTER_SITES= GHC - -MAINTAINER= kuriyama@FreeBSD.org -COMMENT= On-access anti-virus filter for Samba - -BROKEN= fails to configure with samba 4 -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -PATCH_DEPENDS= smbclient:${SAMBAPORT} -BUILD_DEPENDS= ${NONEXISTENT}:${SAMBAPORT}:configure -RUN_DEPENDS= ksh:shells/pdksh - -GNU_CONFIGURE= yes -USES= gmake samba:env shebangfix tar:bzip2 -SHEBANG_FILES= bin/svf-notify.ksh -USE_GITHUB= yes -GH_ACCOUNT= fumiyas - -ALL_TARGET= # should empty -CONFIGURE_ARGS= --with-samba-source=`cd ${PORTSDIR}/${SAMBAPORT}; ${MAKE} -VWRKSRC` \ - --with-clamd=${PREFIX}/sbin/clamd --with-savdid=${PREFIX}/bin/savdid -USE_AUTOTOOLS= autoconf autoheader # for ${SAMBAPORT} configure -MAKE_ARGS= SAMBA_DATADIR=${PREFIX} - -.include <bsd.port.mk> diff --git a/security/samba-virusfilter/distinfo b/security/samba-virusfilter/distinfo deleted file mode 100644 index 50d6018607d8..000000000000 --- a/security/samba-virusfilter/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (samba-virusfilter-0.1.3.tar.bz2) = b3c1bcb0a9fa1517017637c5e010dd95a967ff5e069b851625a2bb2d379bc73a -SIZE (samba-virusfilter-0.1.3.tar.bz2) = 73103 diff --git a/security/samba-virusfilter/pkg-descr b/security/samba-virusfilter/pkg-descr deleted file mode 100644 index 889a5466f122..000000000000 --- a/security/samba-virusfilter/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -This is a set of various Samba VFS modules to scan and filter virus -files on Samba file services with an anti-virus scanner. - -Supported Anti-Virus engines: - - ClamAV (clamd daemon) - - F-Secure Anti-Virus (fsavd daemon) - - Sophos Anti-Virus (savdid daemon) - -WWW: https://github.com/fumiyas/samba-virusfilter diff --git a/security/samba-virusfilter/pkg-plist b/security/samba-virusfilter/pkg-plist deleted file mode 100644 index 88635cf19c5e..000000000000 --- a/security/samba-virusfilter/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/svf-notify -lib/samba/vfs/svf-clamav.so -lib/samba/vfs/svf-fsav.so -lib/samba/vfs/svf-sophos.so diff --git a/textproc/Makefile b/textproc/Makefile index 9cf578a0a099..a1b0833a2daf 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -524,7 +524,6 @@ SUBDIR += ny-aspell SUBDIR += ocaml-csv SUBDIR += ocaml-expat - SUBDIR += ocaml-pxp SUBDIR += ocaml-text SUBDIR += ocaml-tyxml SUBDIR += odt2txt diff --git a/textproc/ocaml-pxp/Makefile b/textproc/ocaml-pxp/Makefile deleted file mode 100644 index e08212853afd..000000000000 --- a/textproc/ocaml-pxp/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# Created by: Stephane Legrand <stephane@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= pxp -PORTVERSION= 1.2.7 -CATEGORIES= textproc -MASTER_SITES= http://download.camlcity.org/download/ -PKGNAMEPREFIX= ocaml- - -MAINTAINER= ports@FreeBSD.org -COMMENT= Validating XML parser for OCaml - -BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:www/ocaml-net -RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/netstring/netstring.a:www/ocaml-net - -BROKEN= does not build -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2017-11-09 - -OPTIONS_DEFINE= ULEX -OPTIONS_DEFAULT=ULEX -ULEX_DESC= Include UTF-8 lexical analyzer support - -USES= gmake -USE_OCAML= true -USE_OCAML_FINDLIB= true -USE_OCAML_LDCONFIG= true -USE_OCAML_CAMLP4= true - -ULEX_BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/ulex/ulexing.a:devel/ocaml-ulex -ULEX_RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/ulex/ulexing.a:devel/ocaml-ulex - -HAS_CONFIGURE= yes -CONFIGURE_ARGS+=-without-wlex-compat -without-wlex - -ALL_TARGET= all opt -MAKE_JOBS_UNSAFE= yes - -# to avoid a conflict with PACKAGES in bsd.port.mk -post-extract: - ${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} ${REINPLACE_CMD} -e 's/PACKAGES/PXP_PACKAGES/' - -post-install: - @${FIND} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/pxp* -type f | \ - ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} - -.include <bsd.port.mk> diff --git a/textproc/ocaml-pxp/distinfo b/textproc/ocaml-pxp/distinfo deleted file mode 100644 index dc0ad7c1b3a9..000000000000 --- a/textproc/ocaml-pxp/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (pxp-1.2.7.tar.gz) = 2b0aca564f71c87825436e31a82de2ca3b3e99ee81a83840a525b0be63d73025 -SIZE (pxp-1.2.7.tar.gz) = 735710 diff --git a/textproc/ocaml-pxp/pkg-descr b/textproc/ocaml-pxp/pkg-descr deleted file mode 100644 index 858d6bc3fcab..000000000000 --- a/textproc/ocaml-pxp/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -PXP is a validating XML parser for OCaml. It strictly complies -to the XML-1.0 standard. - -The parser is simple to call, usually only one statement (function -call) is sufficient to parse an XML document and to represent it -as object tree. - -Once the document is parsed, it can be accessed using a class -interface. The interface allows arbitrary access including -transformations. One of the features of the document representation -is its polymorphic nature; it is simple to add custom methods to -the document classes. Furthermore, the parser can be configured -such that different XML elements are represented by objects created -from different classes. This is a very powerful feature, because -it simplifies the structure of programs processing XML documents. - - -WWW: http://projects.camlcity.org/projects/pxp.html |