diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2006-03-23 22:24:03 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2006-03-23 22:24:03 +0000 |
| commit | 96fe98e1c6bc0301781b0dd7dbfeef3e3f137f43 (patch) | |
| tree | 7650cfe102643b74d6ad1d3efe1771281b5e66f0 /net | |
| parent | - Cacti developers has modified one of oficial patches. (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_5_5_0'.release/5.5.0
Notes
Notes:
svn path=/head/; revision=158034
svn path=/tags/RELEASE_5_5_0/; revision=158035; tag=release/5.5.0
Diffstat (limited to 'net')
617 files changed, 0 insertions, 43946 deletions
diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile deleted file mode 100644 index 10d4cd2b786f..000000000000 --- a/net/asterisk-bristuff/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.2.4 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ - http://ftp.digium.com/pub/asterisk/old-releases/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= An Open Source PBX and telephony toolkit - -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - -BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ - newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 sparc64 amd64 - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= asterisk.sh -USE_REINPLACE= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${PWLIBDIR} \ - OPENH323DIR=${OPENH323DIR} \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 - -.include <bsd.port.pre.mk> - -PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC -OPENH323DIR!= cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC - -.if ${ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build -PLIST_SUB+= WITH_H323="" -MAKE_ENV+= WITH_H323=1 -.endif - -.if defined(WITHOUT_ZAPTEL) -PLIST_SUB+= WITH_ZAPTEL="@comment " -MAKE_ENV+= WITHOUT_ZAPTEL=1 -.else -BUILD_DEPENDS+= libpri>=1.2.0:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -MAKE_ENV+= WITH_ZAPTEL=1 -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if defined(WITHOUT_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -.else -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -PLIST_SUB+= WITH_ODBC="" -MAKE_ENV+= WITH_ODBC=1 -.endif - -.if defined(WITHOUT_FAX) -PLIST_SUB+= WITH_FAX="@comment " -.else -MAKE_ENV+= WITH_FAX=1 -LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp -PLIST_SUB+= WITH_FAX="" -.endif - -.if ${OSVERSION} >= 500036 -PLIST_SUB+= NEWGCC="" -.else -PLIST_SUB+= NEWGCC="@comment " -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - -.include <bsd.port.post.mk> diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo deleted file mode 100644 index 6b4fba28f1df..000000000000 --- a/net/asterisk-bristuff/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d -SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c -SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 diff --git a/net/asterisk-bristuff/files/asterisk.sh.in b/net/asterisk-bristuff/files/asterisk.sh.in deleted file mode 100644 index 22ef57fd3727..000000000000 --- a/net/asterisk-bristuff/files/asterisk.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. %%RC_SUBR%% - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk -pidfile=/var/run/asterisk.pid - -asterisk_enable=${asterisk_enable:-"NO"} - -load_rc_config $name -run_rc_command "$1" diff --git a/net/asterisk-bristuff/files/patch-Makefile b/net/asterisk-bristuff/files/patch-Makefile deleted file mode 100644 index 708a356041a3..000000000000 --- a/net/asterisk-bristuff/files/patch-Makefile +++ /dev/null @@ -1,515 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -19,8 +19,8 @@ - # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- - # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ - # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target --CC=$(CROSS_COMPILE)gcc --HOST_CC=gcc -+CC?=$(CROSS_COMPILE)gcc -+HOST_CC=${CC} - # CROSS_ARCH=Linux - # CROSS_PROC=arm - # SUB_PROC=xscale # or maverick -@@ -44,14 +44,14 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - endif - - #Overwite config files on "make samples" --OVERWRITE=y -+OVERWRITE=n - - #Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 #-pg -+#DEBUG=-g3 #-pg - - #Set NOCRYPTO to yes if you do not want to have crypto support or - #dependencies -@@ -83,7 +83,7 @@ - - # Where to install asterisk after compiling - # Default -> leave empty --INSTALL_PREFIX?= -+INSTALL_PREFIX=$(PREFIX) - - # Staging directory - # Files are copied here temporarily during the install process -@@ -106,17 +106,17 @@ - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - - ifneq ($(OSARCH),SunOS) -- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin -- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin - else -@@ -218,25 +218,25 @@ - endif - - INCLUDE+=-Iinclude -I../include --ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY --ASTCFLAGS+=$(OPTIMIZE) -+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+#ASTCFLAGS+=$(OPTIMIZE) - ASTOBJ=-o asterisk - - ifeq ($(findstring BSD,$(OSARCH)),BSD) - PROC=$(shell uname -m) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifneq ($(PROC),ultrasparc) -- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) -- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),) -+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp - else - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp -@@ -245,27 +245,24 @@ - - ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) -- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp -+ ASTCFLAGS+=$(PTHREAD_CFLAGS) -+ LIBS+=$(PTHREAD_LIBS) -+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),) -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp - endif - MPG123TARG=freebsd - -- # XXX FreeBSD paths -- PREFIX?=/usr/local -- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk -- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk -+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin -- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man -- # XXX end FreeBSD paths -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - - endif # FreeBSD - -@@ -281,7 +278,7 @@ - - ifeq ($(OSARCH),SunOS) - ASTCFLAGS+=-Wcast-align -DSOLARIS -- INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include -+ INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/include - endif - - ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN) -@@ -296,7 +293,7 @@ - - ifndef WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS - endif - -@@ -323,7 +320,7 @@ - ASTERISKVERSIONNUM=999999 - ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name) - else -- ASTERISKVERSIONNUM=000000 -+ ASTERISKVERSIONNUM?=000000 - endif - endif - -@@ -388,10 +385,10 @@ - endif - - ifeq ($(OSARCH),SunOS) -- LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - OBJS+=strcompat.o - ASTLINK= -- SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - endif - - ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) -@@ -399,7 +396,7 @@ - endif - - # This is used when generating the doxygen documentation --ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),) -+ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),) - HAVEDOT=yes - else - HAVEDOT=no -@@ -418,7 +415,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: cleantest depend asterisk subdirs -+all: cleantest depend asterisk subdirs manpage - - #ifneq ($(wildcard tags),) - ctags: tags -@@ -437,13 +434,13 @@ - cd editline && unset CFLAGS LIBS && test -f config.h || ./configure - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: FORCE -- @if [ -d db1-ast ]; then \ -- $(MAKE) -C db1-ast libdb1.a ; \ -- else \ -- echo "You need to do a cvs update -d not just cvs update"; \ -- exit 1; \ -- fi -+#db1-ast/libdb1.a: FORCE -+# @if [ -d db1-ast ]; then \ -+# $(MAKE) -C db1-ast libdb1.a ; \ -+# else \ -+# echo "You need to do a cvs update -d not just cvs update"; \ -+# exit 1; \ -+# fi - - ifneq ($(wildcard .depend),) - include .depend -@@ -510,14 +507,14 @@ - cygwin_a: - $(MAKE) -C cygwin all - --asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -+asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS) - build_tools/make_build_h > include/asterisk/build.h.tmp - if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \ - mv include/asterisk/build.h.tmp include/asterisk/build.h ; \ - fi - rm -f include/asterisk/build.h.tmp - $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c -- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) $(AUDIO_LIBS) -o muted muted.o -@@ -539,38 +536,38 @@ - - datafiles: all - if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros - for x in sounds/digits/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate - for x in sounds/dictate/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters - for x in sounds/letters/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic - for x in sounds/phonetic/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ -@@ -578,18 +575,18 @@ - done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - - update: - @if [ -d .svn ]; then \ -@@ -618,75 +615,53 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi - ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi - for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -d contrib/firmware/iax ]; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ - else \ - echo "You need to do cvs update -d not just cvs update" ; \ - fi - ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . ) -- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi -- @echo " +---- Asterisk Installation Complete -------+" -- @echo " + +" -- @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -- @echo " + +" -- @echo " + Asterisk has successfully been installed. +" -- @echo " + If you would like to install the sample +" -- @echo " + configuration files (overwriting any +" -- @echo " + existing config files), run: +" -- @echo " + +" -- @echo " + $(MAKE) samples +" -- @echo " + +" -- @echo " +----------------- or ---------------------+" -- @echo " + +" -- @echo " + You can go ahead and install the asterisk +" -- @echo " + program documentation now or later run: +" -- @echo " + +" -- @echo " + $(MAKE) progdocs +" -- @echo " + +" -- @echo " + **Note** This requires that you have +" -- @echo " + doxygen installed on your local system +" -- @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck - - NEWMODS=$(notdir $(wildcard */*.so)) -@@ -710,7 +685,7 @@ - echo " WARNING WARNING WARNING" ;\ - fi - --install: all datafiles bininstall -+install: all datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -718,16 +693,19 @@ - upgrade: all bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \ - if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ - fi ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ echo ADSI INSTALL $(BSD_INSTALL_DATA) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ - if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ -@@ -740,7 +718,7 @@ - continue; \ - fi ;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done - if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ - ( \ -@@ -800,25 +778,25 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - for x in sounds/demo-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - for x in sounds/*.mp3; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - done - rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3 -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm - for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ - cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \ -@@ -832,7 +810,7 @@ - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done -@@ -861,10 +839,10 @@ - - __rpm: include/asterisk/version.h spec - rm -rf /tmp/asterisk ; \ -- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ -+ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \ - $(MAKE) DESTDIR=/tmp/asterisk install ; \ - $(MAKE) DESTDIR=/tmp/asterisk samples ; \ -- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ -+ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \ - cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ - rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec - diff --git a/net/asterisk-bristuff/files/patch-agi::Makefile b/net/asterisk-bristuff/files/patch-agi::Makefile deleted file mode 100644 index b35976526f59..000000000000 --- a/net/asterisk-bristuff/files/patch-agi::Makefile +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 -@@ -11,7 +11,9 @@ - # the GNU General Public License - # - --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - CFLAGS+= - -@@ -27,8 +29,9 @@ - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) -+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done -+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - - eagi-test: eagi-test.o - $(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS) diff --git a/net/asterisk-bristuff/files/patch-apps::Makefile b/net/asterisk-bristuff/files/patch-apps::Makefile deleted file mode 100644 index ee7d560bed69..000000000000 --- a/net/asterisk-bristuff/files/patch-apps::Makefile +++ /dev/null @@ -1,79 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig -+++ apps/Makefile -@@ -45,25 +45,27 @@ - #APPS+=app_rpt.so - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h),) - APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so - endif - endif # WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) -+ifdef WITH_FAX -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp.h),) -+APPS+=app_rxfax.so app_txfax.so -+endif -+endif -+ -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - APPS+=app_osplookup.so - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - --CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) --ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) -- ifneq (${CURLLIBS},) -- APPS+=app_curl.so -- endif --endif -+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)$(LOCALBASE)/bin/curl-config --libs) -+APPS+=app_curl.so - - ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -@@ -95,24 +97,32 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone - - install: all -- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so - rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so - - app_curl.so: app_curl.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) - -+ifdef WITH_FAX -+app_rxfax.so : app_rxfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+ -+app_txfax.so : app_txfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+endif -+ - app_sql_postgres.o: app_sql_postgres.c -- $(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c -+ $(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c - - app_sql_postgres.so: app_sql_postgres.o -- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) look.c -o look -lncurses - - ifeq (SunOS,$(shell uname)) - app_chanspy.so: app_chanspy.o diff --git a/net/asterisk-bristuff/files/patch-apps::app_rxfax.c b/net/asterisk-bristuff/files/patch-apps::app_rxfax.c deleted file mode 100644 index 820208e1943d..000000000000 --- a/net/asterisk-bristuff/files/patch-apps::app_rxfax.c +++ /dev/null @@ -1,379 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:44:40 2006 -+++ apps/app_rxfax.c Thu Jan 12 17:41:53 2006 -@@ -0,0 +1,373 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to receive a TIFF FAX file -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <asterisk/dsp.h> -+#include <asterisk/manager.h> -+#include <asterisk/version.h> -+#include <string.h> -+#include <stdlib.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <math.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Receive Application"; -+ -+static char *app = "RxFAX"; -+ -+static char *synopsis = "Receive a FAX to a file"; -+ -+static char *descrip = -+" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" -+"given filename. If the file exists it will be overwritten. The file\n" -+"should be in TIFF/F format.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the sender CSID.\n" -+" FAXPAGES to the number of pages received.\n" -+" FAXBITRATE to the transmition rate.\n" -+" FAXRESOLUTION to the resolution.\n" -+"Returns -1 when the user hangs up.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ char local_ident[21]; -+ char far_ident[21]; -+ char buf[11]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ fax_get_far_ident(s, far_ident); -+ fax_get_local_ident(s, local_ident); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax successfully received.\n"); -+ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); -+ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ manager_event(EVENT_FLAG_CALL, -+ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", -+ chan->name, -+ chan->exten, -+#if ASTERISK_VERSION_NUM <= 010010 -+ chan->callerid, -+#else -+ (chan->cid.cid_num) ? chan->cid.cid_num : "", -+#endif -+ far_ident, -+ local_ident, -+ t.pages_transferred, -+ t.row_resolution, -+ t.bit_rate, -+ s->rx_file); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ snprintf(buf, sizeof(buf), "%i", t.pages_transferred); -+ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); -+ snprintf(buf, sizeof(buf), "%i", t.row_resolution); -+ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); -+ snprintf(buf, sizeof(buf), "%i", t.bit_rate); -+ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax receive not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_d_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows); -+ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); -+ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); -+ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); -+ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int rxfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char template_file[256]; -+ char target_file[256]; -+ char *s; -+ char *t; -+ char *v; -+ char *x; -+ int option; -+ int len; -+ int i; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ target_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(target_file, t, len); -+ target_file[len] = '\0'; -+ /* Allow the use of %d in the file name for a wild card of sorts, to -+ create a new file with the specified name scheme */ -+ if ((x = strchr(target_file, '%')) && x[1] == 'd') -+ { -+ strcpy(template_file, target_file); -+ i = 0; -+ do -+ { -+ snprintf(target_file, 256, template_file, 1); -+ i++; -+ } -+ while (ast_fileexists(target_file, "", chan->language) != -1); -+ } -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_rx_file(&fax, target_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ outf.src = "RxFAX"; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, rxfax_exec, synopsis, descrip); -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk-bristuff/files/patch-apps::app_txfax.c b/net/asterisk-bristuff/files/patch-apps::app_txfax.c deleted file mode 100644 index 15ad6674788e..000000000000 --- a/net/asterisk-bristuff/files/patch-apps::app_txfax.c +++ /dev/null @@ -1,301 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:48:54 2006 -+++ apps/app_txfax.c Thu Jan 12 17:48:36 2006 -@@ -0,0 +1,295 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to send a TIFF file as a FAX -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <string.h> -+#include <stdlib.h> -+#include <math.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Transmit Application"; -+ -+static char *app = "TxFAX"; -+ -+static char *synopsis = "Send a FAX file"; -+ -+static char *descrip = -+" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the receiver CSID.\n" -+"Returns -1 when the user hangs up, or if the file does not exist.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ char far_ident[21]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_far_ident(s, far_ident); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax send not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int txfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char source_file[256]; -+ char *x; -+ char *s; -+ char *t; -+ char *v; -+ int option; -+ int len; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ source_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(source_file, t, len); -+ source_file[len] = '\0'; -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_tx_file(&fax, source_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ //fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, txfax_exec, synopsis, descrip); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk-bristuff/files/patch-cdr::Makefile b/net/asterisk-bristuff/files/patch-cdr::Makefile deleted file mode 100644 index da16b609d5f2..000000000000 --- a/net/asterisk-bristuff/files/patch-cdr::Makefile +++ /dev/null @@ -1,70 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ cdr/Makefile Thu Jan 12 17:56:23 2006 -@@ -21,8 +21,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,18 +38,18 @@ - # - # unixODBC stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) - MODS+=cdr_odbc.so - endif - - # - # FreeTDS stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h),) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.62),1) - CFLAGS += -DFREETDS_0_62 - else - CFLAGS += -DFREETDS_PRE_0_62 -@@ -61,7 +61,7 @@ - # - # PGSQL stuff... Autoconf anyone?? - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) - MODS+=cdr_pgsql.so - endif - -@@ -82,9 +82,9 @@ - MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql),) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/pgsql -- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib/pgsql -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql),) -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql -+ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/pgsql - endif - - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -110,7 +110,7 @@ - all: depend $(MODS) - - install: all -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - clean: - rm -f *.so *.o .depend diff --git a/net/asterisk-bristuff/files/patch-channels::Makefile b/net/asterisk-bristuff/files/patch-channels::Makefile deleted file mode 100644 index edca9b1e7694..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::Makefile +++ /dev/null @@ -1,85 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -48,9 +48,9 @@ - endif - - ifeq (${OSARCH},FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -- CHANH323LIB=-pthread -+ PTLIB=-lpt_FreeBSD_x86_r_s -+ H323LIB=-lh323_FreeBSD_x86_r_s -+ CHANH323LIB= - endif - - ifeq (${OSARCH},NetBSD) -@@ -73,11 +73,11 @@ - SOLINK+=-lrt - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so - endif - --ifneq ($(wildcard h323/libchanh323.a),) -+ifdef WITH_H323 - CHANNEL_LIBS+=chan_h323.so - endif - -@@ -91,12 +91,12 @@ - CHANNEL_LIBS+=chan_alsa.so - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 - endif -@@ -109,12 +109,12 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - CFLAGS+=-DIAX_TRUNKING - CHANNEL_LIBS+=chan_zap.so -@@ -229,8 +229,10 @@ - chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ - else --chan_h323.so: chan_h323.o h323/libchanh323.a -- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat -+chan_h323.so: chan_h323.o h323/ast_h323.o -+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - endif - - chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a -@@ -244,8 +246,7 @@ - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk-bristuff/files/patch-channels::chan_h323.c b/net/asterisk-bristuff/files/patch-channels::chan_h323.c deleted file mode 100644 index 4ca048812ecd..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c.orig -+++ channels/chan_h323.c -@@ -31,6 +31,7 @@ - * \ingroup channel_drivers - */ - -+#include <sys/types.h> - #include <sys/socket.h> - #include <sys/signal.h> - #include <sys/param.h> diff --git a/net/asterisk-bristuff/files/patch-channels::chan_sip.c b/net/asterisk-bristuff/files/patch-channels::chan_sip.c deleted file mode 100644 index 2b2fae7a311f..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,131 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig Tue Jan 24 16:25:53 2006 -+++ channels/chan_sip.c Tue Jan 24 16:30:44 2006 -@@ -337,7 +337,7 @@ static char global_vmexten[AST_MAX_EXTEN - - static char default_language[MAX_LANGUAGE] = ""; - --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; -@@ -475,6 +475,7 @@ struct sip_invite_param { - - struct sip_route { - struct sip_route *next; -+ int lr; - char hop[0]; - }; - -@@ -6015,6 +6016,7 @@ static void build_route(struct sip_pvt * - /* Make a struct route */ - thishop = malloc(sizeof(*thishop) + len); - if (thishop) { -+ thishop->lr = (strnstr(rr, ";lr", len) != NULL ? 1 : 0); - ast_copy_string(thishop->hop, rr, len); - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); - /* Link in */ -@@ -6040,31 +6042,41 @@ static void build_route(struct sip_pvt * - - /* Only append the contact if we are dealing with a strict router */ - if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) { -- /* 2nd append the Contact: if there is one */ -- /* Can be multiple Contact headers, comma separated values - we just take the first */ -- contact = get_header(req, "Contact"); -- if (!ast_strlen_zero(contact)) { -- ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -- /* Look for <: delimited address */ -- c = strchr(contact, '<'); -- if (c) { -- /* Take to > */ -- ++c; -- len = strcspn(c, ">") + 1; -- } else { -- /* No <> - just take the lot */ -- c = contact; -- len = strlen(contact) + 1; -- } -- thishop = malloc(sizeof(*thishop) + len); -+ /* Duplicate first route from the list */ -+ if (head && head->lr) { -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1); - if (thishop) { -- ast_copy_string(thishop->hop, c, len); -- thishop->next = NULL; -- /* Goes at the end */ -- if (tail) -- tail->next = thishop; -- else -- head = thishop; -+ memcpy(thishop, head, sizeof(struct sip_route)+strlen(head->hop)+1); -+ thishop->next = head; -+ head = thishop; -+ } -+ } else { -+ /* Append the Contact: if there is one and first route is w/o `lr' param */ -+ /* Can be multiple Contact headers, comma separated values - we just take the first */ -+ contact = get_header(req, "Contact"); -+ if (!ast_strlen_zero(contact)) { -+ ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -+ /* Look for <: delimited address */ -+ c = strchr(contact, '<'); -+ if (c) { -+ /* Take to > */ -+ ++c; -+ len = strcspn(c, ">") + 1; -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; -+ len = strlen(contact) + 1; -+ } -+ thishop = malloc(sizeof(*thishop) + len); -+ if (thishop) { -+ ast_copy_string(thishop->hop, c, len); -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - } -@@ -10352,7 +10364,11 @@ static int handle_request_invite(struct - gotdest = get_destination(p, NULL); - - get_rdnis(p, NULL); -- extract_uri(p, req); -+ build_route(p, req, 0); -+ if (!p->route->lr) -+ strncpy(p->uri, p->route->hop, sizeof(p->uri) - 1); -+ else -+ extract_uri(p, req); - build_contact(p); - - if (gotdest) { -@@ -10380,7 +10396,6 @@ static int handle_request_invite(struct - c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username ); - *recount = 1; - /* Save Record-Route for any later requests we make on this dialogue */ -- build_route(p, req, 0); - if (c) { - /* Pre-lock the call */ - ast_mutex_lock(&c->lock); -@@ -10466,7 +10481,12 @@ static int handle_request_invite(struct - transmit_response(p, "180 Ringing", req); - break; - case AST_STATE_UP: -- /* Here we have reINVITE request - try to renegotiate codecs with */ -+ /* Assuming this to be reinvite, process new SDP portion */ -+ if (!ast_strlen_zero(get_header(req, "Content-Type"))) { -+ process_sdp(p, req); -+ } else { -+ ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); -+ } - transmit_response_with_sdp(p, "200 OK", req, 1); - break; - default: diff --git a/net/asterisk-bristuff/files/patch-channels::chan_zap.c b/net/asterisk-bristuff/files/patch-channels::chan_zap.c deleted file mode 100644 index ab02c02af962..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,80 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c.orig Tue Nov 29 20:24:39 2005 -+++ channels/chan_zap.c Fri Jan 13 13:28:33 2006 -@@ -638,6 +638,7 @@ static struct zt_pvt { - int cidlen; - int ringt; - int ringt_base; -+ int waitnorings; - int stripmsd; - int callwaitcas; - int callwaitrings; -@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel - } - - ast_mutex_lock(&p->lock); -+ switch (p->sig) { -+ case SIG_FXSGS: -+ case SIG_FXSKS: -+ case SIG_FXSLS: -+ if((ast->_state == AST_STATE_RING) && (p->ringt > 1)) -+ { -+ p->waitnorings = 1; -+ } -+ break; -+ default: -+ break; -+ }; -+ - - index = zt_get_index(ast, p, 1); - -@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data) - ast_setstate(chan, AST_STATE_RING); - chan->rings = 1; - p->ringt = p->ringt_base; -+ p->waitnorings = 0; - res = ast_pbx_run(chan); -+ -+ if(p->waitnorings) -+ { -+ p->ringt = p->ringt_base; -+ for(;;) -+ { -+ int i,j=0; -+ i = ZT_IOMUX_SIGEVENT | ZT_IOMUX_NOWAIT; -+ if (ioctl(p->subs[index].zfd, ZT_IOMUX, &i) == -1) -+ break; -+ -+ if (ioctl(p->subs[index].zfd, ZT_GETEVENT, &j) == -1) -+ break; -+ -+ if(j == ZT_EVENT_RINGOFFHOOK) -+ p->ringt = p->ringt_base; -+ -+ usleep(20000); -+ -+ if (p->ringt <= 0) -+ break; -+ -+ else if (p->ringt > 0) -+ p->ringt--; -+ } -+ p->ringt = 0; -+ p->waitnorings = 0; -+ } -+ - if (res) { - ast_hangup(chan); - ast_log(LOG_WARNING, "PBX exited non-zero\n"); -@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data) - i = iflist; - while(i) { - if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) { -- if (!i->owner && !i->subs[SUB_REAL].owner) { -+ if (!i->owner && !i->subs[SUB_REAL].owner && !i->waitnorings) { - /* This needs to be watched, as it lacks an owner */ - pfds[count].fd = i->subs[SUB_REAL].zfd; - pfds[count].events = POLLPRI; diff --git a/net/asterisk-bristuff/files/patch-channels::h323::ast_h323.cpp b/net/asterisk-bristuff/files/patch-channels::h323::ast_h323.cpp deleted file mode 100644 index feb79e586e91..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig Thu Jan 12 18:16:08 2006 -+++ channels/h323/ast_h323.cpp Thu Jan 12 18:16:35 2006 -@@ -953,8 +953,8 @@ BOOL MyH323Connection::OnReceivedCapabil - H323Channel * MyH323Connection::CreateRealTimeLogicalChannel(const H323Capability & capability, - H323Channel::Directions dir, - unsigned sessionID, -- const H245_H2250LogicalChannelParameters * /*param*/, -- RTP_QOS * /*param*/ ) -+ const H245_H2250LogicalChannelParameters * /*param*/ /*, -+ RTP_QOS * */ /*param*/ ) - { - return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID); - } diff --git a/net/asterisk-bristuff/files/patch-channels::h323::ast_h323.h b/net/asterisk-bristuff/files/patch-channels::h323::ast_h323.h deleted file mode 100644 index 606bb0123173..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::h323::ast_h323.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.h.orig Thu Jan 12 18:14:49 2006 -+++ channels/h323/ast_h323.h Thu Jan 12 18:15:02 2006 -@@ -155,8 +155,8 @@ class MyH323Connection : public H323Conn - H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, - H323Channel::Directions, - unsigned, -- const H245_H2250LogicalChannelParameters *, -- RTP_QOS *); -+ const H245_H2250LogicalChannelParameters * /* , -+ RTP_QOS * */); - H323Connection::AnswerCallResponse OnAnswerCall(const PString &, - const H323SignalPDU &, - H323SignalPDU &); diff --git a/net/asterisk-bristuff/files/patch-codecs::Makefile b/net/asterisk-bristuff/files/patch-codecs::Makefile deleted file mode 100644 index ab5cbc4aef2c..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ codecs/Makefile Fri Jan 13 10:33:21 2006 -@@ -30,8 +30,8 @@ - - UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) - UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) --ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) --ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -+ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex.h) -+ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h) - ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so - LIBSPEEX+=-lspeex -lm -@@ -43,14 +43,14 @@ - endif - ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - -@@ -65,7 +65,7 @@ - LIBLPC10=lpc10/liblpc10.a - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -@@ -126,7 +126,7 @@ - endif - - install: all -- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile b/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile deleted file mode 100644 index 7256eeae5692..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::gsm::Makefile +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- codecs/gsm/Makefile.orig -+++ codecs/gsm/Makefile -@@ -49,7 +49,9 @@ - ifneq (${PROC},arm) - ifneq (${PROC},ppc) - ifneq (${PROC},ppc64) --OPTIMIZE+=-march=$(PROC) -+ifneq (${PROC},amd64) -+#OPTIMIZE+=-march=$(PROC) -+endif - endif - endif - endif diff --git a/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile b/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 26a2f20e5529..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Fri Jan 13 11:01:07 2006 -+++ codecs/ilbc/Makefile Fri Jan 13 11:01:51 2006 -@@ -1,5 +1,5 @@ - ARCH=$(PROC) --CFLAGS+=-Wall -O3 -funroll-loops -+CFLAGS+=-Wall -funroll-loops - ifneq (${OSARCH},CYGWIN) - CFLAGS += -fPIC - endif diff --git a/net/asterisk-bristuff/files/patch-configs::musiconhold.conf.sample b/net/asterisk-bristuff/files/patch-configs::musiconhold.conf.sample deleted file mode 100644 index ff63cc9ff08b..000000000000 --- a/net/asterisk-bristuff/files/patch-configs::musiconhold.conf.sample +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- configs/musiconhold.conf.sample.orig Tue Nov 29 20:24:39 2005 -+++ configs/musiconhold.conf.sample Fri Jan 13 11:38:39 2006 -@@ -4,7 +4,7 @@ - - [default] - mode=quietmp3 --directory=/var/lib/asterisk/mohmp3 -+directory=/usr/local/share/asterisk/mohmp3 - - ; valid mode options: - ; quietmp3 -- default diff --git a/net/asterisk-bristuff/files/patch-db.c b/net/asterisk-bristuff/files/patch-db.c deleted file mode 100644 index ba7f3f206b78..000000000000 --- a/net/asterisk-bristuff/files/patch-db.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jan 13 11:05:32 2006 -+++ db.c Fri Jan 13 11:06:55 2006 -@@ -35,6 +35,7 @@ - #include <errno.h> - #include <unistd.h> - #include <dirent.h> -+#include <db.h> - - #include "asterisk.h" - -@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - #ifdef __CYGWIN__ - #define dbopen __dbopen diff --git a/net/asterisk-bristuff/files/patch-editline::configure b/net/asterisk-bristuff/files/patch-editline::configure deleted file mode 100644 index f6b9c5b76eee..000000000000 --- a/net/asterisk-bristuff/files/patch-editline::configure +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/configure.orig Sun Apr 27 21:13:11 2003 -+++ editline/configure Fri Jan 30 01:47:34 2004 -@@ -1906,7 +1906,7 @@ - CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG" - CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE" - else -- CFLAGS="$CFLAGS -O" -+ CFLAGS="$CFLAGS" - fi - - diff --git a/net/asterisk-bristuff/files/patch-editline::makelist b/net/asterisk-bristuff/files/patch-editline::makelist deleted file mode 100644 index cff9b3ae29e0..000000000000 --- a/net/asterisk-bristuff/files/patch-editline::makelist +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/makelist -+++ editline/makelist -@@ -145,7 +145,7 @@ - # - -fh) - cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ -- sort | tr '[a-z]' '[A-Z]' | $AWK ' -+ sort | tr '[:lower:]' '[:upper:]' | $AWK ' - BEGIN { - printf("/* Automatically generated file, do not edit */\n"); - printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n"); diff --git a/net/asterisk-bristuff/files/patch-formats::Makefile b/net/asterisk-bristuff/files/patch-formats::Makefile deleted file mode 100644 index b2b1db5a37bd..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Fri Jan 13 11:16:07 2006 -+++ formats/Makefile Fri Jan 13 11:47:25 2006 -@@ -20,7 +20,7 @@ - # - # G723 simple frame is deprecated - # --FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - # - # OGG/Vorbis format -@@ -60,7 +60,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm - - install: all -- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c b/net/asterisk-bristuff/files/patch-formats::format_g723_1.c deleted file mode 100644 index ae814f197a1e..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,354 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 13 12:18:51 2006 -+++ formats/format_g723_1.c Fri Jan 13 12:18:41 2006 -@@ -0,0 +1,348 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Save and read raw, headerless G723.1 Annex A data. -+ * -+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net> -+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/channel.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/sched.h> -+#include <asterisk/module.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <stdlib.h> -+#include <sys/time.h> -+#include <unistd.h> -+#include <errno.h> -+#include <string.h> -+#include <pthread.h> -+#ifdef __linux__ -+#include <endian.h> -+#else -+#include <machine/endian.h> -+#endif -+ -+/* Based on format_g729.c */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+struct ast_filestream { -+ void *reserved[AST_RESERVED_POINTERS]; -+ /* This is what a filestream means to us */ -+ FILE *f; /* Descriptor */ -+ struct ast_frame fr; /* Frame information */ -+ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ -+ char empty; /* Empty character */ -+ unsigned char g723[24]; /* One Real G723.1 Frame */ -+}; -+ -+static long g723_tell(struct ast_filestream *); -+ -+AST_MUTEX_DEFINE_STATIC(g723_lock); -+static int glistcnt = 0; -+ -+static char *name = "g723"; -+static char *desc = "Raw G723.1 Annex A data"; -+static char *exts = "g723"; -+ -+static int g723_len(unsigned char buf) -+{ -+ switch(buf & TYPE_MASK) { -+ case TYPE_DONTSEND: -+ return 2; -+ break; -+ case TYPE_SILENCE: -+ return 4; -+ break; -+ case TYPE_HIGH: -+ return 24; -+ break; -+ case TYPE_LOW: -+ return 20; -+ break; -+ default: -+ ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static struct ast_filestream *g723_open(FILE *f) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ tmp->fr.data = tmp->g723; -+ tmp->fr.frametype = AST_FRAME_VOICE; -+ tmp->fr.subclass = AST_FORMAT_G723_1; -+ /* datalen will vary for each frame */ -+ tmp->fr.src = name; -+ tmp->fr.mallocd = 0; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } -+ return tmp; -+} -+ -+static struct ast_filestream *g723_rewrite(FILE *f, const char *comment) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } else -+ ast_log(LOG_WARNING, "Out of memory\n"); -+ return tmp; -+} -+ -+static void g723_close(struct ast_filestream *s) -+{ -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return; -+ } -+ glistcnt--; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ fclose(s->f); -+ free(s); -+ s = NULL; -+} -+ -+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) -+{ -+ int res; -+ /* Send a frame from the file to the appropriate channel */ -+ s->fr.frametype = AST_FRAME_VOICE; -+ s->fr.subclass = AST_FORMAT_G723_1; -+ s->fr.offset = AST_FRIENDLY_OFFSET; -+ s->fr.samples = 240; -+ s->fr.mallocd = 0; -+ s->fr.data = s->g723; -+ if ((res = fread(s->g723, 1, 1, s->f)) != 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ s->fr.datalen = g723_len(s->g723[0]); -+ if (s->fr.datalen < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame!\n"); -+ return NULL; -+ } -+ if (s->fr.datalen > 1 && (res = fread(s->g723 + 1, 1, s->fr.datalen - 1, s->f)) != s->fr.datalen - 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ *whennext = s->fr.samples; -+ return &s->fr; -+} -+ -+static int g723_write(struct ast_filestream *fs, struct ast_frame *f) -+{ -+ int res; -+ unsigned char *cp; -+ if (f->frametype != AST_FRAME_VOICE) { -+ ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); -+ return -1; -+ } -+ if (f->subclass != AST_FORMAT_G723_1) { -+ ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass); -+ return -1; -+ } -+ for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) { -+ res = g723_len(cp[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n"); -+ return -1; -+ } -+ } -+ if (cp != (unsigned char *)f->data + f->datalen) { -+ ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen); -+ return -1; -+ } -+ if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen) { -+ ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno)); -+ return -1; -+ } -+ return 0; -+} -+ -+static char *g723_getcomment(struct ast_filestream *s) -+{ -+ return NULL; -+} -+ -+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence) -+{ -+ long cur, offset, max; -+ off_t coffset, moffset, soffset; -+ int res; -+ unsigned char c; -+ -+ offset = 0; /* Shut up gcc warning */ -+ if (whence == SEEK_SET) { -+ offset = sample_offset; -+ } else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) { -+ if ((cur = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get current position!\n"); -+ return -1; -+ } -+ offset = cur + sample_offset; -+ } -+ if (fseeko(fs->f, 0, SEEK_END) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ else { -+ moffset = ftello(fs->f); -+ } -+ if (whence == SEEK_END) { -+ if ((max = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get maximum position!\n"); -+ return -1; -+ } -+ offset = max - sample_offset; -+ } -+ if (offset < 0) -+ offset = 0; -+ soffset = -1; -+ for (coffset = 0; coffset < moffset && offset > 0; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset); -+ return -1; -+ } -+ soffset = coffset; -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ offset -= 240; -+ } -+ if (soffset != -1 && fseeko(fs->f, soffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int g723_trunc(struct ast_filestream *fs) -+{ -+ /* Truncate file to current length */ -+ if (ftruncate(fileno(fs->f), ftello(fs->f)) < 0) -+ return -1; -+ return 0; -+} -+ -+static long g723_tell(struct ast_filestream *fs) -+{ -+ off_t offset, coffset; -+ int res; -+ long rval; -+ unsigned char c; -+ -+ offset = ftello(fs->f); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset); -+ return -1; -+ } -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ rval += 240; -+ } -+ if (fseeko(fs->f, offset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset); -+ return -1; -+ } -+ return rval; -+} -+ -+int load_module() -+{ -+ return ast_format_register(name, exts, AST_FORMAT_G723_1, -+ g723_open, -+ g723_rewrite, -+ g723_write, -+ g723_seek, -+ g723_trunc, -+ g723_tell, -+ g723_read, -+ g723_close, -+ g723_getcomment); -+} -+ -+int unload_module() -+{ -+ return ast_format_unregister(name); -+} -+ -+int usecount() -+{ -+ int res; -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return -1; -+ } -+ res = glistcnt; -+ ast_mutex_unlock(&g723_lock); -+ return res; -+} -+ -+char *description() -+{ -+ return desc; -+} -+ -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk-bristuff/files/patch-formats::format_g729.c b/net/asterisk-bristuff/files/patch-formats::format_g729.c deleted file mode 100644 index 11be5281608f..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Fri Jan 13 12:20:53 2006 -+++ formats/format_g729.c Fri Jan 13 12:23:33 2006 -@@ -60,7 +60,7 @@ struct ast_filestream { - struct ast_frame fr; /* Frame information */ - char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ - char empty; /* Empty character */ -- unsigned char g729[20]; /* Two Real G729 Frames */ -+ unsigned char g729[10]; /* One Real G729 Frame */ - }; - - -@@ -141,11 +141,11 @@ static struct ast_frame *g729_read(struc - s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_G729A; - s->fr.offset = AST_FRIENDLY_OFFSET; -- s->fr.samples = 160; -- s->fr.datalen = 20; -+ s->fr.samples = 80; -+ s->fr.datalen = 10; - s->fr.mallocd = 0; - s->fr.data = s->g729; -- if ((res = fread(s->g729, 1, 20, s->f)) != 20) { -+ if ((res = fread(s->g729, 1, 10, s->f)) != 10) { - if (res && (res != 10)) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -190,7 +190,7 @@ static int g729_seek(struct ast_filestre - fseek(fs->f, 0, SEEK_END); - max = ftell(fs->f); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -219,7 +219,7 @@ static long g729_tell(struct ast_filestr - { - off_t offset; - offset = ftell(fs->f); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() diff --git a/net/asterisk-bristuff/files/patch-frame.c b/net/asterisk-bristuff/files/patch-frame.c deleted file mode 100644 index 753253c7af0d..000000000000 --- a/net/asterisk-bristuff/files/patch-frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- frame.c.orig Wed Jan 25 13:22:43 2006 -+++ frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk-bristuff/files/patch-funcs::Makefile b/net/asterisk-bristuff/files/patch-funcs::Makefile deleted file mode 100644 index a14daeed285c..000000000000 --- a/net/asterisk-bristuff/files/patch-funcs::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- funcs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ funcs/Makefile Fri Jan 13 12:36:57 2006 -@@ -67,7 +67,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} - - install: all -- for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FUNCS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk-bristuff/files/patch-include::asterisk::utils.h b/net/asterisk-bristuff/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk-bristuff/files/patch-include::asterisk::utils.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/utils.h 2004/10/10 12:55:50 1.1 -+++ include/asterisk/utils.h 2004/10/10 12:56:43 -@@ -37,7 +37,6 @@ - #ifdef inet_ntoa - #undef inet_ntoa - #endif --#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ - - #ifdef LINUX - #define ast_pthread_create pthread_create diff --git a/net/asterisk-bristuff/files/patch-pbx::Makefile b/net/asterisk-bristuff/files/patch-pbx::Makefile deleted file mode 100644 index 97d03e10f871..000000000000 --- a/net/asterisk-bristuff/files/patch-pbx::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig -+++ pbx/Makefile -@@ -23,8 +23,8 @@ - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - --GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` --GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` -+#GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` -+#GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` - MOC=$(QTDIR)/bin/moc - KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include - KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui -@@ -72,7 +72,7 @@ - endif - - install: all -- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk-bristuff/files/patch-res::Makefile b/net/asterisk-bristuff/files/patch-res::Makefile deleted file mode 100644 index de5c365db34d..000000000000 --- a/net/asterisk-bristuff/files/patch-res::Makefile +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile -+++ res/Makefile -@@ -37,8 +37,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifeq (${OSARCH},CYGWIN) -@@ -55,9 +55,7 @@ - CFLAGS+= - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) - CFLAGS+=-DZAPATA_MOH --endif - endif # WITHOUT_ZAPTEL - - # -@@ -75,7 +73,7 @@ - rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h - rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so - rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \ - if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \ - echo "*************************************************************";\ diff --git a/net/asterisk-bristuff/files/patch-rtp.c b/net/asterisk-bristuff/files/patch-rtp.c deleted file mode 100644 index bbc2649929f9..000000000000 --- a/net/asterisk-bristuff/files/patch-rtp.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Fri Jan 13 13:38:01 2006 -+++ rtp.c Fri Jan 13 13:40:50 2006 -@@ -950,8 +950,10 @@ struct ast_rtp *ast_rtp_new_with_bindadd - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; - /* If there's rtcp, initialize it as well. */ -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - /* Try to bind it/them. */ - if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && - (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) diff --git a/net/asterisk-bristuff/files/patch-utils::Makefile b/net/asterisk-bristuff/files/patch-utils::Makefile deleted file mode 100644 index f3164c0f478a..000000000000 --- a/net/asterisk-bristuff/files/patch-utils::Makefile +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- utils/Makefile -+++ utils/Makefile -@@ -17,16 +17,16 @@ - CFLAGS+=-DNO_AST_MM - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - TARGET=stereorize streamplayer - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/popt.h),) - TARGET+=smsq - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/newt.h),) - TARGET+=astman - endif - -@@ -40,7 +40,7 @@ - install: - for x in $(TARGET); do \ - if [ "$$x" != "none" ]; then \ -- $(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ - fi; \ - done - diff --git a/net/asterisk-bristuff/pkg-descr b/net/asterisk-bristuff/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk-bristuff/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Asterisk is an Open Source PBX and telephony toolkit. It is, in a -sense, middleware between Internet and telephony channels on the bottom, -and Internet and telephony applications at the top. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk-bristuff/pkg-plist b/net/asterisk-bristuff/pkg-plist deleted file mode 100644 index 3af861f7a135..000000000000 --- a/net/asterisk-bristuff/pkg-plist +++ /dev/null @@ -1,755 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi -etc/asterisk/adsi.conf-dist -@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf -@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi -etc/asterisk/adtranvofr.conf-dist -@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf -@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi -etc/asterisk/agents.conf-dist -@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf -@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi -etc/asterisk/alarmreceiver.conf-dist -@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf -@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi -etc/asterisk/alsa.conf-dist -@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf -@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi -etc/asterisk/asterisk.adsi-dist -@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi -@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi -etc/asterisk/asterisk.conf-dist -@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf -@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi -etc/asterisk/cdr.conf-dist -@exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf -@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi -etc/asterisk/cdr_custom.conf-dist -@exec [ -f %B/cdr_custom.conf ] || cp %B/%f %B/cdr_custom.conf -@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi -etc/asterisk/cdr_manager.conf-dist -@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf -@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi -etc/asterisk/cdr_odbc.conf-dist -@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf -@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi -etc/asterisk/cdr_pgsql.conf-dist -@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf -@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi -etc/asterisk/cdr_tds.conf-dist -@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf -@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi -etc/asterisk/codecs.conf-dist -@exec [ -f %B/codecs.conf ] || cp %B/%f %B/codecs.conf -@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi -etc/asterisk/dnsmgr.conf-dist -@exec [ -f %B/dnsmgr.conf ] || cp %B/%f %B/dmsmgr.conf -@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi -etc/asterisk/dundi.conf-dist -@exec [ -f %B/dundi.conf ] || cp %B/%f %B/dundi.conf -@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi -etc/asterisk/enum.conf-dist -@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael -@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi -etc/asterisk/extconfig.conf-dist -@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf -@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi -etc/asterisk/extensions.conf-dist -@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf -@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi -etc/asterisk/features.conf-dist -@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf -@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi -etc/asterisk/festival.conf-dist -@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf -@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi -etc/asterisk/iax.conf-dist -@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf -@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi -etc/asterisk/iaxprov.conf-dist -@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf -@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi -etc/asterisk/indications.conf-dist -@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf -@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi -etc/asterisk/logger.conf-dist -@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf -@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi -etc/asterisk/manager.conf-dist -@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf -@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi -etc/asterisk/meetme.conf-dist -@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf -@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi -etc/asterisk/mgcp.conf-dist -@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf -@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi -etc/asterisk/misdn.conf-dist -@exec [ -f %B/misdn.conf ] || cp %B/%f %B/misdn.conf -@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi -etc/asterisk/modem.conf-dist -@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf -@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi -etc/asterisk/modules.conf-dist -@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf -@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi -etc/asterisk/musiconhold.conf-dist -@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf -@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi -etc/asterisk/osp.conf-dist -@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf -@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi -etc/asterisk/oss.conf-dist -@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf -@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi -etc/asterisk/phone.conf-dist -@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf -@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi -etc/asterisk/privacy.conf-dist -@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf -@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi -etc/asterisk/queues.conf-dist -@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf -@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi -etc/asterisk/res_odbc.conf-dist -@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist -@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf -@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi -etc/asterisk/rtp.conf-dist -@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf -@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi -etc/asterisk/sip.conf-dist -@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf -@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi -etc/asterisk/sip_notify.conf-dist -@exec [ -f %B/sip_notify.conf ] || cp %B/%f %B/sip_notify.conf -@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi -etc/asterisk/skinny.conf-dist -@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf -@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi -etc/asterisk/telcordia-1.adsi-dist -@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi -@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi -etc/asterisk/voicemail.conf-dist -@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf -@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi -etc/asterisk/vpb.conf-dist -@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf -@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi -etc/asterisk/zapata.conf-dist -@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/aes.h -include/asterisk/agi.h -include/asterisk/alaw.h -include/asterisk/app.h -include/asterisk/ast_expr.h -include/asterisk/astdb.h -include/asterisk/astmm.h -include/asterisk/astobj.h -include/asterisk/astosp.h -include/asterisk/build.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/chanspy.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/compat.h -include/asterisk/config.h -include/asterisk/compiler.h -include/asterisk/crypto.h -include/asterisk/devicestate.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dnsmgr.h -include/asterisk/doxyref.h -include/asterisk/dsp.h -include/asterisk/dundi.h -include/asterisk/enum.h -include/asterisk/endian.h -include/asterisk/features.h -include/asterisk/file.h -include/asterisk/frame.h -include/asterisk/fskmodem.h -include/asterisk/image.h -include/asterisk/indications.h -include/asterisk/inline_api.h -include/asterisk/io.h -include/asterisk/linkedlists.h -include/asterisk/localtime.h -include/asterisk/lock.h -include/asterisk/logger.h -include/asterisk/manager.h -include/asterisk/md5.h -include/asterisk/module.h -include/asterisk/monitor.h -include/asterisk/musiconhold.h -include/asterisk/netsock.h -include/asterisk/options.h -include/asterisk/pbx.h -include/asterisk/plc.h -include/asterisk/poll-compat.h -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/rtp.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/slinfactory.h -include/asterisk/srv.h -include/asterisk/strings.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/time.h -include/asterisk/transcap.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/unaligned.h -include/asterisk/utils.h -include/asterisk/version.h -include/asterisk/vmodem.h -lib/asterisk/modules/app_adsiprog.so -lib/asterisk/modules/app_alarmreceiver.so -lib/asterisk/modules/app_authenticate.so -lib/asterisk/modules/app_cdr.so -lib/asterisk/modules/app_chanisavail.so -lib/asterisk/modules/app_chanspy.so -lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_curl.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_dictate.so -lib/asterisk/modules/app_directed_pickup.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.so -lib/asterisk/modules/app_dumpchan.so -lib/asterisk/modules/app_echo.so -lib/asterisk/modules/app_enumlookup.so -lib/asterisk/modules/app_eval.so -lib/asterisk/modules/app_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_groupcount.so -lib/asterisk/modules/app_hasnewvoicemail.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_math.so -lib/asterisk/modules/app_md5.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mixmonitor.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_realtime.so -lib/asterisk/modules/app_record.so -%%WITH_FAX%%lib/asterisk/modules/app_rxfax.so -lib/asterisk/modules/app_sayunixtime.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.so -lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_setcidname.so -lib/asterisk/modules/app_setcidnum.so -lib/asterisk/modules/app_setrdnis.so -lib/asterisk/modules/app_settransfercapability.so -lib/asterisk/modules/app_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_stack.so -lib/asterisk/modules/app_system.so -lib/asterisk/modules/app_talkdetect.so -lib/asterisk/modules/app_test.so -lib/asterisk/modules/app_transfer.so -%%WITH_FAX%%lib/asterisk/modules/app_txfax.so -lib/asterisk/modules/app_txtcidname.so -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -lib/asterisk/modules/app_voicemail.so -lib/asterisk/modules/app_waitforring.so -lib/asterisk/modules/app_waitforsilence.so -lib/asterisk/modules/app_while.so -lib/asterisk/modules/app_zapateller.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapbarge.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapras.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so -lib/asterisk/modules/chan_agent.so -lib/asterisk/modules/chan_features.so -%%WITH_H323%%lib/asterisk/modules/chan_h323.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -%%WITH_ZAPTEL%%lib/asterisk/modules/chan_zap.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_gsm.so -lib/asterisk/modules/codec_ilbc.so -lib/asterisk/modules/codec_lpc10.so -lib/asterisk/modules/codec_speex.so -lib/asterisk/modules/codec_ulaw.so -lib/asterisk/modules/format_au.so -lib/asterisk/modules/format_g723_1.so -lib/asterisk/modules/format_g726.so -lib/asterisk/modules/format_g729.so -lib/asterisk/modules/format_gsm.so -lib/asterisk/modules/format_h263.so -lib/asterisk/modules/format_ilbc.so -lib/asterisk/modules/format_jpeg.so -lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_pcm_alaw.so -lib/asterisk/modules/format_sln.so -lib/asterisk/modules/format_vox.so -lib/asterisk/modules/format_wav.so -lib/asterisk/modules/format_wav_gsm.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_enum.so -lib/asterisk/modules/func_uri.so -lib/asterisk/modules/pbx_ael.so -lib/asterisk/modules/pbx_config.so -lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_functions.so -lib/asterisk/modules/pbx_loopback.so -lib/asterisk/modules/pbx_realtime.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.so -%%NEWGCC%%lib/asterisk/modules/res_config_odbc.so -lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_features.so -lib/asterisk/modules/res_indications.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so -lib/asterisk/modules/res_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/autosupport -sbin/rasterisk -sbin/safe_asterisk -sbin/smsq -sbin/stereorize -sbin/streamplayer -%%DATADIR%%/agi-bin/agi-test.agi -%%DATADIR%%/agi-bin/eagi-sphinx-test -%%DATADIR%%/agi-bin/eagi-test -%%DATADIR%%/firmware/iax/iaxy.bin -%%DATADIR%%/images/asterisk-intro.jpg -%%DATADIR%%/keys/freeworlddialup.pub -%%DATADIR%%/keys/iaxtel.pub -%%DATADIR%%/mohmp3/fpm-calm-river.mp3 -%%DATADIR%%/mohmp3/fpm-sunshine.mp3 -%%DATADIR%%/mohmp3/fpm-world-mix.mp3 -%%DATADIR%%/sounds/agent-alreadyon.gsm -%%DATADIR%%/sounds/agent-incorrect.gsm -%%DATADIR%%/sounds/agent-loggedoff.gsm -%%DATADIR%%/sounds/agent-loginok.gsm -%%DATADIR%%/sounds/agent-newlocation.gsm -%%DATADIR%%/sounds/agent-pass.gsm -%%DATADIR%%/sounds/agent-user.gsm -%%DATADIR%%/sounds/auth-incorrect.gsm -%%DATADIR%%/sounds/auth-thankyou.gsm -%%DATADIR%%/sounds/beep.gsm -%%DATADIR%%/sounds/beeperr.gsm -%%DATADIR%%/sounds/conf-adminmenu.gsm -%%DATADIR%%/sounds/conf-enteringno.gsm -%%DATADIR%%/sounds/conf-errormenu.gsm -%%DATADIR%%/sounds/conf-getchannel.gsm -%%DATADIR%%/sounds/conf-getconfno.gsm -%%DATADIR%%/sounds/conf-getpin.gsm -%%DATADIR%%/sounds/conf-hasjoin.gsm -%%DATADIR%%/sounds/conf-hasleft.gsm -%%DATADIR%%/sounds/conf-invalid.gsm -%%DATADIR%%/sounds/conf-invalidpin.gsm -%%DATADIR%%/sounds/conf-kicked.gsm -%%DATADIR%%/sounds/conf-leaderhasleft.gsm -%%DATADIR%%/sounds/conf-locked.gsm -%%DATADIR%%/sounds/conf-lockednow.gsm -%%DATADIR%%/sounds/conf-muted.gsm -%%DATADIR%%/sounds/conf-noempty.gsm -%%DATADIR%%/sounds/conf-onlyone.gsm -%%DATADIR%%/sounds/conf-onlyperson.gsm -%%DATADIR%%/sounds/conf-otherinparty.gsm -%%DATADIR%%/sounds/conf-placeintoconf.gsm -%%DATADIR%%/sounds/conf-thereare.gsm -%%DATADIR%%/sounds/conf-unlockednow.gsm -%%DATADIR%%/sounds/conf-unmuted.gsm -%%DATADIR%%/sounds/conf-usermenu.gsm -%%DATADIR%%/sounds/conf-userswilljoin.gsm -%%DATADIR%%/sounds/conf-userwilljoin.gsm -%%DATADIR%%/sounds/conf-waitforleader.gsm -%%DATADIR%%/sounds/demo-abouttotry.gsm -%%DATADIR%%/sounds/demo-congrats.gsm -%%DATADIR%%/sounds/demo-echodone.gsm -%%DATADIR%%/sounds/demo-echotest.gsm -%%DATADIR%%/sounds/demo-enterkeywords.gsm -%%DATADIR%%/sounds/demo-instruct.gsm -%%DATADIR%%/sounds/demo-moreinfo.gsm -%%DATADIR%%/sounds/demo-nogo.gsm -%%DATADIR%%/sounds/demo-nomatch.gsm -%%DATADIR%%/sounds/demo-thanks.gsm -%%DATADIR%%/sounds/dictate/both_help.gsm -%%DATADIR%%/sounds/dictate/enter_filename.gsm -%%DATADIR%%/sounds/dictate/forhelp.gsm -%%DATADIR%%/sounds/dictate/pause.gsm -%%DATADIR%%/sounds/dictate/paused.gsm -%%DATADIR%%/sounds/dictate/play_help.gsm -%%DATADIR%%/sounds/dictate/playback.gsm -%%DATADIR%%/sounds/dictate/playback_mode.gsm -%%DATADIR%%/sounds/dictate/record.gsm -%%DATADIR%%/sounds/dictate/record_help.gsm -%%DATADIR%%/sounds/dictate/record_mode.gsm -%%DATADIR%%/sounds/dictate/truncating_audio.gsm -%%DATADIR%%/sounds/digits/0.gsm -%%DATADIR%%/sounds/digits/1.gsm -%%DATADIR%%/sounds/digits/10.gsm -%%DATADIR%%/sounds/digits/11.gsm -%%DATADIR%%/sounds/digits/12.gsm -%%DATADIR%%/sounds/digits/13.gsm -%%DATADIR%%/sounds/digits/14.gsm -%%DATADIR%%/sounds/digits/15.gsm -%%DATADIR%%/sounds/digits/16.gsm -%%DATADIR%%/sounds/digits/17.gsm -%%DATADIR%%/sounds/digits/18.gsm -%%DATADIR%%/sounds/digits/19.gsm -%%DATADIR%%/sounds/digits/2.gsm -%%DATADIR%%/sounds/digits/20.gsm -%%DATADIR%%/sounds/digits/3.gsm -%%DATADIR%%/sounds/digits/30.gsm -%%DATADIR%%/sounds/digits/4.gsm -%%DATADIR%%/sounds/digits/40.gsm -%%DATADIR%%/sounds/digits/5.gsm -%%DATADIR%%/sounds/digits/50.gsm -%%DATADIR%%/sounds/digits/6.gsm -%%DATADIR%%/sounds/digits/60.gsm -%%DATADIR%%/sounds/digits/7.gsm -%%DATADIR%%/sounds/digits/70.gsm -%%DATADIR%%/sounds/digits/8.gsm -%%DATADIR%%/sounds/digits/80.gsm -%%DATADIR%%/sounds/digits/9.gsm -%%DATADIR%%/sounds/digits/90.gsm -%%DATADIR%%/sounds/digits/a-m.gsm -%%DATADIR%%/sounds/digits/at.gsm -%%DATADIR%%/sounds/digits/day-0.gsm -%%DATADIR%%/sounds/digits/day-1.gsm -%%DATADIR%%/sounds/digits/day-2.gsm -%%DATADIR%%/sounds/digits/day-3.gsm -%%DATADIR%%/sounds/digits/day-4.gsm -%%DATADIR%%/sounds/digits/day-5.gsm -%%DATADIR%%/sounds/digits/day-6.gsm -%%DATADIR%%/sounds/digits/dollars.gsm -%%DATADIR%%/sounds/digits/h-1.gsm -%%DATADIR%%/sounds/digits/h-10.gsm -%%DATADIR%%/sounds/digits/h-11.gsm -%%DATADIR%%/sounds/digits/h-12.gsm -%%DATADIR%%/sounds/digits/h-13.gsm -%%DATADIR%%/sounds/digits/h-14.gsm -%%DATADIR%%/sounds/digits/h-15.gsm -%%DATADIR%%/sounds/digits/h-16.gsm -%%DATADIR%%/sounds/digits/h-17.gsm -%%DATADIR%%/sounds/digits/h-18.gsm -%%DATADIR%%/sounds/digits/h-19.gsm -%%DATADIR%%/sounds/digits/h-2.gsm -%%DATADIR%%/sounds/digits/h-20.gsm -%%DATADIR%%/sounds/digits/h-3.gsm -%%DATADIR%%/sounds/digits/h-30.gsm -%%DATADIR%%/sounds/digits/h-4.gsm -%%DATADIR%%/sounds/digits/h-5.gsm -%%DATADIR%%/sounds/digits/h-6.gsm -%%DATADIR%%/sounds/digits/h-7.gsm -%%DATADIR%%/sounds/digits/h-8.gsm -%%DATADIR%%/sounds/digits/h-9.gsm -%%DATADIR%%/sounds/digits/hundred.gsm -%%DATADIR%%/sounds/digits/million.gsm -%%DATADIR%%/sounds/digits/minus.gsm -%%DATADIR%%/sounds/digits/mon-0.gsm -%%DATADIR%%/sounds/digits/mon-1.gsm -%%DATADIR%%/sounds/digits/mon-10.gsm -%%DATADIR%%/sounds/digits/mon-11.gsm -%%DATADIR%%/sounds/digits/mon-2.gsm -%%DATADIR%%/sounds/digits/mon-3.gsm -%%DATADIR%%/sounds/digits/mon-4.gsm -%%DATADIR%%/sounds/digits/mon-5.gsm -%%DATADIR%%/sounds/digits/mon-6.gsm -%%DATADIR%%/sounds/digits/mon-7.gsm -%%DATADIR%%/sounds/digits/mon-8.gsm -%%DATADIR%%/sounds/digits/mon-9.gsm -%%DATADIR%%/sounds/digits/oclock.gsm -%%DATADIR%%/sounds/digits/oh.gsm -%%DATADIR%%/sounds/digits/p-m.gsm -%%DATADIR%%/sounds/digits/pound.gsm -%%DATADIR%%/sounds/digits/star.gsm -%%DATADIR%%/sounds/digits/thousand.gsm -%%DATADIR%%/sounds/digits/today.gsm -%%DATADIR%%/sounds/digits/tomorrow.gsm -%%DATADIR%%/sounds/digits/yesterday.gsm -%%DATADIR%%/sounds/dir-instr.gsm -%%DATADIR%%/sounds/dir-intro-fn.gsm -%%DATADIR%%/sounds/dir-intro.gsm -%%DATADIR%%/sounds/dir-nomatch.gsm -%%DATADIR%%/sounds/dir-nomore.gsm -%%DATADIR%%/sounds/hello-world.gsm -%%DATADIR%%/sounds/invalid.gsm -%%DATADIR%%/sounds/letters/a.gsm -%%DATADIR%%/sounds/letters/at.gsm -%%DATADIR%%/sounds/letters/b.gsm -%%DATADIR%%/sounds/letters/c.gsm -%%DATADIR%%/sounds/letters/d.gsm -%%DATADIR%%/sounds/letters/dash.gsm -%%DATADIR%%/sounds/letters/dollar.gsm -%%DATADIR%%/sounds/letters/dot.gsm -%%DATADIR%%/sounds/letters/e.gsm -%%DATADIR%%/sounds/letters/equals.gsm -%%DATADIR%%/sounds/letters/exclaimation-point.gsm -%%DATADIR%%/sounds/letters/f.gsm -%%DATADIR%%/sounds/letters/g.gsm -%%DATADIR%%/sounds/letters/h.gsm -%%DATADIR%%/sounds/letters/i.gsm -%%DATADIR%%/sounds/letters/j.gsm -%%DATADIR%%/sounds/letters/k.gsm -%%DATADIR%%/sounds/letters/l.gsm -%%DATADIR%%/sounds/letters/m.gsm -%%DATADIR%%/sounds/letters/n.gsm -%%DATADIR%%/sounds/letters/o.gsm -%%DATADIR%%/sounds/letters/p.gsm -%%DATADIR%%/sounds/letters/plus.gsm -%%DATADIR%%/sounds/letters/q.gsm -%%DATADIR%%/sounds/letters/r.gsm -%%DATADIR%%/sounds/letters/s.gsm -%%DATADIR%%/sounds/letters/slash.gsm -%%DATADIR%%/sounds/letters/space.gsm -%%DATADIR%%/sounds/letters/t.gsm -%%DATADIR%%/sounds/letters/u.gsm -%%DATADIR%%/sounds/letters/v.gsm -%%DATADIR%%/sounds/letters/w.gsm -%%DATADIR%%/sounds/letters/x.gsm -%%DATADIR%%/sounds/letters/y.gsm -%%DATADIR%%/sounds/letters/z.gsm -%%DATADIR%%/sounds/letters/zed.gsm -%%DATADIR%%/sounds/pbx-invalid.gsm -%%DATADIR%%/sounds/pbx-invalidpark.gsm -%%DATADIR%%/sounds/pbx-transfer.gsm -%%DATADIR%%/sounds/phonetic/9_p.gsm -%%DATADIR%%/sounds/phonetic/a_p.gsm -%%DATADIR%%/sounds/phonetic/b_p.gsm -%%DATADIR%%/sounds/phonetic/c_p.gsm -%%DATADIR%%/sounds/phonetic/d_p.gsm -%%DATADIR%%/sounds/phonetic/e_p.gsm -%%DATADIR%%/sounds/phonetic/f_p.gsm -%%DATADIR%%/sounds/phonetic/g_p.gsm -%%DATADIR%%/sounds/phonetic/h_p.gsm -%%DATADIR%%/sounds/phonetic/i_p.gsm -%%DATADIR%%/sounds/phonetic/j_p.gsm -%%DATADIR%%/sounds/phonetic/k_p.gsm -%%DATADIR%%/sounds/phonetic/l_p.gsm -%%DATADIR%%/sounds/phonetic/m_p.gsm -%%DATADIR%%/sounds/phonetic/n_p.gsm -%%DATADIR%%/sounds/phonetic/o_p.gsm -%%DATADIR%%/sounds/phonetic/p_p.gsm -%%DATADIR%%/sounds/phonetic/q_p.gsm -%%DATADIR%%/sounds/phonetic/r_p.gsm -%%DATADIR%%/sounds/phonetic/s_p.gsm -%%DATADIR%%/sounds/phonetic/t_p.gsm -%%DATADIR%%/sounds/phonetic/u_p.gsm -%%DATADIR%%/sounds/phonetic/v_p.gsm -%%DATADIR%%/sounds/phonetic/w_p.gsm -%%DATADIR%%/sounds/phonetic/x_p.gsm -%%DATADIR%%/sounds/phonetic/y_p.gsm -%%DATADIR%%/sounds/phonetic/z_p.gsm -%%DATADIR%%/sounds/priv-callee-options.gsm -%%DATADIR%%/sounds/priv-callpending.gsm -%%DATADIR%%/sounds/priv-introsaved.gsm -%%DATADIR%%/sounds/priv-recordintro.gsm -%%DATADIR%%/sounds/privacy-incorrect.gsm -%%DATADIR%%/sounds/privacy-prompt.gsm -%%DATADIR%%/sounds/privacy-thankyou.gsm -%%DATADIR%%/sounds/privacy-unident.gsm -%%DATADIR%%/sounds/queue-callswaiting.gsm -%%DATADIR%%/sounds/queue-holdtime.gsm -%%DATADIR%%/sounds/queue-less-than.gsm -%%DATADIR%%/sounds/queue-minutes.gsm -%%DATADIR%%/sounds/queue-periodic-announce.gsm -%%DATADIR%%/sounds/queue-reporthold.gsm -%%DATADIR%%/sounds/queue-seconds.gsm -%%DATADIR%%/sounds/queue-thankyou.gsm -%%DATADIR%%/sounds/queue-thereare.gsm -%%DATADIR%%/sounds/queue-youarenext.gsm -%%DATADIR%%/sounds/screen-callee-options.gsm -%%DATADIR%%/sounds/spy-agent.gsm -%%DATADIR%%/sounds/spy-h323.gsm -%%DATADIR%%/sounds/spy-iax.gsm -%%DATADIR%%/sounds/spy-iax2.gsm -%%DATADIR%%/sounds/spy-mgcp.gsm -%%DATADIR%%/sounds/spy-sip.gsm -%%DATADIR%%/sounds/spy-skinny.gsm -%%DATADIR%%/sounds/spy-zap.gsm -%%DATADIR%%/sounds/ss-noservice.gsm -%%DATADIR%%/sounds/transfer.gsm -%%DATADIR%%/sounds/tt-allbusy.gsm -%%DATADIR%%/sounds/tt-monkeys.gsm -%%DATADIR%%/sounds/tt-monkeysintro.gsm -%%DATADIR%%/sounds/tt-somethingwrong.gsm -%%DATADIR%%/sounds/tt-weasels.gsm -%%DATADIR%%/sounds/vm-Cust1.gsm -%%DATADIR%%/sounds/vm-Cust2.gsm -%%DATADIR%%/sounds/vm-Cust3.gsm -%%DATADIR%%/sounds/vm-Cust4.gsm -%%DATADIR%%/sounds/vm-Cust5.gsm -%%DATADIR%%/sounds/vm-Family.gsm -%%DATADIR%%/sounds/vm-Friends.gsm -%%DATADIR%%/sounds/vm-INBOX.gsm -%%DATADIR%%/sounds/vm-Old.gsm -%%DATADIR%%/sounds/vm-Work.gsm -%%DATADIR%%/sounds/vm-advopts.gsm -%%DATADIR%%/sounds/vm-and.gsm -%%DATADIR%%/sounds/vm-calldiffnum.gsm -%%DATADIR%%/sounds/vm-changeto.gsm -%%DATADIR%%/sounds/vm-delete.gsm -%%DATADIR%%/sounds/vm-deleted.gsm -%%DATADIR%%/sounds/vm-dialout.gsm -%%DATADIR%%/sounds/vm-enter-num-to-call.gsm -%%DATADIR%%/sounds/vm-extension.gsm -%%DATADIR%%/sounds/vm-first.gsm -%%DATADIR%%/sounds/vm-for.gsm -%%DATADIR%%/sounds/vm-forward.gsm -%%DATADIR%%/sounds/vm-forwardoptions.gsm -%%DATADIR%%/sounds/vm-from-extension.gsm -%%DATADIR%%/sounds/vm-from-phonenumber.gsm -%%DATADIR%%/sounds/vm-from.gsm -%%DATADIR%%/sounds/vm-goodbye.gsm -%%DATADIR%%/sounds/vm-helpexit.gsm -%%DATADIR%%/sounds/vm-incorrect-mailbox.gsm -%%DATADIR%%/sounds/vm-incorrect.gsm -%%DATADIR%%/sounds/vm-instructions.gsm -%%DATADIR%%/sounds/vm-intro.gsm -%%DATADIR%%/sounds/vm-isonphone.gsm -%%DATADIR%%/sounds/vm-isunavail.gsm -%%DATADIR%%/sounds/vm-last.gsm -%%DATADIR%%/sounds/vm-leavemsg.gsm -%%DATADIR%%/sounds/vm-login.gsm -%%DATADIR%%/sounds/vm-mailboxfull.gsm -%%DATADIR%%/sounds/vm-message.gsm -%%DATADIR%%/sounds/vm-messages.gsm -%%DATADIR%%/sounds/vm-minutes.gsm -%%DATADIR%%/sounds/vm-mismatch.gsm -%%DATADIR%%/sounds/vm-msginstruct.gsm -%%DATADIR%%/sounds/vm-msgsaved.gsm -%%DATADIR%%/sounds/vm-newpassword.gsm -%%DATADIR%%/sounds/vm-newuser.gsm -%%DATADIR%%/sounds/vm-next.gsm -%%DATADIR%%/sounds/vm-no.gsm -%%DATADIR%%/sounds/vm-nobodyavail.gsm -%%DATADIR%%/sounds/vm-nobox.gsm -%%DATADIR%%/sounds/vm-nomore.gsm -%%DATADIR%%/sounds/vm-nonumber.gsm -%%DATADIR%%/sounds/vm-num-i-have.gsm -%%DATADIR%%/sounds/vm-onefor.gsm -%%DATADIR%%/sounds/vm-options.gsm -%%DATADIR%%/sounds/vm-opts.gsm -%%DATADIR%%/sounds/vm-passchanged.gsm -%%DATADIR%%/sounds/vm-password.gsm -%%DATADIR%%/sounds/vm-press.gsm -%%DATADIR%%/sounds/vm-prev.gsm -%%DATADIR%%/sounds/vm-reachoper.gsm -%%DATADIR%%/sounds/vm-rec-busy.gsm -%%DATADIR%%/sounds/vm-rec-name.gsm -%%DATADIR%%/sounds/vm-rec-temp.gsm -%%DATADIR%%/sounds/vm-rec-unv.gsm -%%DATADIR%%/sounds/vm-received.gsm -%%DATADIR%%/sounds/vm-reenterpassword.gsm -%%DATADIR%%/sounds/vm-repeat.gsm -%%DATADIR%%/sounds/vm-review.gsm -%%DATADIR%%/sounds/vm-saved.gsm -%%DATADIR%%/sounds/vm-savedto.gsm -%%DATADIR%%/sounds/vm-savefolder.gsm -%%DATADIR%%/sounds/vm-savemessage.gsm -%%DATADIR%%/sounds/vm-saveoper.gsm -%%DATADIR%%/sounds/vm-sorry.gsm -%%DATADIR%%/sounds/vm-star-cancel.gsm -%%DATADIR%%/sounds/vm-starmain.gsm -%%DATADIR%%/sounds/vm-tempgreeting.gsm -%%DATADIR%%/sounds/vm-tempgreeting2.gsm -%%DATADIR%%/sounds/vm-tempremoved.gsm -%%DATADIR%%/sounds/vm-then-pound.gsm -%%DATADIR%%/sounds/vm-theperson.gsm -%%DATADIR%%/sounds/vm-tocallback.gsm -%%DATADIR%%/sounds/vm-tocallnum.gsm -%%DATADIR%%/sounds/vm-tocancel.gsm -%%DATADIR%%/sounds/vm-tocancelmsg.gsm -%%DATADIR%%/sounds/vm-toenternumber.gsm -%%DATADIR%%/sounds/vm-toforward.gsm -%%DATADIR%%/sounds/vm-tohearenv.gsm -%%DATADIR%%/sounds/vm-tomakecall.gsm -%%DATADIR%%/sounds/vm-tooshort.gsm -%%DATADIR%%/sounds/vm-toreply.gsm -%%DATADIR%%/sounds/vm-torerecord.gsm -%%DATADIR%%/sounds/vm-undelete.gsm -%%DATADIR%%/sounds/vm-undeleted.gsm -%%DATADIR%%/sounds/vm-unknown-caller.gsm -%%DATADIR%%/sounds/vm-whichbox.gsm -%%DATADIR%%/sounds/vm-youhave.gsm -%%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate -@dirrm %%DATADIR%%/sounds/phonetic -@dirrm %%DATADIR%%/sounds/letters -@dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/mohmp3 -@dirrm %%DATADIR%%/keys -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/firmware/iax -@dirrm %%DATADIR%%/firmware -@dirrm %%DATADIR%%/agi-bin -@dirrm %%DATADIR%% -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/%%DATADIR%%/astdb -@cwd /var -spool/asterisk/voicemail/default/1234/busy.gsm -spool/asterisk/voicemail/default/1234/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/voicemail/default/1234 -@dirrm spool/asterisk/voicemail/default -@dirrm spool/asterisk/voicemail -@dirrm spool/asterisk/tmp -@dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile deleted file mode 100644 index 10d4cd2b786f..000000000000 --- a/net/asterisk10/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.2.4 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ - http://ftp.digium.com/pub/asterisk/old-releases/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= An Open Source PBX and telephony toolkit - -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - -BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ - newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 sparc64 amd64 - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= asterisk.sh -USE_REINPLACE= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${PWLIBDIR} \ - OPENH323DIR=${OPENH323DIR} \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 - -.include <bsd.port.pre.mk> - -PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC -OPENH323DIR!= cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC - -.if ${ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build -PLIST_SUB+= WITH_H323="" -MAKE_ENV+= WITH_H323=1 -.endif - -.if defined(WITHOUT_ZAPTEL) -PLIST_SUB+= WITH_ZAPTEL="@comment " -MAKE_ENV+= WITHOUT_ZAPTEL=1 -.else -BUILD_DEPENDS+= libpri>=1.2.0:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -MAKE_ENV+= WITH_ZAPTEL=1 -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if defined(WITHOUT_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -.else -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -PLIST_SUB+= WITH_ODBC="" -MAKE_ENV+= WITH_ODBC=1 -.endif - -.if defined(WITHOUT_FAX) -PLIST_SUB+= WITH_FAX="@comment " -.else -MAKE_ENV+= WITH_FAX=1 -LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp -PLIST_SUB+= WITH_FAX="" -.endif - -.if ${OSVERSION} >= 500036 -PLIST_SUB+= NEWGCC="" -.else -PLIST_SUB+= NEWGCC="@comment " -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - -.include <bsd.port.post.mk> diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo deleted file mode 100644 index 6b4fba28f1df..000000000000 --- a/net/asterisk10/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d -SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c -SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 diff --git a/net/asterisk10/files/asterisk.sh.in b/net/asterisk10/files/asterisk.sh.in deleted file mode 100644 index 22ef57fd3727..000000000000 --- a/net/asterisk10/files/asterisk.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. %%RC_SUBR%% - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk -pidfile=/var/run/asterisk.pid - -asterisk_enable=${asterisk_enable:-"NO"} - -load_rc_config $name -run_rc_command "$1" diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile deleted file mode 100644 index 708a356041a3..000000000000 --- a/net/asterisk10/files/patch-Makefile +++ /dev/null @@ -1,515 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -19,8 +19,8 @@ - # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- - # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ - # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target --CC=$(CROSS_COMPILE)gcc --HOST_CC=gcc -+CC?=$(CROSS_COMPILE)gcc -+HOST_CC=${CC} - # CROSS_ARCH=Linux - # CROSS_PROC=arm - # SUB_PROC=xscale # or maverick -@@ -44,14 +44,14 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - endif - - #Overwite config files on "make samples" --OVERWRITE=y -+OVERWRITE=n - - #Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 #-pg -+#DEBUG=-g3 #-pg - - #Set NOCRYPTO to yes if you do not want to have crypto support or - #dependencies -@@ -83,7 +83,7 @@ - - # Where to install asterisk after compiling - # Default -> leave empty --INSTALL_PREFIX?= -+INSTALL_PREFIX=$(PREFIX) - - # Staging directory - # Files are copied here temporarily during the install process -@@ -106,17 +106,17 @@ - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - - ifneq ($(OSARCH),SunOS) -- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin -- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin - else -@@ -218,25 +218,25 @@ - endif - - INCLUDE+=-Iinclude -I../include --ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY --ASTCFLAGS+=$(OPTIMIZE) -+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+#ASTCFLAGS+=$(OPTIMIZE) - ASTOBJ=-o asterisk - - ifeq ($(findstring BSD,$(OSARCH)),BSD) - PROC=$(shell uname -m) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifneq ($(PROC),ultrasparc) -- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) -- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),) -+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp - else - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp -@@ -245,27 +245,24 @@ - - ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) -- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp -+ ASTCFLAGS+=$(PTHREAD_CFLAGS) -+ LIBS+=$(PTHREAD_LIBS) -+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),) -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp - endif - MPG123TARG=freebsd - -- # XXX FreeBSD paths -- PREFIX?=/usr/local -- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk -- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk -+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin -- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man -- # XXX end FreeBSD paths -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - - endif # FreeBSD - -@@ -281,7 +278,7 @@ - - ifeq ($(OSARCH),SunOS) - ASTCFLAGS+=-Wcast-align -DSOLARIS -- INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include -+ INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/include - endif - - ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN) -@@ -296,7 +293,7 @@ - - ifndef WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS - endif - -@@ -323,7 +320,7 @@ - ASTERISKVERSIONNUM=999999 - ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name) - else -- ASTERISKVERSIONNUM=000000 -+ ASTERISKVERSIONNUM?=000000 - endif - endif - -@@ -388,10 +385,10 @@ - endif - - ifeq ($(OSARCH),SunOS) -- LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - OBJS+=strcompat.o - ASTLINK= -- SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - endif - - ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) -@@ -399,7 +396,7 @@ - endif - - # This is used when generating the doxygen documentation --ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),) -+ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),) - HAVEDOT=yes - else - HAVEDOT=no -@@ -418,7 +415,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: cleantest depend asterisk subdirs -+all: cleantest depend asterisk subdirs manpage - - #ifneq ($(wildcard tags),) - ctags: tags -@@ -437,13 +434,13 @@ - cd editline && unset CFLAGS LIBS && test -f config.h || ./configure - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: FORCE -- @if [ -d db1-ast ]; then \ -- $(MAKE) -C db1-ast libdb1.a ; \ -- else \ -- echo "You need to do a cvs update -d not just cvs update"; \ -- exit 1; \ -- fi -+#db1-ast/libdb1.a: FORCE -+# @if [ -d db1-ast ]; then \ -+# $(MAKE) -C db1-ast libdb1.a ; \ -+# else \ -+# echo "You need to do a cvs update -d not just cvs update"; \ -+# exit 1; \ -+# fi - - ifneq ($(wildcard .depend),) - include .depend -@@ -510,14 +507,14 @@ - cygwin_a: - $(MAKE) -C cygwin all - --asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -+asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS) - build_tools/make_build_h > include/asterisk/build.h.tmp - if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \ - mv include/asterisk/build.h.tmp include/asterisk/build.h ; \ - fi - rm -f include/asterisk/build.h.tmp - $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c -- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) $(AUDIO_LIBS) -o muted muted.o -@@ -539,38 +536,38 @@ - - datafiles: all - if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros - for x in sounds/digits/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate - for x in sounds/dictate/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters - for x in sounds/letters/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic - for x in sounds/phonetic/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ -@@ -578,18 +575,18 @@ - done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - - update: - @if [ -d .svn ]; then \ -@@ -618,75 +615,53 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi - ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi - for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -d contrib/firmware/iax ]; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ - else \ - echo "You need to do cvs update -d not just cvs update" ; \ - fi - ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . ) -- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi -- @echo " +---- Asterisk Installation Complete -------+" -- @echo " + +" -- @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -- @echo " + +" -- @echo " + Asterisk has successfully been installed. +" -- @echo " + If you would like to install the sample +" -- @echo " + configuration files (overwriting any +" -- @echo " + existing config files), run: +" -- @echo " + +" -- @echo " + $(MAKE) samples +" -- @echo " + +" -- @echo " +----------------- or ---------------------+" -- @echo " + +" -- @echo " + You can go ahead and install the asterisk +" -- @echo " + program documentation now or later run: +" -- @echo " + +" -- @echo " + $(MAKE) progdocs +" -- @echo " + +" -- @echo " + **Note** This requires that you have +" -- @echo " + doxygen installed on your local system +" -- @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck - - NEWMODS=$(notdir $(wildcard */*.so)) -@@ -710,7 +685,7 @@ - echo " WARNING WARNING WARNING" ;\ - fi - --install: all datafiles bininstall -+install: all datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -718,16 +693,19 @@ - upgrade: all bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \ - if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ - fi ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ echo ADSI INSTALL $(BSD_INSTALL_DATA) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ - if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ -@@ -740,7 +718,7 @@ - continue; \ - fi ;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done - if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ - ( \ -@@ -800,25 +778,25 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - for x in sounds/demo-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - for x in sounds/*.mp3; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - done - rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3 -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm - for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ - cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \ -@@ -832,7 +810,7 @@ - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done -@@ -861,10 +839,10 @@ - - __rpm: include/asterisk/version.h spec - rm -rf /tmp/asterisk ; \ -- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ -+ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \ - $(MAKE) DESTDIR=/tmp/asterisk install ; \ - $(MAKE) DESTDIR=/tmp/asterisk samples ; \ -- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ -+ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \ - cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ - rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec - diff --git a/net/asterisk10/files/patch-agi::Makefile b/net/asterisk10/files/patch-agi::Makefile deleted file mode 100644 index b35976526f59..000000000000 --- a/net/asterisk10/files/patch-agi::Makefile +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 -@@ -11,7 +11,9 @@ - # the GNU General Public License - # - --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - CFLAGS+= - -@@ -27,8 +29,9 @@ - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) -+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done -+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - - eagi-test: eagi-test.o - $(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS) diff --git a/net/asterisk10/files/patch-apps::Makefile b/net/asterisk10/files/patch-apps::Makefile deleted file mode 100644 index ee7d560bed69..000000000000 --- a/net/asterisk10/files/patch-apps::Makefile +++ /dev/null @@ -1,79 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig -+++ apps/Makefile -@@ -45,25 +45,27 @@ - #APPS+=app_rpt.so - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h),) - APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so - endif - endif # WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) -+ifdef WITH_FAX -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp.h),) -+APPS+=app_rxfax.so app_txfax.so -+endif -+endif -+ -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - APPS+=app_osplookup.so - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - --CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) --ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) -- ifneq (${CURLLIBS},) -- APPS+=app_curl.so -- endif --endif -+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)$(LOCALBASE)/bin/curl-config --libs) -+APPS+=app_curl.so - - ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -@@ -95,24 +97,32 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone - - install: all -- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so - rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so - - app_curl.so: app_curl.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) - -+ifdef WITH_FAX -+app_rxfax.so : app_rxfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+ -+app_txfax.so : app_txfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+endif -+ - app_sql_postgres.o: app_sql_postgres.c -- $(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c -+ $(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c - - app_sql_postgres.so: app_sql_postgres.o -- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) look.c -o look -lncurses - - ifeq (SunOS,$(shell uname)) - app_chanspy.so: app_chanspy.o diff --git a/net/asterisk10/files/patch-apps::app_rxfax.c b/net/asterisk10/files/patch-apps::app_rxfax.c deleted file mode 100644 index 820208e1943d..000000000000 --- a/net/asterisk10/files/patch-apps::app_rxfax.c +++ /dev/null @@ -1,379 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:44:40 2006 -+++ apps/app_rxfax.c Thu Jan 12 17:41:53 2006 -@@ -0,0 +1,373 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to receive a TIFF FAX file -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <asterisk/dsp.h> -+#include <asterisk/manager.h> -+#include <asterisk/version.h> -+#include <string.h> -+#include <stdlib.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <math.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Receive Application"; -+ -+static char *app = "RxFAX"; -+ -+static char *synopsis = "Receive a FAX to a file"; -+ -+static char *descrip = -+" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" -+"given filename. If the file exists it will be overwritten. The file\n" -+"should be in TIFF/F format.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the sender CSID.\n" -+" FAXPAGES to the number of pages received.\n" -+" FAXBITRATE to the transmition rate.\n" -+" FAXRESOLUTION to the resolution.\n" -+"Returns -1 when the user hangs up.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ char local_ident[21]; -+ char far_ident[21]; -+ char buf[11]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ fax_get_far_ident(s, far_ident); -+ fax_get_local_ident(s, local_ident); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax successfully received.\n"); -+ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); -+ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ manager_event(EVENT_FLAG_CALL, -+ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", -+ chan->name, -+ chan->exten, -+#if ASTERISK_VERSION_NUM <= 010010 -+ chan->callerid, -+#else -+ (chan->cid.cid_num) ? chan->cid.cid_num : "", -+#endif -+ far_ident, -+ local_ident, -+ t.pages_transferred, -+ t.row_resolution, -+ t.bit_rate, -+ s->rx_file); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ snprintf(buf, sizeof(buf), "%i", t.pages_transferred); -+ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); -+ snprintf(buf, sizeof(buf), "%i", t.row_resolution); -+ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); -+ snprintf(buf, sizeof(buf), "%i", t.bit_rate); -+ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax receive not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_d_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows); -+ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); -+ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); -+ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); -+ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int rxfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char template_file[256]; -+ char target_file[256]; -+ char *s; -+ char *t; -+ char *v; -+ char *x; -+ int option; -+ int len; -+ int i; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ target_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(target_file, t, len); -+ target_file[len] = '\0'; -+ /* Allow the use of %d in the file name for a wild card of sorts, to -+ create a new file with the specified name scheme */ -+ if ((x = strchr(target_file, '%')) && x[1] == 'd') -+ { -+ strcpy(template_file, target_file); -+ i = 0; -+ do -+ { -+ snprintf(target_file, 256, template_file, 1); -+ i++; -+ } -+ while (ast_fileexists(target_file, "", chan->language) != -1); -+ } -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_rx_file(&fax, target_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ outf.src = "RxFAX"; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, rxfax_exec, synopsis, descrip); -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk10/files/patch-apps::app_txfax.c b/net/asterisk10/files/patch-apps::app_txfax.c deleted file mode 100644 index 15ad6674788e..000000000000 --- a/net/asterisk10/files/patch-apps::app_txfax.c +++ /dev/null @@ -1,301 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:48:54 2006 -+++ apps/app_txfax.c Thu Jan 12 17:48:36 2006 -@@ -0,0 +1,295 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to send a TIFF file as a FAX -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <string.h> -+#include <stdlib.h> -+#include <math.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Transmit Application"; -+ -+static char *app = "TxFAX"; -+ -+static char *synopsis = "Send a FAX file"; -+ -+static char *descrip = -+" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the receiver CSID.\n" -+"Returns -1 when the user hangs up, or if the file does not exist.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ char far_ident[21]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_far_ident(s, far_ident); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax send not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int txfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char source_file[256]; -+ char *x; -+ char *s; -+ char *t; -+ char *v; -+ int option; -+ int len; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ source_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(source_file, t, len); -+ source_file[len] = '\0'; -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_tx_file(&fax, source_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ //fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, txfax_exec, synopsis, descrip); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk10/files/patch-cdr::Makefile b/net/asterisk10/files/patch-cdr::Makefile deleted file mode 100644 index da16b609d5f2..000000000000 --- a/net/asterisk10/files/patch-cdr::Makefile +++ /dev/null @@ -1,70 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ cdr/Makefile Thu Jan 12 17:56:23 2006 -@@ -21,8 +21,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,18 +38,18 @@ - # - # unixODBC stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) - MODS+=cdr_odbc.so - endif - - # - # FreeTDS stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h),) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.62),1) - CFLAGS += -DFREETDS_0_62 - else - CFLAGS += -DFREETDS_PRE_0_62 -@@ -61,7 +61,7 @@ - # - # PGSQL stuff... Autoconf anyone?? - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) - MODS+=cdr_pgsql.so - endif - -@@ -82,9 +82,9 @@ - MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql),) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/pgsql -- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib/pgsql -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql),) -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql -+ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/pgsql - endif - - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -110,7 +110,7 @@ - all: depend $(MODS) - - install: all -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - clean: - rm -f *.so *.o .depend diff --git a/net/asterisk10/files/patch-channels::Makefile b/net/asterisk10/files/patch-channels::Makefile deleted file mode 100644 index edca9b1e7694..000000000000 --- a/net/asterisk10/files/patch-channels::Makefile +++ /dev/null @@ -1,85 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -48,9 +48,9 @@ - endif - - ifeq (${OSARCH},FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -- CHANH323LIB=-pthread -+ PTLIB=-lpt_FreeBSD_x86_r_s -+ H323LIB=-lh323_FreeBSD_x86_r_s -+ CHANH323LIB= - endif - - ifeq (${OSARCH},NetBSD) -@@ -73,11 +73,11 @@ - SOLINK+=-lrt - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so - endif - --ifneq ($(wildcard h323/libchanh323.a),) -+ifdef WITH_H323 - CHANNEL_LIBS+=chan_h323.so - endif - -@@ -91,12 +91,12 @@ - CHANNEL_LIBS+=chan_alsa.so - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 - endif -@@ -109,12 +109,12 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - CFLAGS+=-DIAX_TRUNKING - CHANNEL_LIBS+=chan_zap.so -@@ -229,8 +229,10 @@ - chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ - else --chan_h323.so: chan_h323.o h323/libchanh323.a -- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat -+chan_h323.so: chan_h323.o h323/ast_h323.o -+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - endif - - chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a -@@ -244,8 +246,7 @@ - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk10/files/patch-channels::chan_h323.c b/net/asterisk10/files/patch-channels::chan_h323.c deleted file mode 100644 index 4ca048812ecd..000000000000 --- a/net/asterisk10/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c.orig -+++ channels/chan_h323.c -@@ -31,6 +31,7 @@ - * \ingroup channel_drivers - */ - -+#include <sys/types.h> - #include <sys/socket.h> - #include <sys/signal.h> - #include <sys/param.h> diff --git a/net/asterisk10/files/patch-channels::chan_sip.c b/net/asterisk10/files/patch-channels::chan_sip.c deleted file mode 100644 index 2b2fae7a311f..000000000000 --- a/net/asterisk10/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,131 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig Tue Jan 24 16:25:53 2006 -+++ channels/chan_sip.c Tue Jan 24 16:30:44 2006 -@@ -337,7 +337,7 @@ static char global_vmexten[AST_MAX_EXTEN - - static char default_language[MAX_LANGUAGE] = ""; - --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; -@@ -475,6 +475,7 @@ struct sip_invite_param { - - struct sip_route { - struct sip_route *next; -+ int lr; - char hop[0]; - }; - -@@ -6015,6 +6016,7 @@ static void build_route(struct sip_pvt * - /* Make a struct route */ - thishop = malloc(sizeof(*thishop) + len); - if (thishop) { -+ thishop->lr = (strnstr(rr, ";lr", len) != NULL ? 1 : 0); - ast_copy_string(thishop->hop, rr, len); - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); - /* Link in */ -@@ -6040,31 +6042,41 @@ static void build_route(struct sip_pvt * - - /* Only append the contact if we are dealing with a strict router */ - if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) { -- /* 2nd append the Contact: if there is one */ -- /* Can be multiple Contact headers, comma separated values - we just take the first */ -- contact = get_header(req, "Contact"); -- if (!ast_strlen_zero(contact)) { -- ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -- /* Look for <: delimited address */ -- c = strchr(contact, '<'); -- if (c) { -- /* Take to > */ -- ++c; -- len = strcspn(c, ">") + 1; -- } else { -- /* No <> - just take the lot */ -- c = contact; -- len = strlen(contact) + 1; -- } -- thishop = malloc(sizeof(*thishop) + len); -+ /* Duplicate first route from the list */ -+ if (head && head->lr) { -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1); - if (thishop) { -- ast_copy_string(thishop->hop, c, len); -- thishop->next = NULL; -- /* Goes at the end */ -- if (tail) -- tail->next = thishop; -- else -- head = thishop; -+ memcpy(thishop, head, sizeof(struct sip_route)+strlen(head->hop)+1); -+ thishop->next = head; -+ head = thishop; -+ } -+ } else { -+ /* Append the Contact: if there is one and first route is w/o `lr' param */ -+ /* Can be multiple Contact headers, comma separated values - we just take the first */ -+ contact = get_header(req, "Contact"); -+ if (!ast_strlen_zero(contact)) { -+ ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -+ /* Look for <: delimited address */ -+ c = strchr(contact, '<'); -+ if (c) { -+ /* Take to > */ -+ ++c; -+ len = strcspn(c, ">") + 1; -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; -+ len = strlen(contact) + 1; -+ } -+ thishop = malloc(sizeof(*thishop) + len); -+ if (thishop) { -+ ast_copy_string(thishop->hop, c, len); -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - } -@@ -10352,7 +10364,11 @@ static int handle_request_invite(struct - gotdest = get_destination(p, NULL); - - get_rdnis(p, NULL); -- extract_uri(p, req); -+ build_route(p, req, 0); -+ if (!p->route->lr) -+ strncpy(p->uri, p->route->hop, sizeof(p->uri) - 1); -+ else -+ extract_uri(p, req); - build_contact(p); - - if (gotdest) { -@@ -10380,7 +10396,6 @@ static int handle_request_invite(struct - c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username ); - *recount = 1; - /* Save Record-Route for any later requests we make on this dialogue */ -- build_route(p, req, 0); - if (c) { - /* Pre-lock the call */ - ast_mutex_lock(&c->lock); -@@ -10466,7 +10481,12 @@ static int handle_request_invite(struct - transmit_response(p, "180 Ringing", req); - break; - case AST_STATE_UP: -- /* Here we have reINVITE request - try to renegotiate codecs with */ -+ /* Assuming this to be reinvite, process new SDP portion */ -+ if (!ast_strlen_zero(get_header(req, "Content-Type"))) { -+ process_sdp(p, req); -+ } else { -+ ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); -+ } - transmit_response_with_sdp(p, "200 OK", req, 1); - break; - default: diff --git a/net/asterisk10/files/patch-channels::chan_zap.c b/net/asterisk10/files/patch-channels::chan_zap.c deleted file mode 100644 index ab02c02af962..000000000000 --- a/net/asterisk10/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,80 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c.orig Tue Nov 29 20:24:39 2005 -+++ channels/chan_zap.c Fri Jan 13 13:28:33 2006 -@@ -638,6 +638,7 @@ static struct zt_pvt { - int cidlen; - int ringt; - int ringt_base; -+ int waitnorings; - int stripmsd; - int callwaitcas; - int callwaitrings; -@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel - } - - ast_mutex_lock(&p->lock); -+ switch (p->sig) { -+ case SIG_FXSGS: -+ case SIG_FXSKS: -+ case SIG_FXSLS: -+ if((ast->_state == AST_STATE_RING) && (p->ringt > 1)) -+ { -+ p->waitnorings = 1; -+ } -+ break; -+ default: -+ break; -+ }; -+ - - index = zt_get_index(ast, p, 1); - -@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data) - ast_setstate(chan, AST_STATE_RING); - chan->rings = 1; - p->ringt = p->ringt_base; -+ p->waitnorings = 0; - res = ast_pbx_run(chan); -+ -+ if(p->waitnorings) -+ { -+ p->ringt = p->ringt_base; -+ for(;;) -+ { -+ int i,j=0; -+ i = ZT_IOMUX_SIGEVENT | ZT_IOMUX_NOWAIT; -+ if (ioctl(p->subs[index].zfd, ZT_IOMUX, &i) == -1) -+ break; -+ -+ if (ioctl(p->subs[index].zfd, ZT_GETEVENT, &j) == -1) -+ break; -+ -+ if(j == ZT_EVENT_RINGOFFHOOK) -+ p->ringt = p->ringt_base; -+ -+ usleep(20000); -+ -+ if (p->ringt <= 0) -+ break; -+ -+ else if (p->ringt > 0) -+ p->ringt--; -+ } -+ p->ringt = 0; -+ p->waitnorings = 0; -+ } -+ - if (res) { - ast_hangup(chan); - ast_log(LOG_WARNING, "PBX exited non-zero\n"); -@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data) - i = iflist; - while(i) { - if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) { -- if (!i->owner && !i->subs[SUB_REAL].owner) { -+ if (!i->owner && !i->subs[SUB_REAL].owner && !i->waitnorings) { - /* This needs to be watched, as it lacks an owner */ - pfds[count].fd = i->subs[SUB_REAL].zfd; - pfds[count].events = POLLPRI; diff --git a/net/asterisk10/files/patch-channels::h323::ast_h323.cpp b/net/asterisk10/files/patch-channels::h323::ast_h323.cpp deleted file mode 100644 index feb79e586e91..000000000000 --- a/net/asterisk10/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig Thu Jan 12 18:16:08 2006 -+++ channels/h323/ast_h323.cpp Thu Jan 12 18:16:35 2006 -@@ -953,8 +953,8 @@ BOOL MyH323Connection::OnReceivedCapabil - H323Channel * MyH323Connection::CreateRealTimeLogicalChannel(const H323Capability & capability, - H323Channel::Directions dir, - unsigned sessionID, -- const H245_H2250LogicalChannelParameters * /*param*/, -- RTP_QOS * /*param*/ ) -+ const H245_H2250LogicalChannelParameters * /*param*/ /*, -+ RTP_QOS * */ /*param*/ ) - { - return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID); - } diff --git a/net/asterisk10/files/patch-channels::h323::ast_h323.h b/net/asterisk10/files/patch-channels::h323::ast_h323.h deleted file mode 100644 index 606bb0123173..000000000000 --- a/net/asterisk10/files/patch-channels::h323::ast_h323.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.h.orig Thu Jan 12 18:14:49 2006 -+++ channels/h323/ast_h323.h Thu Jan 12 18:15:02 2006 -@@ -155,8 +155,8 @@ class MyH323Connection : public H323Conn - H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, - H323Channel::Directions, - unsigned, -- const H245_H2250LogicalChannelParameters *, -- RTP_QOS *); -+ const H245_H2250LogicalChannelParameters * /* , -+ RTP_QOS * */); - H323Connection::AnswerCallResponse OnAnswerCall(const PString &, - const H323SignalPDU &, - H323SignalPDU &); diff --git a/net/asterisk10/files/patch-codecs::Makefile b/net/asterisk10/files/patch-codecs::Makefile deleted file mode 100644 index ab5cbc4aef2c..000000000000 --- a/net/asterisk10/files/patch-codecs::Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ codecs/Makefile Fri Jan 13 10:33:21 2006 -@@ -30,8 +30,8 @@ - - UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) - UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) --ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) --ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -+ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex.h) -+ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h) - ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so - LIBSPEEX+=-lspeex -lm -@@ -43,14 +43,14 @@ - endif - ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - -@@ -65,7 +65,7 @@ - LIBLPC10=lpc10/liblpc10.a - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -@@ -126,7 +126,7 @@ - endif - - install: all -- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk10/files/patch-codecs::gsm::Makefile b/net/asterisk10/files/patch-codecs::gsm::Makefile deleted file mode 100644 index 7256eeae5692..000000000000 --- a/net/asterisk10/files/patch-codecs::gsm::Makefile +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- codecs/gsm/Makefile.orig -+++ codecs/gsm/Makefile -@@ -49,7 +49,9 @@ - ifneq (${PROC},arm) - ifneq (${PROC},ppc) - ifneq (${PROC},ppc64) --OPTIMIZE+=-march=$(PROC) -+ifneq (${PROC},amd64) -+#OPTIMIZE+=-march=$(PROC) -+endif - endif - endif - endif diff --git a/net/asterisk10/files/patch-codecs::ilbc::Makefile b/net/asterisk10/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 26a2f20e5529..000000000000 --- a/net/asterisk10/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Fri Jan 13 11:01:07 2006 -+++ codecs/ilbc/Makefile Fri Jan 13 11:01:51 2006 -@@ -1,5 +1,5 @@ - ARCH=$(PROC) --CFLAGS+=-Wall -O3 -funroll-loops -+CFLAGS+=-Wall -funroll-loops - ifneq (${OSARCH},CYGWIN) - CFLAGS += -fPIC - endif diff --git a/net/asterisk10/files/patch-configs::musiconhold.conf.sample b/net/asterisk10/files/patch-configs::musiconhold.conf.sample deleted file mode 100644 index ff63cc9ff08b..000000000000 --- a/net/asterisk10/files/patch-configs::musiconhold.conf.sample +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- configs/musiconhold.conf.sample.orig Tue Nov 29 20:24:39 2005 -+++ configs/musiconhold.conf.sample Fri Jan 13 11:38:39 2006 -@@ -4,7 +4,7 @@ - - [default] - mode=quietmp3 --directory=/var/lib/asterisk/mohmp3 -+directory=/usr/local/share/asterisk/mohmp3 - - ; valid mode options: - ; quietmp3 -- default diff --git a/net/asterisk10/files/patch-db.c b/net/asterisk10/files/patch-db.c deleted file mode 100644 index ba7f3f206b78..000000000000 --- a/net/asterisk10/files/patch-db.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jan 13 11:05:32 2006 -+++ db.c Fri Jan 13 11:06:55 2006 -@@ -35,6 +35,7 @@ - #include <errno.h> - #include <unistd.h> - #include <dirent.h> -+#include <db.h> - - #include "asterisk.h" - -@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - #ifdef __CYGWIN__ - #define dbopen __dbopen diff --git a/net/asterisk10/files/patch-editline::configure b/net/asterisk10/files/patch-editline::configure deleted file mode 100644 index f6b9c5b76eee..000000000000 --- a/net/asterisk10/files/patch-editline::configure +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/configure.orig Sun Apr 27 21:13:11 2003 -+++ editline/configure Fri Jan 30 01:47:34 2004 -@@ -1906,7 +1906,7 @@ - CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG" - CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE" - else -- CFLAGS="$CFLAGS -O" -+ CFLAGS="$CFLAGS" - fi - - diff --git a/net/asterisk10/files/patch-editline::makelist b/net/asterisk10/files/patch-editline::makelist deleted file mode 100644 index cff9b3ae29e0..000000000000 --- a/net/asterisk10/files/patch-editline::makelist +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/makelist -+++ editline/makelist -@@ -145,7 +145,7 @@ - # - -fh) - cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ -- sort | tr '[a-z]' '[A-Z]' | $AWK ' -+ sort | tr '[:lower:]' '[:upper:]' | $AWK ' - BEGIN { - printf("/* Automatically generated file, do not edit */\n"); - printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n"); diff --git a/net/asterisk10/files/patch-formats::Makefile b/net/asterisk10/files/patch-formats::Makefile deleted file mode 100644 index b2b1db5a37bd..000000000000 --- a/net/asterisk10/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Fri Jan 13 11:16:07 2006 -+++ formats/Makefile Fri Jan 13 11:47:25 2006 -@@ -20,7 +20,7 @@ - # - # G723 simple frame is deprecated - # --FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - # - # OGG/Vorbis format -@@ -60,7 +60,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm - - install: all -- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk10/files/patch-formats::format_g723_1.c b/net/asterisk10/files/patch-formats::format_g723_1.c deleted file mode 100644 index ae814f197a1e..000000000000 --- a/net/asterisk10/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,354 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 13 12:18:51 2006 -+++ formats/format_g723_1.c Fri Jan 13 12:18:41 2006 -@@ -0,0 +1,348 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Save and read raw, headerless G723.1 Annex A data. -+ * -+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net> -+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/channel.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/sched.h> -+#include <asterisk/module.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <stdlib.h> -+#include <sys/time.h> -+#include <unistd.h> -+#include <errno.h> -+#include <string.h> -+#include <pthread.h> -+#ifdef __linux__ -+#include <endian.h> -+#else -+#include <machine/endian.h> -+#endif -+ -+/* Based on format_g729.c */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+struct ast_filestream { -+ void *reserved[AST_RESERVED_POINTERS]; -+ /* This is what a filestream means to us */ -+ FILE *f; /* Descriptor */ -+ struct ast_frame fr; /* Frame information */ -+ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ -+ char empty; /* Empty character */ -+ unsigned char g723[24]; /* One Real G723.1 Frame */ -+}; -+ -+static long g723_tell(struct ast_filestream *); -+ -+AST_MUTEX_DEFINE_STATIC(g723_lock); -+static int glistcnt = 0; -+ -+static char *name = "g723"; -+static char *desc = "Raw G723.1 Annex A data"; -+static char *exts = "g723"; -+ -+static int g723_len(unsigned char buf) -+{ -+ switch(buf & TYPE_MASK) { -+ case TYPE_DONTSEND: -+ return 2; -+ break; -+ case TYPE_SILENCE: -+ return 4; -+ break; -+ case TYPE_HIGH: -+ return 24; -+ break; -+ case TYPE_LOW: -+ return 20; -+ break; -+ default: -+ ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static struct ast_filestream *g723_open(FILE *f) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ tmp->fr.data = tmp->g723; -+ tmp->fr.frametype = AST_FRAME_VOICE; -+ tmp->fr.subclass = AST_FORMAT_G723_1; -+ /* datalen will vary for each frame */ -+ tmp->fr.src = name; -+ tmp->fr.mallocd = 0; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } -+ return tmp; -+} -+ -+static struct ast_filestream *g723_rewrite(FILE *f, const char *comment) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } else -+ ast_log(LOG_WARNING, "Out of memory\n"); -+ return tmp; -+} -+ -+static void g723_close(struct ast_filestream *s) -+{ -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return; -+ } -+ glistcnt--; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ fclose(s->f); -+ free(s); -+ s = NULL; -+} -+ -+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) -+{ -+ int res; -+ /* Send a frame from the file to the appropriate channel */ -+ s->fr.frametype = AST_FRAME_VOICE; -+ s->fr.subclass = AST_FORMAT_G723_1; -+ s->fr.offset = AST_FRIENDLY_OFFSET; -+ s->fr.samples = 240; -+ s->fr.mallocd = 0; -+ s->fr.data = s->g723; -+ if ((res = fread(s->g723, 1, 1, s->f)) != 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ s->fr.datalen = g723_len(s->g723[0]); -+ if (s->fr.datalen < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame!\n"); -+ return NULL; -+ } -+ if (s->fr.datalen > 1 && (res = fread(s->g723 + 1, 1, s->fr.datalen - 1, s->f)) != s->fr.datalen - 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ *whennext = s->fr.samples; -+ return &s->fr; -+} -+ -+static int g723_write(struct ast_filestream *fs, struct ast_frame *f) -+{ -+ int res; -+ unsigned char *cp; -+ if (f->frametype != AST_FRAME_VOICE) { -+ ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); -+ return -1; -+ } -+ if (f->subclass != AST_FORMAT_G723_1) { -+ ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass); -+ return -1; -+ } -+ for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) { -+ res = g723_len(cp[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n"); -+ return -1; -+ } -+ } -+ if (cp != (unsigned char *)f->data + f->datalen) { -+ ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen); -+ return -1; -+ } -+ if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen) { -+ ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno)); -+ return -1; -+ } -+ return 0; -+} -+ -+static char *g723_getcomment(struct ast_filestream *s) -+{ -+ return NULL; -+} -+ -+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence) -+{ -+ long cur, offset, max; -+ off_t coffset, moffset, soffset; -+ int res; -+ unsigned char c; -+ -+ offset = 0; /* Shut up gcc warning */ -+ if (whence == SEEK_SET) { -+ offset = sample_offset; -+ } else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) { -+ if ((cur = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get current position!\n"); -+ return -1; -+ } -+ offset = cur + sample_offset; -+ } -+ if (fseeko(fs->f, 0, SEEK_END) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ else { -+ moffset = ftello(fs->f); -+ } -+ if (whence == SEEK_END) { -+ if ((max = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get maximum position!\n"); -+ return -1; -+ } -+ offset = max - sample_offset; -+ } -+ if (offset < 0) -+ offset = 0; -+ soffset = -1; -+ for (coffset = 0; coffset < moffset && offset > 0; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset); -+ return -1; -+ } -+ soffset = coffset; -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ offset -= 240; -+ } -+ if (soffset != -1 && fseeko(fs->f, soffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int g723_trunc(struct ast_filestream *fs) -+{ -+ /* Truncate file to current length */ -+ if (ftruncate(fileno(fs->f), ftello(fs->f)) < 0) -+ return -1; -+ return 0; -+} -+ -+static long g723_tell(struct ast_filestream *fs) -+{ -+ off_t offset, coffset; -+ int res; -+ long rval; -+ unsigned char c; -+ -+ offset = ftello(fs->f); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset); -+ return -1; -+ } -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ rval += 240; -+ } -+ if (fseeko(fs->f, offset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset); -+ return -1; -+ } -+ return rval; -+} -+ -+int load_module() -+{ -+ return ast_format_register(name, exts, AST_FORMAT_G723_1, -+ g723_open, -+ g723_rewrite, -+ g723_write, -+ g723_seek, -+ g723_trunc, -+ g723_tell, -+ g723_read, -+ g723_close, -+ g723_getcomment); -+} -+ -+int unload_module() -+{ -+ return ast_format_unregister(name); -+} -+ -+int usecount() -+{ -+ int res; -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return -1; -+ } -+ res = glistcnt; -+ ast_mutex_unlock(&g723_lock); -+ return res; -+} -+ -+char *description() -+{ -+ return desc; -+} -+ -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk10/files/patch-formats::format_g729.c b/net/asterisk10/files/patch-formats::format_g729.c deleted file mode 100644 index 11be5281608f..000000000000 --- a/net/asterisk10/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Fri Jan 13 12:20:53 2006 -+++ formats/format_g729.c Fri Jan 13 12:23:33 2006 -@@ -60,7 +60,7 @@ struct ast_filestream { - struct ast_frame fr; /* Frame information */ - char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ - char empty; /* Empty character */ -- unsigned char g729[20]; /* Two Real G729 Frames */ -+ unsigned char g729[10]; /* One Real G729 Frame */ - }; - - -@@ -141,11 +141,11 @@ static struct ast_frame *g729_read(struc - s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_G729A; - s->fr.offset = AST_FRIENDLY_OFFSET; -- s->fr.samples = 160; -- s->fr.datalen = 20; -+ s->fr.samples = 80; -+ s->fr.datalen = 10; - s->fr.mallocd = 0; - s->fr.data = s->g729; -- if ((res = fread(s->g729, 1, 20, s->f)) != 20) { -+ if ((res = fread(s->g729, 1, 10, s->f)) != 10) { - if (res && (res != 10)) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -190,7 +190,7 @@ static int g729_seek(struct ast_filestre - fseek(fs->f, 0, SEEK_END); - max = ftell(fs->f); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -219,7 +219,7 @@ static long g729_tell(struct ast_filestr - { - off_t offset; - offset = ftell(fs->f); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() diff --git a/net/asterisk10/files/patch-frame.c b/net/asterisk10/files/patch-frame.c deleted file mode 100644 index 753253c7af0d..000000000000 --- a/net/asterisk10/files/patch-frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- frame.c.orig Wed Jan 25 13:22:43 2006 -+++ frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk10/files/patch-funcs::Makefile b/net/asterisk10/files/patch-funcs::Makefile deleted file mode 100644 index a14daeed285c..000000000000 --- a/net/asterisk10/files/patch-funcs::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- funcs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ funcs/Makefile Fri Jan 13 12:36:57 2006 -@@ -67,7 +67,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} - - install: all -- for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FUNCS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk10/files/patch-include::asterisk::utils.h b/net/asterisk10/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk10/files/patch-include::asterisk::utils.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/utils.h 2004/10/10 12:55:50 1.1 -+++ include/asterisk/utils.h 2004/10/10 12:56:43 -@@ -37,7 +37,6 @@ - #ifdef inet_ntoa - #undef inet_ntoa - #endif --#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ - - #ifdef LINUX - #define ast_pthread_create pthread_create diff --git a/net/asterisk10/files/patch-pbx::Makefile b/net/asterisk10/files/patch-pbx::Makefile deleted file mode 100644 index 97d03e10f871..000000000000 --- a/net/asterisk10/files/patch-pbx::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig -+++ pbx/Makefile -@@ -23,8 +23,8 @@ - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - --GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` --GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` -+#GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` -+#GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` - MOC=$(QTDIR)/bin/moc - KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include - KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui -@@ -72,7 +72,7 @@ - endif - - install: all -- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk10/files/patch-res::Makefile b/net/asterisk10/files/patch-res::Makefile deleted file mode 100644 index de5c365db34d..000000000000 --- a/net/asterisk10/files/patch-res::Makefile +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile -+++ res/Makefile -@@ -37,8 +37,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifeq (${OSARCH},CYGWIN) -@@ -55,9 +55,7 @@ - CFLAGS+= - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) - CFLAGS+=-DZAPATA_MOH --endif - endif # WITHOUT_ZAPTEL - - # -@@ -75,7 +73,7 @@ - rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h - rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so - rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \ - if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \ - echo "*************************************************************";\ diff --git a/net/asterisk10/files/patch-rtp.c b/net/asterisk10/files/patch-rtp.c deleted file mode 100644 index bbc2649929f9..000000000000 --- a/net/asterisk10/files/patch-rtp.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Fri Jan 13 13:38:01 2006 -+++ rtp.c Fri Jan 13 13:40:50 2006 -@@ -950,8 +950,10 @@ struct ast_rtp *ast_rtp_new_with_bindadd - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; - /* If there's rtcp, initialize it as well. */ -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - /* Try to bind it/them. */ - if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && - (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) diff --git a/net/asterisk10/files/patch-utils::Makefile b/net/asterisk10/files/patch-utils::Makefile deleted file mode 100644 index f3164c0f478a..000000000000 --- a/net/asterisk10/files/patch-utils::Makefile +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- utils/Makefile -+++ utils/Makefile -@@ -17,16 +17,16 @@ - CFLAGS+=-DNO_AST_MM - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - TARGET=stereorize streamplayer - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/popt.h),) - TARGET+=smsq - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/newt.h),) - TARGET+=astman - endif - -@@ -40,7 +40,7 @@ - install: - for x in $(TARGET); do \ - if [ "$$x" != "none" ]; then \ -- $(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ - fi; \ - done - diff --git a/net/asterisk10/pkg-descr b/net/asterisk10/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk10/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Asterisk is an Open Source PBX and telephony toolkit. It is, in a -sense, middleware between Internet and telephony channels on the bottom, -and Internet and telephony applications at the top. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist deleted file mode 100644 index 3af861f7a135..000000000000 --- a/net/asterisk10/pkg-plist +++ /dev/null @@ -1,755 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi -etc/asterisk/adsi.conf-dist -@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf -@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi -etc/asterisk/adtranvofr.conf-dist -@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf -@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi -etc/asterisk/agents.conf-dist -@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf -@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi -etc/asterisk/alarmreceiver.conf-dist -@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf -@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi -etc/asterisk/alsa.conf-dist -@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf -@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi -etc/asterisk/asterisk.adsi-dist -@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi -@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi -etc/asterisk/asterisk.conf-dist -@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf -@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi -etc/asterisk/cdr.conf-dist -@exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf -@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi -etc/asterisk/cdr_custom.conf-dist -@exec [ -f %B/cdr_custom.conf ] || cp %B/%f %B/cdr_custom.conf -@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi -etc/asterisk/cdr_manager.conf-dist -@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf -@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi -etc/asterisk/cdr_odbc.conf-dist -@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf -@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi -etc/asterisk/cdr_pgsql.conf-dist -@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf -@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi -etc/asterisk/cdr_tds.conf-dist -@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf -@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi -etc/asterisk/codecs.conf-dist -@exec [ -f %B/codecs.conf ] || cp %B/%f %B/codecs.conf -@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi -etc/asterisk/dnsmgr.conf-dist -@exec [ -f %B/dnsmgr.conf ] || cp %B/%f %B/dmsmgr.conf -@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi -etc/asterisk/dundi.conf-dist -@exec [ -f %B/dundi.conf ] || cp %B/%f %B/dundi.conf -@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi -etc/asterisk/enum.conf-dist -@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael -@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi -etc/asterisk/extconfig.conf-dist -@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf -@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi -etc/asterisk/extensions.conf-dist -@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf -@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi -etc/asterisk/features.conf-dist -@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf -@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi -etc/asterisk/festival.conf-dist -@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf -@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi -etc/asterisk/iax.conf-dist -@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf -@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi -etc/asterisk/iaxprov.conf-dist -@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf -@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi -etc/asterisk/indications.conf-dist -@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf -@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi -etc/asterisk/logger.conf-dist -@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf -@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi -etc/asterisk/manager.conf-dist -@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf -@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi -etc/asterisk/meetme.conf-dist -@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf -@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi -etc/asterisk/mgcp.conf-dist -@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf -@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi -etc/asterisk/misdn.conf-dist -@exec [ -f %B/misdn.conf ] || cp %B/%f %B/misdn.conf -@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi -etc/asterisk/modem.conf-dist -@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf -@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi -etc/asterisk/modules.conf-dist -@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf -@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi -etc/asterisk/musiconhold.conf-dist -@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf -@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi -etc/asterisk/osp.conf-dist -@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf -@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi -etc/asterisk/oss.conf-dist -@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf -@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi -etc/asterisk/phone.conf-dist -@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf -@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi -etc/asterisk/privacy.conf-dist -@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf -@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi -etc/asterisk/queues.conf-dist -@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf -@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi -etc/asterisk/res_odbc.conf-dist -@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist -@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf -@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi -etc/asterisk/rtp.conf-dist -@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf -@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi -etc/asterisk/sip.conf-dist -@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf -@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi -etc/asterisk/sip_notify.conf-dist -@exec [ -f %B/sip_notify.conf ] || cp %B/%f %B/sip_notify.conf -@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi -etc/asterisk/skinny.conf-dist -@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf -@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi -etc/asterisk/telcordia-1.adsi-dist -@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi -@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi -etc/asterisk/voicemail.conf-dist -@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf -@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi -etc/asterisk/vpb.conf-dist -@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf -@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi -etc/asterisk/zapata.conf-dist -@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/aes.h -include/asterisk/agi.h -include/asterisk/alaw.h -include/asterisk/app.h -include/asterisk/ast_expr.h -include/asterisk/astdb.h -include/asterisk/astmm.h -include/asterisk/astobj.h -include/asterisk/astosp.h -include/asterisk/build.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/chanspy.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/compat.h -include/asterisk/config.h -include/asterisk/compiler.h -include/asterisk/crypto.h -include/asterisk/devicestate.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dnsmgr.h -include/asterisk/doxyref.h -include/asterisk/dsp.h -include/asterisk/dundi.h -include/asterisk/enum.h -include/asterisk/endian.h -include/asterisk/features.h -include/asterisk/file.h -include/asterisk/frame.h -include/asterisk/fskmodem.h -include/asterisk/image.h -include/asterisk/indications.h -include/asterisk/inline_api.h -include/asterisk/io.h -include/asterisk/linkedlists.h -include/asterisk/localtime.h -include/asterisk/lock.h -include/asterisk/logger.h -include/asterisk/manager.h -include/asterisk/md5.h -include/asterisk/module.h -include/asterisk/monitor.h -include/asterisk/musiconhold.h -include/asterisk/netsock.h -include/asterisk/options.h -include/asterisk/pbx.h -include/asterisk/plc.h -include/asterisk/poll-compat.h -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/rtp.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/slinfactory.h -include/asterisk/srv.h -include/asterisk/strings.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/time.h -include/asterisk/transcap.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/unaligned.h -include/asterisk/utils.h -include/asterisk/version.h -include/asterisk/vmodem.h -lib/asterisk/modules/app_adsiprog.so -lib/asterisk/modules/app_alarmreceiver.so -lib/asterisk/modules/app_authenticate.so -lib/asterisk/modules/app_cdr.so -lib/asterisk/modules/app_chanisavail.so -lib/asterisk/modules/app_chanspy.so -lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_curl.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_dictate.so -lib/asterisk/modules/app_directed_pickup.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.so -lib/asterisk/modules/app_dumpchan.so -lib/asterisk/modules/app_echo.so -lib/asterisk/modules/app_enumlookup.so -lib/asterisk/modules/app_eval.so -lib/asterisk/modules/app_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_groupcount.so -lib/asterisk/modules/app_hasnewvoicemail.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_math.so -lib/asterisk/modules/app_md5.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mixmonitor.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_realtime.so -lib/asterisk/modules/app_record.so -%%WITH_FAX%%lib/asterisk/modules/app_rxfax.so -lib/asterisk/modules/app_sayunixtime.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.so -lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_setcidname.so -lib/asterisk/modules/app_setcidnum.so -lib/asterisk/modules/app_setrdnis.so -lib/asterisk/modules/app_settransfercapability.so -lib/asterisk/modules/app_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_stack.so -lib/asterisk/modules/app_system.so -lib/asterisk/modules/app_talkdetect.so -lib/asterisk/modules/app_test.so -lib/asterisk/modules/app_transfer.so -%%WITH_FAX%%lib/asterisk/modules/app_txfax.so -lib/asterisk/modules/app_txtcidname.so -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -lib/asterisk/modules/app_voicemail.so -lib/asterisk/modules/app_waitforring.so -lib/asterisk/modules/app_waitforsilence.so -lib/asterisk/modules/app_while.so -lib/asterisk/modules/app_zapateller.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapbarge.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapras.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so -lib/asterisk/modules/chan_agent.so -lib/asterisk/modules/chan_features.so -%%WITH_H323%%lib/asterisk/modules/chan_h323.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -%%WITH_ZAPTEL%%lib/asterisk/modules/chan_zap.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_gsm.so -lib/asterisk/modules/codec_ilbc.so -lib/asterisk/modules/codec_lpc10.so -lib/asterisk/modules/codec_speex.so -lib/asterisk/modules/codec_ulaw.so -lib/asterisk/modules/format_au.so -lib/asterisk/modules/format_g723_1.so -lib/asterisk/modules/format_g726.so -lib/asterisk/modules/format_g729.so -lib/asterisk/modules/format_gsm.so -lib/asterisk/modules/format_h263.so -lib/asterisk/modules/format_ilbc.so -lib/asterisk/modules/format_jpeg.so -lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_pcm_alaw.so -lib/asterisk/modules/format_sln.so -lib/asterisk/modules/format_vox.so -lib/asterisk/modules/format_wav.so -lib/asterisk/modules/format_wav_gsm.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_enum.so -lib/asterisk/modules/func_uri.so -lib/asterisk/modules/pbx_ael.so -lib/asterisk/modules/pbx_config.so -lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_functions.so -lib/asterisk/modules/pbx_loopback.so -lib/asterisk/modules/pbx_realtime.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.so -%%NEWGCC%%lib/asterisk/modules/res_config_odbc.so -lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_features.so -lib/asterisk/modules/res_indications.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so -lib/asterisk/modules/res_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/autosupport -sbin/rasterisk -sbin/safe_asterisk -sbin/smsq -sbin/stereorize -sbin/streamplayer -%%DATADIR%%/agi-bin/agi-test.agi -%%DATADIR%%/agi-bin/eagi-sphinx-test -%%DATADIR%%/agi-bin/eagi-test -%%DATADIR%%/firmware/iax/iaxy.bin -%%DATADIR%%/images/asterisk-intro.jpg -%%DATADIR%%/keys/freeworlddialup.pub -%%DATADIR%%/keys/iaxtel.pub -%%DATADIR%%/mohmp3/fpm-calm-river.mp3 -%%DATADIR%%/mohmp3/fpm-sunshine.mp3 -%%DATADIR%%/mohmp3/fpm-world-mix.mp3 -%%DATADIR%%/sounds/agent-alreadyon.gsm -%%DATADIR%%/sounds/agent-incorrect.gsm -%%DATADIR%%/sounds/agent-loggedoff.gsm -%%DATADIR%%/sounds/agent-loginok.gsm -%%DATADIR%%/sounds/agent-newlocation.gsm -%%DATADIR%%/sounds/agent-pass.gsm -%%DATADIR%%/sounds/agent-user.gsm -%%DATADIR%%/sounds/auth-incorrect.gsm -%%DATADIR%%/sounds/auth-thankyou.gsm -%%DATADIR%%/sounds/beep.gsm -%%DATADIR%%/sounds/beeperr.gsm -%%DATADIR%%/sounds/conf-adminmenu.gsm -%%DATADIR%%/sounds/conf-enteringno.gsm -%%DATADIR%%/sounds/conf-errormenu.gsm -%%DATADIR%%/sounds/conf-getchannel.gsm -%%DATADIR%%/sounds/conf-getconfno.gsm -%%DATADIR%%/sounds/conf-getpin.gsm -%%DATADIR%%/sounds/conf-hasjoin.gsm -%%DATADIR%%/sounds/conf-hasleft.gsm -%%DATADIR%%/sounds/conf-invalid.gsm -%%DATADIR%%/sounds/conf-invalidpin.gsm -%%DATADIR%%/sounds/conf-kicked.gsm -%%DATADIR%%/sounds/conf-leaderhasleft.gsm -%%DATADIR%%/sounds/conf-locked.gsm -%%DATADIR%%/sounds/conf-lockednow.gsm -%%DATADIR%%/sounds/conf-muted.gsm -%%DATADIR%%/sounds/conf-noempty.gsm -%%DATADIR%%/sounds/conf-onlyone.gsm -%%DATADIR%%/sounds/conf-onlyperson.gsm -%%DATADIR%%/sounds/conf-otherinparty.gsm -%%DATADIR%%/sounds/conf-placeintoconf.gsm -%%DATADIR%%/sounds/conf-thereare.gsm -%%DATADIR%%/sounds/conf-unlockednow.gsm -%%DATADIR%%/sounds/conf-unmuted.gsm -%%DATADIR%%/sounds/conf-usermenu.gsm -%%DATADIR%%/sounds/conf-userswilljoin.gsm -%%DATADIR%%/sounds/conf-userwilljoin.gsm -%%DATADIR%%/sounds/conf-waitforleader.gsm -%%DATADIR%%/sounds/demo-abouttotry.gsm -%%DATADIR%%/sounds/demo-congrats.gsm -%%DATADIR%%/sounds/demo-echodone.gsm -%%DATADIR%%/sounds/demo-echotest.gsm -%%DATADIR%%/sounds/demo-enterkeywords.gsm -%%DATADIR%%/sounds/demo-instruct.gsm -%%DATADIR%%/sounds/demo-moreinfo.gsm -%%DATADIR%%/sounds/demo-nogo.gsm -%%DATADIR%%/sounds/demo-nomatch.gsm -%%DATADIR%%/sounds/demo-thanks.gsm -%%DATADIR%%/sounds/dictate/both_help.gsm -%%DATADIR%%/sounds/dictate/enter_filename.gsm -%%DATADIR%%/sounds/dictate/forhelp.gsm -%%DATADIR%%/sounds/dictate/pause.gsm -%%DATADIR%%/sounds/dictate/paused.gsm -%%DATADIR%%/sounds/dictate/play_help.gsm -%%DATADIR%%/sounds/dictate/playback.gsm -%%DATADIR%%/sounds/dictate/playback_mode.gsm -%%DATADIR%%/sounds/dictate/record.gsm -%%DATADIR%%/sounds/dictate/record_help.gsm -%%DATADIR%%/sounds/dictate/record_mode.gsm -%%DATADIR%%/sounds/dictate/truncating_audio.gsm -%%DATADIR%%/sounds/digits/0.gsm -%%DATADIR%%/sounds/digits/1.gsm -%%DATADIR%%/sounds/digits/10.gsm -%%DATADIR%%/sounds/digits/11.gsm -%%DATADIR%%/sounds/digits/12.gsm -%%DATADIR%%/sounds/digits/13.gsm -%%DATADIR%%/sounds/digits/14.gsm -%%DATADIR%%/sounds/digits/15.gsm -%%DATADIR%%/sounds/digits/16.gsm -%%DATADIR%%/sounds/digits/17.gsm -%%DATADIR%%/sounds/digits/18.gsm -%%DATADIR%%/sounds/digits/19.gsm -%%DATADIR%%/sounds/digits/2.gsm -%%DATADIR%%/sounds/digits/20.gsm -%%DATADIR%%/sounds/digits/3.gsm -%%DATADIR%%/sounds/digits/30.gsm -%%DATADIR%%/sounds/digits/4.gsm -%%DATADIR%%/sounds/digits/40.gsm -%%DATADIR%%/sounds/digits/5.gsm -%%DATADIR%%/sounds/digits/50.gsm -%%DATADIR%%/sounds/digits/6.gsm -%%DATADIR%%/sounds/digits/60.gsm -%%DATADIR%%/sounds/digits/7.gsm -%%DATADIR%%/sounds/digits/70.gsm -%%DATADIR%%/sounds/digits/8.gsm -%%DATADIR%%/sounds/digits/80.gsm -%%DATADIR%%/sounds/digits/9.gsm -%%DATADIR%%/sounds/digits/90.gsm -%%DATADIR%%/sounds/digits/a-m.gsm -%%DATADIR%%/sounds/digits/at.gsm -%%DATADIR%%/sounds/digits/day-0.gsm -%%DATADIR%%/sounds/digits/day-1.gsm -%%DATADIR%%/sounds/digits/day-2.gsm -%%DATADIR%%/sounds/digits/day-3.gsm -%%DATADIR%%/sounds/digits/day-4.gsm -%%DATADIR%%/sounds/digits/day-5.gsm -%%DATADIR%%/sounds/digits/day-6.gsm -%%DATADIR%%/sounds/digits/dollars.gsm -%%DATADIR%%/sounds/digits/h-1.gsm -%%DATADIR%%/sounds/digits/h-10.gsm -%%DATADIR%%/sounds/digits/h-11.gsm -%%DATADIR%%/sounds/digits/h-12.gsm -%%DATADIR%%/sounds/digits/h-13.gsm -%%DATADIR%%/sounds/digits/h-14.gsm -%%DATADIR%%/sounds/digits/h-15.gsm -%%DATADIR%%/sounds/digits/h-16.gsm -%%DATADIR%%/sounds/digits/h-17.gsm -%%DATADIR%%/sounds/digits/h-18.gsm -%%DATADIR%%/sounds/digits/h-19.gsm -%%DATADIR%%/sounds/digits/h-2.gsm -%%DATADIR%%/sounds/digits/h-20.gsm -%%DATADIR%%/sounds/digits/h-3.gsm -%%DATADIR%%/sounds/digits/h-30.gsm -%%DATADIR%%/sounds/digits/h-4.gsm -%%DATADIR%%/sounds/digits/h-5.gsm -%%DATADIR%%/sounds/digits/h-6.gsm -%%DATADIR%%/sounds/digits/h-7.gsm -%%DATADIR%%/sounds/digits/h-8.gsm -%%DATADIR%%/sounds/digits/h-9.gsm -%%DATADIR%%/sounds/digits/hundred.gsm -%%DATADIR%%/sounds/digits/million.gsm -%%DATADIR%%/sounds/digits/minus.gsm -%%DATADIR%%/sounds/digits/mon-0.gsm -%%DATADIR%%/sounds/digits/mon-1.gsm -%%DATADIR%%/sounds/digits/mon-10.gsm -%%DATADIR%%/sounds/digits/mon-11.gsm -%%DATADIR%%/sounds/digits/mon-2.gsm -%%DATADIR%%/sounds/digits/mon-3.gsm -%%DATADIR%%/sounds/digits/mon-4.gsm -%%DATADIR%%/sounds/digits/mon-5.gsm -%%DATADIR%%/sounds/digits/mon-6.gsm -%%DATADIR%%/sounds/digits/mon-7.gsm -%%DATADIR%%/sounds/digits/mon-8.gsm -%%DATADIR%%/sounds/digits/mon-9.gsm -%%DATADIR%%/sounds/digits/oclock.gsm -%%DATADIR%%/sounds/digits/oh.gsm -%%DATADIR%%/sounds/digits/p-m.gsm -%%DATADIR%%/sounds/digits/pound.gsm -%%DATADIR%%/sounds/digits/star.gsm -%%DATADIR%%/sounds/digits/thousand.gsm -%%DATADIR%%/sounds/digits/today.gsm -%%DATADIR%%/sounds/digits/tomorrow.gsm -%%DATADIR%%/sounds/digits/yesterday.gsm -%%DATADIR%%/sounds/dir-instr.gsm -%%DATADIR%%/sounds/dir-intro-fn.gsm -%%DATADIR%%/sounds/dir-intro.gsm -%%DATADIR%%/sounds/dir-nomatch.gsm -%%DATADIR%%/sounds/dir-nomore.gsm -%%DATADIR%%/sounds/hello-world.gsm -%%DATADIR%%/sounds/invalid.gsm -%%DATADIR%%/sounds/letters/a.gsm -%%DATADIR%%/sounds/letters/at.gsm -%%DATADIR%%/sounds/letters/b.gsm -%%DATADIR%%/sounds/letters/c.gsm -%%DATADIR%%/sounds/letters/d.gsm -%%DATADIR%%/sounds/letters/dash.gsm -%%DATADIR%%/sounds/letters/dollar.gsm -%%DATADIR%%/sounds/letters/dot.gsm -%%DATADIR%%/sounds/letters/e.gsm -%%DATADIR%%/sounds/letters/equals.gsm -%%DATADIR%%/sounds/letters/exclaimation-point.gsm -%%DATADIR%%/sounds/letters/f.gsm -%%DATADIR%%/sounds/letters/g.gsm -%%DATADIR%%/sounds/letters/h.gsm -%%DATADIR%%/sounds/letters/i.gsm -%%DATADIR%%/sounds/letters/j.gsm -%%DATADIR%%/sounds/letters/k.gsm -%%DATADIR%%/sounds/letters/l.gsm -%%DATADIR%%/sounds/letters/m.gsm -%%DATADIR%%/sounds/letters/n.gsm -%%DATADIR%%/sounds/letters/o.gsm -%%DATADIR%%/sounds/letters/p.gsm -%%DATADIR%%/sounds/letters/plus.gsm -%%DATADIR%%/sounds/letters/q.gsm -%%DATADIR%%/sounds/letters/r.gsm -%%DATADIR%%/sounds/letters/s.gsm -%%DATADIR%%/sounds/letters/slash.gsm -%%DATADIR%%/sounds/letters/space.gsm -%%DATADIR%%/sounds/letters/t.gsm -%%DATADIR%%/sounds/letters/u.gsm -%%DATADIR%%/sounds/letters/v.gsm -%%DATADIR%%/sounds/letters/w.gsm -%%DATADIR%%/sounds/letters/x.gsm -%%DATADIR%%/sounds/letters/y.gsm -%%DATADIR%%/sounds/letters/z.gsm -%%DATADIR%%/sounds/letters/zed.gsm -%%DATADIR%%/sounds/pbx-invalid.gsm -%%DATADIR%%/sounds/pbx-invalidpark.gsm -%%DATADIR%%/sounds/pbx-transfer.gsm -%%DATADIR%%/sounds/phonetic/9_p.gsm -%%DATADIR%%/sounds/phonetic/a_p.gsm -%%DATADIR%%/sounds/phonetic/b_p.gsm -%%DATADIR%%/sounds/phonetic/c_p.gsm -%%DATADIR%%/sounds/phonetic/d_p.gsm -%%DATADIR%%/sounds/phonetic/e_p.gsm -%%DATADIR%%/sounds/phonetic/f_p.gsm -%%DATADIR%%/sounds/phonetic/g_p.gsm -%%DATADIR%%/sounds/phonetic/h_p.gsm -%%DATADIR%%/sounds/phonetic/i_p.gsm -%%DATADIR%%/sounds/phonetic/j_p.gsm -%%DATADIR%%/sounds/phonetic/k_p.gsm -%%DATADIR%%/sounds/phonetic/l_p.gsm -%%DATADIR%%/sounds/phonetic/m_p.gsm -%%DATADIR%%/sounds/phonetic/n_p.gsm -%%DATADIR%%/sounds/phonetic/o_p.gsm -%%DATADIR%%/sounds/phonetic/p_p.gsm -%%DATADIR%%/sounds/phonetic/q_p.gsm -%%DATADIR%%/sounds/phonetic/r_p.gsm -%%DATADIR%%/sounds/phonetic/s_p.gsm -%%DATADIR%%/sounds/phonetic/t_p.gsm -%%DATADIR%%/sounds/phonetic/u_p.gsm -%%DATADIR%%/sounds/phonetic/v_p.gsm -%%DATADIR%%/sounds/phonetic/w_p.gsm -%%DATADIR%%/sounds/phonetic/x_p.gsm -%%DATADIR%%/sounds/phonetic/y_p.gsm -%%DATADIR%%/sounds/phonetic/z_p.gsm -%%DATADIR%%/sounds/priv-callee-options.gsm -%%DATADIR%%/sounds/priv-callpending.gsm -%%DATADIR%%/sounds/priv-introsaved.gsm -%%DATADIR%%/sounds/priv-recordintro.gsm -%%DATADIR%%/sounds/privacy-incorrect.gsm -%%DATADIR%%/sounds/privacy-prompt.gsm -%%DATADIR%%/sounds/privacy-thankyou.gsm -%%DATADIR%%/sounds/privacy-unident.gsm -%%DATADIR%%/sounds/queue-callswaiting.gsm -%%DATADIR%%/sounds/queue-holdtime.gsm -%%DATADIR%%/sounds/queue-less-than.gsm -%%DATADIR%%/sounds/queue-minutes.gsm -%%DATADIR%%/sounds/queue-periodic-announce.gsm -%%DATADIR%%/sounds/queue-reporthold.gsm -%%DATADIR%%/sounds/queue-seconds.gsm -%%DATADIR%%/sounds/queue-thankyou.gsm -%%DATADIR%%/sounds/queue-thereare.gsm -%%DATADIR%%/sounds/queue-youarenext.gsm -%%DATADIR%%/sounds/screen-callee-options.gsm -%%DATADIR%%/sounds/spy-agent.gsm -%%DATADIR%%/sounds/spy-h323.gsm -%%DATADIR%%/sounds/spy-iax.gsm -%%DATADIR%%/sounds/spy-iax2.gsm -%%DATADIR%%/sounds/spy-mgcp.gsm -%%DATADIR%%/sounds/spy-sip.gsm -%%DATADIR%%/sounds/spy-skinny.gsm -%%DATADIR%%/sounds/spy-zap.gsm -%%DATADIR%%/sounds/ss-noservice.gsm -%%DATADIR%%/sounds/transfer.gsm -%%DATADIR%%/sounds/tt-allbusy.gsm -%%DATADIR%%/sounds/tt-monkeys.gsm -%%DATADIR%%/sounds/tt-monkeysintro.gsm -%%DATADIR%%/sounds/tt-somethingwrong.gsm -%%DATADIR%%/sounds/tt-weasels.gsm -%%DATADIR%%/sounds/vm-Cust1.gsm -%%DATADIR%%/sounds/vm-Cust2.gsm -%%DATADIR%%/sounds/vm-Cust3.gsm -%%DATADIR%%/sounds/vm-Cust4.gsm -%%DATADIR%%/sounds/vm-Cust5.gsm -%%DATADIR%%/sounds/vm-Family.gsm -%%DATADIR%%/sounds/vm-Friends.gsm -%%DATADIR%%/sounds/vm-INBOX.gsm -%%DATADIR%%/sounds/vm-Old.gsm -%%DATADIR%%/sounds/vm-Work.gsm -%%DATADIR%%/sounds/vm-advopts.gsm -%%DATADIR%%/sounds/vm-and.gsm -%%DATADIR%%/sounds/vm-calldiffnum.gsm -%%DATADIR%%/sounds/vm-changeto.gsm -%%DATADIR%%/sounds/vm-delete.gsm -%%DATADIR%%/sounds/vm-deleted.gsm -%%DATADIR%%/sounds/vm-dialout.gsm -%%DATADIR%%/sounds/vm-enter-num-to-call.gsm -%%DATADIR%%/sounds/vm-extension.gsm -%%DATADIR%%/sounds/vm-first.gsm -%%DATADIR%%/sounds/vm-for.gsm -%%DATADIR%%/sounds/vm-forward.gsm -%%DATADIR%%/sounds/vm-forwardoptions.gsm -%%DATADIR%%/sounds/vm-from-extension.gsm -%%DATADIR%%/sounds/vm-from-phonenumber.gsm -%%DATADIR%%/sounds/vm-from.gsm -%%DATADIR%%/sounds/vm-goodbye.gsm -%%DATADIR%%/sounds/vm-helpexit.gsm -%%DATADIR%%/sounds/vm-incorrect-mailbox.gsm -%%DATADIR%%/sounds/vm-incorrect.gsm -%%DATADIR%%/sounds/vm-instructions.gsm -%%DATADIR%%/sounds/vm-intro.gsm -%%DATADIR%%/sounds/vm-isonphone.gsm -%%DATADIR%%/sounds/vm-isunavail.gsm -%%DATADIR%%/sounds/vm-last.gsm -%%DATADIR%%/sounds/vm-leavemsg.gsm -%%DATADIR%%/sounds/vm-login.gsm -%%DATADIR%%/sounds/vm-mailboxfull.gsm -%%DATADIR%%/sounds/vm-message.gsm -%%DATADIR%%/sounds/vm-messages.gsm -%%DATADIR%%/sounds/vm-minutes.gsm -%%DATADIR%%/sounds/vm-mismatch.gsm -%%DATADIR%%/sounds/vm-msginstruct.gsm -%%DATADIR%%/sounds/vm-msgsaved.gsm -%%DATADIR%%/sounds/vm-newpassword.gsm -%%DATADIR%%/sounds/vm-newuser.gsm -%%DATADIR%%/sounds/vm-next.gsm -%%DATADIR%%/sounds/vm-no.gsm -%%DATADIR%%/sounds/vm-nobodyavail.gsm -%%DATADIR%%/sounds/vm-nobox.gsm -%%DATADIR%%/sounds/vm-nomore.gsm -%%DATADIR%%/sounds/vm-nonumber.gsm -%%DATADIR%%/sounds/vm-num-i-have.gsm -%%DATADIR%%/sounds/vm-onefor.gsm -%%DATADIR%%/sounds/vm-options.gsm -%%DATADIR%%/sounds/vm-opts.gsm -%%DATADIR%%/sounds/vm-passchanged.gsm -%%DATADIR%%/sounds/vm-password.gsm -%%DATADIR%%/sounds/vm-press.gsm -%%DATADIR%%/sounds/vm-prev.gsm -%%DATADIR%%/sounds/vm-reachoper.gsm -%%DATADIR%%/sounds/vm-rec-busy.gsm -%%DATADIR%%/sounds/vm-rec-name.gsm -%%DATADIR%%/sounds/vm-rec-temp.gsm -%%DATADIR%%/sounds/vm-rec-unv.gsm -%%DATADIR%%/sounds/vm-received.gsm -%%DATADIR%%/sounds/vm-reenterpassword.gsm -%%DATADIR%%/sounds/vm-repeat.gsm -%%DATADIR%%/sounds/vm-review.gsm -%%DATADIR%%/sounds/vm-saved.gsm -%%DATADIR%%/sounds/vm-savedto.gsm -%%DATADIR%%/sounds/vm-savefolder.gsm -%%DATADIR%%/sounds/vm-savemessage.gsm -%%DATADIR%%/sounds/vm-saveoper.gsm -%%DATADIR%%/sounds/vm-sorry.gsm -%%DATADIR%%/sounds/vm-star-cancel.gsm -%%DATADIR%%/sounds/vm-starmain.gsm -%%DATADIR%%/sounds/vm-tempgreeting.gsm -%%DATADIR%%/sounds/vm-tempgreeting2.gsm -%%DATADIR%%/sounds/vm-tempremoved.gsm -%%DATADIR%%/sounds/vm-then-pound.gsm -%%DATADIR%%/sounds/vm-theperson.gsm -%%DATADIR%%/sounds/vm-tocallback.gsm -%%DATADIR%%/sounds/vm-tocallnum.gsm -%%DATADIR%%/sounds/vm-tocancel.gsm -%%DATADIR%%/sounds/vm-tocancelmsg.gsm -%%DATADIR%%/sounds/vm-toenternumber.gsm -%%DATADIR%%/sounds/vm-toforward.gsm -%%DATADIR%%/sounds/vm-tohearenv.gsm -%%DATADIR%%/sounds/vm-tomakecall.gsm -%%DATADIR%%/sounds/vm-tooshort.gsm -%%DATADIR%%/sounds/vm-toreply.gsm -%%DATADIR%%/sounds/vm-torerecord.gsm -%%DATADIR%%/sounds/vm-undelete.gsm -%%DATADIR%%/sounds/vm-undeleted.gsm -%%DATADIR%%/sounds/vm-unknown-caller.gsm -%%DATADIR%%/sounds/vm-whichbox.gsm -%%DATADIR%%/sounds/vm-youhave.gsm -%%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate -@dirrm %%DATADIR%%/sounds/phonetic -@dirrm %%DATADIR%%/sounds/letters -@dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/mohmp3 -@dirrm %%DATADIR%%/keys -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/firmware/iax -@dirrm %%DATADIR%%/firmware -@dirrm %%DATADIR%%/agi-bin -@dirrm %%DATADIR%% -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/%%DATADIR%%/astdb -@cwd /var -spool/asterisk/voicemail/default/1234/busy.gsm -spool/asterisk/voicemail/default/1234/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/voicemail/default/1234 -@dirrm spool/asterisk/voicemail/default -@dirrm spool/asterisk/voicemail -@dirrm spool/asterisk/tmp -@dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile deleted file mode 100644 index 10d4cd2b786f..000000000000 --- a/net/asterisk12/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.2.4 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ - http://ftp.digium.com/pub/asterisk/old-releases/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= An Open Source PBX and telephony toolkit - -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - -BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ - newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 sparc64 amd64 - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= asterisk.sh -USE_REINPLACE= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${PWLIBDIR} \ - OPENH323DIR=${OPENH323DIR} \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 - -.include <bsd.port.pre.mk> - -PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC -OPENH323DIR!= cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC - -.if ${ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build -PLIST_SUB+= WITH_H323="" -MAKE_ENV+= WITH_H323=1 -.endif - -.if defined(WITHOUT_ZAPTEL) -PLIST_SUB+= WITH_ZAPTEL="@comment " -MAKE_ENV+= WITHOUT_ZAPTEL=1 -.else -BUILD_DEPENDS+= libpri>=1.2.0:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -MAKE_ENV+= WITH_ZAPTEL=1 -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if defined(WITHOUT_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -.else -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -PLIST_SUB+= WITH_ODBC="" -MAKE_ENV+= WITH_ODBC=1 -.endif - -.if defined(WITHOUT_FAX) -PLIST_SUB+= WITH_FAX="@comment " -.else -MAKE_ENV+= WITH_FAX=1 -LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp -PLIST_SUB+= WITH_FAX="" -.endif - -.if ${OSVERSION} >= 500036 -PLIST_SUB+= NEWGCC="" -.else -PLIST_SUB+= NEWGCC="@comment " -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - -.include <bsd.port.post.mk> diff --git a/net/asterisk12/distinfo b/net/asterisk12/distinfo deleted file mode 100644 index 6b4fba28f1df..000000000000 --- a/net/asterisk12/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d -SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c -SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 diff --git a/net/asterisk12/files/asterisk.sh.in b/net/asterisk12/files/asterisk.sh.in deleted file mode 100644 index 22ef57fd3727..000000000000 --- a/net/asterisk12/files/asterisk.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. %%RC_SUBR%% - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk -pidfile=/var/run/asterisk.pid - -asterisk_enable=${asterisk_enable:-"NO"} - -load_rc_config $name -run_rc_command "$1" diff --git a/net/asterisk12/files/patch-Makefile b/net/asterisk12/files/patch-Makefile deleted file mode 100644 index 708a356041a3..000000000000 --- a/net/asterisk12/files/patch-Makefile +++ /dev/null @@ -1,515 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -19,8 +19,8 @@ - # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- - # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ - # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target --CC=$(CROSS_COMPILE)gcc --HOST_CC=gcc -+CC?=$(CROSS_COMPILE)gcc -+HOST_CC=${CC} - # CROSS_ARCH=Linux - # CROSS_PROC=arm - # SUB_PROC=xscale # or maverick -@@ -44,14 +44,14 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - endif - - #Overwite config files on "make samples" --OVERWRITE=y -+OVERWRITE=n - - #Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 #-pg -+#DEBUG=-g3 #-pg - - #Set NOCRYPTO to yes if you do not want to have crypto support or - #dependencies -@@ -83,7 +83,7 @@ - - # Where to install asterisk after compiling - # Default -> leave empty --INSTALL_PREFIX?= -+INSTALL_PREFIX=$(PREFIX) - - # Staging directory - # Files are copied here temporarily during the install process -@@ -106,17 +106,17 @@ - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - - ifneq ($(OSARCH),SunOS) -- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin -- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin - else -@@ -218,25 +218,25 @@ - endif - - INCLUDE+=-Iinclude -I../include --ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY --ASTCFLAGS+=$(OPTIMIZE) -+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+#ASTCFLAGS+=$(OPTIMIZE) - ASTOBJ=-o asterisk - - ifeq ($(findstring BSD,$(OSARCH)),BSD) - PROC=$(shell uname -m) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifneq ($(PROC),ultrasparc) -- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) -- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),) -+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp - else - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp -@@ -245,27 +245,24 @@ - - ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) -- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp -+ ASTCFLAGS+=$(PTHREAD_CFLAGS) -+ LIBS+=$(PTHREAD_LIBS) -+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),) -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp - endif - MPG123TARG=freebsd - -- # XXX FreeBSD paths -- PREFIX?=/usr/local -- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk -- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk -+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin -- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man -- # XXX end FreeBSD paths -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - - endif # FreeBSD - -@@ -281,7 +278,7 @@ - - ifeq ($(OSARCH),SunOS) - ASTCFLAGS+=-Wcast-align -DSOLARIS -- INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include -+ INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/include - endif - - ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN) -@@ -296,7 +293,7 @@ - - ifndef WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS - endif - -@@ -323,7 +320,7 @@ - ASTERISKVERSIONNUM=999999 - ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name) - else -- ASTERISKVERSIONNUM=000000 -+ ASTERISKVERSIONNUM?=000000 - endif - endif - -@@ -388,10 +385,10 @@ - endif - - ifeq ($(OSARCH),SunOS) -- LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - OBJS+=strcompat.o - ASTLINK= -- SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - endif - - ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) -@@ -399,7 +396,7 @@ - endif - - # This is used when generating the doxygen documentation --ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),) -+ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),) - HAVEDOT=yes - else - HAVEDOT=no -@@ -418,7 +415,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: cleantest depend asterisk subdirs -+all: cleantest depend asterisk subdirs manpage - - #ifneq ($(wildcard tags),) - ctags: tags -@@ -437,13 +434,13 @@ - cd editline && unset CFLAGS LIBS && test -f config.h || ./configure - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: FORCE -- @if [ -d db1-ast ]; then \ -- $(MAKE) -C db1-ast libdb1.a ; \ -- else \ -- echo "You need to do a cvs update -d not just cvs update"; \ -- exit 1; \ -- fi -+#db1-ast/libdb1.a: FORCE -+# @if [ -d db1-ast ]; then \ -+# $(MAKE) -C db1-ast libdb1.a ; \ -+# else \ -+# echo "You need to do a cvs update -d not just cvs update"; \ -+# exit 1; \ -+# fi - - ifneq ($(wildcard .depend),) - include .depend -@@ -510,14 +507,14 @@ - cygwin_a: - $(MAKE) -C cygwin all - --asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -+asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS) - build_tools/make_build_h > include/asterisk/build.h.tmp - if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \ - mv include/asterisk/build.h.tmp include/asterisk/build.h ; \ - fi - rm -f include/asterisk/build.h.tmp - $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c -- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) $(AUDIO_LIBS) -o muted muted.o -@@ -539,38 +536,38 @@ - - datafiles: all - if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros - for x in sounds/digits/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate - for x in sounds/dictate/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters - for x in sounds/letters/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic - for x in sounds/phonetic/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ -@@ -578,18 +575,18 @@ - done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - - update: - @if [ -d .svn ]; then \ -@@ -618,75 +615,53 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi - ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi - for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -d contrib/firmware/iax ]; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ - else \ - echo "You need to do cvs update -d not just cvs update" ; \ - fi - ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . ) -- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi -- @echo " +---- Asterisk Installation Complete -------+" -- @echo " + +" -- @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -- @echo " + +" -- @echo " + Asterisk has successfully been installed. +" -- @echo " + If you would like to install the sample +" -- @echo " + configuration files (overwriting any +" -- @echo " + existing config files), run: +" -- @echo " + +" -- @echo " + $(MAKE) samples +" -- @echo " + +" -- @echo " +----------------- or ---------------------+" -- @echo " + +" -- @echo " + You can go ahead and install the asterisk +" -- @echo " + program documentation now or later run: +" -- @echo " + +" -- @echo " + $(MAKE) progdocs +" -- @echo " + +" -- @echo " + **Note** This requires that you have +" -- @echo " + doxygen installed on your local system +" -- @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck - - NEWMODS=$(notdir $(wildcard */*.so)) -@@ -710,7 +685,7 @@ - echo " WARNING WARNING WARNING" ;\ - fi - --install: all datafiles bininstall -+install: all datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -718,16 +693,19 @@ - upgrade: all bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \ - if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ - fi ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ echo ADSI INSTALL $(BSD_INSTALL_DATA) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ - if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ -@@ -740,7 +718,7 @@ - continue; \ - fi ;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done - if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ - ( \ -@@ -800,25 +778,25 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - for x in sounds/demo-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - for x in sounds/*.mp3; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - done - rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3 -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm - for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ - cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \ -@@ -832,7 +810,7 @@ - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done -@@ -861,10 +839,10 @@ - - __rpm: include/asterisk/version.h spec - rm -rf /tmp/asterisk ; \ -- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ -+ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \ - $(MAKE) DESTDIR=/tmp/asterisk install ; \ - $(MAKE) DESTDIR=/tmp/asterisk samples ; \ -- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ -+ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \ - cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ - rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec - diff --git a/net/asterisk12/files/patch-agi::Makefile b/net/asterisk12/files/patch-agi::Makefile deleted file mode 100644 index b35976526f59..000000000000 --- a/net/asterisk12/files/patch-agi::Makefile +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 -@@ -11,7 +11,9 @@ - # the GNU General Public License - # - --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - CFLAGS+= - -@@ -27,8 +29,9 @@ - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) -+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done -+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - - eagi-test: eagi-test.o - $(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS) diff --git a/net/asterisk12/files/patch-apps::Makefile b/net/asterisk12/files/patch-apps::Makefile deleted file mode 100644 index ee7d560bed69..000000000000 --- a/net/asterisk12/files/patch-apps::Makefile +++ /dev/null @@ -1,79 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig -+++ apps/Makefile -@@ -45,25 +45,27 @@ - #APPS+=app_rpt.so - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h),) - APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so - endif - endif # WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) -+ifdef WITH_FAX -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp.h),) -+APPS+=app_rxfax.so app_txfax.so -+endif -+endif -+ -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - APPS+=app_osplookup.so - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - --CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) --ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) -- ifneq (${CURLLIBS},) -- APPS+=app_curl.so -- endif --endif -+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)$(LOCALBASE)/bin/curl-config --libs) -+APPS+=app_curl.so - - ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -@@ -95,24 +97,32 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone - - install: all -- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so - rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so - - app_curl.so: app_curl.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) - -+ifdef WITH_FAX -+app_rxfax.so : app_rxfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+ -+app_txfax.so : app_txfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+endif -+ - app_sql_postgres.o: app_sql_postgres.c -- $(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c -+ $(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c - - app_sql_postgres.so: app_sql_postgres.o -- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) look.c -o look -lncurses - - ifeq (SunOS,$(shell uname)) - app_chanspy.so: app_chanspy.o diff --git a/net/asterisk12/files/patch-apps::app_rxfax.c b/net/asterisk12/files/patch-apps::app_rxfax.c deleted file mode 100644 index 820208e1943d..000000000000 --- a/net/asterisk12/files/patch-apps::app_rxfax.c +++ /dev/null @@ -1,379 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:44:40 2006 -+++ apps/app_rxfax.c Thu Jan 12 17:41:53 2006 -@@ -0,0 +1,373 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to receive a TIFF FAX file -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <asterisk/dsp.h> -+#include <asterisk/manager.h> -+#include <asterisk/version.h> -+#include <string.h> -+#include <stdlib.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <math.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Receive Application"; -+ -+static char *app = "RxFAX"; -+ -+static char *synopsis = "Receive a FAX to a file"; -+ -+static char *descrip = -+" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" -+"given filename. If the file exists it will be overwritten. The file\n" -+"should be in TIFF/F format.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the sender CSID.\n" -+" FAXPAGES to the number of pages received.\n" -+" FAXBITRATE to the transmition rate.\n" -+" FAXRESOLUTION to the resolution.\n" -+"Returns -1 when the user hangs up.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ char local_ident[21]; -+ char far_ident[21]; -+ char buf[11]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ fax_get_far_ident(s, far_ident); -+ fax_get_local_ident(s, local_ident); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax successfully received.\n"); -+ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); -+ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ manager_event(EVENT_FLAG_CALL, -+ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", -+ chan->name, -+ chan->exten, -+#if ASTERISK_VERSION_NUM <= 010010 -+ chan->callerid, -+#else -+ (chan->cid.cid_num) ? chan->cid.cid_num : "", -+#endif -+ far_ident, -+ local_ident, -+ t.pages_transferred, -+ t.row_resolution, -+ t.bit_rate, -+ s->rx_file); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ snprintf(buf, sizeof(buf), "%i", t.pages_transferred); -+ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); -+ snprintf(buf, sizeof(buf), "%i", t.row_resolution); -+ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); -+ snprintf(buf, sizeof(buf), "%i", t.bit_rate); -+ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax receive not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_d_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows); -+ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); -+ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); -+ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); -+ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int rxfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char template_file[256]; -+ char target_file[256]; -+ char *s; -+ char *t; -+ char *v; -+ char *x; -+ int option; -+ int len; -+ int i; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ target_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(target_file, t, len); -+ target_file[len] = '\0'; -+ /* Allow the use of %d in the file name for a wild card of sorts, to -+ create a new file with the specified name scheme */ -+ if ((x = strchr(target_file, '%')) && x[1] == 'd') -+ { -+ strcpy(template_file, target_file); -+ i = 0; -+ do -+ { -+ snprintf(target_file, 256, template_file, 1); -+ i++; -+ } -+ while (ast_fileexists(target_file, "", chan->language) != -1); -+ } -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_rx_file(&fax, target_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ outf.src = "RxFAX"; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, rxfax_exec, synopsis, descrip); -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk12/files/patch-apps::app_txfax.c b/net/asterisk12/files/patch-apps::app_txfax.c deleted file mode 100644 index 15ad6674788e..000000000000 --- a/net/asterisk12/files/patch-apps::app_txfax.c +++ /dev/null @@ -1,301 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:48:54 2006 -+++ apps/app_txfax.c Thu Jan 12 17:48:36 2006 -@@ -0,0 +1,295 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to send a TIFF file as a FAX -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <string.h> -+#include <stdlib.h> -+#include <math.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Transmit Application"; -+ -+static char *app = "TxFAX"; -+ -+static char *synopsis = "Send a FAX file"; -+ -+static char *descrip = -+" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the receiver CSID.\n" -+"Returns -1 when the user hangs up, or if the file does not exist.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ char far_ident[21]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_far_ident(s, far_ident); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax send not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int txfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char source_file[256]; -+ char *x; -+ char *s; -+ char *t; -+ char *v; -+ int option; -+ int len; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ source_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(source_file, t, len); -+ source_file[len] = '\0'; -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_tx_file(&fax, source_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ //fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, txfax_exec, synopsis, descrip); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk12/files/patch-cdr::Makefile b/net/asterisk12/files/patch-cdr::Makefile deleted file mode 100644 index da16b609d5f2..000000000000 --- a/net/asterisk12/files/patch-cdr::Makefile +++ /dev/null @@ -1,70 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ cdr/Makefile Thu Jan 12 17:56:23 2006 -@@ -21,8 +21,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,18 +38,18 @@ - # - # unixODBC stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) - MODS+=cdr_odbc.so - endif - - # - # FreeTDS stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h),) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.62),1) - CFLAGS += -DFREETDS_0_62 - else - CFLAGS += -DFREETDS_PRE_0_62 -@@ -61,7 +61,7 @@ - # - # PGSQL stuff... Autoconf anyone?? - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) - MODS+=cdr_pgsql.so - endif - -@@ -82,9 +82,9 @@ - MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql),) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/pgsql -- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib/pgsql -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql),) -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql -+ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/pgsql - endif - - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -110,7 +110,7 @@ - all: depend $(MODS) - - install: all -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - clean: - rm -f *.so *.o .depend diff --git a/net/asterisk12/files/patch-channels::Makefile b/net/asterisk12/files/patch-channels::Makefile deleted file mode 100644 index edca9b1e7694..000000000000 --- a/net/asterisk12/files/patch-channels::Makefile +++ /dev/null @@ -1,85 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -48,9 +48,9 @@ - endif - - ifeq (${OSARCH},FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -- CHANH323LIB=-pthread -+ PTLIB=-lpt_FreeBSD_x86_r_s -+ H323LIB=-lh323_FreeBSD_x86_r_s -+ CHANH323LIB= - endif - - ifeq (${OSARCH},NetBSD) -@@ -73,11 +73,11 @@ - SOLINK+=-lrt - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so - endif - --ifneq ($(wildcard h323/libchanh323.a),) -+ifdef WITH_H323 - CHANNEL_LIBS+=chan_h323.so - endif - -@@ -91,12 +91,12 @@ - CHANNEL_LIBS+=chan_alsa.so - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 - endif -@@ -109,12 +109,12 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - CFLAGS+=-DIAX_TRUNKING - CHANNEL_LIBS+=chan_zap.so -@@ -229,8 +229,10 @@ - chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ - else --chan_h323.so: chan_h323.o h323/libchanh323.a -- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat -+chan_h323.so: chan_h323.o h323/ast_h323.o -+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - endif - - chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a -@@ -244,8 +246,7 @@ - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk12/files/patch-channels::chan_h323.c b/net/asterisk12/files/patch-channels::chan_h323.c deleted file mode 100644 index 4ca048812ecd..000000000000 --- a/net/asterisk12/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c.orig -+++ channels/chan_h323.c -@@ -31,6 +31,7 @@ - * \ingroup channel_drivers - */ - -+#include <sys/types.h> - #include <sys/socket.h> - #include <sys/signal.h> - #include <sys/param.h> diff --git a/net/asterisk12/files/patch-channels::chan_sip.c b/net/asterisk12/files/patch-channels::chan_sip.c deleted file mode 100644 index 2b2fae7a311f..000000000000 --- a/net/asterisk12/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,131 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig Tue Jan 24 16:25:53 2006 -+++ channels/chan_sip.c Tue Jan 24 16:30:44 2006 -@@ -337,7 +337,7 @@ static char global_vmexten[AST_MAX_EXTEN - - static char default_language[MAX_LANGUAGE] = ""; - --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; -@@ -475,6 +475,7 @@ struct sip_invite_param { - - struct sip_route { - struct sip_route *next; -+ int lr; - char hop[0]; - }; - -@@ -6015,6 +6016,7 @@ static void build_route(struct sip_pvt * - /* Make a struct route */ - thishop = malloc(sizeof(*thishop) + len); - if (thishop) { -+ thishop->lr = (strnstr(rr, ";lr", len) != NULL ? 1 : 0); - ast_copy_string(thishop->hop, rr, len); - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); - /* Link in */ -@@ -6040,31 +6042,41 @@ static void build_route(struct sip_pvt * - - /* Only append the contact if we are dealing with a strict router */ - if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) { -- /* 2nd append the Contact: if there is one */ -- /* Can be multiple Contact headers, comma separated values - we just take the first */ -- contact = get_header(req, "Contact"); -- if (!ast_strlen_zero(contact)) { -- ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -- /* Look for <: delimited address */ -- c = strchr(contact, '<'); -- if (c) { -- /* Take to > */ -- ++c; -- len = strcspn(c, ">") + 1; -- } else { -- /* No <> - just take the lot */ -- c = contact; -- len = strlen(contact) + 1; -- } -- thishop = malloc(sizeof(*thishop) + len); -+ /* Duplicate first route from the list */ -+ if (head && head->lr) { -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1); - if (thishop) { -- ast_copy_string(thishop->hop, c, len); -- thishop->next = NULL; -- /* Goes at the end */ -- if (tail) -- tail->next = thishop; -- else -- head = thishop; -+ memcpy(thishop, head, sizeof(struct sip_route)+strlen(head->hop)+1); -+ thishop->next = head; -+ head = thishop; -+ } -+ } else { -+ /* Append the Contact: if there is one and first route is w/o `lr' param */ -+ /* Can be multiple Contact headers, comma separated values - we just take the first */ -+ contact = get_header(req, "Contact"); -+ if (!ast_strlen_zero(contact)) { -+ ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -+ /* Look for <: delimited address */ -+ c = strchr(contact, '<'); -+ if (c) { -+ /* Take to > */ -+ ++c; -+ len = strcspn(c, ">") + 1; -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; -+ len = strlen(contact) + 1; -+ } -+ thishop = malloc(sizeof(*thishop) + len); -+ if (thishop) { -+ ast_copy_string(thishop->hop, c, len); -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - } -@@ -10352,7 +10364,11 @@ static int handle_request_invite(struct - gotdest = get_destination(p, NULL); - - get_rdnis(p, NULL); -- extract_uri(p, req); -+ build_route(p, req, 0); -+ if (!p->route->lr) -+ strncpy(p->uri, p->route->hop, sizeof(p->uri) - 1); -+ else -+ extract_uri(p, req); - build_contact(p); - - if (gotdest) { -@@ -10380,7 +10396,6 @@ static int handle_request_invite(struct - c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username ); - *recount = 1; - /* Save Record-Route for any later requests we make on this dialogue */ -- build_route(p, req, 0); - if (c) { - /* Pre-lock the call */ - ast_mutex_lock(&c->lock); -@@ -10466,7 +10481,12 @@ static int handle_request_invite(struct - transmit_response(p, "180 Ringing", req); - break; - case AST_STATE_UP: -- /* Here we have reINVITE request - try to renegotiate codecs with */ -+ /* Assuming this to be reinvite, process new SDP portion */ -+ if (!ast_strlen_zero(get_header(req, "Content-Type"))) { -+ process_sdp(p, req); -+ } else { -+ ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); -+ } - transmit_response_with_sdp(p, "200 OK", req, 1); - break; - default: diff --git a/net/asterisk12/files/patch-channels::chan_zap.c b/net/asterisk12/files/patch-channels::chan_zap.c deleted file mode 100644 index ab02c02af962..000000000000 --- a/net/asterisk12/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,80 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c.orig Tue Nov 29 20:24:39 2005 -+++ channels/chan_zap.c Fri Jan 13 13:28:33 2006 -@@ -638,6 +638,7 @@ static struct zt_pvt { - int cidlen; - int ringt; - int ringt_base; -+ int waitnorings; - int stripmsd; - int callwaitcas; - int callwaitrings; -@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel - } - - ast_mutex_lock(&p->lock); -+ switch (p->sig) { -+ case SIG_FXSGS: -+ case SIG_FXSKS: -+ case SIG_FXSLS: -+ if((ast->_state == AST_STATE_RING) && (p->ringt > 1)) -+ { -+ p->waitnorings = 1; -+ } -+ break; -+ default: -+ break; -+ }; -+ - - index = zt_get_index(ast, p, 1); - -@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data) - ast_setstate(chan, AST_STATE_RING); - chan->rings = 1; - p->ringt = p->ringt_base; -+ p->waitnorings = 0; - res = ast_pbx_run(chan); -+ -+ if(p->waitnorings) -+ { -+ p->ringt = p->ringt_base; -+ for(;;) -+ { -+ int i,j=0; -+ i = ZT_IOMUX_SIGEVENT | ZT_IOMUX_NOWAIT; -+ if (ioctl(p->subs[index].zfd, ZT_IOMUX, &i) == -1) -+ break; -+ -+ if (ioctl(p->subs[index].zfd, ZT_GETEVENT, &j) == -1) -+ break; -+ -+ if(j == ZT_EVENT_RINGOFFHOOK) -+ p->ringt = p->ringt_base; -+ -+ usleep(20000); -+ -+ if (p->ringt <= 0) -+ break; -+ -+ else if (p->ringt > 0) -+ p->ringt--; -+ } -+ p->ringt = 0; -+ p->waitnorings = 0; -+ } -+ - if (res) { - ast_hangup(chan); - ast_log(LOG_WARNING, "PBX exited non-zero\n"); -@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data) - i = iflist; - while(i) { - if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) { -- if (!i->owner && !i->subs[SUB_REAL].owner) { -+ if (!i->owner && !i->subs[SUB_REAL].owner && !i->waitnorings) { - /* This needs to be watched, as it lacks an owner */ - pfds[count].fd = i->subs[SUB_REAL].zfd; - pfds[count].events = POLLPRI; diff --git a/net/asterisk12/files/patch-channels::h323::ast_h323.cpp b/net/asterisk12/files/patch-channels::h323::ast_h323.cpp deleted file mode 100644 index feb79e586e91..000000000000 --- a/net/asterisk12/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig Thu Jan 12 18:16:08 2006 -+++ channels/h323/ast_h323.cpp Thu Jan 12 18:16:35 2006 -@@ -953,8 +953,8 @@ BOOL MyH323Connection::OnReceivedCapabil - H323Channel * MyH323Connection::CreateRealTimeLogicalChannel(const H323Capability & capability, - H323Channel::Directions dir, - unsigned sessionID, -- const H245_H2250LogicalChannelParameters * /*param*/, -- RTP_QOS * /*param*/ ) -+ const H245_H2250LogicalChannelParameters * /*param*/ /*, -+ RTP_QOS * */ /*param*/ ) - { - return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID); - } diff --git a/net/asterisk12/files/patch-channels::h323::ast_h323.h b/net/asterisk12/files/patch-channels::h323::ast_h323.h deleted file mode 100644 index 606bb0123173..000000000000 --- a/net/asterisk12/files/patch-channels::h323::ast_h323.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.h.orig Thu Jan 12 18:14:49 2006 -+++ channels/h323/ast_h323.h Thu Jan 12 18:15:02 2006 -@@ -155,8 +155,8 @@ class MyH323Connection : public H323Conn - H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, - H323Channel::Directions, - unsigned, -- const H245_H2250LogicalChannelParameters *, -- RTP_QOS *); -+ const H245_H2250LogicalChannelParameters * /* , -+ RTP_QOS * */); - H323Connection::AnswerCallResponse OnAnswerCall(const PString &, - const H323SignalPDU &, - H323SignalPDU &); diff --git a/net/asterisk12/files/patch-codecs::Makefile b/net/asterisk12/files/patch-codecs::Makefile deleted file mode 100644 index ab5cbc4aef2c..000000000000 --- a/net/asterisk12/files/patch-codecs::Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ codecs/Makefile Fri Jan 13 10:33:21 2006 -@@ -30,8 +30,8 @@ - - UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) - UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) --ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) --ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -+ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex.h) -+ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h) - ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so - LIBSPEEX+=-lspeex -lm -@@ -43,14 +43,14 @@ - endif - ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - -@@ -65,7 +65,7 @@ - LIBLPC10=lpc10/liblpc10.a - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -@@ -126,7 +126,7 @@ - endif - - install: all -- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk12/files/patch-codecs::gsm::Makefile b/net/asterisk12/files/patch-codecs::gsm::Makefile deleted file mode 100644 index 7256eeae5692..000000000000 --- a/net/asterisk12/files/patch-codecs::gsm::Makefile +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- codecs/gsm/Makefile.orig -+++ codecs/gsm/Makefile -@@ -49,7 +49,9 @@ - ifneq (${PROC},arm) - ifneq (${PROC},ppc) - ifneq (${PROC},ppc64) --OPTIMIZE+=-march=$(PROC) -+ifneq (${PROC},amd64) -+#OPTIMIZE+=-march=$(PROC) -+endif - endif - endif - endif diff --git a/net/asterisk12/files/patch-codecs::ilbc::Makefile b/net/asterisk12/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 26a2f20e5529..000000000000 --- a/net/asterisk12/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Fri Jan 13 11:01:07 2006 -+++ codecs/ilbc/Makefile Fri Jan 13 11:01:51 2006 -@@ -1,5 +1,5 @@ - ARCH=$(PROC) --CFLAGS+=-Wall -O3 -funroll-loops -+CFLAGS+=-Wall -funroll-loops - ifneq (${OSARCH},CYGWIN) - CFLAGS += -fPIC - endif diff --git a/net/asterisk12/files/patch-configs::musiconhold.conf.sample b/net/asterisk12/files/patch-configs::musiconhold.conf.sample deleted file mode 100644 index ff63cc9ff08b..000000000000 --- a/net/asterisk12/files/patch-configs::musiconhold.conf.sample +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- configs/musiconhold.conf.sample.orig Tue Nov 29 20:24:39 2005 -+++ configs/musiconhold.conf.sample Fri Jan 13 11:38:39 2006 -@@ -4,7 +4,7 @@ - - [default] - mode=quietmp3 --directory=/var/lib/asterisk/mohmp3 -+directory=/usr/local/share/asterisk/mohmp3 - - ; valid mode options: - ; quietmp3 -- default diff --git a/net/asterisk12/files/patch-db.c b/net/asterisk12/files/patch-db.c deleted file mode 100644 index ba7f3f206b78..000000000000 --- a/net/asterisk12/files/patch-db.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jan 13 11:05:32 2006 -+++ db.c Fri Jan 13 11:06:55 2006 -@@ -35,6 +35,7 @@ - #include <errno.h> - #include <unistd.h> - #include <dirent.h> -+#include <db.h> - - #include "asterisk.h" - -@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - #ifdef __CYGWIN__ - #define dbopen __dbopen diff --git a/net/asterisk12/files/patch-editline::configure b/net/asterisk12/files/patch-editline::configure deleted file mode 100644 index f6b9c5b76eee..000000000000 --- a/net/asterisk12/files/patch-editline::configure +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/configure.orig Sun Apr 27 21:13:11 2003 -+++ editline/configure Fri Jan 30 01:47:34 2004 -@@ -1906,7 +1906,7 @@ - CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG" - CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE" - else -- CFLAGS="$CFLAGS -O" -+ CFLAGS="$CFLAGS" - fi - - diff --git a/net/asterisk12/files/patch-editline::makelist b/net/asterisk12/files/patch-editline::makelist deleted file mode 100644 index cff9b3ae29e0..000000000000 --- a/net/asterisk12/files/patch-editline::makelist +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/makelist -+++ editline/makelist -@@ -145,7 +145,7 @@ - # - -fh) - cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ -- sort | tr '[a-z]' '[A-Z]' | $AWK ' -+ sort | tr '[:lower:]' '[:upper:]' | $AWK ' - BEGIN { - printf("/* Automatically generated file, do not edit */\n"); - printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n"); diff --git a/net/asterisk12/files/patch-formats::Makefile b/net/asterisk12/files/patch-formats::Makefile deleted file mode 100644 index b2b1db5a37bd..000000000000 --- a/net/asterisk12/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Fri Jan 13 11:16:07 2006 -+++ formats/Makefile Fri Jan 13 11:47:25 2006 -@@ -20,7 +20,7 @@ - # - # G723 simple frame is deprecated - # --FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - # - # OGG/Vorbis format -@@ -60,7 +60,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm - - install: all -- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk12/files/patch-formats::format_g723_1.c b/net/asterisk12/files/patch-formats::format_g723_1.c deleted file mode 100644 index ae814f197a1e..000000000000 --- a/net/asterisk12/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,354 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 13 12:18:51 2006 -+++ formats/format_g723_1.c Fri Jan 13 12:18:41 2006 -@@ -0,0 +1,348 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Save and read raw, headerless G723.1 Annex A data. -+ * -+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net> -+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/channel.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/sched.h> -+#include <asterisk/module.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <stdlib.h> -+#include <sys/time.h> -+#include <unistd.h> -+#include <errno.h> -+#include <string.h> -+#include <pthread.h> -+#ifdef __linux__ -+#include <endian.h> -+#else -+#include <machine/endian.h> -+#endif -+ -+/* Based on format_g729.c */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+struct ast_filestream { -+ void *reserved[AST_RESERVED_POINTERS]; -+ /* This is what a filestream means to us */ -+ FILE *f; /* Descriptor */ -+ struct ast_frame fr; /* Frame information */ -+ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ -+ char empty; /* Empty character */ -+ unsigned char g723[24]; /* One Real G723.1 Frame */ -+}; -+ -+static long g723_tell(struct ast_filestream *); -+ -+AST_MUTEX_DEFINE_STATIC(g723_lock); -+static int glistcnt = 0; -+ -+static char *name = "g723"; -+static char *desc = "Raw G723.1 Annex A data"; -+static char *exts = "g723"; -+ -+static int g723_len(unsigned char buf) -+{ -+ switch(buf & TYPE_MASK) { -+ case TYPE_DONTSEND: -+ return 2; -+ break; -+ case TYPE_SILENCE: -+ return 4; -+ break; -+ case TYPE_HIGH: -+ return 24; -+ break; -+ case TYPE_LOW: -+ return 20; -+ break; -+ default: -+ ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static struct ast_filestream *g723_open(FILE *f) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ tmp->fr.data = tmp->g723; -+ tmp->fr.frametype = AST_FRAME_VOICE; -+ tmp->fr.subclass = AST_FORMAT_G723_1; -+ /* datalen will vary for each frame */ -+ tmp->fr.src = name; -+ tmp->fr.mallocd = 0; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } -+ return tmp; -+} -+ -+static struct ast_filestream *g723_rewrite(FILE *f, const char *comment) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } else -+ ast_log(LOG_WARNING, "Out of memory\n"); -+ return tmp; -+} -+ -+static void g723_close(struct ast_filestream *s) -+{ -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return; -+ } -+ glistcnt--; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ fclose(s->f); -+ free(s); -+ s = NULL; -+} -+ -+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) -+{ -+ int res; -+ /* Send a frame from the file to the appropriate channel */ -+ s->fr.frametype = AST_FRAME_VOICE; -+ s->fr.subclass = AST_FORMAT_G723_1; -+ s->fr.offset = AST_FRIENDLY_OFFSET; -+ s->fr.samples = 240; -+ s->fr.mallocd = 0; -+ s->fr.data = s->g723; -+ if ((res = fread(s->g723, 1, 1, s->f)) != 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ s->fr.datalen = g723_len(s->g723[0]); -+ if (s->fr.datalen < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame!\n"); -+ return NULL; -+ } -+ if (s->fr.datalen > 1 && (res = fread(s->g723 + 1, 1, s->fr.datalen - 1, s->f)) != s->fr.datalen - 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ *whennext = s->fr.samples; -+ return &s->fr; -+} -+ -+static int g723_write(struct ast_filestream *fs, struct ast_frame *f) -+{ -+ int res; -+ unsigned char *cp; -+ if (f->frametype != AST_FRAME_VOICE) { -+ ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); -+ return -1; -+ } -+ if (f->subclass != AST_FORMAT_G723_1) { -+ ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass); -+ return -1; -+ } -+ for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) { -+ res = g723_len(cp[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n"); -+ return -1; -+ } -+ } -+ if (cp != (unsigned char *)f->data + f->datalen) { -+ ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen); -+ return -1; -+ } -+ if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen) { -+ ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno)); -+ return -1; -+ } -+ return 0; -+} -+ -+static char *g723_getcomment(struct ast_filestream *s) -+{ -+ return NULL; -+} -+ -+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence) -+{ -+ long cur, offset, max; -+ off_t coffset, moffset, soffset; -+ int res; -+ unsigned char c; -+ -+ offset = 0; /* Shut up gcc warning */ -+ if (whence == SEEK_SET) { -+ offset = sample_offset; -+ } else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) { -+ if ((cur = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get current position!\n"); -+ return -1; -+ } -+ offset = cur + sample_offset; -+ } -+ if (fseeko(fs->f, 0, SEEK_END) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ else { -+ moffset = ftello(fs->f); -+ } -+ if (whence == SEEK_END) { -+ if ((max = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get maximum position!\n"); -+ return -1; -+ } -+ offset = max - sample_offset; -+ } -+ if (offset < 0) -+ offset = 0; -+ soffset = -1; -+ for (coffset = 0; coffset < moffset && offset > 0; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset); -+ return -1; -+ } -+ soffset = coffset; -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ offset -= 240; -+ } -+ if (soffset != -1 && fseeko(fs->f, soffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int g723_trunc(struct ast_filestream *fs) -+{ -+ /* Truncate file to current length */ -+ if (ftruncate(fileno(fs->f), ftello(fs->f)) < 0) -+ return -1; -+ return 0; -+} -+ -+static long g723_tell(struct ast_filestream *fs) -+{ -+ off_t offset, coffset; -+ int res; -+ long rval; -+ unsigned char c; -+ -+ offset = ftello(fs->f); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset); -+ return -1; -+ } -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ rval += 240; -+ } -+ if (fseeko(fs->f, offset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset); -+ return -1; -+ } -+ return rval; -+} -+ -+int load_module() -+{ -+ return ast_format_register(name, exts, AST_FORMAT_G723_1, -+ g723_open, -+ g723_rewrite, -+ g723_write, -+ g723_seek, -+ g723_trunc, -+ g723_tell, -+ g723_read, -+ g723_close, -+ g723_getcomment); -+} -+ -+int unload_module() -+{ -+ return ast_format_unregister(name); -+} -+ -+int usecount() -+{ -+ int res; -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return -1; -+ } -+ res = glistcnt; -+ ast_mutex_unlock(&g723_lock); -+ return res; -+} -+ -+char *description() -+{ -+ return desc; -+} -+ -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk12/files/patch-formats::format_g729.c b/net/asterisk12/files/patch-formats::format_g729.c deleted file mode 100644 index 11be5281608f..000000000000 --- a/net/asterisk12/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Fri Jan 13 12:20:53 2006 -+++ formats/format_g729.c Fri Jan 13 12:23:33 2006 -@@ -60,7 +60,7 @@ struct ast_filestream { - struct ast_frame fr; /* Frame information */ - char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ - char empty; /* Empty character */ -- unsigned char g729[20]; /* Two Real G729 Frames */ -+ unsigned char g729[10]; /* One Real G729 Frame */ - }; - - -@@ -141,11 +141,11 @@ static struct ast_frame *g729_read(struc - s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_G729A; - s->fr.offset = AST_FRIENDLY_OFFSET; -- s->fr.samples = 160; -- s->fr.datalen = 20; -+ s->fr.samples = 80; -+ s->fr.datalen = 10; - s->fr.mallocd = 0; - s->fr.data = s->g729; -- if ((res = fread(s->g729, 1, 20, s->f)) != 20) { -+ if ((res = fread(s->g729, 1, 10, s->f)) != 10) { - if (res && (res != 10)) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -190,7 +190,7 @@ static int g729_seek(struct ast_filestre - fseek(fs->f, 0, SEEK_END); - max = ftell(fs->f); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -219,7 +219,7 @@ static long g729_tell(struct ast_filestr - { - off_t offset; - offset = ftell(fs->f); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() diff --git a/net/asterisk12/files/patch-frame.c b/net/asterisk12/files/patch-frame.c deleted file mode 100644 index 753253c7af0d..000000000000 --- a/net/asterisk12/files/patch-frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- frame.c.orig Wed Jan 25 13:22:43 2006 -+++ frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk12/files/patch-funcs::Makefile b/net/asterisk12/files/patch-funcs::Makefile deleted file mode 100644 index a14daeed285c..000000000000 --- a/net/asterisk12/files/patch-funcs::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- funcs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ funcs/Makefile Fri Jan 13 12:36:57 2006 -@@ -67,7 +67,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} - - install: all -- for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FUNCS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk12/files/patch-include::asterisk::utils.h b/net/asterisk12/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk12/files/patch-include::asterisk::utils.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/utils.h 2004/10/10 12:55:50 1.1 -+++ include/asterisk/utils.h 2004/10/10 12:56:43 -@@ -37,7 +37,6 @@ - #ifdef inet_ntoa - #undef inet_ntoa - #endif --#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ - - #ifdef LINUX - #define ast_pthread_create pthread_create diff --git a/net/asterisk12/files/patch-pbx::Makefile b/net/asterisk12/files/patch-pbx::Makefile deleted file mode 100644 index 97d03e10f871..000000000000 --- a/net/asterisk12/files/patch-pbx::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig -+++ pbx/Makefile -@@ -23,8 +23,8 @@ - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - --GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` --GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` -+#GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` -+#GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` - MOC=$(QTDIR)/bin/moc - KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include - KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui -@@ -72,7 +72,7 @@ - endif - - install: all -- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk12/files/patch-res::Makefile b/net/asterisk12/files/patch-res::Makefile deleted file mode 100644 index de5c365db34d..000000000000 --- a/net/asterisk12/files/patch-res::Makefile +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile -+++ res/Makefile -@@ -37,8 +37,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifeq (${OSARCH},CYGWIN) -@@ -55,9 +55,7 @@ - CFLAGS+= - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) - CFLAGS+=-DZAPATA_MOH --endif - endif # WITHOUT_ZAPTEL - - # -@@ -75,7 +73,7 @@ - rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h - rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so - rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \ - if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \ - echo "*************************************************************";\ diff --git a/net/asterisk12/files/patch-rtp.c b/net/asterisk12/files/patch-rtp.c deleted file mode 100644 index bbc2649929f9..000000000000 --- a/net/asterisk12/files/patch-rtp.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Fri Jan 13 13:38:01 2006 -+++ rtp.c Fri Jan 13 13:40:50 2006 -@@ -950,8 +950,10 @@ struct ast_rtp *ast_rtp_new_with_bindadd - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; - /* If there's rtcp, initialize it as well. */ -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - /* Try to bind it/them. */ - if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && - (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) diff --git a/net/asterisk12/files/patch-utils::Makefile b/net/asterisk12/files/patch-utils::Makefile deleted file mode 100644 index f3164c0f478a..000000000000 --- a/net/asterisk12/files/patch-utils::Makefile +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- utils/Makefile -+++ utils/Makefile -@@ -17,16 +17,16 @@ - CFLAGS+=-DNO_AST_MM - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - TARGET=stereorize streamplayer - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/popt.h),) - TARGET+=smsq - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/newt.h),) - TARGET+=astman - endif - -@@ -40,7 +40,7 @@ - install: - for x in $(TARGET); do \ - if [ "$$x" != "none" ]; then \ -- $(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ - fi; \ - done - diff --git a/net/asterisk12/pkg-descr b/net/asterisk12/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk12/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Asterisk is an Open Source PBX and telephony toolkit. It is, in a -sense, middleware between Internet and telephony channels on the bottom, -and Internet and telephony applications at the top. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk12/pkg-plist b/net/asterisk12/pkg-plist deleted file mode 100644 index 3af861f7a135..000000000000 --- a/net/asterisk12/pkg-plist +++ /dev/null @@ -1,755 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi -etc/asterisk/adsi.conf-dist -@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf -@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi -etc/asterisk/adtranvofr.conf-dist -@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf -@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi -etc/asterisk/agents.conf-dist -@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf -@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi -etc/asterisk/alarmreceiver.conf-dist -@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf -@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi -etc/asterisk/alsa.conf-dist -@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf -@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi -etc/asterisk/asterisk.adsi-dist -@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi -@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi -etc/asterisk/asterisk.conf-dist -@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf -@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi -etc/asterisk/cdr.conf-dist -@exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf -@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi -etc/asterisk/cdr_custom.conf-dist -@exec [ -f %B/cdr_custom.conf ] || cp %B/%f %B/cdr_custom.conf -@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi -etc/asterisk/cdr_manager.conf-dist -@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf -@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi -etc/asterisk/cdr_odbc.conf-dist -@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf -@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi -etc/asterisk/cdr_pgsql.conf-dist -@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf -@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi -etc/asterisk/cdr_tds.conf-dist -@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf -@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi -etc/asterisk/codecs.conf-dist -@exec [ -f %B/codecs.conf ] || cp %B/%f %B/codecs.conf -@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi -etc/asterisk/dnsmgr.conf-dist -@exec [ -f %B/dnsmgr.conf ] || cp %B/%f %B/dmsmgr.conf -@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi -etc/asterisk/dundi.conf-dist -@exec [ -f %B/dundi.conf ] || cp %B/%f %B/dundi.conf -@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi -etc/asterisk/enum.conf-dist -@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael -@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi -etc/asterisk/extconfig.conf-dist -@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf -@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi -etc/asterisk/extensions.conf-dist -@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf -@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi -etc/asterisk/features.conf-dist -@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf -@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi -etc/asterisk/festival.conf-dist -@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf -@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi -etc/asterisk/iax.conf-dist -@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf -@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi -etc/asterisk/iaxprov.conf-dist -@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf -@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi -etc/asterisk/indications.conf-dist -@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf -@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi -etc/asterisk/logger.conf-dist -@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf -@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi -etc/asterisk/manager.conf-dist -@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf -@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi -etc/asterisk/meetme.conf-dist -@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf -@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi -etc/asterisk/mgcp.conf-dist -@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf -@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi -etc/asterisk/misdn.conf-dist -@exec [ -f %B/misdn.conf ] || cp %B/%f %B/misdn.conf -@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi -etc/asterisk/modem.conf-dist -@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf -@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi -etc/asterisk/modules.conf-dist -@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf -@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi -etc/asterisk/musiconhold.conf-dist -@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf -@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi -etc/asterisk/osp.conf-dist -@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf -@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi -etc/asterisk/oss.conf-dist -@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf -@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi -etc/asterisk/phone.conf-dist -@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf -@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi -etc/asterisk/privacy.conf-dist -@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf -@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi -etc/asterisk/queues.conf-dist -@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf -@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi -etc/asterisk/res_odbc.conf-dist -@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist -@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf -@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi -etc/asterisk/rtp.conf-dist -@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf -@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi -etc/asterisk/sip.conf-dist -@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf -@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi -etc/asterisk/sip_notify.conf-dist -@exec [ -f %B/sip_notify.conf ] || cp %B/%f %B/sip_notify.conf -@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi -etc/asterisk/skinny.conf-dist -@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf -@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi -etc/asterisk/telcordia-1.adsi-dist -@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi -@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi -etc/asterisk/voicemail.conf-dist -@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf -@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi -etc/asterisk/vpb.conf-dist -@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf -@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi -etc/asterisk/zapata.conf-dist -@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/aes.h -include/asterisk/agi.h -include/asterisk/alaw.h -include/asterisk/app.h -include/asterisk/ast_expr.h -include/asterisk/astdb.h -include/asterisk/astmm.h -include/asterisk/astobj.h -include/asterisk/astosp.h -include/asterisk/build.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/chanspy.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/compat.h -include/asterisk/config.h -include/asterisk/compiler.h -include/asterisk/crypto.h -include/asterisk/devicestate.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dnsmgr.h -include/asterisk/doxyref.h -include/asterisk/dsp.h -include/asterisk/dundi.h -include/asterisk/enum.h -include/asterisk/endian.h -include/asterisk/features.h -include/asterisk/file.h -include/asterisk/frame.h -include/asterisk/fskmodem.h -include/asterisk/image.h -include/asterisk/indications.h -include/asterisk/inline_api.h -include/asterisk/io.h -include/asterisk/linkedlists.h -include/asterisk/localtime.h -include/asterisk/lock.h -include/asterisk/logger.h -include/asterisk/manager.h -include/asterisk/md5.h -include/asterisk/module.h -include/asterisk/monitor.h -include/asterisk/musiconhold.h -include/asterisk/netsock.h -include/asterisk/options.h -include/asterisk/pbx.h -include/asterisk/plc.h -include/asterisk/poll-compat.h -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/rtp.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/slinfactory.h -include/asterisk/srv.h -include/asterisk/strings.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/time.h -include/asterisk/transcap.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/unaligned.h -include/asterisk/utils.h -include/asterisk/version.h -include/asterisk/vmodem.h -lib/asterisk/modules/app_adsiprog.so -lib/asterisk/modules/app_alarmreceiver.so -lib/asterisk/modules/app_authenticate.so -lib/asterisk/modules/app_cdr.so -lib/asterisk/modules/app_chanisavail.so -lib/asterisk/modules/app_chanspy.so -lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_curl.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_dictate.so -lib/asterisk/modules/app_directed_pickup.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.so -lib/asterisk/modules/app_dumpchan.so -lib/asterisk/modules/app_echo.so -lib/asterisk/modules/app_enumlookup.so -lib/asterisk/modules/app_eval.so -lib/asterisk/modules/app_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_groupcount.so -lib/asterisk/modules/app_hasnewvoicemail.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_math.so -lib/asterisk/modules/app_md5.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mixmonitor.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_realtime.so -lib/asterisk/modules/app_record.so -%%WITH_FAX%%lib/asterisk/modules/app_rxfax.so -lib/asterisk/modules/app_sayunixtime.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.so -lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_setcidname.so -lib/asterisk/modules/app_setcidnum.so -lib/asterisk/modules/app_setrdnis.so -lib/asterisk/modules/app_settransfercapability.so -lib/asterisk/modules/app_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_stack.so -lib/asterisk/modules/app_system.so -lib/asterisk/modules/app_talkdetect.so -lib/asterisk/modules/app_test.so -lib/asterisk/modules/app_transfer.so -%%WITH_FAX%%lib/asterisk/modules/app_txfax.so -lib/asterisk/modules/app_txtcidname.so -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -lib/asterisk/modules/app_voicemail.so -lib/asterisk/modules/app_waitforring.so -lib/asterisk/modules/app_waitforsilence.so -lib/asterisk/modules/app_while.so -lib/asterisk/modules/app_zapateller.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapbarge.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapras.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so -lib/asterisk/modules/chan_agent.so -lib/asterisk/modules/chan_features.so -%%WITH_H323%%lib/asterisk/modules/chan_h323.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -%%WITH_ZAPTEL%%lib/asterisk/modules/chan_zap.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_gsm.so -lib/asterisk/modules/codec_ilbc.so -lib/asterisk/modules/codec_lpc10.so -lib/asterisk/modules/codec_speex.so -lib/asterisk/modules/codec_ulaw.so -lib/asterisk/modules/format_au.so -lib/asterisk/modules/format_g723_1.so -lib/asterisk/modules/format_g726.so -lib/asterisk/modules/format_g729.so -lib/asterisk/modules/format_gsm.so -lib/asterisk/modules/format_h263.so -lib/asterisk/modules/format_ilbc.so -lib/asterisk/modules/format_jpeg.so -lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_pcm_alaw.so -lib/asterisk/modules/format_sln.so -lib/asterisk/modules/format_vox.so -lib/asterisk/modules/format_wav.so -lib/asterisk/modules/format_wav_gsm.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_enum.so -lib/asterisk/modules/func_uri.so -lib/asterisk/modules/pbx_ael.so -lib/asterisk/modules/pbx_config.so -lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_functions.so -lib/asterisk/modules/pbx_loopback.so -lib/asterisk/modules/pbx_realtime.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.so -%%NEWGCC%%lib/asterisk/modules/res_config_odbc.so -lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_features.so -lib/asterisk/modules/res_indications.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so -lib/asterisk/modules/res_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/autosupport -sbin/rasterisk -sbin/safe_asterisk -sbin/smsq -sbin/stereorize -sbin/streamplayer -%%DATADIR%%/agi-bin/agi-test.agi -%%DATADIR%%/agi-bin/eagi-sphinx-test -%%DATADIR%%/agi-bin/eagi-test -%%DATADIR%%/firmware/iax/iaxy.bin -%%DATADIR%%/images/asterisk-intro.jpg -%%DATADIR%%/keys/freeworlddialup.pub -%%DATADIR%%/keys/iaxtel.pub -%%DATADIR%%/mohmp3/fpm-calm-river.mp3 -%%DATADIR%%/mohmp3/fpm-sunshine.mp3 -%%DATADIR%%/mohmp3/fpm-world-mix.mp3 -%%DATADIR%%/sounds/agent-alreadyon.gsm -%%DATADIR%%/sounds/agent-incorrect.gsm -%%DATADIR%%/sounds/agent-loggedoff.gsm -%%DATADIR%%/sounds/agent-loginok.gsm -%%DATADIR%%/sounds/agent-newlocation.gsm -%%DATADIR%%/sounds/agent-pass.gsm -%%DATADIR%%/sounds/agent-user.gsm -%%DATADIR%%/sounds/auth-incorrect.gsm -%%DATADIR%%/sounds/auth-thankyou.gsm -%%DATADIR%%/sounds/beep.gsm -%%DATADIR%%/sounds/beeperr.gsm -%%DATADIR%%/sounds/conf-adminmenu.gsm -%%DATADIR%%/sounds/conf-enteringno.gsm -%%DATADIR%%/sounds/conf-errormenu.gsm -%%DATADIR%%/sounds/conf-getchannel.gsm -%%DATADIR%%/sounds/conf-getconfno.gsm -%%DATADIR%%/sounds/conf-getpin.gsm -%%DATADIR%%/sounds/conf-hasjoin.gsm -%%DATADIR%%/sounds/conf-hasleft.gsm -%%DATADIR%%/sounds/conf-invalid.gsm -%%DATADIR%%/sounds/conf-invalidpin.gsm -%%DATADIR%%/sounds/conf-kicked.gsm -%%DATADIR%%/sounds/conf-leaderhasleft.gsm -%%DATADIR%%/sounds/conf-locked.gsm -%%DATADIR%%/sounds/conf-lockednow.gsm -%%DATADIR%%/sounds/conf-muted.gsm -%%DATADIR%%/sounds/conf-noempty.gsm -%%DATADIR%%/sounds/conf-onlyone.gsm -%%DATADIR%%/sounds/conf-onlyperson.gsm -%%DATADIR%%/sounds/conf-otherinparty.gsm -%%DATADIR%%/sounds/conf-placeintoconf.gsm -%%DATADIR%%/sounds/conf-thereare.gsm -%%DATADIR%%/sounds/conf-unlockednow.gsm -%%DATADIR%%/sounds/conf-unmuted.gsm -%%DATADIR%%/sounds/conf-usermenu.gsm -%%DATADIR%%/sounds/conf-userswilljoin.gsm -%%DATADIR%%/sounds/conf-userwilljoin.gsm -%%DATADIR%%/sounds/conf-waitforleader.gsm -%%DATADIR%%/sounds/demo-abouttotry.gsm -%%DATADIR%%/sounds/demo-congrats.gsm -%%DATADIR%%/sounds/demo-echodone.gsm -%%DATADIR%%/sounds/demo-echotest.gsm -%%DATADIR%%/sounds/demo-enterkeywords.gsm -%%DATADIR%%/sounds/demo-instruct.gsm -%%DATADIR%%/sounds/demo-moreinfo.gsm -%%DATADIR%%/sounds/demo-nogo.gsm -%%DATADIR%%/sounds/demo-nomatch.gsm -%%DATADIR%%/sounds/demo-thanks.gsm -%%DATADIR%%/sounds/dictate/both_help.gsm -%%DATADIR%%/sounds/dictate/enter_filename.gsm -%%DATADIR%%/sounds/dictate/forhelp.gsm -%%DATADIR%%/sounds/dictate/pause.gsm -%%DATADIR%%/sounds/dictate/paused.gsm -%%DATADIR%%/sounds/dictate/play_help.gsm -%%DATADIR%%/sounds/dictate/playback.gsm -%%DATADIR%%/sounds/dictate/playback_mode.gsm -%%DATADIR%%/sounds/dictate/record.gsm -%%DATADIR%%/sounds/dictate/record_help.gsm -%%DATADIR%%/sounds/dictate/record_mode.gsm -%%DATADIR%%/sounds/dictate/truncating_audio.gsm -%%DATADIR%%/sounds/digits/0.gsm -%%DATADIR%%/sounds/digits/1.gsm -%%DATADIR%%/sounds/digits/10.gsm -%%DATADIR%%/sounds/digits/11.gsm -%%DATADIR%%/sounds/digits/12.gsm -%%DATADIR%%/sounds/digits/13.gsm -%%DATADIR%%/sounds/digits/14.gsm -%%DATADIR%%/sounds/digits/15.gsm -%%DATADIR%%/sounds/digits/16.gsm -%%DATADIR%%/sounds/digits/17.gsm -%%DATADIR%%/sounds/digits/18.gsm -%%DATADIR%%/sounds/digits/19.gsm -%%DATADIR%%/sounds/digits/2.gsm -%%DATADIR%%/sounds/digits/20.gsm -%%DATADIR%%/sounds/digits/3.gsm -%%DATADIR%%/sounds/digits/30.gsm -%%DATADIR%%/sounds/digits/4.gsm -%%DATADIR%%/sounds/digits/40.gsm -%%DATADIR%%/sounds/digits/5.gsm -%%DATADIR%%/sounds/digits/50.gsm -%%DATADIR%%/sounds/digits/6.gsm -%%DATADIR%%/sounds/digits/60.gsm -%%DATADIR%%/sounds/digits/7.gsm -%%DATADIR%%/sounds/digits/70.gsm -%%DATADIR%%/sounds/digits/8.gsm -%%DATADIR%%/sounds/digits/80.gsm -%%DATADIR%%/sounds/digits/9.gsm -%%DATADIR%%/sounds/digits/90.gsm -%%DATADIR%%/sounds/digits/a-m.gsm -%%DATADIR%%/sounds/digits/at.gsm -%%DATADIR%%/sounds/digits/day-0.gsm -%%DATADIR%%/sounds/digits/day-1.gsm -%%DATADIR%%/sounds/digits/day-2.gsm -%%DATADIR%%/sounds/digits/day-3.gsm -%%DATADIR%%/sounds/digits/day-4.gsm -%%DATADIR%%/sounds/digits/day-5.gsm -%%DATADIR%%/sounds/digits/day-6.gsm -%%DATADIR%%/sounds/digits/dollars.gsm -%%DATADIR%%/sounds/digits/h-1.gsm -%%DATADIR%%/sounds/digits/h-10.gsm -%%DATADIR%%/sounds/digits/h-11.gsm -%%DATADIR%%/sounds/digits/h-12.gsm -%%DATADIR%%/sounds/digits/h-13.gsm -%%DATADIR%%/sounds/digits/h-14.gsm -%%DATADIR%%/sounds/digits/h-15.gsm -%%DATADIR%%/sounds/digits/h-16.gsm -%%DATADIR%%/sounds/digits/h-17.gsm -%%DATADIR%%/sounds/digits/h-18.gsm -%%DATADIR%%/sounds/digits/h-19.gsm -%%DATADIR%%/sounds/digits/h-2.gsm -%%DATADIR%%/sounds/digits/h-20.gsm -%%DATADIR%%/sounds/digits/h-3.gsm -%%DATADIR%%/sounds/digits/h-30.gsm -%%DATADIR%%/sounds/digits/h-4.gsm -%%DATADIR%%/sounds/digits/h-5.gsm -%%DATADIR%%/sounds/digits/h-6.gsm -%%DATADIR%%/sounds/digits/h-7.gsm -%%DATADIR%%/sounds/digits/h-8.gsm -%%DATADIR%%/sounds/digits/h-9.gsm -%%DATADIR%%/sounds/digits/hundred.gsm -%%DATADIR%%/sounds/digits/million.gsm -%%DATADIR%%/sounds/digits/minus.gsm -%%DATADIR%%/sounds/digits/mon-0.gsm -%%DATADIR%%/sounds/digits/mon-1.gsm -%%DATADIR%%/sounds/digits/mon-10.gsm -%%DATADIR%%/sounds/digits/mon-11.gsm -%%DATADIR%%/sounds/digits/mon-2.gsm -%%DATADIR%%/sounds/digits/mon-3.gsm -%%DATADIR%%/sounds/digits/mon-4.gsm -%%DATADIR%%/sounds/digits/mon-5.gsm -%%DATADIR%%/sounds/digits/mon-6.gsm -%%DATADIR%%/sounds/digits/mon-7.gsm -%%DATADIR%%/sounds/digits/mon-8.gsm -%%DATADIR%%/sounds/digits/mon-9.gsm -%%DATADIR%%/sounds/digits/oclock.gsm -%%DATADIR%%/sounds/digits/oh.gsm -%%DATADIR%%/sounds/digits/p-m.gsm -%%DATADIR%%/sounds/digits/pound.gsm -%%DATADIR%%/sounds/digits/star.gsm -%%DATADIR%%/sounds/digits/thousand.gsm -%%DATADIR%%/sounds/digits/today.gsm -%%DATADIR%%/sounds/digits/tomorrow.gsm -%%DATADIR%%/sounds/digits/yesterday.gsm -%%DATADIR%%/sounds/dir-instr.gsm -%%DATADIR%%/sounds/dir-intro-fn.gsm -%%DATADIR%%/sounds/dir-intro.gsm -%%DATADIR%%/sounds/dir-nomatch.gsm -%%DATADIR%%/sounds/dir-nomore.gsm -%%DATADIR%%/sounds/hello-world.gsm -%%DATADIR%%/sounds/invalid.gsm -%%DATADIR%%/sounds/letters/a.gsm -%%DATADIR%%/sounds/letters/at.gsm -%%DATADIR%%/sounds/letters/b.gsm -%%DATADIR%%/sounds/letters/c.gsm -%%DATADIR%%/sounds/letters/d.gsm -%%DATADIR%%/sounds/letters/dash.gsm -%%DATADIR%%/sounds/letters/dollar.gsm -%%DATADIR%%/sounds/letters/dot.gsm -%%DATADIR%%/sounds/letters/e.gsm -%%DATADIR%%/sounds/letters/equals.gsm -%%DATADIR%%/sounds/letters/exclaimation-point.gsm -%%DATADIR%%/sounds/letters/f.gsm -%%DATADIR%%/sounds/letters/g.gsm -%%DATADIR%%/sounds/letters/h.gsm -%%DATADIR%%/sounds/letters/i.gsm -%%DATADIR%%/sounds/letters/j.gsm -%%DATADIR%%/sounds/letters/k.gsm -%%DATADIR%%/sounds/letters/l.gsm -%%DATADIR%%/sounds/letters/m.gsm -%%DATADIR%%/sounds/letters/n.gsm -%%DATADIR%%/sounds/letters/o.gsm -%%DATADIR%%/sounds/letters/p.gsm -%%DATADIR%%/sounds/letters/plus.gsm -%%DATADIR%%/sounds/letters/q.gsm -%%DATADIR%%/sounds/letters/r.gsm -%%DATADIR%%/sounds/letters/s.gsm -%%DATADIR%%/sounds/letters/slash.gsm -%%DATADIR%%/sounds/letters/space.gsm -%%DATADIR%%/sounds/letters/t.gsm -%%DATADIR%%/sounds/letters/u.gsm -%%DATADIR%%/sounds/letters/v.gsm -%%DATADIR%%/sounds/letters/w.gsm -%%DATADIR%%/sounds/letters/x.gsm -%%DATADIR%%/sounds/letters/y.gsm -%%DATADIR%%/sounds/letters/z.gsm -%%DATADIR%%/sounds/letters/zed.gsm -%%DATADIR%%/sounds/pbx-invalid.gsm -%%DATADIR%%/sounds/pbx-invalidpark.gsm -%%DATADIR%%/sounds/pbx-transfer.gsm -%%DATADIR%%/sounds/phonetic/9_p.gsm -%%DATADIR%%/sounds/phonetic/a_p.gsm -%%DATADIR%%/sounds/phonetic/b_p.gsm -%%DATADIR%%/sounds/phonetic/c_p.gsm -%%DATADIR%%/sounds/phonetic/d_p.gsm -%%DATADIR%%/sounds/phonetic/e_p.gsm -%%DATADIR%%/sounds/phonetic/f_p.gsm -%%DATADIR%%/sounds/phonetic/g_p.gsm -%%DATADIR%%/sounds/phonetic/h_p.gsm -%%DATADIR%%/sounds/phonetic/i_p.gsm -%%DATADIR%%/sounds/phonetic/j_p.gsm -%%DATADIR%%/sounds/phonetic/k_p.gsm -%%DATADIR%%/sounds/phonetic/l_p.gsm -%%DATADIR%%/sounds/phonetic/m_p.gsm -%%DATADIR%%/sounds/phonetic/n_p.gsm -%%DATADIR%%/sounds/phonetic/o_p.gsm -%%DATADIR%%/sounds/phonetic/p_p.gsm -%%DATADIR%%/sounds/phonetic/q_p.gsm -%%DATADIR%%/sounds/phonetic/r_p.gsm -%%DATADIR%%/sounds/phonetic/s_p.gsm -%%DATADIR%%/sounds/phonetic/t_p.gsm -%%DATADIR%%/sounds/phonetic/u_p.gsm -%%DATADIR%%/sounds/phonetic/v_p.gsm -%%DATADIR%%/sounds/phonetic/w_p.gsm -%%DATADIR%%/sounds/phonetic/x_p.gsm -%%DATADIR%%/sounds/phonetic/y_p.gsm -%%DATADIR%%/sounds/phonetic/z_p.gsm -%%DATADIR%%/sounds/priv-callee-options.gsm -%%DATADIR%%/sounds/priv-callpending.gsm -%%DATADIR%%/sounds/priv-introsaved.gsm -%%DATADIR%%/sounds/priv-recordintro.gsm -%%DATADIR%%/sounds/privacy-incorrect.gsm -%%DATADIR%%/sounds/privacy-prompt.gsm -%%DATADIR%%/sounds/privacy-thankyou.gsm -%%DATADIR%%/sounds/privacy-unident.gsm -%%DATADIR%%/sounds/queue-callswaiting.gsm -%%DATADIR%%/sounds/queue-holdtime.gsm -%%DATADIR%%/sounds/queue-less-than.gsm -%%DATADIR%%/sounds/queue-minutes.gsm -%%DATADIR%%/sounds/queue-periodic-announce.gsm -%%DATADIR%%/sounds/queue-reporthold.gsm -%%DATADIR%%/sounds/queue-seconds.gsm -%%DATADIR%%/sounds/queue-thankyou.gsm -%%DATADIR%%/sounds/queue-thereare.gsm -%%DATADIR%%/sounds/queue-youarenext.gsm -%%DATADIR%%/sounds/screen-callee-options.gsm -%%DATADIR%%/sounds/spy-agent.gsm -%%DATADIR%%/sounds/spy-h323.gsm -%%DATADIR%%/sounds/spy-iax.gsm -%%DATADIR%%/sounds/spy-iax2.gsm -%%DATADIR%%/sounds/spy-mgcp.gsm -%%DATADIR%%/sounds/spy-sip.gsm -%%DATADIR%%/sounds/spy-skinny.gsm -%%DATADIR%%/sounds/spy-zap.gsm -%%DATADIR%%/sounds/ss-noservice.gsm -%%DATADIR%%/sounds/transfer.gsm -%%DATADIR%%/sounds/tt-allbusy.gsm -%%DATADIR%%/sounds/tt-monkeys.gsm -%%DATADIR%%/sounds/tt-monkeysintro.gsm -%%DATADIR%%/sounds/tt-somethingwrong.gsm -%%DATADIR%%/sounds/tt-weasels.gsm -%%DATADIR%%/sounds/vm-Cust1.gsm -%%DATADIR%%/sounds/vm-Cust2.gsm -%%DATADIR%%/sounds/vm-Cust3.gsm -%%DATADIR%%/sounds/vm-Cust4.gsm -%%DATADIR%%/sounds/vm-Cust5.gsm -%%DATADIR%%/sounds/vm-Family.gsm -%%DATADIR%%/sounds/vm-Friends.gsm -%%DATADIR%%/sounds/vm-INBOX.gsm -%%DATADIR%%/sounds/vm-Old.gsm -%%DATADIR%%/sounds/vm-Work.gsm -%%DATADIR%%/sounds/vm-advopts.gsm -%%DATADIR%%/sounds/vm-and.gsm -%%DATADIR%%/sounds/vm-calldiffnum.gsm -%%DATADIR%%/sounds/vm-changeto.gsm -%%DATADIR%%/sounds/vm-delete.gsm -%%DATADIR%%/sounds/vm-deleted.gsm -%%DATADIR%%/sounds/vm-dialout.gsm -%%DATADIR%%/sounds/vm-enter-num-to-call.gsm -%%DATADIR%%/sounds/vm-extension.gsm -%%DATADIR%%/sounds/vm-first.gsm -%%DATADIR%%/sounds/vm-for.gsm -%%DATADIR%%/sounds/vm-forward.gsm -%%DATADIR%%/sounds/vm-forwardoptions.gsm -%%DATADIR%%/sounds/vm-from-extension.gsm -%%DATADIR%%/sounds/vm-from-phonenumber.gsm -%%DATADIR%%/sounds/vm-from.gsm -%%DATADIR%%/sounds/vm-goodbye.gsm -%%DATADIR%%/sounds/vm-helpexit.gsm -%%DATADIR%%/sounds/vm-incorrect-mailbox.gsm -%%DATADIR%%/sounds/vm-incorrect.gsm -%%DATADIR%%/sounds/vm-instructions.gsm -%%DATADIR%%/sounds/vm-intro.gsm -%%DATADIR%%/sounds/vm-isonphone.gsm -%%DATADIR%%/sounds/vm-isunavail.gsm -%%DATADIR%%/sounds/vm-last.gsm -%%DATADIR%%/sounds/vm-leavemsg.gsm -%%DATADIR%%/sounds/vm-login.gsm -%%DATADIR%%/sounds/vm-mailboxfull.gsm -%%DATADIR%%/sounds/vm-message.gsm -%%DATADIR%%/sounds/vm-messages.gsm -%%DATADIR%%/sounds/vm-minutes.gsm -%%DATADIR%%/sounds/vm-mismatch.gsm -%%DATADIR%%/sounds/vm-msginstruct.gsm -%%DATADIR%%/sounds/vm-msgsaved.gsm -%%DATADIR%%/sounds/vm-newpassword.gsm -%%DATADIR%%/sounds/vm-newuser.gsm -%%DATADIR%%/sounds/vm-next.gsm -%%DATADIR%%/sounds/vm-no.gsm -%%DATADIR%%/sounds/vm-nobodyavail.gsm -%%DATADIR%%/sounds/vm-nobox.gsm -%%DATADIR%%/sounds/vm-nomore.gsm -%%DATADIR%%/sounds/vm-nonumber.gsm -%%DATADIR%%/sounds/vm-num-i-have.gsm -%%DATADIR%%/sounds/vm-onefor.gsm -%%DATADIR%%/sounds/vm-options.gsm -%%DATADIR%%/sounds/vm-opts.gsm -%%DATADIR%%/sounds/vm-passchanged.gsm -%%DATADIR%%/sounds/vm-password.gsm -%%DATADIR%%/sounds/vm-press.gsm -%%DATADIR%%/sounds/vm-prev.gsm -%%DATADIR%%/sounds/vm-reachoper.gsm -%%DATADIR%%/sounds/vm-rec-busy.gsm -%%DATADIR%%/sounds/vm-rec-name.gsm -%%DATADIR%%/sounds/vm-rec-temp.gsm -%%DATADIR%%/sounds/vm-rec-unv.gsm -%%DATADIR%%/sounds/vm-received.gsm -%%DATADIR%%/sounds/vm-reenterpassword.gsm -%%DATADIR%%/sounds/vm-repeat.gsm -%%DATADIR%%/sounds/vm-review.gsm -%%DATADIR%%/sounds/vm-saved.gsm -%%DATADIR%%/sounds/vm-savedto.gsm -%%DATADIR%%/sounds/vm-savefolder.gsm -%%DATADIR%%/sounds/vm-savemessage.gsm -%%DATADIR%%/sounds/vm-saveoper.gsm -%%DATADIR%%/sounds/vm-sorry.gsm -%%DATADIR%%/sounds/vm-star-cancel.gsm -%%DATADIR%%/sounds/vm-starmain.gsm -%%DATADIR%%/sounds/vm-tempgreeting.gsm -%%DATADIR%%/sounds/vm-tempgreeting2.gsm -%%DATADIR%%/sounds/vm-tempremoved.gsm -%%DATADIR%%/sounds/vm-then-pound.gsm -%%DATADIR%%/sounds/vm-theperson.gsm -%%DATADIR%%/sounds/vm-tocallback.gsm -%%DATADIR%%/sounds/vm-tocallnum.gsm -%%DATADIR%%/sounds/vm-tocancel.gsm -%%DATADIR%%/sounds/vm-tocancelmsg.gsm -%%DATADIR%%/sounds/vm-toenternumber.gsm -%%DATADIR%%/sounds/vm-toforward.gsm -%%DATADIR%%/sounds/vm-tohearenv.gsm -%%DATADIR%%/sounds/vm-tomakecall.gsm -%%DATADIR%%/sounds/vm-tooshort.gsm -%%DATADIR%%/sounds/vm-toreply.gsm -%%DATADIR%%/sounds/vm-torerecord.gsm -%%DATADIR%%/sounds/vm-undelete.gsm -%%DATADIR%%/sounds/vm-undeleted.gsm -%%DATADIR%%/sounds/vm-unknown-caller.gsm -%%DATADIR%%/sounds/vm-whichbox.gsm -%%DATADIR%%/sounds/vm-youhave.gsm -%%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate -@dirrm %%DATADIR%%/sounds/phonetic -@dirrm %%DATADIR%%/sounds/letters -@dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/mohmp3 -@dirrm %%DATADIR%%/keys -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/firmware/iax -@dirrm %%DATADIR%%/firmware -@dirrm %%DATADIR%%/agi-bin -@dirrm %%DATADIR%% -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/%%DATADIR%%/astdb -@cwd /var -spool/asterisk/voicemail/default/1234/busy.gsm -spool/asterisk/voicemail/default/1234/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/voicemail/default/1234 -@dirrm spool/asterisk/voicemail/default -@dirrm spool/asterisk/voicemail -@dirrm spool/asterisk/tmp -@dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile deleted file mode 100644 index 10d4cd2b786f..000000000000 --- a/net/asterisk14/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.2.4 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ - http://ftp.digium.com/pub/asterisk/old-releases/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= An Open Source PBX and telephony toolkit - -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - -BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ - newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 sparc64 amd64 - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= asterisk.sh -USE_REINPLACE= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${PWLIBDIR} \ - OPENH323DIR=${OPENH323DIR} \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 - -.include <bsd.port.pre.mk> - -PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC -OPENH323DIR!= cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC - -.if ${ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build -PLIST_SUB+= WITH_H323="" -MAKE_ENV+= WITH_H323=1 -.endif - -.if defined(WITHOUT_ZAPTEL) -PLIST_SUB+= WITH_ZAPTEL="@comment " -MAKE_ENV+= WITHOUT_ZAPTEL=1 -.else -BUILD_DEPENDS+= libpri>=1.2.0:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -MAKE_ENV+= WITH_ZAPTEL=1 -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if defined(WITHOUT_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -.else -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -PLIST_SUB+= WITH_ODBC="" -MAKE_ENV+= WITH_ODBC=1 -.endif - -.if defined(WITHOUT_FAX) -PLIST_SUB+= WITH_FAX="@comment " -.else -MAKE_ENV+= WITH_FAX=1 -LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp -PLIST_SUB+= WITH_FAX="" -.endif - -.if ${OSVERSION} >= 500036 -PLIST_SUB+= NEWGCC="" -.else -PLIST_SUB+= NEWGCC="@comment " -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - -.include <bsd.port.post.mk> diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo deleted file mode 100644 index 6b4fba28f1df..000000000000 --- a/net/asterisk14/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d -SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c -SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 diff --git a/net/asterisk14/files/asterisk.sh.in b/net/asterisk14/files/asterisk.sh.in deleted file mode 100644 index 22ef57fd3727..000000000000 --- a/net/asterisk14/files/asterisk.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. %%RC_SUBR%% - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk -pidfile=/var/run/asterisk.pid - -asterisk_enable=${asterisk_enable:-"NO"} - -load_rc_config $name -run_rc_command "$1" diff --git a/net/asterisk14/files/patch-Makefile b/net/asterisk14/files/patch-Makefile deleted file mode 100644 index 708a356041a3..000000000000 --- a/net/asterisk14/files/patch-Makefile +++ /dev/null @@ -1,515 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -19,8 +19,8 @@ - # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- - # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ - # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target --CC=$(CROSS_COMPILE)gcc --HOST_CC=gcc -+CC?=$(CROSS_COMPILE)gcc -+HOST_CC=${CC} - # CROSS_ARCH=Linux - # CROSS_PROC=arm - # SUB_PROC=xscale # or maverick -@@ -44,14 +44,14 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - endif - - #Overwite config files on "make samples" --OVERWRITE=y -+OVERWRITE=n - - #Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 #-pg -+#DEBUG=-g3 #-pg - - #Set NOCRYPTO to yes if you do not want to have crypto support or - #dependencies -@@ -83,7 +83,7 @@ - - # Where to install asterisk after compiling - # Default -> leave empty --INSTALL_PREFIX?= -+INSTALL_PREFIX=$(PREFIX) - - # Staging directory - # Files are copied here temporarily during the install process -@@ -106,17 +106,17 @@ - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - - ifneq ($(OSARCH),SunOS) -- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin -- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin - else -@@ -218,25 +218,25 @@ - endif - - INCLUDE+=-Iinclude -I../include --ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY --ASTCFLAGS+=$(OPTIMIZE) -+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+#ASTCFLAGS+=$(OPTIMIZE) - ASTOBJ=-o asterisk - - ifeq ($(findstring BSD,$(OSARCH)),BSD) - PROC=$(shell uname -m) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifneq ($(PROC),ultrasparc) -- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) -- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),) -+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp - else - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp -@@ -245,27 +245,24 @@ - - ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) -- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp -+ ASTCFLAGS+=$(PTHREAD_CFLAGS) -+ LIBS+=$(PTHREAD_LIBS) -+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),) -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp - endif - MPG123TARG=freebsd - -- # XXX FreeBSD paths -- PREFIX?=/usr/local -- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk -- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk -+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin -- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man -- # XXX end FreeBSD paths -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - - endif # FreeBSD - -@@ -281,7 +278,7 @@ - - ifeq ($(OSARCH),SunOS) - ASTCFLAGS+=-Wcast-align -DSOLARIS -- INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include -+ INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/include - endif - - ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN) -@@ -296,7 +293,7 @@ - - ifndef WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS - endif - -@@ -323,7 +320,7 @@ - ASTERISKVERSIONNUM=999999 - ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name) - else -- ASTERISKVERSIONNUM=000000 -+ ASTERISKVERSIONNUM?=000000 - endif - endif - -@@ -388,10 +385,10 @@ - endif - - ifeq ($(OSARCH),SunOS) -- LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - OBJS+=strcompat.o - ASTLINK= -- SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - endif - - ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) -@@ -399,7 +396,7 @@ - endif - - # This is used when generating the doxygen documentation --ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),) -+ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),) - HAVEDOT=yes - else - HAVEDOT=no -@@ -418,7 +415,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: cleantest depend asterisk subdirs -+all: cleantest depend asterisk subdirs manpage - - #ifneq ($(wildcard tags),) - ctags: tags -@@ -437,13 +434,13 @@ - cd editline && unset CFLAGS LIBS && test -f config.h || ./configure - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: FORCE -- @if [ -d db1-ast ]; then \ -- $(MAKE) -C db1-ast libdb1.a ; \ -- else \ -- echo "You need to do a cvs update -d not just cvs update"; \ -- exit 1; \ -- fi -+#db1-ast/libdb1.a: FORCE -+# @if [ -d db1-ast ]; then \ -+# $(MAKE) -C db1-ast libdb1.a ; \ -+# else \ -+# echo "You need to do a cvs update -d not just cvs update"; \ -+# exit 1; \ -+# fi - - ifneq ($(wildcard .depend),) - include .depend -@@ -510,14 +507,14 @@ - cygwin_a: - $(MAKE) -C cygwin all - --asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -+asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS) - build_tools/make_build_h > include/asterisk/build.h.tmp - if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \ - mv include/asterisk/build.h.tmp include/asterisk/build.h ; \ - fi - rm -f include/asterisk/build.h.tmp - $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c -- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) $(AUDIO_LIBS) -o muted muted.o -@@ -539,38 +536,38 @@ - - datafiles: all - if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros - for x in sounds/digits/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate - for x in sounds/dictate/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters - for x in sounds/letters/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic - for x in sounds/phonetic/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ -@@ -578,18 +575,18 @@ - done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - - update: - @if [ -d .svn ]; then \ -@@ -618,75 +615,53 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi - ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi - for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -d contrib/firmware/iax ]; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ - else \ - echo "You need to do cvs update -d not just cvs update" ; \ - fi - ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . ) -- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi -- @echo " +---- Asterisk Installation Complete -------+" -- @echo " + +" -- @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -- @echo " + +" -- @echo " + Asterisk has successfully been installed. +" -- @echo " + If you would like to install the sample +" -- @echo " + configuration files (overwriting any +" -- @echo " + existing config files), run: +" -- @echo " + +" -- @echo " + $(MAKE) samples +" -- @echo " + +" -- @echo " +----------------- or ---------------------+" -- @echo " + +" -- @echo " + You can go ahead and install the asterisk +" -- @echo " + program documentation now or later run: +" -- @echo " + +" -- @echo " + $(MAKE) progdocs +" -- @echo " + +" -- @echo " + **Note** This requires that you have +" -- @echo " + doxygen installed on your local system +" -- @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck - - NEWMODS=$(notdir $(wildcard */*.so)) -@@ -710,7 +685,7 @@ - echo " WARNING WARNING WARNING" ;\ - fi - --install: all datafiles bininstall -+install: all datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -718,16 +693,19 @@ - upgrade: all bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \ - if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ - fi ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ echo ADSI INSTALL $(BSD_INSTALL_DATA) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ - if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ -@@ -740,7 +718,7 @@ - continue; \ - fi ;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done - if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ - ( \ -@@ -800,25 +778,25 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - for x in sounds/demo-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - for x in sounds/*.mp3; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - done - rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3 -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm - for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ - cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \ -@@ -832,7 +810,7 @@ - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done -@@ -861,10 +839,10 @@ - - __rpm: include/asterisk/version.h spec - rm -rf /tmp/asterisk ; \ -- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ -+ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \ - $(MAKE) DESTDIR=/tmp/asterisk install ; \ - $(MAKE) DESTDIR=/tmp/asterisk samples ; \ -- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ -+ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \ - cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ - rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec - diff --git a/net/asterisk14/files/patch-agi::Makefile b/net/asterisk14/files/patch-agi::Makefile deleted file mode 100644 index b35976526f59..000000000000 --- a/net/asterisk14/files/patch-agi::Makefile +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 -@@ -11,7 +11,9 @@ - # the GNU General Public License - # - --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - CFLAGS+= - -@@ -27,8 +29,9 @@ - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) -+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done -+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - - eagi-test: eagi-test.o - $(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS) diff --git a/net/asterisk14/files/patch-apps::Makefile b/net/asterisk14/files/patch-apps::Makefile deleted file mode 100644 index ee7d560bed69..000000000000 --- a/net/asterisk14/files/patch-apps::Makefile +++ /dev/null @@ -1,79 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig -+++ apps/Makefile -@@ -45,25 +45,27 @@ - #APPS+=app_rpt.so - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h),) - APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so - endif - endif # WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) -+ifdef WITH_FAX -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp.h),) -+APPS+=app_rxfax.so app_txfax.so -+endif -+endif -+ -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - APPS+=app_osplookup.so - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - --CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) --ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) -- ifneq (${CURLLIBS},) -- APPS+=app_curl.so -- endif --endif -+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)$(LOCALBASE)/bin/curl-config --libs) -+APPS+=app_curl.so - - ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -@@ -95,24 +97,32 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone - - install: all -- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so - rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so - - app_curl.so: app_curl.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) - -+ifdef WITH_FAX -+app_rxfax.so : app_rxfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+ -+app_txfax.so : app_txfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+endif -+ - app_sql_postgres.o: app_sql_postgres.c -- $(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c -+ $(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c - - app_sql_postgres.so: app_sql_postgres.o -- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) look.c -o look -lncurses - - ifeq (SunOS,$(shell uname)) - app_chanspy.so: app_chanspy.o diff --git a/net/asterisk14/files/patch-apps::app_rxfax.c b/net/asterisk14/files/patch-apps::app_rxfax.c deleted file mode 100644 index 820208e1943d..000000000000 --- a/net/asterisk14/files/patch-apps::app_rxfax.c +++ /dev/null @@ -1,379 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:44:40 2006 -+++ apps/app_rxfax.c Thu Jan 12 17:41:53 2006 -@@ -0,0 +1,373 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to receive a TIFF FAX file -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <asterisk/dsp.h> -+#include <asterisk/manager.h> -+#include <asterisk/version.h> -+#include <string.h> -+#include <stdlib.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <math.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Receive Application"; -+ -+static char *app = "RxFAX"; -+ -+static char *synopsis = "Receive a FAX to a file"; -+ -+static char *descrip = -+" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" -+"given filename. If the file exists it will be overwritten. The file\n" -+"should be in TIFF/F format.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the sender CSID.\n" -+" FAXPAGES to the number of pages received.\n" -+" FAXBITRATE to the transmition rate.\n" -+" FAXRESOLUTION to the resolution.\n" -+"Returns -1 when the user hangs up.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ char local_ident[21]; -+ char far_ident[21]; -+ char buf[11]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ fax_get_far_ident(s, far_ident); -+ fax_get_local_ident(s, local_ident); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax successfully received.\n"); -+ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); -+ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ manager_event(EVENT_FLAG_CALL, -+ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", -+ chan->name, -+ chan->exten, -+#if ASTERISK_VERSION_NUM <= 010010 -+ chan->callerid, -+#else -+ (chan->cid.cid_num) ? chan->cid.cid_num : "", -+#endif -+ far_ident, -+ local_ident, -+ t.pages_transferred, -+ t.row_resolution, -+ t.bit_rate, -+ s->rx_file); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ snprintf(buf, sizeof(buf), "%i", t.pages_transferred); -+ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); -+ snprintf(buf, sizeof(buf), "%i", t.row_resolution); -+ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); -+ snprintf(buf, sizeof(buf), "%i", t.bit_rate); -+ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax receive not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_d_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows); -+ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); -+ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); -+ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); -+ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int rxfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char template_file[256]; -+ char target_file[256]; -+ char *s; -+ char *t; -+ char *v; -+ char *x; -+ int option; -+ int len; -+ int i; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ target_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(target_file, t, len); -+ target_file[len] = '\0'; -+ /* Allow the use of %d in the file name for a wild card of sorts, to -+ create a new file with the specified name scheme */ -+ if ((x = strchr(target_file, '%')) && x[1] == 'd') -+ { -+ strcpy(template_file, target_file); -+ i = 0; -+ do -+ { -+ snprintf(target_file, 256, template_file, 1); -+ i++; -+ } -+ while (ast_fileexists(target_file, "", chan->language) != -1); -+ } -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_rx_file(&fax, target_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ outf.src = "RxFAX"; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, rxfax_exec, synopsis, descrip); -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk14/files/patch-apps::app_txfax.c b/net/asterisk14/files/patch-apps::app_txfax.c deleted file mode 100644 index 15ad6674788e..000000000000 --- a/net/asterisk14/files/patch-apps::app_txfax.c +++ /dev/null @@ -1,301 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:48:54 2006 -+++ apps/app_txfax.c Thu Jan 12 17:48:36 2006 -@@ -0,0 +1,295 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to send a TIFF file as a FAX -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <string.h> -+#include <stdlib.h> -+#include <math.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Transmit Application"; -+ -+static char *app = "TxFAX"; -+ -+static char *synopsis = "Send a FAX file"; -+ -+static char *descrip = -+" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the receiver CSID.\n" -+"Returns -1 when the user hangs up, or if the file does not exist.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ char far_ident[21]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_far_ident(s, far_ident); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax send not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int txfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char source_file[256]; -+ char *x; -+ char *s; -+ char *t; -+ char *v; -+ int option; -+ int len; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ source_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(source_file, t, len); -+ source_file[len] = '\0'; -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_tx_file(&fax, source_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ //fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, txfax_exec, synopsis, descrip); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk14/files/patch-cdr::Makefile b/net/asterisk14/files/patch-cdr::Makefile deleted file mode 100644 index da16b609d5f2..000000000000 --- a/net/asterisk14/files/patch-cdr::Makefile +++ /dev/null @@ -1,70 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ cdr/Makefile Thu Jan 12 17:56:23 2006 -@@ -21,8 +21,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,18 +38,18 @@ - # - # unixODBC stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) - MODS+=cdr_odbc.so - endif - - # - # FreeTDS stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h),) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.62),1) - CFLAGS += -DFREETDS_0_62 - else - CFLAGS += -DFREETDS_PRE_0_62 -@@ -61,7 +61,7 @@ - # - # PGSQL stuff... Autoconf anyone?? - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) - MODS+=cdr_pgsql.so - endif - -@@ -82,9 +82,9 @@ - MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql),) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/pgsql -- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib/pgsql -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql),) -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql -+ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/pgsql - endif - - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -110,7 +110,7 @@ - all: depend $(MODS) - - install: all -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - clean: - rm -f *.so *.o .depend diff --git a/net/asterisk14/files/patch-channels::Makefile b/net/asterisk14/files/patch-channels::Makefile deleted file mode 100644 index edca9b1e7694..000000000000 --- a/net/asterisk14/files/patch-channels::Makefile +++ /dev/null @@ -1,85 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -48,9 +48,9 @@ - endif - - ifeq (${OSARCH},FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -- CHANH323LIB=-pthread -+ PTLIB=-lpt_FreeBSD_x86_r_s -+ H323LIB=-lh323_FreeBSD_x86_r_s -+ CHANH323LIB= - endif - - ifeq (${OSARCH},NetBSD) -@@ -73,11 +73,11 @@ - SOLINK+=-lrt - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so - endif - --ifneq ($(wildcard h323/libchanh323.a),) -+ifdef WITH_H323 - CHANNEL_LIBS+=chan_h323.so - endif - -@@ -91,12 +91,12 @@ - CHANNEL_LIBS+=chan_alsa.so - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 - endif -@@ -109,12 +109,12 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - CFLAGS+=-DIAX_TRUNKING - CHANNEL_LIBS+=chan_zap.so -@@ -229,8 +229,10 @@ - chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ - else --chan_h323.so: chan_h323.o h323/libchanh323.a -- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat -+chan_h323.so: chan_h323.o h323/ast_h323.o -+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - endif - - chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a -@@ -244,8 +246,7 @@ - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk14/files/patch-channels::chan_h323.c b/net/asterisk14/files/patch-channels::chan_h323.c deleted file mode 100644 index 4ca048812ecd..000000000000 --- a/net/asterisk14/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c.orig -+++ channels/chan_h323.c -@@ -31,6 +31,7 @@ - * \ingroup channel_drivers - */ - -+#include <sys/types.h> - #include <sys/socket.h> - #include <sys/signal.h> - #include <sys/param.h> diff --git a/net/asterisk14/files/patch-channels::chan_sip.c b/net/asterisk14/files/patch-channels::chan_sip.c deleted file mode 100644 index 2b2fae7a311f..000000000000 --- a/net/asterisk14/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,131 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig Tue Jan 24 16:25:53 2006 -+++ channels/chan_sip.c Tue Jan 24 16:30:44 2006 -@@ -337,7 +337,7 @@ static char global_vmexten[AST_MAX_EXTEN - - static char default_language[MAX_LANGUAGE] = ""; - --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; -@@ -475,6 +475,7 @@ struct sip_invite_param { - - struct sip_route { - struct sip_route *next; -+ int lr; - char hop[0]; - }; - -@@ -6015,6 +6016,7 @@ static void build_route(struct sip_pvt * - /* Make a struct route */ - thishop = malloc(sizeof(*thishop) + len); - if (thishop) { -+ thishop->lr = (strnstr(rr, ";lr", len) != NULL ? 1 : 0); - ast_copy_string(thishop->hop, rr, len); - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); - /* Link in */ -@@ -6040,31 +6042,41 @@ static void build_route(struct sip_pvt * - - /* Only append the contact if we are dealing with a strict router */ - if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) { -- /* 2nd append the Contact: if there is one */ -- /* Can be multiple Contact headers, comma separated values - we just take the first */ -- contact = get_header(req, "Contact"); -- if (!ast_strlen_zero(contact)) { -- ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -- /* Look for <: delimited address */ -- c = strchr(contact, '<'); -- if (c) { -- /* Take to > */ -- ++c; -- len = strcspn(c, ">") + 1; -- } else { -- /* No <> - just take the lot */ -- c = contact; -- len = strlen(contact) + 1; -- } -- thishop = malloc(sizeof(*thishop) + len); -+ /* Duplicate first route from the list */ -+ if (head && head->lr) { -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1); - if (thishop) { -- ast_copy_string(thishop->hop, c, len); -- thishop->next = NULL; -- /* Goes at the end */ -- if (tail) -- tail->next = thishop; -- else -- head = thishop; -+ memcpy(thishop, head, sizeof(struct sip_route)+strlen(head->hop)+1); -+ thishop->next = head; -+ head = thishop; -+ } -+ } else { -+ /* Append the Contact: if there is one and first route is w/o `lr' param */ -+ /* Can be multiple Contact headers, comma separated values - we just take the first */ -+ contact = get_header(req, "Contact"); -+ if (!ast_strlen_zero(contact)) { -+ ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -+ /* Look for <: delimited address */ -+ c = strchr(contact, '<'); -+ if (c) { -+ /* Take to > */ -+ ++c; -+ len = strcspn(c, ">") + 1; -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; -+ len = strlen(contact) + 1; -+ } -+ thishop = malloc(sizeof(*thishop) + len); -+ if (thishop) { -+ ast_copy_string(thishop->hop, c, len); -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - } -@@ -10352,7 +10364,11 @@ static int handle_request_invite(struct - gotdest = get_destination(p, NULL); - - get_rdnis(p, NULL); -- extract_uri(p, req); -+ build_route(p, req, 0); -+ if (!p->route->lr) -+ strncpy(p->uri, p->route->hop, sizeof(p->uri) - 1); -+ else -+ extract_uri(p, req); - build_contact(p); - - if (gotdest) { -@@ -10380,7 +10396,6 @@ static int handle_request_invite(struct - c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username ); - *recount = 1; - /* Save Record-Route for any later requests we make on this dialogue */ -- build_route(p, req, 0); - if (c) { - /* Pre-lock the call */ - ast_mutex_lock(&c->lock); -@@ -10466,7 +10481,12 @@ static int handle_request_invite(struct - transmit_response(p, "180 Ringing", req); - break; - case AST_STATE_UP: -- /* Here we have reINVITE request - try to renegotiate codecs with */ -+ /* Assuming this to be reinvite, process new SDP portion */ -+ if (!ast_strlen_zero(get_header(req, "Content-Type"))) { -+ process_sdp(p, req); -+ } else { -+ ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); -+ } - transmit_response_with_sdp(p, "200 OK", req, 1); - break; - default: diff --git a/net/asterisk14/files/patch-channels::chan_zap.c b/net/asterisk14/files/patch-channels::chan_zap.c deleted file mode 100644 index ab02c02af962..000000000000 --- a/net/asterisk14/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,80 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c.orig Tue Nov 29 20:24:39 2005 -+++ channels/chan_zap.c Fri Jan 13 13:28:33 2006 -@@ -638,6 +638,7 @@ static struct zt_pvt { - int cidlen; - int ringt; - int ringt_base; -+ int waitnorings; - int stripmsd; - int callwaitcas; - int callwaitrings; -@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel - } - - ast_mutex_lock(&p->lock); -+ switch (p->sig) { -+ case SIG_FXSGS: -+ case SIG_FXSKS: -+ case SIG_FXSLS: -+ if((ast->_state == AST_STATE_RING) && (p->ringt > 1)) -+ { -+ p->waitnorings = 1; -+ } -+ break; -+ default: -+ break; -+ }; -+ - - index = zt_get_index(ast, p, 1); - -@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data) - ast_setstate(chan, AST_STATE_RING); - chan->rings = 1; - p->ringt = p->ringt_base; -+ p->waitnorings = 0; - res = ast_pbx_run(chan); -+ -+ if(p->waitnorings) -+ { -+ p->ringt = p->ringt_base; -+ for(;;) -+ { -+ int i,j=0; -+ i = ZT_IOMUX_SIGEVENT | ZT_IOMUX_NOWAIT; -+ if (ioctl(p->subs[index].zfd, ZT_IOMUX, &i) == -1) -+ break; -+ -+ if (ioctl(p->subs[index].zfd, ZT_GETEVENT, &j) == -1) -+ break; -+ -+ if(j == ZT_EVENT_RINGOFFHOOK) -+ p->ringt = p->ringt_base; -+ -+ usleep(20000); -+ -+ if (p->ringt <= 0) -+ break; -+ -+ else if (p->ringt > 0) -+ p->ringt--; -+ } -+ p->ringt = 0; -+ p->waitnorings = 0; -+ } -+ - if (res) { - ast_hangup(chan); - ast_log(LOG_WARNING, "PBX exited non-zero\n"); -@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data) - i = iflist; - while(i) { - if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) { -- if (!i->owner && !i->subs[SUB_REAL].owner) { -+ if (!i->owner && !i->subs[SUB_REAL].owner && !i->waitnorings) { - /* This needs to be watched, as it lacks an owner */ - pfds[count].fd = i->subs[SUB_REAL].zfd; - pfds[count].events = POLLPRI; diff --git a/net/asterisk14/files/patch-channels::h323::ast_h323.cpp b/net/asterisk14/files/patch-channels::h323::ast_h323.cpp deleted file mode 100644 index feb79e586e91..000000000000 --- a/net/asterisk14/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig Thu Jan 12 18:16:08 2006 -+++ channels/h323/ast_h323.cpp Thu Jan 12 18:16:35 2006 -@@ -953,8 +953,8 @@ BOOL MyH323Connection::OnReceivedCapabil - H323Channel * MyH323Connection::CreateRealTimeLogicalChannel(const H323Capability & capability, - H323Channel::Directions dir, - unsigned sessionID, -- const H245_H2250LogicalChannelParameters * /*param*/, -- RTP_QOS * /*param*/ ) -+ const H245_H2250LogicalChannelParameters * /*param*/ /*, -+ RTP_QOS * */ /*param*/ ) - { - return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID); - } diff --git a/net/asterisk14/files/patch-channels::h323::ast_h323.h b/net/asterisk14/files/patch-channels::h323::ast_h323.h deleted file mode 100644 index 606bb0123173..000000000000 --- a/net/asterisk14/files/patch-channels::h323::ast_h323.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.h.orig Thu Jan 12 18:14:49 2006 -+++ channels/h323/ast_h323.h Thu Jan 12 18:15:02 2006 -@@ -155,8 +155,8 @@ class MyH323Connection : public H323Conn - H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, - H323Channel::Directions, - unsigned, -- const H245_H2250LogicalChannelParameters *, -- RTP_QOS *); -+ const H245_H2250LogicalChannelParameters * /* , -+ RTP_QOS * */); - H323Connection::AnswerCallResponse OnAnswerCall(const PString &, - const H323SignalPDU &, - H323SignalPDU &); diff --git a/net/asterisk14/files/patch-codecs::Makefile b/net/asterisk14/files/patch-codecs::Makefile deleted file mode 100644 index ab5cbc4aef2c..000000000000 --- a/net/asterisk14/files/patch-codecs::Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ codecs/Makefile Fri Jan 13 10:33:21 2006 -@@ -30,8 +30,8 @@ - - UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) - UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) --ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) --ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -+ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex.h) -+ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h) - ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so - LIBSPEEX+=-lspeex -lm -@@ -43,14 +43,14 @@ - endif - ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - -@@ -65,7 +65,7 @@ - LIBLPC10=lpc10/liblpc10.a - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -@@ -126,7 +126,7 @@ - endif - - install: all -- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk14/files/patch-codecs::gsm::Makefile b/net/asterisk14/files/patch-codecs::gsm::Makefile deleted file mode 100644 index 7256eeae5692..000000000000 --- a/net/asterisk14/files/patch-codecs::gsm::Makefile +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- codecs/gsm/Makefile.orig -+++ codecs/gsm/Makefile -@@ -49,7 +49,9 @@ - ifneq (${PROC},arm) - ifneq (${PROC},ppc) - ifneq (${PROC},ppc64) --OPTIMIZE+=-march=$(PROC) -+ifneq (${PROC},amd64) -+#OPTIMIZE+=-march=$(PROC) -+endif - endif - endif - endif diff --git a/net/asterisk14/files/patch-codecs::ilbc::Makefile b/net/asterisk14/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 26a2f20e5529..000000000000 --- a/net/asterisk14/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Fri Jan 13 11:01:07 2006 -+++ codecs/ilbc/Makefile Fri Jan 13 11:01:51 2006 -@@ -1,5 +1,5 @@ - ARCH=$(PROC) --CFLAGS+=-Wall -O3 -funroll-loops -+CFLAGS+=-Wall -funroll-loops - ifneq (${OSARCH},CYGWIN) - CFLAGS += -fPIC - endif diff --git a/net/asterisk14/files/patch-configs::musiconhold.conf.sample b/net/asterisk14/files/patch-configs::musiconhold.conf.sample deleted file mode 100644 index ff63cc9ff08b..000000000000 --- a/net/asterisk14/files/patch-configs::musiconhold.conf.sample +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- configs/musiconhold.conf.sample.orig Tue Nov 29 20:24:39 2005 -+++ configs/musiconhold.conf.sample Fri Jan 13 11:38:39 2006 -@@ -4,7 +4,7 @@ - - [default] - mode=quietmp3 --directory=/var/lib/asterisk/mohmp3 -+directory=/usr/local/share/asterisk/mohmp3 - - ; valid mode options: - ; quietmp3 -- default diff --git a/net/asterisk14/files/patch-db.c b/net/asterisk14/files/patch-db.c deleted file mode 100644 index ba7f3f206b78..000000000000 --- a/net/asterisk14/files/patch-db.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jan 13 11:05:32 2006 -+++ db.c Fri Jan 13 11:06:55 2006 -@@ -35,6 +35,7 @@ - #include <errno.h> - #include <unistd.h> - #include <dirent.h> -+#include <db.h> - - #include "asterisk.h" - -@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - #ifdef __CYGWIN__ - #define dbopen __dbopen diff --git a/net/asterisk14/files/patch-editline::configure b/net/asterisk14/files/patch-editline::configure deleted file mode 100644 index f6b9c5b76eee..000000000000 --- a/net/asterisk14/files/patch-editline::configure +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/configure.orig Sun Apr 27 21:13:11 2003 -+++ editline/configure Fri Jan 30 01:47:34 2004 -@@ -1906,7 +1906,7 @@ - CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG" - CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE" - else -- CFLAGS="$CFLAGS -O" -+ CFLAGS="$CFLAGS" - fi - - diff --git a/net/asterisk14/files/patch-editline::makelist b/net/asterisk14/files/patch-editline::makelist deleted file mode 100644 index cff9b3ae29e0..000000000000 --- a/net/asterisk14/files/patch-editline::makelist +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/makelist -+++ editline/makelist -@@ -145,7 +145,7 @@ - # - -fh) - cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ -- sort | tr '[a-z]' '[A-Z]' | $AWK ' -+ sort | tr '[:lower:]' '[:upper:]' | $AWK ' - BEGIN { - printf("/* Automatically generated file, do not edit */\n"); - printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n"); diff --git a/net/asterisk14/files/patch-formats::Makefile b/net/asterisk14/files/patch-formats::Makefile deleted file mode 100644 index b2b1db5a37bd..000000000000 --- a/net/asterisk14/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Fri Jan 13 11:16:07 2006 -+++ formats/Makefile Fri Jan 13 11:47:25 2006 -@@ -20,7 +20,7 @@ - # - # G723 simple frame is deprecated - # --FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - # - # OGG/Vorbis format -@@ -60,7 +60,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm - - install: all -- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk14/files/patch-formats::format_g723_1.c b/net/asterisk14/files/patch-formats::format_g723_1.c deleted file mode 100644 index ae814f197a1e..000000000000 --- a/net/asterisk14/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,354 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 13 12:18:51 2006 -+++ formats/format_g723_1.c Fri Jan 13 12:18:41 2006 -@@ -0,0 +1,348 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Save and read raw, headerless G723.1 Annex A data. -+ * -+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net> -+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/channel.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/sched.h> -+#include <asterisk/module.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <stdlib.h> -+#include <sys/time.h> -+#include <unistd.h> -+#include <errno.h> -+#include <string.h> -+#include <pthread.h> -+#ifdef __linux__ -+#include <endian.h> -+#else -+#include <machine/endian.h> -+#endif -+ -+/* Based on format_g729.c */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+struct ast_filestream { -+ void *reserved[AST_RESERVED_POINTERS]; -+ /* This is what a filestream means to us */ -+ FILE *f; /* Descriptor */ -+ struct ast_frame fr; /* Frame information */ -+ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ -+ char empty; /* Empty character */ -+ unsigned char g723[24]; /* One Real G723.1 Frame */ -+}; -+ -+static long g723_tell(struct ast_filestream *); -+ -+AST_MUTEX_DEFINE_STATIC(g723_lock); -+static int glistcnt = 0; -+ -+static char *name = "g723"; -+static char *desc = "Raw G723.1 Annex A data"; -+static char *exts = "g723"; -+ -+static int g723_len(unsigned char buf) -+{ -+ switch(buf & TYPE_MASK) { -+ case TYPE_DONTSEND: -+ return 2; -+ break; -+ case TYPE_SILENCE: -+ return 4; -+ break; -+ case TYPE_HIGH: -+ return 24; -+ break; -+ case TYPE_LOW: -+ return 20; -+ break; -+ default: -+ ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static struct ast_filestream *g723_open(FILE *f) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ tmp->fr.data = tmp->g723; -+ tmp->fr.frametype = AST_FRAME_VOICE; -+ tmp->fr.subclass = AST_FORMAT_G723_1; -+ /* datalen will vary for each frame */ -+ tmp->fr.src = name; -+ tmp->fr.mallocd = 0; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } -+ return tmp; -+} -+ -+static struct ast_filestream *g723_rewrite(FILE *f, const char *comment) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } else -+ ast_log(LOG_WARNING, "Out of memory\n"); -+ return tmp; -+} -+ -+static void g723_close(struct ast_filestream *s) -+{ -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return; -+ } -+ glistcnt--; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ fclose(s->f); -+ free(s); -+ s = NULL; -+} -+ -+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) -+{ -+ int res; -+ /* Send a frame from the file to the appropriate channel */ -+ s->fr.frametype = AST_FRAME_VOICE; -+ s->fr.subclass = AST_FORMAT_G723_1; -+ s->fr.offset = AST_FRIENDLY_OFFSET; -+ s->fr.samples = 240; -+ s->fr.mallocd = 0; -+ s->fr.data = s->g723; -+ if ((res = fread(s->g723, 1, 1, s->f)) != 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ s->fr.datalen = g723_len(s->g723[0]); -+ if (s->fr.datalen < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame!\n"); -+ return NULL; -+ } -+ if (s->fr.datalen > 1 && (res = fread(s->g723 + 1, 1, s->fr.datalen - 1, s->f)) != s->fr.datalen - 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ *whennext = s->fr.samples; -+ return &s->fr; -+} -+ -+static int g723_write(struct ast_filestream *fs, struct ast_frame *f) -+{ -+ int res; -+ unsigned char *cp; -+ if (f->frametype != AST_FRAME_VOICE) { -+ ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); -+ return -1; -+ } -+ if (f->subclass != AST_FORMAT_G723_1) { -+ ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass); -+ return -1; -+ } -+ for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) { -+ res = g723_len(cp[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n"); -+ return -1; -+ } -+ } -+ if (cp != (unsigned char *)f->data + f->datalen) { -+ ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen); -+ return -1; -+ } -+ if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen) { -+ ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno)); -+ return -1; -+ } -+ return 0; -+} -+ -+static char *g723_getcomment(struct ast_filestream *s) -+{ -+ return NULL; -+} -+ -+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence) -+{ -+ long cur, offset, max; -+ off_t coffset, moffset, soffset; -+ int res; -+ unsigned char c; -+ -+ offset = 0; /* Shut up gcc warning */ -+ if (whence == SEEK_SET) { -+ offset = sample_offset; -+ } else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) { -+ if ((cur = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get current position!\n"); -+ return -1; -+ } -+ offset = cur + sample_offset; -+ } -+ if (fseeko(fs->f, 0, SEEK_END) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ else { -+ moffset = ftello(fs->f); -+ } -+ if (whence == SEEK_END) { -+ if ((max = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get maximum position!\n"); -+ return -1; -+ } -+ offset = max - sample_offset; -+ } -+ if (offset < 0) -+ offset = 0; -+ soffset = -1; -+ for (coffset = 0; coffset < moffset && offset > 0; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset); -+ return -1; -+ } -+ soffset = coffset; -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ offset -= 240; -+ } -+ if (soffset != -1 && fseeko(fs->f, soffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int g723_trunc(struct ast_filestream *fs) -+{ -+ /* Truncate file to current length */ -+ if (ftruncate(fileno(fs->f), ftello(fs->f)) < 0) -+ return -1; -+ return 0; -+} -+ -+static long g723_tell(struct ast_filestream *fs) -+{ -+ off_t offset, coffset; -+ int res; -+ long rval; -+ unsigned char c; -+ -+ offset = ftello(fs->f); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset); -+ return -1; -+ } -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ rval += 240; -+ } -+ if (fseeko(fs->f, offset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset); -+ return -1; -+ } -+ return rval; -+} -+ -+int load_module() -+{ -+ return ast_format_register(name, exts, AST_FORMAT_G723_1, -+ g723_open, -+ g723_rewrite, -+ g723_write, -+ g723_seek, -+ g723_trunc, -+ g723_tell, -+ g723_read, -+ g723_close, -+ g723_getcomment); -+} -+ -+int unload_module() -+{ -+ return ast_format_unregister(name); -+} -+ -+int usecount() -+{ -+ int res; -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return -1; -+ } -+ res = glistcnt; -+ ast_mutex_unlock(&g723_lock); -+ return res; -+} -+ -+char *description() -+{ -+ return desc; -+} -+ -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk14/files/patch-formats::format_g729.c b/net/asterisk14/files/patch-formats::format_g729.c deleted file mode 100644 index 11be5281608f..000000000000 --- a/net/asterisk14/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Fri Jan 13 12:20:53 2006 -+++ formats/format_g729.c Fri Jan 13 12:23:33 2006 -@@ -60,7 +60,7 @@ struct ast_filestream { - struct ast_frame fr; /* Frame information */ - char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ - char empty; /* Empty character */ -- unsigned char g729[20]; /* Two Real G729 Frames */ -+ unsigned char g729[10]; /* One Real G729 Frame */ - }; - - -@@ -141,11 +141,11 @@ static struct ast_frame *g729_read(struc - s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_G729A; - s->fr.offset = AST_FRIENDLY_OFFSET; -- s->fr.samples = 160; -- s->fr.datalen = 20; -+ s->fr.samples = 80; -+ s->fr.datalen = 10; - s->fr.mallocd = 0; - s->fr.data = s->g729; -- if ((res = fread(s->g729, 1, 20, s->f)) != 20) { -+ if ((res = fread(s->g729, 1, 10, s->f)) != 10) { - if (res && (res != 10)) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -190,7 +190,7 @@ static int g729_seek(struct ast_filestre - fseek(fs->f, 0, SEEK_END); - max = ftell(fs->f); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -219,7 +219,7 @@ static long g729_tell(struct ast_filestr - { - off_t offset; - offset = ftell(fs->f); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() diff --git a/net/asterisk14/files/patch-frame.c b/net/asterisk14/files/patch-frame.c deleted file mode 100644 index 753253c7af0d..000000000000 --- a/net/asterisk14/files/patch-frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- frame.c.orig Wed Jan 25 13:22:43 2006 -+++ frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk14/files/patch-funcs::Makefile b/net/asterisk14/files/patch-funcs::Makefile deleted file mode 100644 index a14daeed285c..000000000000 --- a/net/asterisk14/files/patch-funcs::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- funcs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ funcs/Makefile Fri Jan 13 12:36:57 2006 -@@ -67,7 +67,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} - - install: all -- for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FUNCS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk14/files/patch-include::asterisk::utils.h b/net/asterisk14/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk14/files/patch-include::asterisk::utils.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/utils.h 2004/10/10 12:55:50 1.1 -+++ include/asterisk/utils.h 2004/10/10 12:56:43 -@@ -37,7 +37,6 @@ - #ifdef inet_ntoa - #undef inet_ntoa - #endif --#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ - - #ifdef LINUX - #define ast_pthread_create pthread_create diff --git a/net/asterisk14/files/patch-pbx::Makefile b/net/asterisk14/files/patch-pbx::Makefile deleted file mode 100644 index 97d03e10f871..000000000000 --- a/net/asterisk14/files/patch-pbx::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig -+++ pbx/Makefile -@@ -23,8 +23,8 @@ - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - --GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` --GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` -+#GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` -+#GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` - MOC=$(QTDIR)/bin/moc - KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include - KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui -@@ -72,7 +72,7 @@ - endif - - install: all -- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk14/files/patch-res::Makefile b/net/asterisk14/files/patch-res::Makefile deleted file mode 100644 index de5c365db34d..000000000000 --- a/net/asterisk14/files/patch-res::Makefile +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile -+++ res/Makefile -@@ -37,8 +37,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifeq (${OSARCH},CYGWIN) -@@ -55,9 +55,7 @@ - CFLAGS+= - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) - CFLAGS+=-DZAPATA_MOH --endif - endif # WITHOUT_ZAPTEL - - # -@@ -75,7 +73,7 @@ - rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h - rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so - rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \ - if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \ - echo "*************************************************************";\ diff --git a/net/asterisk14/files/patch-rtp.c b/net/asterisk14/files/patch-rtp.c deleted file mode 100644 index bbc2649929f9..000000000000 --- a/net/asterisk14/files/patch-rtp.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Fri Jan 13 13:38:01 2006 -+++ rtp.c Fri Jan 13 13:40:50 2006 -@@ -950,8 +950,10 @@ struct ast_rtp *ast_rtp_new_with_bindadd - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; - /* If there's rtcp, initialize it as well. */ -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - /* Try to bind it/them. */ - if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && - (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) diff --git a/net/asterisk14/files/patch-utils::Makefile b/net/asterisk14/files/patch-utils::Makefile deleted file mode 100644 index f3164c0f478a..000000000000 --- a/net/asterisk14/files/patch-utils::Makefile +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- utils/Makefile -+++ utils/Makefile -@@ -17,16 +17,16 @@ - CFLAGS+=-DNO_AST_MM - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - TARGET=stereorize streamplayer - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/popt.h),) - TARGET+=smsq - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/newt.h),) - TARGET+=astman - endif - -@@ -40,7 +40,7 @@ - install: - for x in $(TARGET); do \ - if [ "$$x" != "none" ]; then \ -- $(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ - fi; \ - done - diff --git a/net/asterisk14/pkg-descr b/net/asterisk14/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk14/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Asterisk is an Open Source PBX and telephony toolkit. It is, in a -sense, middleware between Internet and telephony channels on the bottom, -and Internet and telephony applications at the top. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk14/pkg-plist b/net/asterisk14/pkg-plist deleted file mode 100644 index 3af861f7a135..000000000000 --- a/net/asterisk14/pkg-plist +++ /dev/null @@ -1,755 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi -etc/asterisk/adsi.conf-dist -@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf -@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi -etc/asterisk/adtranvofr.conf-dist -@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf -@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi -etc/asterisk/agents.conf-dist -@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf -@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi -etc/asterisk/alarmreceiver.conf-dist -@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf -@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi -etc/asterisk/alsa.conf-dist -@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf -@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi -etc/asterisk/asterisk.adsi-dist -@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi -@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi -etc/asterisk/asterisk.conf-dist -@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf -@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi -etc/asterisk/cdr.conf-dist -@exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf -@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi -etc/asterisk/cdr_custom.conf-dist -@exec [ -f %B/cdr_custom.conf ] || cp %B/%f %B/cdr_custom.conf -@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi -etc/asterisk/cdr_manager.conf-dist -@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf -@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi -etc/asterisk/cdr_odbc.conf-dist -@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf -@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi -etc/asterisk/cdr_pgsql.conf-dist -@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf -@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi -etc/asterisk/cdr_tds.conf-dist -@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf -@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi -etc/asterisk/codecs.conf-dist -@exec [ -f %B/codecs.conf ] || cp %B/%f %B/codecs.conf -@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi -etc/asterisk/dnsmgr.conf-dist -@exec [ -f %B/dnsmgr.conf ] || cp %B/%f %B/dmsmgr.conf -@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi -etc/asterisk/dundi.conf-dist -@exec [ -f %B/dundi.conf ] || cp %B/%f %B/dundi.conf -@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi -etc/asterisk/enum.conf-dist -@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael -@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi -etc/asterisk/extconfig.conf-dist -@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf -@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi -etc/asterisk/extensions.conf-dist -@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf -@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi -etc/asterisk/features.conf-dist -@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf -@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi -etc/asterisk/festival.conf-dist -@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf -@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi -etc/asterisk/iax.conf-dist -@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf -@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi -etc/asterisk/iaxprov.conf-dist -@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf -@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi -etc/asterisk/indications.conf-dist -@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf -@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi -etc/asterisk/logger.conf-dist -@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf -@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi -etc/asterisk/manager.conf-dist -@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf -@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi -etc/asterisk/meetme.conf-dist -@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf -@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi -etc/asterisk/mgcp.conf-dist -@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf -@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi -etc/asterisk/misdn.conf-dist -@exec [ -f %B/misdn.conf ] || cp %B/%f %B/misdn.conf -@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi -etc/asterisk/modem.conf-dist -@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf -@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi -etc/asterisk/modules.conf-dist -@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf -@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi -etc/asterisk/musiconhold.conf-dist -@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf -@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi -etc/asterisk/osp.conf-dist -@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf -@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi -etc/asterisk/oss.conf-dist -@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf -@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi -etc/asterisk/phone.conf-dist -@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf -@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi -etc/asterisk/privacy.conf-dist -@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf -@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi -etc/asterisk/queues.conf-dist -@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf -@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi -etc/asterisk/res_odbc.conf-dist -@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist -@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf -@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi -etc/asterisk/rtp.conf-dist -@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf -@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi -etc/asterisk/sip.conf-dist -@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf -@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi -etc/asterisk/sip_notify.conf-dist -@exec [ -f %B/sip_notify.conf ] || cp %B/%f %B/sip_notify.conf -@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi -etc/asterisk/skinny.conf-dist -@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf -@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi -etc/asterisk/telcordia-1.adsi-dist -@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi -@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi -etc/asterisk/voicemail.conf-dist -@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf -@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi -etc/asterisk/vpb.conf-dist -@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf -@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi -etc/asterisk/zapata.conf-dist -@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/aes.h -include/asterisk/agi.h -include/asterisk/alaw.h -include/asterisk/app.h -include/asterisk/ast_expr.h -include/asterisk/astdb.h -include/asterisk/astmm.h -include/asterisk/astobj.h -include/asterisk/astosp.h -include/asterisk/build.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/chanspy.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/compat.h -include/asterisk/config.h -include/asterisk/compiler.h -include/asterisk/crypto.h -include/asterisk/devicestate.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dnsmgr.h -include/asterisk/doxyref.h -include/asterisk/dsp.h -include/asterisk/dundi.h -include/asterisk/enum.h -include/asterisk/endian.h -include/asterisk/features.h -include/asterisk/file.h -include/asterisk/frame.h -include/asterisk/fskmodem.h -include/asterisk/image.h -include/asterisk/indications.h -include/asterisk/inline_api.h -include/asterisk/io.h -include/asterisk/linkedlists.h -include/asterisk/localtime.h -include/asterisk/lock.h -include/asterisk/logger.h -include/asterisk/manager.h -include/asterisk/md5.h -include/asterisk/module.h -include/asterisk/monitor.h -include/asterisk/musiconhold.h -include/asterisk/netsock.h -include/asterisk/options.h -include/asterisk/pbx.h -include/asterisk/plc.h -include/asterisk/poll-compat.h -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/rtp.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/slinfactory.h -include/asterisk/srv.h -include/asterisk/strings.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/time.h -include/asterisk/transcap.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/unaligned.h -include/asterisk/utils.h -include/asterisk/version.h -include/asterisk/vmodem.h -lib/asterisk/modules/app_adsiprog.so -lib/asterisk/modules/app_alarmreceiver.so -lib/asterisk/modules/app_authenticate.so -lib/asterisk/modules/app_cdr.so -lib/asterisk/modules/app_chanisavail.so -lib/asterisk/modules/app_chanspy.so -lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_curl.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_dictate.so -lib/asterisk/modules/app_directed_pickup.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.so -lib/asterisk/modules/app_dumpchan.so -lib/asterisk/modules/app_echo.so -lib/asterisk/modules/app_enumlookup.so -lib/asterisk/modules/app_eval.so -lib/asterisk/modules/app_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_groupcount.so -lib/asterisk/modules/app_hasnewvoicemail.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_math.so -lib/asterisk/modules/app_md5.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mixmonitor.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_realtime.so -lib/asterisk/modules/app_record.so -%%WITH_FAX%%lib/asterisk/modules/app_rxfax.so -lib/asterisk/modules/app_sayunixtime.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.so -lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_setcidname.so -lib/asterisk/modules/app_setcidnum.so -lib/asterisk/modules/app_setrdnis.so -lib/asterisk/modules/app_settransfercapability.so -lib/asterisk/modules/app_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_stack.so -lib/asterisk/modules/app_system.so -lib/asterisk/modules/app_talkdetect.so -lib/asterisk/modules/app_test.so -lib/asterisk/modules/app_transfer.so -%%WITH_FAX%%lib/asterisk/modules/app_txfax.so -lib/asterisk/modules/app_txtcidname.so -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -lib/asterisk/modules/app_voicemail.so -lib/asterisk/modules/app_waitforring.so -lib/asterisk/modules/app_waitforsilence.so -lib/asterisk/modules/app_while.so -lib/asterisk/modules/app_zapateller.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapbarge.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapras.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so -lib/asterisk/modules/chan_agent.so -lib/asterisk/modules/chan_features.so -%%WITH_H323%%lib/asterisk/modules/chan_h323.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -%%WITH_ZAPTEL%%lib/asterisk/modules/chan_zap.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_gsm.so -lib/asterisk/modules/codec_ilbc.so -lib/asterisk/modules/codec_lpc10.so -lib/asterisk/modules/codec_speex.so -lib/asterisk/modules/codec_ulaw.so -lib/asterisk/modules/format_au.so -lib/asterisk/modules/format_g723_1.so -lib/asterisk/modules/format_g726.so -lib/asterisk/modules/format_g729.so -lib/asterisk/modules/format_gsm.so -lib/asterisk/modules/format_h263.so -lib/asterisk/modules/format_ilbc.so -lib/asterisk/modules/format_jpeg.so -lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_pcm_alaw.so -lib/asterisk/modules/format_sln.so -lib/asterisk/modules/format_vox.so -lib/asterisk/modules/format_wav.so -lib/asterisk/modules/format_wav_gsm.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_enum.so -lib/asterisk/modules/func_uri.so -lib/asterisk/modules/pbx_ael.so -lib/asterisk/modules/pbx_config.so -lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_functions.so -lib/asterisk/modules/pbx_loopback.so -lib/asterisk/modules/pbx_realtime.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.so -%%NEWGCC%%lib/asterisk/modules/res_config_odbc.so -lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_features.so -lib/asterisk/modules/res_indications.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so -lib/asterisk/modules/res_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/autosupport -sbin/rasterisk -sbin/safe_asterisk -sbin/smsq -sbin/stereorize -sbin/streamplayer -%%DATADIR%%/agi-bin/agi-test.agi -%%DATADIR%%/agi-bin/eagi-sphinx-test -%%DATADIR%%/agi-bin/eagi-test -%%DATADIR%%/firmware/iax/iaxy.bin -%%DATADIR%%/images/asterisk-intro.jpg -%%DATADIR%%/keys/freeworlddialup.pub -%%DATADIR%%/keys/iaxtel.pub -%%DATADIR%%/mohmp3/fpm-calm-river.mp3 -%%DATADIR%%/mohmp3/fpm-sunshine.mp3 -%%DATADIR%%/mohmp3/fpm-world-mix.mp3 -%%DATADIR%%/sounds/agent-alreadyon.gsm -%%DATADIR%%/sounds/agent-incorrect.gsm -%%DATADIR%%/sounds/agent-loggedoff.gsm -%%DATADIR%%/sounds/agent-loginok.gsm -%%DATADIR%%/sounds/agent-newlocation.gsm -%%DATADIR%%/sounds/agent-pass.gsm -%%DATADIR%%/sounds/agent-user.gsm -%%DATADIR%%/sounds/auth-incorrect.gsm -%%DATADIR%%/sounds/auth-thankyou.gsm -%%DATADIR%%/sounds/beep.gsm -%%DATADIR%%/sounds/beeperr.gsm -%%DATADIR%%/sounds/conf-adminmenu.gsm -%%DATADIR%%/sounds/conf-enteringno.gsm -%%DATADIR%%/sounds/conf-errormenu.gsm -%%DATADIR%%/sounds/conf-getchannel.gsm -%%DATADIR%%/sounds/conf-getconfno.gsm -%%DATADIR%%/sounds/conf-getpin.gsm -%%DATADIR%%/sounds/conf-hasjoin.gsm -%%DATADIR%%/sounds/conf-hasleft.gsm -%%DATADIR%%/sounds/conf-invalid.gsm -%%DATADIR%%/sounds/conf-invalidpin.gsm -%%DATADIR%%/sounds/conf-kicked.gsm -%%DATADIR%%/sounds/conf-leaderhasleft.gsm -%%DATADIR%%/sounds/conf-locked.gsm -%%DATADIR%%/sounds/conf-lockednow.gsm -%%DATADIR%%/sounds/conf-muted.gsm -%%DATADIR%%/sounds/conf-noempty.gsm -%%DATADIR%%/sounds/conf-onlyone.gsm -%%DATADIR%%/sounds/conf-onlyperson.gsm -%%DATADIR%%/sounds/conf-otherinparty.gsm -%%DATADIR%%/sounds/conf-placeintoconf.gsm -%%DATADIR%%/sounds/conf-thereare.gsm -%%DATADIR%%/sounds/conf-unlockednow.gsm -%%DATADIR%%/sounds/conf-unmuted.gsm -%%DATADIR%%/sounds/conf-usermenu.gsm -%%DATADIR%%/sounds/conf-userswilljoin.gsm -%%DATADIR%%/sounds/conf-userwilljoin.gsm -%%DATADIR%%/sounds/conf-waitforleader.gsm -%%DATADIR%%/sounds/demo-abouttotry.gsm -%%DATADIR%%/sounds/demo-congrats.gsm -%%DATADIR%%/sounds/demo-echodone.gsm -%%DATADIR%%/sounds/demo-echotest.gsm -%%DATADIR%%/sounds/demo-enterkeywords.gsm -%%DATADIR%%/sounds/demo-instruct.gsm -%%DATADIR%%/sounds/demo-moreinfo.gsm -%%DATADIR%%/sounds/demo-nogo.gsm -%%DATADIR%%/sounds/demo-nomatch.gsm -%%DATADIR%%/sounds/demo-thanks.gsm -%%DATADIR%%/sounds/dictate/both_help.gsm -%%DATADIR%%/sounds/dictate/enter_filename.gsm -%%DATADIR%%/sounds/dictate/forhelp.gsm -%%DATADIR%%/sounds/dictate/pause.gsm -%%DATADIR%%/sounds/dictate/paused.gsm -%%DATADIR%%/sounds/dictate/play_help.gsm -%%DATADIR%%/sounds/dictate/playback.gsm -%%DATADIR%%/sounds/dictate/playback_mode.gsm -%%DATADIR%%/sounds/dictate/record.gsm -%%DATADIR%%/sounds/dictate/record_help.gsm -%%DATADIR%%/sounds/dictate/record_mode.gsm -%%DATADIR%%/sounds/dictate/truncating_audio.gsm -%%DATADIR%%/sounds/digits/0.gsm -%%DATADIR%%/sounds/digits/1.gsm -%%DATADIR%%/sounds/digits/10.gsm -%%DATADIR%%/sounds/digits/11.gsm -%%DATADIR%%/sounds/digits/12.gsm -%%DATADIR%%/sounds/digits/13.gsm -%%DATADIR%%/sounds/digits/14.gsm -%%DATADIR%%/sounds/digits/15.gsm -%%DATADIR%%/sounds/digits/16.gsm -%%DATADIR%%/sounds/digits/17.gsm -%%DATADIR%%/sounds/digits/18.gsm -%%DATADIR%%/sounds/digits/19.gsm -%%DATADIR%%/sounds/digits/2.gsm -%%DATADIR%%/sounds/digits/20.gsm -%%DATADIR%%/sounds/digits/3.gsm -%%DATADIR%%/sounds/digits/30.gsm -%%DATADIR%%/sounds/digits/4.gsm -%%DATADIR%%/sounds/digits/40.gsm -%%DATADIR%%/sounds/digits/5.gsm -%%DATADIR%%/sounds/digits/50.gsm -%%DATADIR%%/sounds/digits/6.gsm -%%DATADIR%%/sounds/digits/60.gsm -%%DATADIR%%/sounds/digits/7.gsm -%%DATADIR%%/sounds/digits/70.gsm -%%DATADIR%%/sounds/digits/8.gsm -%%DATADIR%%/sounds/digits/80.gsm -%%DATADIR%%/sounds/digits/9.gsm -%%DATADIR%%/sounds/digits/90.gsm -%%DATADIR%%/sounds/digits/a-m.gsm -%%DATADIR%%/sounds/digits/at.gsm -%%DATADIR%%/sounds/digits/day-0.gsm -%%DATADIR%%/sounds/digits/day-1.gsm -%%DATADIR%%/sounds/digits/day-2.gsm -%%DATADIR%%/sounds/digits/day-3.gsm -%%DATADIR%%/sounds/digits/day-4.gsm -%%DATADIR%%/sounds/digits/day-5.gsm -%%DATADIR%%/sounds/digits/day-6.gsm -%%DATADIR%%/sounds/digits/dollars.gsm -%%DATADIR%%/sounds/digits/h-1.gsm -%%DATADIR%%/sounds/digits/h-10.gsm -%%DATADIR%%/sounds/digits/h-11.gsm -%%DATADIR%%/sounds/digits/h-12.gsm -%%DATADIR%%/sounds/digits/h-13.gsm -%%DATADIR%%/sounds/digits/h-14.gsm -%%DATADIR%%/sounds/digits/h-15.gsm -%%DATADIR%%/sounds/digits/h-16.gsm -%%DATADIR%%/sounds/digits/h-17.gsm -%%DATADIR%%/sounds/digits/h-18.gsm -%%DATADIR%%/sounds/digits/h-19.gsm -%%DATADIR%%/sounds/digits/h-2.gsm -%%DATADIR%%/sounds/digits/h-20.gsm -%%DATADIR%%/sounds/digits/h-3.gsm -%%DATADIR%%/sounds/digits/h-30.gsm -%%DATADIR%%/sounds/digits/h-4.gsm -%%DATADIR%%/sounds/digits/h-5.gsm -%%DATADIR%%/sounds/digits/h-6.gsm -%%DATADIR%%/sounds/digits/h-7.gsm -%%DATADIR%%/sounds/digits/h-8.gsm -%%DATADIR%%/sounds/digits/h-9.gsm -%%DATADIR%%/sounds/digits/hundred.gsm -%%DATADIR%%/sounds/digits/million.gsm -%%DATADIR%%/sounds/digits/minus.gsm -%%DATADIR%%/sounds/digits/mon-0.gsm -%%DATADIR%%/sounds/digits/mon-1.gsm -%%DATADIR%%/sounds/digits/mon-10.gsm -%%DATADIR%%/sounds/digits/mon-11.gsm -%%DATADIR%%/sounds/digits/mon-2.gsm -%%DATADIR%%/sounds/digits/mon-3.gsm -%%DATADIR%%/sounds/digits/mon-4.gsm -%%DATADIR%%/sounds/digits/mon-5.gsm -%%DATADIR%%/sounds/digits/mon-6.gsm -%%DATADIR%%/sounds/digits/mon-7.gsm -%%DATADIR%%/sounds/digits/mon-8.gsm -%%DATADIR%%/sounds/digits/mon-9.gsm -%%DATADIR%%/sounds/digits/oclock.gsm -%%DATADIR%%/sounds/digits/oh.gsm -%%DATADIR%%/sounds/digits/p-m.gsm -%%DATADIR%%/sounds/digits/pound.gsm -%%DATADIR%%/sounds/digits/star.gsm -%%DATADIR%%/sounds/digits/thousand.gsm -%%DATADIR%%/sounds/digits/today.gsm -%%DATADIR%%/sounds/digits/tomorrow.gsm -%%DATADIR%%/sounds/digits/yesterday.gsm -%%DATADIR%%/sounds/dir-instr.gsm -%%DATADIR%%/sounds/dir-intro-fn.gsm -%%DATADIR%%/sounds/dir-intro.gsm -%%DATADIR%%/sounds/dir-nomatch.gsm -%%DATADIR%%/sounds/dir-nomore.gsm -%%DATADIR%%/sounds/hello-world.gsm -%%DATADIR%%/sounds/invalid.gsm -%%DATADIR%%/sounds/letters/a.gsm -%%DATADIR%%/sounds/letters/at.gsm -%%DATADIR%%/sounds/letters/b.gsm -%%DATADIR%%/sounds/letters/c.gsm -%%DATADIR%%/sounds/letters/d.gsm -%%DATADIR%%/sounds/letters/dash.gsm -%%DATADIR%%/sounds/letters/dollar.gsm -%%DATADIR%%/sounds/letters/dot.gsm -%%DATADIR%%/sounds/letters/e.gsm -%%DATADIR%%/sounds/letters/equals.gsm -%%DATADIR%%/sounds/letters/exclaimation-point.gsm -%%DATADIR%%/sounds/letters/f.gsm -%%DATADIR%%/sounds/letters/g.gsm -%%DATADIR%%/sounds/letters/h.gsm -%%DATADIR%%/sounds/letters/i.gsm -%%DATADIR%%/sounds/letters/j.gsm -%%DATADIR%%/sounds/letters/k.gsm -%%DATADIR%%/sounds/letters/l.gsm -%%DATADIR%%/sounds/letters/m.gsm -%%DATADIR%%/sounds/letters/n.gsm -%%DATADIR%%/sounds/letters/o.gsm -%%DATADIR%%/sounds/letters/p.gsm -%%DATADIR%%/sounds/letters/plus.gsm -%%DATADIR%%/sounds/letters/q.gsm -%%DATADIR%%/sounds/letters/r.gsm -%%DATADIR%%/sounds/letters/s.gsm -%%DATADIR%%/sounds/letters/slash.gsm -%%DATADIR%%/sounds/letters/space.gsm -%%DATADIR%%/sounds/letters/t.gsm -%%DATADIR%%/sounds/letters/u.gsm -%%DATADIR%%/sounds/letters/v.gsm -%%DATADIR%%/sounds/letters/w.gsm -%%DATADIR%%/sounds/letters/x.gsm -%%DATADIR%%/sounds/letters/y.gsm -%%DATADIR%%/sounds/letters/z.gsm -%%DATADIR%%/sounds/letters/zed.gsm -%%DATADIR%%/sounds/pbx-invalid.gsm -%%DATADIR%%/sounds/pbx-invalidpark.gsm -%%DATADIR%%/sounds/pbx-transfer.gsm -%%DATADIR%%/sounds/phonetic/9_p.gsm -%%DATADIR%%/sounds/phonetic/a_p.gsm -%%DATADIR%%/sounds/phonetic/b_p.gsm -%%DATADIR%%/sounds/phonetic/c_p.gsm -%%DATADIR%%/sounds/phonetic/d_p.gsm -%%DATADIR%%/sounds/phonetic/e_p.gsm -%%DATADIR%%/sounds/phonetic/f_p.gsm -%%DATADIR%%/sounds/phonetic/g_p.gsm -%%DATADIR%%/sounds/phonetic/h_p.gsm -%%DATADIR%%/sounds/phonetic/i_p.gsm -%%DATADIR%%/sounds/phonetic/j_p.gsm -%%DATADIR%%/sounds/phonetic/k_p.gsm -%%DATADIR%%/sounds/phonetic/l_p.gsm -%%DATADIR%%/sounds/phonetic/m_p.gsm -%%DATADIR%%/sounds/phonetic/n_p.gsm -%%DATADIR%%/sounds/phonetic/o_p.gsm -%%DATADIR%%/sounds/phonetic/p_p.gsm -%%DATADIR%%/sounds/phonetic/q_p.gsm -%%DATADIR%%/sounds/phonetic/r_p.gsm -%%DATADIR%%/sounds/phonetic/s_p.gsm -%%DATADIR%%/sounds/phonetic/t_p.gsm -%%DATADIR%%/sounds/phonetic/u_p.gsm -%%DATADIR%%/sounds/phonetic/v_p.gsm -%%DATADIR%%/sounds/phonetic/w_p.gsm -%%DATADIR%%/sounds/phonetic/x_p.gsm -%%DATADIR%%/sounds/phonetic/y_p.gsm -%%DATADIR%%/sounds/phonetic/z_p.gsm -%%DATADIR%%/sounds/priv-callee-options.gsm -%%DATADIR%%/sounds/priv-callpending.gsm -%%DATADIR%%/sounds/priv-introsaved.gsm -%%DATADIR%%/sounds/priv-recordintro.gsm -%%DATADIR%%/sounds/privacy-incorrect.gsm -%%DATADIR%%/sounds/privacy-prompt.gsm -%%DATADIR%%/sounds/privacy-thankyou.gsm -%%DATADIR%%/sounds/privacy-unident.gsm -%%DATADIR%%/sounds/queue-callswaiting.gsm -%%DATADIR%%/sounds/queue-holdtime.gsm -%%DATADIR%%/sounds/queue-less-than.gsm -%%DATADIR%%/sounds/queue-minutes.gsm -%%DATADIR%%/sounds/queue-periodic-announce.gsm -%%DATADIR%%/sounds/queue-reporthold.gsm -%%DATADIR%%/sounds/queue-seconds.gsm -%%DATADIR%%/sounds/queue-thankyou.gsm -%%DATADIR%%/sounds/queue-thereare.gsm -%%DATADIR%%/sounds/queue-youarenext.gsm -%%DATADIR%%/sounds/screen-callee-options.gsm -%%DATADIR%%/sounds/spy-agent.gsm -%%DATADIR%%/sounds/spy-h323.gsm -%%DATADIR%%/sounds/spy-iax.gsm -%%DATADIR%%/sounds/spy-iax2.gsm -%%DATADIR%%/sounds/spy-mgcp.gsm -%%DATADIR%%/sounds/spy-sip.gsm -%%DATADIR%%/sounds/spy-skinny.gsm -%%DATADIR%%/sounds/spy-zap.gsm -%%DATADIR%%/sounds/ss-noservice.gsm -%%DATADIR%%/sounds/transfer.gsm -%%DATADIR%%/sounds/tt-allbusy.gsm -%%DATADIR%%/sounds/tt-monkeys.gsm -%%DATADIR%%/sounds/tt-monkeysintro.gsm -%%DATADIR%%/sounds/tt-somethingwrong.gsm -%%DATADIR%%/sounds/tt-weasels.gsm -%%DATADIR%%/sounds/vm-Cust1.gsm -%%DATADIR%%/sounds/vm-Cust2.gsm -%%DATADIR%%/sounds/vm-Cust3.gsm -%%DATADIR%%/sounds/vm-Cust4.gsm -%%DATADIR%%/sounds/vm-Cust5.gsm -%%DATADIR%%/sounds/vm-Family.gsm -%%DATADIR%%/sounds/vm-Friends.gsm -%%DATADIR%%/sounds/vm-INBOX.gsm -%%DATADIR%%/sounds/vm-Old.gsm -%%DATADIR%%/sounds/vm-Work.gsm -%%DATADIR%%/sounds/vm-advopts.gsm -%%DATADIR%%/sounds/vm-and.gsm -%%DATADIR%%/sounds/vm-calldiffnum.gsm -%%DATADIR%%/sounds/vm-changeto.gsm -%%DATADIR%%/sounds/vm-delete.gsm -%%DATADIR%%/sounds/vm-deleted.gsm -%%DATADIR%%/sounds/vm-dialout.gsm -%%DATADIR%%/sounds/vm-enter-num-to-call.gsm -%%DATADIR%%/sounds/vm-extension.gsm -%%DATADIR%%/sounds/vm-first.gsm -%%DATADIR%%/sounds/vm-for.gsm -%%DATADIR%%/sounds/vm-forward.gsm -%%DATADIR%%/sounds/vm-forwardoptions.gsm -%%DATADIR%%/sounds/vm-from-extension.gsm -%%DATADIR%%/sounds/vm-from-phonenumber.gsm -%%DATADIR%%/sounds/vm-from.gsm -%%DATADIR%%/sounds/vm-goodbye.gsm -%%DATADIR%%/sounds/vm-helpexit.gsm -%%DATADIR%%/sounds/vm-incorrect-mailbox.gsm -%%DATADIR%%/sounds/vm-incorrect.gsm -%%DATADIR%%/sounds/vm-instructions.gsm -%%DATADIR%%/sounds/vm-intro.gsm -%%DATADIR%%/sounds/vm-isonphone.gsm -%%DATADIR%%/sounds/vm-isunavail.gsm -%%DATADIR%%/sounds/vm-last.gsm -%%DATADIR%%/sounds/vm-leavemsg.gsm -%%DATADIR%%/sounds/vm-login.gsm -%%DATADIR%%/sounds/vm-mailboxfull.gsm -%%DATADIR%%/sounds/vm-message.gsm -%%DATADIR%%/sounds/vm-messages.gsm -%%DATADIR%%/sounds/vm-minutes.gsm -%%DATADIR%%/sounds/vm-mismatch.gsm -%%DATADIR%%/sounds/vm-msginstruct.gsm -%%DATADIR%%/sounds/vm-msgsaved.gsm -%%DATADIR%%/sounds/vm-newpassword.gsm -%%DATADIR%%/sounds/vm-newuser.gsm -%%DATADIR%%/sounds/vm-next.gsm -%%DATADIR%%/sounds/vm-no.gsm -%%DATADIR%%/sounds/vm-nobodyavail.gsm -%%DATADIR%%/sounds/vm-nobox.gsm -%%DATADIR%%/sounds/vm-nomore.gsm -%%DATADIR%%/sounds/vm-nonumber.gsm -%%DATADIR%%/sounds/vm-num-i-have.gsm -%%DATADIR%%/sounds/vm-onefor.gsm -%%DATADIR%%/sounds/vm-options.gsm -%%DATADIR%%/sounds/vm-opts.gsm -%%DATADIR%%/sounds/vm-passchanged.gsm -%%DATADIR%%/sounds/vm-password.gsm -%%DATADIR%%/sounds/vm-press.gsm -%%DATADIR%%/sounds/vm-prev.gsm -%%DATADIR%%/sounds/vm-reachoper.gsm -%%DATADIR%%/sounds/vm-rec-busy.gsm -%%DATADIR%%/sounds/vm-rec-name.gsm -%%DATADIR%%/sounds/vm-rec-temp.gsm -%%DATADIR%%/sounds/vm-rec-unv.gsm -%%DATADIR%%/sounds/vm-received.gsm -%%DATADIR%%/sounds/vm-reenterpassword.gsm -%%DATADIR%%/sounds/vm-repeat.gsm -%%DATADIR%%/sounds/vm-review.gsm -%%DATADIR%%/sounds/vm-saved.gsm -%%DATADIR%%/sounds/vm-savedto.gsm -%%DATADIR%%/sounds/vm-savefolder.gsm -%%DATADIR%%/sounds/vm-savemessage.gsm -%%DATADIR%%/sounds/vm-saveoper.gsm -%%DATADIR%%/sounds/vm-sorry.gsm -%%DATADIR%%/sounds/vm-star-cancel.gsm -%%DATADIR%%/sounds/vm-starmain.gsm -%%DATADIR%%/sounds/vm-tempgreeting.gsm -%%DATADIR%%/sounds/vm-tempgreeting2.gsm -%%DATADIR%%/sounds/vm-tempremoved.gsm -%%DATADIR%%/sounds/vm-then-pound.gsm -%%DATADIR%%/sounds/vm-theperson.gsm -%%DATADIR%%/sounds/vm-tocallback.gsm -%%DATADIR%%/sounds/vm-tocallnum.gsm -%%DATADIR%%/sounds/vm-tocancel.gsm -%%DATADIR%%/sounds/vm-tocancelmsg.gsm -%%DATADIR%%/sounds/vm-toenternumber.gsm -%%DATADIR%%/sounds/vm-toforward.gsm -%%DATADIR%%/sounds/vm-tohearenv.gsm -%%DATADIR%%/sounds/vm-tomakecall.gsm -%%DATADIR%%/sounds/vm-tooshort.gsm -%%DATADIR%%/sounds/vm-toreply.gsm -%%DATADIR%%/sounds/vm-torerecord.gsm -%%DATADIR%%/sounds/vm-undelete.gsm -%%DATADIR%%/sounds/vm-undeleted.gsm -%%DATADIR%%/sounds/vm-unknown-caller.gsm -%%DATADIR%%/sounds/vm-whichbox.gsm -%%DATADIR%%/sounds/vm-youhave.gsm -%%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate -@dirrm %%DATADIR%%/sounds/phonetic -@dirrm %%DATADIR%%/sounds/letters -@dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/mohmp3 -@dirrm %%DATADIR%%/keys -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/firmware/iax -@dirrm %%DATADIR%%/firmware -@dirrm %%DATADIR%%/agi-bin -@dirrm %%DATADIR%% -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/%%DATADIR%%/astdb -@cwd /var -spool/asterisk/voicemail/default/1234/busy.gsm -spool/asterisk/voicemail/default/1234/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/voicemail/default/1234 -@dirrm spool/asterisk/voicemail/default -@dirrm spool/asterisk/voicemail -@dirrm spool/asterisk/tmp -@dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile deleted file mode 100644 index 10d4cd2b786f..000000000000 --- a/net/asterisk16/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.2.4 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ - http://ftp.digium.com/pub/asterisk/old-releases/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= An Open Source PBX and telephony toolkit - -PATCHFILES= asterisk124_codec_negotiation-20060202_2.diff.gz -PATCH_SITES= http://www.portaone.com/~bamby/public/ - -BUILD_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex \ - newt.51:${PORTSDIR}/devel/newt \ - curl.3:${PORTSDIR}/ftp/curl -RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 - -ONLY_FOR_ARCHS= i386 sparc64 amd64 - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= asterisk.sh -USE_REINPLACE= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${PWLIBDIR} \ - OPENH323DIR=${OPENH323DIR} \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 - -.include <bsd.port.pre.mk> - -PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC -OPENH323DIR!= cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC - -.if ${ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build -PLIST_SUB+= WITH_H323="" -MAKE_ENV+= WITH_H323=1 -.endif - -.if defined(WITHOUT_ZAPTEL) -PLIST_SUB+= WITH_ZAPTEL="@comment " -MAKE_ENV+= WITHOUT_ZAPTEL=1 -.else -BUILD_DEPENDS+= libpri>=1.2.0:${PORTSDIR}/misc/libpri \ - ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -LIB_DEPENDS+= pri.1:${PORTSDIR}/misc/libpri -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -MAKE_ENV+= WITH_ZAPTEL=1 -.endif - -# -# WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV -# similarly -.if defined(WITHOUT_ODBC) -PLIST_SUB+= WITH_ODBC="@comment " -.else -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -PLIST_SUB+= WITH_ODBC="" -MAKE_ENV+= WITH_ODBC=1 -.endif - -.if defined(WITHOUT_FAX) -PLIST_SUB+= WITH_FAX="@comment " -.else -MAKE_ENV+= WITH_FAX=1 -LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp -PLIST_SUB+= WITH_FAX="" -.endif - -.if ${OSVERSION} >= 500036 -PLIST_SUB+= NEWGCC="" -.else -PLIST_SUB+= NEWGCC="@comment " -.endif - -post-patch: - ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample - -.include <bsd.port.post.mk> diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo deleted file mode 100644 index 6b4fba28f1df..000000000000 --- a/net/asterisk16/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (asterisk-1.2.4.tar.gz) = 14721abdc85fc3381db275b61dffce2d -SHA256 (asterisk-1.2.4.tar.gz) = a386a6cd587a84afd534d35be26758a9e64fff4d679960ebd82ddc7142bb083c -SIZE (asterisk-1.2.4.tar.gz) = 10536366 -MD5 (asterisk124_codec_negotiation-20060202_2.diff.gz) = 1f00b43fd1db77ac783c2573d847f398 -SHA256 (asterisk124_codec_negotiation-20060202_2.diff.gz) = f30106056aed3c050ac81c4ec8cdab0b69c1ac73440257d5480aea02c92e0fb6 -SIZE (asterisk124_codec_negotiation-20060202_2.diff.gz) = 28543 diff --git a/net/asterisk16/files/asterisk.sh.in b/net/asterisk16/files/asterisk.sh.in deleted file mode 100644 index 22ef57fd3727..000000000000 --- a/net/asterisk16/files/asterisk.sh.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. %%RC_SUBR%% - -name=asterisk -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/asterisk -pidfile=/var/run/asterisk.pid - -asterisk_enable=${asterisk_enable:-"NO"} - -load_rc_config $name -run_rc_command "$1" diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile deleted file mode 100644 index 708a356041a3..000000000000 --- a/net/asterisk16/files/patch-Makefile +++ /dev/null @@ -1,515 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -19,8 +19,8 @@ - # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- - # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ - # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target --CC=$(CROSS_COMPILE)gcc --HOST_CC=gcc -+CC?=$(CROSS_COMPILE)gcc -+HOST_CC=${CC} - # CROSS_ARCH=Linux - # CROSS_PROC=arm - # SUB_PROC=xscale # or maverick -@@ -44,14 +44,14 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - endif - - #Overwite config files on "make samples" --OVERWRITE=y -+OVERWRITE=n - - #Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 #-pg -+#DEBUG=-g3 #-pg - - #Set NOCRYPTO to yes if you do not want to have crypto support or - #dependencies -@@ -83,7 +83,7 @@ - - # Where to install asterisk after compiling - # Default -> leave empty --INSTALL_PREFIX?= -+INSTALL_PREFIX=$(PREFIX) - - # Staging directory - # Files are copied here temporarily during the install process -@@ -106,17 +106,17 @@ - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - - ifneq ($(OSARCH),SunOS) -- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk - ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin -- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - MODULES_DIR=$(ASTLIBDIR)/modules - AGI_DIR=$(ASTVARLIBDIR)/agi-bin - else -@@ -218,25 +218,25 @@ - endif - - INCLUDE+=-Iinclude -I../include --ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY --ASTCFLAGS+=$(OPTIMIZE) -+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+#ASTCFLAGS+=$(OPTIMIZE) - ASTOBJ=-o asterisk - - ifeq ($(findstring BSD,$(OSARCH)),BSD) - PROC=$(shell uname -m) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifneq ($(PROC),ultrasparc) -- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - - ifeq ($(PROC),ppc) - ASTCFLAGS+=-fsigned-char - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),) -- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),) -+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp - else - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp -@@ -245,27 +245,24 @@ - - ifeq ($(OSARCH),FreeBSD) - BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) -- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),) -- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp -+ ASTCFLAGS+=$(PTHREAD_CFLAGS) -+ LIBS+=$(PTHREAD_LIBS) -+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),) -+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp - endif - MPG123TARG=freebsd - -- # XXX FreeBSD paths -- PREFIX?=/usr/local -- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk -- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk -- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk -- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk -- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk -- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk -+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk -+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk -+ ASTSPOOLDIR=/var/spool/asterisk -+ ASTLOGDIR=/var/log/asterisk -+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf -- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin -- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin -- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run -- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man -- # XXX end FreeBSD paths -+ ASTBINDIR=$(INSTALL_PREFIX)/bin -+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ ASTVARRUNDIR=/var/run -+ ASTMANDIR=$(INSTALL_PREFIX)/man - - endif # FreeBSD - -@@ -281,7 +278,7 @@ - - ifeq ($(OSARCH),SunOS) - ASTCFLAGS+=-Wcast-align -DSOLARIS -- INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include -+ INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/include - endif - - ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN) -@@ -296,7 +293,7 @@ - - ifndef WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS - endif - -@@ -323,7 +320,7 @@ - ASTERISKVERSIONNUM=999999 - ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name) - else -- ASTERISKVERSIONNUM=000000 -+ ASTERISKVERSIONNUM?=000000 - endif - endif - -@@ -388,10 +385,10 @@ - endif - - ifeq ($(OSARCH),SunOS) -- LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - OBJS+=strcompat.o - ASTLINK= -- SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - endif - - ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) -@@ -399,7 +396,7 @@ - endif - - # This is used when generating the doxygen documentation --ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),) -+ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),) - HAVEDOT=yes - else - HAVEDOT=no -@@ -418,7 +415,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: cleantest depend asterisk subdirs -+all: cleantest depend asterisk subdirs manpage - - #ifneq ($(wildcard tags),) - ctags: tags -@@ -437,13 +434,13 @@ - cd editline && unset CFLAGS LIBS && test -f config.h || ./configure - $(MAKE) -C editline libedit.a - --db1-ast/libdb1.a: FORCE -- @if [ -d db1-ast ]; then \ -- $(MAKE) -C db1-ast libdb1.a ; \ -- else \ -- echo "You need to do a cvs update -d not just cvs update"; \ -- exit 1; \ -- fi -+#db1-ast/libdb1.a: FORCE -+# @if [ -d db1-ast ]; then \ -+# $(MAKE) -C db1-ast libdb1.a ; \ -+# else \ -+# echo "You need to do a cvs update -d not just cvs update"; \ -+# exit 1; \ -+# fi - - ifneq ($(wildcard .depend),) - include .depend -@@ -510,14 +507,14 @@ - cygwin_a: - $(MAKE) -C cygwin all - --asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -+asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS) - build_tools/make_build_h > include/asterisk/build.h.tmp - if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \ - mv include/asterisk/build.h.tmp include/asterisk/build.h ; \ - fi - rm -f include/asterisk/build.h.tmp - $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c -- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) $(AUDIO_LIBS) -o muted muted.o -@@ -539,38 +536,38 @@ - - datafiles: all - if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros - for x in sounds/digits/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate - for x in sounds/dictate/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters - for x in sounds/letters/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic - for x in sounds/phonetic/*.gsm; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ -@@ -578,18 +575,18 @@ - done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ - done -- mkdir -p $(DESTDIR)$(AGI_DIR) -+ $(MKDIR) $(DESTDIR)$(AGI_DIR) - - update: - @if [ -d .svn ]; then \ -@@ -618,75 +615,53 @@ - OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor -- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor -+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi -+ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi - ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk -- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ - chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ - fi - for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done -- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) -- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) -+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR) -+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) - if [ -n "$(OLDHEADERS)" ]; then \ - rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ - fi - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax -+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -+ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8 -+ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -d contrib/firmware/iax ]; then \ -- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ -+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ - else \ - echo "You need to do cvs update -d not just cvs update" ; \ - fi - ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . ) -- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi -- @echo " +---- Asterisk Installation Complete -------+" -- @echo " + +" -- @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -- @echo " + +" -- @echo " + Asterisk has successfully been installed. +" -- @echo " + If you would like to install the sample +" -- @echo " + configuration files (overwriting any +" -- @echo " + existing config files), run: +" -- @echo " + +" -- @echo " + $(MAKE) samples +" -- @echo " + +" -- @echo " +----------------- or ---------------------+" -- @echo " + +" -- @echo " + You can go ahead and install the asterisk +" -- @echo " + program documentation now or later run: +" -- @echo " + +" -- @echo " + $(MAKE) progdocs +" -- @echo " + +" -- @echo " + **Note** This requires that you have +" -- @echo " + doxygen installed on your local system +" -- @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck - - NEWMODS=$(notdir $(wildcard */*.so)) -@@ -710,7 +685,7 @@ - echo " WARNING WARNING WARNING" ;\ - fi - --install: all datafiles bininstall -+install: all datafiles bininstall samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi -@@ -718,16 +693,19 @@ - upgrade: all bininstall - - adsi: -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.adsi; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \ - if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ - fi ; \ - done - - samples: adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ echo ADSI INSTALL $(BSD_INSTALL_DATA) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ - if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ - if [ "$(OVERWRITE)" = "y" ]; then \ - if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ -@@ -740,7 +718,7 @@ - continue; \ - fi ;\ - fi ; \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done - if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ - ( \ -@@ -800,25 +778,25 @@ - echo "; Default: strict"; \ - echo ";"; \ - echo ";translation_algorithm = strict"; \ -- ) > $(DESTDIR)$(ASTCONFPATH) ; \ -+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \ - else \ - echo "Skipping asterisk.conf creation"; \ - fi -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - for x in sounds/demo-*; do \ - if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ - else \ - echo "No description for $$x"; \ - exit 1; \ - fi; \ - done -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - for x in sounds/*.mp3; do \ -- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ - done - rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3 -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX - :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm - for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ - cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \ -@@ -832,7 +810,7 @@ - @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) - @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) - $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk - for x in images/*.gif; do \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ - done -@@ -861,10 +839,10 @@ - - __rpm: include/asterisk/version.h spec - rm -rf /tmp/asterisk ; \ -- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \ -+ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \ - $(MAKE) DESTDIR=/tmp/asterisk install ; \ - $(MAKE) DESTDIR=/tmp/asterisk samples ; \ -- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \ -+ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \ - cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ - rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec - diff --git a/net/asterisk16/files/patch-agi::Makefile b/net/asterisk16/files/patch-agi::Makefile deleted file mode 100644 index b35976526f59..000000000000 --- a/net/asterisk16/files/patch-agi::Makefile +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Thu Jan 12 15:42:07 2006 -+++ agi/Makefile Thu Jan 12 15:44:39 2006 -@@ -11,7 +11,9 @@ - # the GNU General Public License - # - --AGIS=agi-test.agi eagi-test eagi-sphinx-test -+AGIS_BIN=eagi-test eagi-sphinx-test -+AGIS_SCR=agi-test.agi -+AGIS=$(AGIS_SCR) $(AGIS_BIN) - - CFLAGS+= - -@@ -27,8 +29,9 @@ - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR) -+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done -+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done - - eagi-test: eagi-test.o - $(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS) diff --git a/net/asterisk16/files/patch-apps::Makefile b/net/asterisk16/files/patch-apps::Makefile deleted file mode 100644 index ee7d560bed69..000000000000 --- a/net/asterisk16/files/patch-apps::Makefile +++ /dev/null @@ -1,79 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig -+++ apps/Makefile -@@ -45,25 +45,27 @@ - #APPS+=app_rpt.so - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h),) - APPS+=app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so app_page.so - endif - endif # WITHOUT_ZAPTEL - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) -+ifdef WITH_FAX -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp.h),) -+APPS+=app_rxfax.so app_txfax.so -+endif -+endif -+ -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) - APPS+=app_osplookup.so - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - --CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs) --ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),) -- ifneq (${CURLLIBS},) -- APPS+=app_curl.so -- endif --endif -+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)$(LOCALBASE)/bin/curl-config --libs) -+APPS+=app_curl.so - - ifeq (${OSARCH},CYGWIN) - CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols -@@ -95,24 +97,32 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone - - install: all -- for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(APPS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so - rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so - - app_curl.so: app_curl.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS) - -+ifdef WITH_FAX -+app_rxfax.so : app_rxfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+ -+app_txfax.so : app_txfax.o -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lspandsp -ltiff -+endif -+ - app_sql_postgres.o: app_sql_postgres.c -- $(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c -+ $(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c - - app_sql_postgres.so: app_sql_postgres.o -- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) look.c -o look -lncurses - - ifeq (SunOS,$(shell uname)) - app_chanspy.so: app_chanspy.o diff --git a/net/asterisk16/files/patch-apps::app_rxfax.c b/net/asterisk16/files/patch-apps::app_rxfax.c deleted file mode 100644 index 820208e1943d..000000000000 --- a/net/asterisk16/files/patch-apps::app_rxfax.c +++ /dev/null @@ -1,379 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:44:40 2006 -+++ apps/app_rxfax.c Thu Jan 12 17:41:53 2006 -@@ -0,0 +1,373 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to receive a TIFF FAX file -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <asterisk/dsp.h> -+#include <asterisk/manager.h> -+#include <asterisk/version.h> -+#include <string.h> -+#include <stdlib.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <math.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Receive Application"; -+ -+static char *app = "RxFAX"; -+ -+static char *synopsis = "Receive a FAX to a file"; -+ -+static char *descrip = -+" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n" -+"given filename. If the file exists it will be overwritten. The file\n" -+"should be in TIFF/F format.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the sender CSID.\n" -+" FAXPAGES to the number of pages received.\n" -+" FAXBITRATE to the transmition rate.\n" -+" FAXRESOLUTION to the resolution.\n" -+"Returns -1 when the user hangs up.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ char local_ident[21]; -+ char far_ident[21]; -+ char buf[11]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ fax_get_far_ident(s, far_ident); -+ fax_get_local_ident(s, local_ident); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax successfully received.\n"); -+ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident); -+ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ manager_event(EVENT_FLAG_CALL, -+ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n", -+ chan->name, -+ chan->exten, -+#if ASTERISK_VERSION_NUM <= 010010 -+ chan->callerid, -+#else -+ (chan->cid.cid_num) ? chan->cid.cid_num : "", -+#endif -+ far_ident, -+ local_ident, -+ t.pages_transferred, -+ t.row_resolution, -+ t.bit_rate, -+ s->rx_file); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ snprintf(buf, sizeof(buf), "%i", t.pages_transferred); -+ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf); -+ snprintf(buf, sizeof(buf), "%i", t.row_resolution); -+ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf); -+ snprintf(buf, sizeof(buf), "%i", t.bit_rate); -+ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax receive not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_d_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ t30_stats_t t; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_transfer_statistics(s, &t); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); -+ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows); -+ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution); -+ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); -+ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows); -+ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); -+ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding); -+ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int rxfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char template_file[256]; -+ char target_file[256]; -+ char *s; -+ char *t; -+ char *v; -+ char *x; -+ int option; -+ int len; -+ int i; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ target_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(target_file, t, len); -+ target_file[len] = '\0'; -+ /* Allow the use of %d in the file name for a wild card of sorts, to -+ create a new file with the specified name scheme */ -+ if ((x = strchr(target_file, '%')) && x[1] == 'd') -+ { -+ strcpy(template_file, target_file); -+ i = 0; -+ do -+ { -+ snprintf(target_file, 256, template_file, 1); -+ i++; -+ } -+ while (ast_fileexists(target_file, "", chan->language) != -1); -+ } -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_rx_file(&fax, target_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ outf.src = "RxFAX"; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, rxfax_exec, synopsis, descrip); -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk16/files/patch-apps::app_txfax.c b/net/asterisk16/files/patch-apps::app_txfax.c deleted file mode 100644 index 15ad6674788e..000000000000 --- a/net/asterisk16/files/patch-apps::app_txfax.c +++ /dev/null @@ -1,301 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Thu Jan 12 17:48:54 2006 -+++ apps/app_txfax.c Thu Jan 12 17:48:36 2006 -@@ -0,0 +1,295 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Trivial application to send a TIFF file as a FAX -+ * -+ * Copyright (C) 2003, Steve Underwood -+ * -+ * Steve Underwood <steveu@coppice.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <asterisk/pbx.h> -+#include <asterisk/module.h> -+#include <asterisk/translate.h> -+#include <string.h> -+#include <stdlib.h> -+#include <math.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500028 -+#include <inttypes.h> -+#else -+#include <stdint.h> -+#endif -+#include <pthread.h> -+#include <errno.h> -+#include <tiffio.h> -+ -+#include <spandsp.h> -+ -+static char *tdesc = "Trivial FAX Transmit Application"; -+ -+static char *app = "TxFAX"; -+ -+static char *synopsis = "Send a FAX file"; -+ -+static char *descrip = -+" TxFAX(filename[|caller][|debug]): Send a given TIFF file to the channel as a FAX.\n" -+"The \"caller\" option makes the application behave as a calling machine,\n" -+"rather than the answering machine. The default behaviour is to behave as\n" -+"an answering machine.\n" -+"Uses LOCALSTATIONID to identify itself to the remote end.\n" -+" LOCALHEADERINFO to generate a header line on each page.\n" -+"Sets REMOTESTATIONID to the receiver CSID.\n" -+"Returns -1 when the user hangs up, or if the file does not exist.\n" -+"Returns 0 otherwise.\n"; -+ -+STANDARD_LOCAL_USER; -+ -+LOCAL_USER_DECL; -+ -+#define MAX_BLOCK_SIZE 240 -+ -+static void t30_flush(t30_state_t *s, int which) -+{ -+ //TODO: -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static void phase_e_handler(t30_state_t *s, void *user_data, int result) -+{ -+ struct ast_channel *chan; -+ char far_ident[21]; -+ -+ chan = (struct ast_channel *) user_data; -+ if (result) -+ { -+ fax_get_far_ident(s, far_ident); -+ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident); -+ } -+ else -+ { -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ ast_log(LOG_DEBUG, "Fax send not successful.\n"); -+ ast_log(LOG_DEBUG, "==============================================================================\n"); -+ } -+} -+/*- End of function --------------------------------------------------------*/ -+ -+static int txfax_exec(struct ast_channel *chan, void *data) -+{ -+ int res = 0; -+ char source_file[256]; -+ char *x; -+ char *s; -+ char *t; -+ char *v; -+ int option; -+ int len; -+ t30_state_t fax; -+ int calling_party; -+ int verbose; -+ int samples; -+ -+ struct localuser *u; -+ struct ast_frame *inf = NULL; -+ struct ast_frame outf; -+ -+ int original_read_fmt; -+ int original_write_fmt; -+ -+ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET]; -+ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET; -+ -+ if (chan == NULL) -+ { -+ ast_log(LOG_WARNING, "Fax transmit channel is NULL. Giving up.\n"); -+ return -1; -+ } -+ -+ /* The next few lines of code parse out the filename and header from the input string */ -+ if (data == NULL) -+ { -+ /* No data implies no filename or anything is present */ -+ ast_log(LOG_WARNING, "Txfax requires an argument (filename)\n"); -+ return -1; -+ } -+ -+ calling_party = FALSE; -+ verbose = FALSE; -+ source_file[0] = '\0'; -+ -+ for (option = 0, v = s = data; v; option++, s++) -+ { -+ t = s; -+ v = strchr(s, '|'); -+ s = (v) ? v : s + strlen(s); -+ strncpy(buf, t, s - t); -+ buf[s - t] = '\0'; -+ if (option == 0) -+ { -+ /* The first option is always the file name */ -+ len = s - t; -+ if (len > 255) -+ len = 255; -+ strncpy(source_file, t, len); -+ source_file[len] = '\0'; -+ } -+ else if (strncmp("caller", t, s - t) == 0) -+ { -+ calling_party = TRUE; -+ } -+ else if (strncmp("debug", t, s - t) == 0) -+ { -+ verbose = TRUE; -+ } -+ } -+ -+ /* Done parsing */ -+ -+ LOCAL_USER_ADD(u); -+ -+ if (chan->_state != AST_STATE_UP) -+ { -+ /* Shouldn't need this, but checking to see if channel is already answered -+ * Theoretically asterisk should already have answered before running the app */ -+ res = ast_answer(chan); -+ } -+ -+ if (!res) -+ { -+ original_read_fmt = chan->readformat; -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n"); -+ return -1; -+ } -+ } -+ original_write_fmt = chan->writeformat; -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR); -+ if (res < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n"); -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ return -1; -+ } -+ } -+ fax_init(&fax, calling_party, NULL); -+ fax.verbose = verbose; -+ -+ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID"); -+ if (x && x[0]) -+ fax_set_local_ident(&fax, x); -+ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO"); -+ if (x && x[0]) -+ fax_set_header_info(&fax, x); -+ fax_set_tx_file(&fax, source_file); -+ //fax_set_phase_b_handler(&fax, phase_b_handler, chan); -+ //fax_set_phase_d_handler(&fax, phase_d_handler, chan); -+ fax_set_phase_e_handler(&fax, phase_e_handler, chan); -+ while (ast_waitfor(chan, -1) > -1) -+ { -+ inf = ast_read(chan); -+ if (inf == NULL) -+ { -+ res = -1; -+ break; -+ } -+ if (inf->frametype == AST_FRAME_VOICE) -+ { -+ if (fax_rx_process(&fax, inf->data, inf->samples)) -+ break; -+ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE; -+ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples); -+ if (len) -+ { -+ memset(&outf, 0, sizeof(outf)); -+ outf.frametype = AST_FRAME_VOICE; -+ outf.subclass = AST_FORMAT_SLINEAR; -+ outf.datalen = len*sizeof(int16_t); -+ outf.samples = len; -+ outf.data = &buf[AST_FRIENDLY_OFFSET]; -+ outf.offset = AST_FRIENDLY_OFFSET; -+ if (ast_write(chan, &outf) < 0) -+ { -+ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno)); -+ break; -+ } -+ } -+ } -+ ast_frfree(inf); -+ } -+ if (inf == NULL) -+ { -+ ast_log(LOG_DEBUG, "Got hangup\n"); -+ res = -1; -+ } -+ if (original_read_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_read_format(chan, original_read_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name); -+ } -+ if (original_write_fmt != AST_FORMAT_SLINEAR) -+ { -+ res = ast_set_write_format(chan, original_write_fmt); -+ if (res) -+ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name); -+ } -+ } -+ else -+ { -+ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name); -+ } -+ LOCAL_USER_REMOVE(u); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int unload_module(void) -+{ -+ STANDARD_HANGUP_LOCALUSERS; -+ return ast_unregister_application(app); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int load_module(void) -+{ -+ return ast_register_application(app, txfax_exec, synopsis, descrip); -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *description(void) -+{ -+ return tdesc; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+int usecount(void) -+{ -+ int res; -+ -+ STANDARD_USECOUNT(res); -+ return res; -+} -+/*- End of function --------------------------------------------------------*/ -+ -+char *key(void) -+{ -+ return ASTERISK_GPL_KEY; -+} -+/*- End of function --------------------------------------------------------*/ -+/*- End of file ------------------------------------------------------------*/ diff --git a/net/asterisk16/files/patch-cdr::Makefile b/net/asterisk16/files/patch-cdr::Makefile deleted file mode 100644 index da16b609d5f2..000000000000 --- a/net/asterisk16/files/patch-cdr::Makefile +++ /dev/null @@ -1,70 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ cdr/Makefile Thu Jan 12 17:56:23 2006 -@@ -21,8 +21,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,18 +38,18 @@ - # - # unixODBC stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) - MODS+=cdr_odbc.so - endif - - # - # FreeTDS stuff... - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h),) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 - else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.62),1) - CFLAGS += -DFREETDS_0_62 - else - CFLAGS += -DFREETDS_PRE_0_62 -@@ -61,7 +61,7 @@ - # - # PGSQL stuff... Autoconf anyone?? - # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) - MODS+=cdr_pgsql.so - endif - -@@ -82,9 +82,9 @@ - MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql),) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/pgsql -- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib/pgsql -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql),) -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql -+ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/pgsql - endif - - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -110,7 +110,7 @@ - all: depend $(MODS) - - install: all -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - clean: - rm -f *.so *.o .depend diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile deleted file mode 100644 index edca9b1e7694..000000000000 --- a/net/asterisk16/files/patch-channels::Makefile +++ /dev/null @@ -1,85 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -48,9 +48,9 @@ - endif - - ifeq (${OSARCH},FreeBSD) -- PTLIB=-lpt_FreeBSD_x86_r -- H323LIB=-lh323_FreeBSD_x86_r -- CHANH323LIB=-pthread -+ PTLIB=-lpt_FreeBSD_x86_r_s -+ H323LIB=-lh323_FreeBSD_x86_r_s -+ CHANH323LIB= - endif - - ifeq (${OSARCH},NetBSD) -@@ -73,11 +73,11 @@ - SOLINK+=-lrt - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/ixjuser.h),) - CHANNEL_LIBS+=chan_phone.so - endif - --ifneq ($(wildcard h323/libchanh323.a),) -+ifdef WITH_H323 - CHANNEL_LIBS+=chan_h323.so - endif - -@@ -91,12 +91,12 @@ - CHANNEL_LIBS+=chan_alsa.so - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libpri.so.1),) - CFLAGS+=-DZAPATA_PRI - ZAPPRI=-lpri - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib/libmfcr2.so.1),) - CFLAGS+=-DZAPATA_R2 - ZAPR2=-lmfcr2 - endif -@@ -109,12 +109,12 @@ - endif - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) - ifeq (${OSARCH},NetBSD) - SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib - endif - ifeq (${OSARCH},FreeBSD) -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - CFLAGS+=-DIAX_TRUNKING - CHANNEL_LIBS+=chan_zap.so -@@ -229,8 +229,10 @@ - chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast - $(CC) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) -lstdc++ - else --chan_h323.so: chan_h323.o h323/libchanh323.a -- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat -+chan_h323.so: chan_h323.o h323/ast_h323.o -+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - endif - - chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a -@@ -244,8 +246,7 @@ - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -- if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk16/files/patch-channels::chan_h323.c b/net/asterisk16/files/patch-channels::chan_h323.c deleted file mode 100644 index 4ca048812ecd..000000000000 --- a/net/asterisk16/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c.orig -+++ channels/chan_h323.c -@@ -31,6 +31,7 @@ - * \ingroup channel_drivers - */ - -+#include <sys/types.h> - #include <sys/socket.h> - #include <sys/signal.h> - #include <sys/param.h> diff --git a/net/asterisk16/files/patch-channels::chan_sip.c b/net/asterisk16/files/patch-channels::chan_sip.c deleted file mode 100644 index 2b2fae7a311f..000000000000 --- a/net/asterisk16/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,131 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig Tue Jan 24 16:25:53 2006 -+++ channels/chan_sip.c Tue Jan 24 16:30:44 2006 -@@ -337,7 +337,7 @@ static char global_vmexten[AST_MAX_EXTEN - - static char default_language[MAX_LANGUAGE] = ""; - --#define DEFAULT_CALLERID "asterisk" -+#define DEFAULT_CALLERID "Unknown" - static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; -@@ -475,6 +475,7 @@ struct sip_invite_param { - - struct sip_route { - struct sip_route *next; -+ int lr; - char hop[0]; - }; - -@@ -6015,6 +6016,7 @@ static void build_route(struct sip_pvt * - /* Make a struct route */ - thishop = malloc(sizeof(*thishop) + len); - if (thishop) { -+ thishop->lr = (strnstr(rr, ";lr", len) != NULL ? 1 : 0); - ast_copy_string(thishop->hop, rr, len); - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); - /* Link in */ -@@ -6040,31 +6042,41 @@ static void build_route(struct sip_pvt * - - /* Only append the contact if we are dealing with a strict router */ - if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) { -- /* 2nd append the Contact: if there is one */ -- /* Can be multiple Contact headers, comma separated values - we just take the first */ -- contact = get_header(req, "Contact"); -- if (!ast_strlen_zero(contact)) { -- ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -- /* Look for <: delimited address */ -- c = strchr(contact, '<'); -- if (c) { -- /* Take to > */ -- ++c; -- len = strcspn(c, ">") + 1; -- } else { -- /* No <> - just take the lot */ -- c = contact; -- len = strlen(contact) + 1; -- } -- thishop = malloc(sizeof(*thishop) + len); -+ /* Duplicate first route from the list */ -+ if (head && head->lr) { -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+strlen(head->hop)+1); - if (thishop) { -- ast_copy_string(thishop->hop, c, len); -- thishop->next = NULL; -- /* Goes at the end */ -- if (tail) -- tail->next = thishop; -- else -- head = thishop; -+ memcpy(thishop, head, sizeof(struct sip_route)+strlen(head->hop)+1); -+ thishop->next = head; -+ head = thishop; -+ } -+ } else { -+ /* Append the Contact: if there is one and first route is w/o `lr' param */ -+ /* Can be multiple Contact headers, comma separated values - we just take the first */ -+ contact = get_header(req, "Contact"); -+ if (!ast_strlen_zero(contact)) { -+ ast_log(LOG_DEBUG, "build_route: Contact hop: %s\n", contact); -+ /* Look for <: delimited address */ -+ c = strchr(contact, '<'); -+ if (c) { -+ /* Take to > */ -+ ++c; -+ len = strcspn(c, ">") + 1; -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; -+ len = strlen(contact) + 1; -+ } -+ thishop = malloc(sizeof(*thishop) + len); -+ if (thishop) { -+ ast_copy_string(thishop->hop, c, len); -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - } -@@ -10352,7 +10364,11 @@ static int handle_request_invite(struct - gotdest = get_destination(p, NULL); - - get_rdnis(p, NULL); -- extract_uri(p, req); -+ build_route(p, req, 0); -+ if (!p->route->lr) -+ strncpy(p->uri, p->route->hop, sizeof(p->uri) - 1); -+ else -+ extract_uri(p, req); - build_contact(p); - - if (gotdest) { -@@ -10380,7 +10396,6 @@ static int handle_request_invite(struct - c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username ); - *recount = 1; - /* Save Record-Route for any later requests we make on this dialogue */ -- build_route(p, req, 0); - if (c) { - /* Pre-lock the call */ - ast_mutex_lock(&c->lock); -@@ -10466,7 +10481,12 @@ static int handle_request_invite(struct - transmit_response(p, "180 Ringing", req); - break; - case AST_STATE_UP: -- /* Here we have reINVITE request - try to renegotiate codecs with */ -+ /* Assuming this to be reinvite, process new SDP portion */ -+ if (!ast_strlen_zero(get_header(req, "Content-Type"))) { -+ process_sdp(p, req); -+ } else { -+ ast_log(LOG_DEBUG, "Hm.... No sdp for the moment\n"); -+ } - transmit_response_with_sdp(p, "200 OK", req, 1); - break; - default: diff --git a/net/asterisk16/files/patch-channels::chan_zap.c b/net/asterisk16/files/patch-channels::chan_zap.c deleted file mode 100644 index ab02c02af962..000000000000 --- a/net/asterisk16/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,80 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c.orig Tue Nov 29 20:24:39 2005 -+++ channels/chan_zap.c Fri Jan 13 13:28:33 2006 -@@ -638,6 +638,7 @@ static struct zt_pvt { - int cidlen; - int ringt; - int ringt_base; -+ int waitnorings; - int stripmsd; - int callwaitcas; - int callwaitrings; -@@ -2308,6 +2309,19 @@ static int zt_hangup(struct ast_channel - } - - ast_mutex_lock(&p->lock); -+ switch (p->sig) { -+ case SIG_FXSGS: -+ case SIG_FXSKS: -+ case SIG_FXSLS: -+ if((ast->_state == AST_STATE_RING) && (p->ringt > 1)) -+ { -+ p->waitnorings = 1; -+ } -+ break; -+ default: -+ break; -+ }; -+ - - index = zt_get_index(ast, p, 1); - -@@ -6129,7 +6143,37 @@ static void *ss_thread(void *data) - ast_setstate(chan, AST_STATE_RING); - chan->rings = 1; - p->ringt = p->ringt_base; -+ p->waitnorings = 0; - res = ast_pbx_run(chan); -+ -+ if(p->waitnorings) -+ { -+ p->ringt = p->ringt_base; -+ for(;;) -+ { -+ int i,j=0; -+ i = ZT_IOMUX_SIGEVENT | ZT_IOMUX_NOWAIT; -+ if (ioctl(p->subs[index].zfd, ZT_IOMUX, &i) == -1) -+ break; -+ -+ if (ioctl(p->subs[index].zfd, ZT_GETEVENT, &j) == -1) -+ break; -+ -+ if(j == ZT_EVENT_RINGOFFHOOK) -+ p->ringt = p->ringt_base; -+ -+ usleep(20000); -+ -+ if (p->ringt <= 0) -+ break; -+ -+ else if (p->ringt > 0) -+ p->ringt--; -+ } -+ p->ringt = 0; -+ p->waitnorings = 0; -+ } -+ - if (res) { - ast_hangup(chan); - ast_log(LOG_WARNING, "PBX exited non-zero\n"); -@@ -6431,7 +6475,7 @@ static void *do_monitor(void *data) - i = iflist; - while(i) { - if ((i->subs[SUB_REAL].zfd > -1) && i->sig && (!i->radio)) { -- if (!i->owner && !i->subs[SUB_REAL].owner) { -+ if (!i->owner && !i->subs[SUB_REAL].owner && !i->waitnorings) { - /* This needs to be watched, as it lacks an owner */ - pfds[count].fd = i->subs[SUB_REAL].zfd; - pfds[count].events = POLLPRI; diff --git a/net/asterisk16/files/patch-channels::h323::ast_h323.cpp b/net/asterisk16/files/patch-channels::h323::ast_h323.cpp deleted file mode 100644 index feb79e586e91..000000000000 --- a/net/asterisk16/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig Thu Jan 12 18:16:08 2006 -+++ channels/h323/ast_h323.cpp Thu Jan 12 18:16:35 2006 -@@ -953,8 +953,8 @@ BOOL MyH323Connection::OnReceivedCapabil - H323Channel * MyH323Connection::CreateRealTimeLogicalChannel(const H323Capability & capability, - H323Channel::Directions dir, - unsigned sessionID, -- const H245_H2250LogicalChannelParameters * /*param*/, -- RTP_QOS * /*param*/ ) -+ const H245_H2250LogicalChannelParameters * /*param*/ /*, -+ RTP_QOS * */ /*param*/ ) - { - return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID); - } diff --git a/net/asterisk16/files/patch-channels::h323::ast_h323.h b/net/asterisk16/files/patch-channels::h323::ast_h323.h deleted file mode 100644 index 606bb0123173..000000000000 --- a/net/asterisk16/files/patch-channels::h323::ast_h323.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.h.orig Thu Jan 12 18:14:49 2006 -+++ channels/h323/ast_h323.h Thu Jan 12 18:15:02 2006 -@@ -155,8 +155,8 @@ class MyH323Connection : public H323Conn - H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, - H323Channel::Directions, - unsigned, -- const H245_H2250LogicalChannelParameters *, -- RTP_QOS *); -+ const H245_H2250LogicalChannelParameters * /* , -+ RTP_QOS * */); - H323Connection::AnswerCallResponse OnAnswerCall(const PString &, - const H323SignalPDU &, - H323SignalPDU &); diff --git a/net/asterisk16/files/patch-codecs::Makefile b/net/asterisk16/files/patch-codecs::Makefile deleted file mode 100644 index ab5cbc4aef2c..000000000000 --- a/net/asterisk16/files/patch-codecs::Makefile +++ /dev/null @@ -1,53 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ codecs/Makefile Fri Jan 13 10:33:21 2006 -@@ -30,8 +30,8 @@ - - UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) - UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) --ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) --ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) -+ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex.h) -+ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h) - ifneq (${UI_SPEEX},) - MODSPEEX=codec_speex.so - LIBSPEEX+=-lspeex -lm -@@ -43,14 +43,14 @@ - endif - ifneq (${ULI_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - ifneq (${ULIS_SPEEX},) - MODSPEEX=codec_speex.so -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex -- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex -+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - endif - -@@ -65,7 +65,7 @@ - LIBLPC10=lpc10/liblpc10.a - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -@@ -126,7 +126,7 @@ - endif - - install: all -- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk16/files/patch-codecs::gsm::Makefile b/net/asterisk16/files/patch-codecs::gsm::Makefile deleted file mode 100644 index 7256eeae5692..000000000000 --- a/net/asterisk16/files/patch-codecs::gsm::Makefile +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- codecs/gsm/Makefile.orig -+++ codecs/gsm/Makefile -@@ -49,7 +49,9 @@ - ifneq (${PROC},arm) - ifneq (${PROC},ppc) - ifneq (${PROC},ppc64) --OPTIMIZE+=-march=$(PROC) -+ifneq (${PROC},amd64) -+#OPTIMIZE+=-march=$(PROC) -+endif - endif - endif - endif diff --git a/net/asterisk16/files/patch-codecs::ilbc::Makefile b/net/asterisk16/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 26a2f20e5529..000000000000 --- a/net/asterisk16/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Fri Jan 13 11:01:07 2006 -+++ codecs/ilbc/Makefile Fri Jan 13 11:01:51 2006 -@@ -1,5 +1,5 @@ - ARCH=$(PROC) --CFLAGS+=-Wall -O3 -funroll-loops -+CFLAGS+=-Wall -funroll-loops - ifneq (${OSARCH},CYGWIN) - CFLAGS += -fPIC - endif diff --git a/net/asterisk16/files/patch-configs::musiconhold.conf.sample b/net/asterisk16/files/patch-configs::musiconhold.conf.sample deleted file mode 100644 index ff63cc9ff08b..000000000000 --- a/net/asterisk16/files/patch-configs::musiconhold.conf.sample +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- configs/musiconhold.conf.sample.orig Tue Nov 29 20:24:39 2005 -+++ configs/musiconhold.conf.sample Fri Jan 13 11:38:39 2006 -@@ -4,7 +4,7 @@ - - [default] - mode=quietmp3 --directory=/var/lib/asterisk/mohmp3 -+directory=/usr/local/share/asterisk/mohmp3 - - ; valid mode options: - ; quietmp3 -- default diff --git a/net/asterisk16/files/patch-db.c b/net/asterisk16/files/patch-db.c deleted file mode 100644 index ba7f3f206b78..000000000000 --- a/net/asterisk16/files/patch-db.c +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jan 13 11:05:32 2006 -+++ db.c Fri Jan 13 11:06:55 2006 -@@ -35,6 +35,7 @@ - #include <errno.h> - #include <unistd.h> - #include <dirent.h> -+#include <db.h> - - #include "asterisk.h" - -@@ -51,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi - #include "asterisk/utils.h" - #include "asterisk/lock.h" - #include "asterisk/manager.h" --#include "db1-ast/include/db.h" - - #ifdef __CYGWIN__ - #define dbopen __dbopen diff --git a/net/asterisk16/files/patch-editline::configure b/net/asterisk16/files/patch-editline::configure deleted file mode 100644 index f6b9c5b76eee..000000000000 --- a/net/asterisk16/files/patch-editline::configure +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/configure.orig Sun Apr 27 21:13:11 2003 -+++ editline/configure Fri Jan 30 01:47:34 2004 -@@ -1906,7 +1906,7 @@ - CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG" - CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE" - else -- CFLAGS="$CFLAGS -O" -+ CFLAGS="$CFLAGS" - fi - - diff --git a/net/asterisk16/files/patch-editline::makelist b/net/asterisk16/files/patch-editline::makelist deleted file mode 100644 index cff9b3ae29e0..000000000000 --- a/net/asterisk16/files/patch-editline::makelist +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- editline/makelist -+++ editline/makelist -@@ -145,7 +145,7 @@ - # - -fh) - cat $FILES | $AWK '/el_action_t/ { print $3 }' | \ -- sort | tr '[a-z]' '[A-Z]' | $AWK ' -+ sort | tr '[:lower:]' '[:upper:]' | $AWK ' - BEGIN { - printf("/* Automatically generated file, do not edit */\n"); - printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n"); diff --git a/net/asterisk16/files/patch-formats::Makefile b/net/asterisk16/files/patch-formats::Makefile deleted file mode 100644 index b2b1db5a37bd..000000000000 --- a/net/asterisk16/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Fri Jan 13 11:16:07 2006 -+++ formats/Makefile Fri Jan 13 11:47:25 2006 -@@ -20,7 +20,7 @@ - # - # G723 simple frame is deprecated - # --FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - # - # OGG/Vorbis format -@@ -60,7 +60,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm - - install: all -- for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FORMAT_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk16/files/patch-formats::format_g723_1.c b/net/asterisk16/files/patch-formats::format_g723_1.c deleted file mode 100644 index ae814f197a1e..000000000000 --- a/net/asterisk16/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,354 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 13 12:18:51 2006 -+++ formats/format_g723_1.c Fri Jan 13 12:18:41 2006 -@@ -0,0 +1,348 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Save and read raw, headerless G723.1 Annex A data. -+ * -+ * Copyright (C) 1999, Mark Spencer <markster@linux-support.net> -+ * Copyright (C) 2003, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <stdio.h> -+#include <asterisk/lock.h> -+#include <asterisk/channel.h> -+#include <asterisk/file.h> -+#include <asterisk/logger.h> -+#include <asterisk/sched.h> -+#include <asterisk/module.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#include <stdlib.h> -+#include <sys/time.h> -+#include <unistd.h> -+#include <errno.h> -+#include <string.h> -+#include <pthread.h> -+#ifdef __linux__ -+#include <endian.h> -+#else -+#include <machine/endian.h> -+#endif -+ -+/* Based on format_g729.c */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+struct ast_filestream { -+ void *reserved[AST_RESERVED_POINTERS]; -+ /* This is what a filestream means to us */ -+ FILE *f; /* Descriptor */ -+ struct ast_frame fr; /* Frame information */ -+ char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ -+ char empty; /* Empty character */ -+ unsigned char g723[24]; /* One Real G723.1 Frame */ -+}; -+ -+static long g723_tell(struct ast_filestream *); -+ -+AST_MUTEX_DEFINE_STATIC(g723_lock); -+static int glistcnt = 0; -+ -+static char *name = "g723"; -+static char *desc = "Raw G723.1 Annex A data"; -+static char *exts = "g723"; -+ -+static int g723_len(unsigned char buf) -+{ -+ switch(buf & TYPE_MASK) { -+ case TYPE_DONTSEND: -+ return 2; -+ break; -+ case TYPE_SILENCE: -+ return 4; -+ break; -+ case TYPE_HIGH: -+ return 24; -+ break; -+ case TYPE_LOW: -+ return 20; -+ break; -+ default: -+ ast_log(LOG_WARNING, "Badly encoded G723.1 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static struct ast_filestream *g723_open(FILE *f) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ tmp->fr.data = tmp->g723; -+ tmp->fr.frametype = AST_FRAME_VOICE; -+ tmp->fr.subclass = AST_FORMAT_G723_1; -+ /* datalen will vary for each frame */ -+ tmp->fr.src = name; -+ tmp->fr.mallocd = 0; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } -+ return tmp; -+} -+ -+static struct ast_filestream *g723_rewrite(FILE *f, const char *comment) -+{ -+ /* We don't have any header to read or anything really, but -+ if we did, it would go here. We also might want to check -+ and be sure it's a valid file. */ -+ struct ast_filestream *tmp; -+ if ((tmp = malloc(sizeof(struct ast_filestream)))) { -+ memset(tmp, 0, sizeof(struct ast_filestream)); -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ free(tmp); -+ return NULL; -+ } -+ tmp->f = f; -+ glistcnt++; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ } else -+ ast_log(LOG_WARNING, "Out of memory\n"); -+ return tmp; -+} -+ -+static void g723_close(struct ast_filestream *s) -+{ -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return; -+ } -+ glistcnt--; -+ ast_mutex_unlock(&g723_lock); -+ ast_update_use_count(); -+ fclose(s->f); -+ free(s); -+ s = NULL; -+} -+ -+static struct ast_frame *g723_read(struct ast_filestream *s, int *whennext) -+{ -+ int res; -+ /* Send a frame from the file to the appropriate channel */ -+ s->fr.frametype = AST_FRAME_VOICE; -+ s->fr.subclass = AST_FORMAT_G723_1; -+ s->fr.offset = AST_FRIENDLY_OFFSET; -+ s->fr.samples = 240; -+ s->fr.mallocd = 0; -+ s->fr.data = s->g723; -+ if ((res = fread(s->g723, 1, 1, s->f)) != 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ s->fr.datalen = g723_len(s->g723[0]); -+ if (s->fr.datalen < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame!\n"); -+ return NULL; -+ } -+ if (s->fr.datalen > 1 && (res = fread(s->g723 + 1, 1, s->fr.datalen - 1, s->f)) != s->fr.datalen - 1) { -+ if (res) -+ ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); -+ return NULL; -+ } -+ *whennext = s->fr.samples; -+ return &s->fr; -+} -+ -+static int g723_write(struct ast_filestream *fs, struct ast_frame *f) -+{ -+ int res; -+ unsigned char *cp; -+ if (f->frametype != AST_FRAME_VOICE) { -+ ast_log(LOG_WARNING, "Asked to write non-voice frame!\n"); -+ return -1; -+ } -+ if (f->subclass != AST_FORMAT_G723_1) { -+ ast_log(LOG_WARNING, "Asked to write non-G723.1 frame (%d)!\n", f->subclass); -+ return -1; -+ } -+ for (cp = f->data; cp < (unsigned char *)f->data + f->datalen; cp += res) { -+ res = g723_len(cp[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Asked to write invalid G723.1 frame!\n"); -+ return -1; -+ } -+ } -+ if (cp != (unsigned char *)f->data + f->datalen) { -+ ast_log(LOG_WARNING, "Invalid G723.1 data length, %d\n", f->datalen); -+ return -1; -+ } -+ if ((res = fwrite(f->data, 1, f->datalen, fs->f)) != f->datalen) { -+ ast_log(LOG_WARNING, "Bad write %d: %s\n", res, strerror(errno)); -+ return -1; -+ } -+ return 0; -+} -+ -+static char *g723_getcomment(struct ast_filestream *s) -+{ -+ return NULL; -+} -+ -+static int g723_seek(struct ast_filestream *fs, long sample_offset, int whence) -+{ -+ long cur, offset, max; -+ off_t coffset, moffset, soffset; -+ int res; -+ unsigned char c; -+ -+ offset = 0; /* Shut up gcc warning */ -+ if (whence == SEEK_SET) { -+ offset = sample_offset; -+ } else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) { -+ if ((cur = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get current position!\n"); -+ return -1; -+ } -+ offset = cur + sample_offset; -+ } -+ if (fseeko(fs->f, 0, SEEK_END) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ else { -+ moffset = ftello(fs->f); -+ } -+ if (whence == SEEK_END) { -+ if ((max = g723_tell(fs)) == -1) { -+ ast_log(LOG_WARNING, "Can't get maximum position!\n"); -+ return -1; -+ } -+ offset = max - sample_offset; -+ } -+ if (offset < 0) -+ offset = 0; -+ soffset = -1; -+ for (coffset = 0; coffset < moffset && offset > 0; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %lli!\n", coffset); -+ return -1; -+ } -+ soffset = coffset; -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %lli!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ offset -= 240; -+ } -+ if (soffset != -1 && fseeko(fs->f, soffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", soffset); -+ return -1; -+ } -+ -+ return 0; -+} -+ -+static int g723_trunc(struct ast_filestream *fs) -+{ -+ /* Truncate file to current length */ -+ if (ftruncate(fileno(fs->f), ftello(fs->f)) < 0) -+ return -1; -+ return 0; -+} -+ -+static long g723_tell(struct ast_filestream *fs) -+{ -+ off_t offset, coffset; -+ int res; -+ long rval; -+ unsigned char c; -+ -+ offset = ftello(fs->f); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (fseeko(fs->f, coffset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (fread(&c, 1, 1, fs->f) != 1) { -+ ast_log(LOG_WARNING, "Can't read from offset %llu!\n", coffset); -+ return -1; -+ } -+ if ((res = g723_len(c)) < 0) { -+ ast_log(LOG_WARNING, "Invalid G723.1 frame at offset %llu!\n", coffset); -+ return -1; -+ } -+ if (res > 1) -+ rval += 240; -+ } -+ if (fseeko(fs->f, offset, SEEK_SET) == -1) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", offset); -+ return -1; -+ } -+ return rval; -+} -+ -+int load_module() -+{ -+ return ast_format_register(name, exts, AST_FORMAT_G723_1, -+ g723_open, -+ g723_rewrite, -+ g723_write, -+ g723_seek, -+ g723_trunc, -+ g723_tell, -+ g723_read, -+ g723_close, -+ g723_getcomment); -+} -+ -+int unload_module() -+{ -+ return ast_format_unregister(name); -+} -+ -+int usecount() -+{ -+ int res; -+ if (ast_mutex_lock(&g723_lock)) { -+ ast_log(LOG_WARNING, "Unable to lock g723 list\n"); -+ return -1; -+ } -+ res = glistcnt; -+ ast_mutex_unlock(&g723_lock); -+ return res; -+} -+ -+char *description() -+{ -+ return desc; -+} -+ -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk16/files/patch-formats::format_g729.c b/net/asterisk16/files/patch-formats::format_g729.c deleted file mode 100644 index 11be5281608f..000000000000 --- a/net/asterisk16/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Fri Jan 13 12:20:53 2006 -+++ formats/format_g729.c Fri Jan 13 12:23:33 2006 -@@ -60,7 +60,7 @@ struct ast_filestream { - struct ast_frame fr; /* Frame information */ - char waste[AST_FRIENDLY_OFFSET]; /* Buffer for sending frames, etc */ - char empty; /* Empty character */ -- unsigned char g729[20]; /* Two Real G729 Frames */ -+ unsigned char g729[10]; /* One Real G729 Frame */ - }; - - -@@ -141,11 +141,11 @@ static struct ast_frame *g729_read(struc - s->fr.frametype = AST_FRAME_VOICE; - s->fr.subclass = AST_FORMAT_G729A; - s->fr.offset = AST_FRIENDLY_OFFSET; -- s->fr.samples = 160; -- s->fr.datalen = 20; -+ s->fr.samples = 80; -+ s->fr.datalen = 10; - s->fr.mallocd = 0; - s->fr.data = s->g729; -- if ((res = fread(s->g729, 1, 20, s->f)) != 20) { -+ if ((res = fread(s->g729, 1, 10, s->f)) != 10) { - if (res && (res != 10)) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -190,7 +190,7 @@ static int g729_seek(struct ast_filestre - fseek(fs->f, 0, SEEK_END); - max = ftell(fs->f); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -219,7 +219,7 @@ static long g729_tell(struct ast_filestr - { - off_t offset; - offset = ftell(fs->f); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() diff --git a/net/asterisk16/files/patch-frame.c b/net/asterisk16/files/patch-frame.c deleted file mode 100644 index 753253c7af0d..000000000000 --- a/net/asterisk16/files/patch-frame.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- frame.c.orig Wed Jan 25 13:22:43 2006 -+++ frame.c Wed Jan 25 13:21:25 2006 -@@ -1170,7 +1170,7 @@ static int g723_len(unsigned char buf) - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; diff --git a/net/asterisk16/files/patch-funcs::Makefile b/net/asterisk16/files/patch-funcs::Makefile deleted file mode 100644 index a14daeed285c..000000000000 --- a/net/asterisk16/files/patch-funcs::Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- funcs/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ funcs/Makefile Fri Jan 13 12:36:57 2006 -@@ -67,7 +67,7 @@ - $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} - - install: all -- for x in $(FUNCS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(FUNCS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk16/files/patch-include::asterisk::utils.h b/net/asterisk16/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk16/files/patch-include::asterisk::utils.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- include/asterisk/utils.h 2004/10/10 12:55:50 1.1 -+++ include/asterisk/utils.h 2004/10/10 12:56:43 -@@ -37,7 +37,6 @@ - #ifdef inet_ntoa - #undef inet_ntoa - #endif --#define inet_ntoa __dont__use__inet_ntoa__use__ast_inet_ntoa__instead__ - - #ifdef LINUX - #define ast_pthread_create pthread_create diff --git a/net/asterisk16/files/patch-pbx::Makefile b/net/asterisk16/files/patch-pbx::Makefile deleted file mode 100644 index 97d03e10f871..000000000000 --- a/net/asterisk16/files/patch-pbx::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig -+++ pbx/Makefile -@@ -23,8 +23,8 @@ - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - --GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` --GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` -+#GTK_FLAGS=`${CROSS_COMPILE_BIN}gtk-config --cflags gthread` -+#GTK_LIBS=`${CROSS_COMPILE_BIN}gtk-config --libs gthread` - MOC=$(QTDIR)/bin/moc - KDE_FLAGS=-I$(KDEDIR)/include -I$(KDEDIR)/include/kde -I$(QTDIR)/include - KDE_LIBS=-L$(KDEDIR)/lib -L$(QTDIR)/lib -lqt -lkdecore -lkdeui -@@ -72,7 +72,7 @@ - endif - - install: all -- for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(PBX_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - depend: .depend - diff --git a/net/asterisk16/files/patch-res::Makefile b/net/asterisk16/files/patch-res::Makefile deleted file mode 100644 index de5c365db34d..000000000000 --- a/net/asterisk16/files/patch-res::Makefile +++ /dev/null @@ -1,35 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile -+++ res/Makefile -@@ -37,8 +37,8 @@ - endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -- SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -+ SOLINK+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - ifeq (${OSARCH},CYGWIN) -@@ -55,9 +55,7 @@ - CFLAGS+= - - ifndef WITHOUT_ZAPTEL --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h),) - CFLAGS+=-DZAPATA_MOH --endif - endif # WITHOUT_ZAPTEL - - # -@@ -75,7 +73,7 @@ - rm -f $(DESTDIR)$(ASTHEADERDIR)/parking.h - rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so - rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - @if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \ - if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \ - echo "*************************************************************";\ diff --git a/net/asterisk16/files/patch-rtp.c b/net/asterisk16/files/patch-rtp.c deleted file mode 100644 index bbc2649929f9..000000000000 --- a/net/asterisk16/files/patch-rtp.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Fri Jan 13 13:38:01 2006 -+++ rtp.c Fri Jan 13 13:40:50 2006 -@@ -950,8 +950,10 @@ struct ast_rtp *ast_rtp_new_with_bindadd - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; - /* If there's rtcp, initialize it as well. */ -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - /* Try to bind it/them. */ - if (!(first = bind(rtp->s, (struct sockaddr *)&rtp->us, sizeof(rtp->us))) && - (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us)))) diff --git a/net/asterisk16/files/patch-utils::Makefile b/net/asterisk16/files/patch-utils::Makefile deleted file mode 100644 index f3164c0f478a..000000000000 --- a/net/asterisk16/files/patch-utils::Makefile +++ /dev/null @@ -1,34 +0,0 @@ - -$FreeBSD$ - ---- utils/Makefile -+++ utils/Makefile -@@ -17,16 +17,16 @@ - CFLAGS+=-DNO_AST_MM - - ifeq ($(findstring BSD,${OSARCH}),BSD) -- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib -+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib - endif - - TARGET=stereorize streamplayer - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/popt.h),) - TARGET+=smsq - endif - --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/newt.h),) - TARGET+=astman - endif - -@@ -40,7 +40,7 @@ - install: - for x in $(TARGET); do \ - if [ "$$x" != "none" ]; then \ -- $(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \ - fi; \ - done - diff --git a/net/asterisk16/pkg-descr b/net/asterisk16/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk16/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Asterisk is an Open Source PBX and telephony toolkit. It is, in a -sense, middleware between Internet and telephony channels on the bottom, -and Internet and telephony applications at the top. - -WWW: http://www.asteriskpbx.com diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist deleted file mode 100644 index 3af861f7a135..000000000000 --- a/net/asterisk16/pkg-plist +++ /dev/null @@ -1,755 +0,0 @@ -@unexec if cmp -s %D/etc/asterisk/adsi.conf %D/etc/asterisk/adsi.conf-dist; then rm -f %D/etc/asterisk/adsi.conf; fi -etc/asterisk/adsi.conf-dist -@exec [ -f %B/adsi.conf ] || cp %B/%f %B/adsi.conf -@unexec if cmp -s %D/etc/asterisk/adtranvofr.conf %D/etc/asterisk/adtranvofr.conf-dist; then rm -f %D/etc/asterisk/adtranvofr.conf; fi -etc/asterisk/adtranvofr.conf-dist -@exec [ -f %B/adtranvofr.conf ] || cp %B/%f %B/adtranvofr.conf -@unexec if cmp -s %D/etc/asterisk/agents.conf %D/etc/asterisk/agents.conf-dist; then rm -f %D/etc/asterisk/agents.conf; fi -etc/asterisk/agents.conf-dist -@exec [ -f %B/agents.conf ] || cp %B/%f %B/agents.conf -@unexec if cmp -s %D/etc/asterisk/alarmreceiver.conf %D/etc/asterisk/alarmreceiver.conf-dist; then rm -f %D/etc/asterisk/alarmreceiver.conf; fi -etc/asterisk/alarmreceiver.conf-dist -@exec [ -f %B/alarmreceiver.conf ] || cp %B/%f %B/alarmreceiver.conf -@unexec if cmp -s %D/etc/asterisk/alsa.conf %D/etc/asterisk/alsa.conf-dist; then rm -f %D/etc/asterisk/alsa.conf; fi -etc/asterisk/alsa.conf-dist -@exec [ -f %B/alsa.conf ] || cp %B/%f %B/alsa.conf -@unexec if cmp -s %D/etc/asterisk/asterisk.adsi %D/etc/asterisk/asterisk.adsi-dist; then rm -f %D/etc/asterisk/asterisk.adsi; fi -etc/asterisk/asterisk.adsi-dist -@exec [ -f %B/asterisk.adsi ] || cp %B/%f %B/asterisk.adsi -@unexec if cmp -s %D/etc/asterisk/asterisk.conf %D/etc/asterisk/asterisk.conf-dist; then rm -f %D/etc/asterisk/asterisk.conf; fi -etc/asterisk/asterisk.conf-dist -@exec [ -f %B/asterisk.conf ] || cp %B/%f %B/asterisk.conf -@unexec if cmp -s %D/etc/asterisk/cdr.conf %D/etc/asterisk/cdr.conf-dist; then rm -f %D/etc/asterisk/cdr.conf; fi -etc/asterisk/cdr.conf-dist -@exec [ -f %B/cdr.conf ] || cp %B/%f %B/cdr.conf -@unexec if cmp -s %D/etc/asterisk/cdr_custom.conf %D/etc/asterisk/cdr_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_custom.conf; fi -etc/asterisk/cdr_custom.conf-dist -@exec [ -f %B/cdr_custom.conf ] || cp %B/%f %B/cdr_custom.conf -@unexec if cmp -s %D/etc/asterisk/cdr_manager.conf %D/etc/asterisk/cdr_manager.conf-dist; then rm -f %D/etc/asterisk/cdr_manager.conf; fi -etc/asterisk/cdr_manager.conf-dist -@exec [ -f %B/cdr_manager.conf ] || cp %B/%f %B/cdr_manager.conf -@unexec if cmp -s %D/etc/asterisk/cdr_odbc.conf %D/etc/asterisk/cdr_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_odbc.conf; fi -etc/asterisk/cdr_odbc.conf-dist -@exec [ -f %B/cdr_odbc.conf ] || cp %B/%f %B/cdr_odbc.conf -@unexec if cmp -s %D/etc/asterisk/cdr_pgsql.conf %D/etc/asterisk/cdr_pgsql.conf-dist; then rm -f %D/etc/asterisk/cdr_pgsql.conf; fi -etc/asterisk/cdr_pgsql.conf-dist -@exec [ -f %B/cdr_pgsql.conf ] || cp %B/%f %B/cdr_pgsql.conf -@unexec if cmp -s %D/etc/asterisk/cdr_tds.conf %D/etc/asterisk/cdr_tds.conf-dist; then rm -f %D/etc/asterisk/cdr_tds.conf; fi -etc/asterisk/cdr_tds.conf-dist -@exec [ -f %B/cdr_tds.conf ] || cp %B/%f %B/cdr_tds.conf -@unexec if cmp -s %D/etc/asterisk/codecs.conf %D/etc/asterisk/codecs.conf-dist; then rm -f %D/etc/asterisk/codecs.conf; fi -etc/asterisk/codecs.conf-dist -@exec [ -f %B/codecs.conf ] || cp %B/%f %B/codecs.conf -@unexec if cmp -s %D/etc/asterisk/dnsmgr.conf %D/etc/asterisk/dnsmgr.conf-dist; then rm -f %D/etc/asterisk/dnsmgr.conf; fi -etc/asterisk/dnsmgr.conf-dist -@exec [ -f %B/dnsmgr.conf ] || cp %B/%f %B/dmsmgr.conf -@unexec if cmp -s %D/etc/asterisk/dundi.conf %D/etc/asterisk/dundi.conf-dist; then rm -f %D/etc/asterisk/dundi.conf; fi -etc/asterisk/dundi.conf-dist -@exec [ -f %B/dundi.conf ] || cp %B/%f %B/dundi.conf -@unexec if cmp -s %D/etc/asterisk/enum.conf %D/etc/asterisk/enum.conf-dist; then rm -f %D/etc/asterisk/enum.conf; fi -etc/asterisk/enum.conf-dist -@exec [ -f %B/enum.conf ] || cp %B/%f %B/enum.conf -@unexec if cmp -s %D/etc/asterisk/extensions.ael %D/etc/asterisk/extensions.ael-dist; then rm -f %D/etc/asterisk/extensions.ael; fi -etc/asterisk/extensions.ael-dist -@exec [ -f %B/extensions.ael ] || cp %B/%f %B/extensions.ael -@unexec if cmp -s %D/etc/asterisk/extconfig.conf %D/etc/asterisk/extconfig.conf-dist; then rm -f %D/etc/asterisk/extconfig.conf; fi -etc/asterisk/extconfig.conf-dist -@exec [ -f %B/extconfig.conf ] || cp %B/%f %B/extconfig.conf -@unexec if cmp -s %D/etc/asterisk/extensions.conf %D/etc/asterisk/extensions.conf-dist; then rm -f %D/etc/asterisk/extensions.conf; fi -etc/asterisk/extensions.conf-dist -@exec [ -f %B/extensions.conf ] || cp %B/%f %B/extensions.conf -@unexec if cmp -s %D/etc/asterisk/features.conf %D/etc/asterisk/features.conf-dist; then rm -f %D/etc/asterisk/features.conf; fi -etc/asterisk/features.conf-dist -@exec [ -f %B/features.conf ] || cp %B/%f %B/features.conf -@unexec if cmp -s %D/etc/asterisk/festival.conf %D/etc/asterisk/festival.conf-dist; then rm -f %D/etc/asterisk/festival.conf; fi -etc/asterisk/festival.conf-dist -@exec [ -f %B/festival.conf ] || cp %B/%f %B/festival.conf -@unexec if cmp -s %D/etc/asterisk/iax.conf %D/etc/asterisk/iax.conf-dist; then rm -f %D/etc/asterisk/iax.conf; fi -etc/asterisk/iax.conf-dist -@exec [ -f %B/iax.conf ] || cp %B/%f %B/iax.conf -@unexec if cmp -s %D/etc/asterisk/iaxprov.conf %D/etc/asterisk/iaxprov.conf-dist; then rm -f %D/etc/asterisk/iaxprov.conf; fi -etc/asterisk/iaxprov.conf-dist -@exec [ -f %B/iaxprov.conf ] || cp %B/%f %B/iaxprov.conf -@unexec if cmp -s %D/etc/asterisk/indications.conf %D/etc/asterisk/indications.conf-dist; then rm -f %D/etc/asterisk/indications.conf; fi -etc/asterisk/indications.conf-dist -@exec [ -f %B/indications.conf ] || cp %B/%f %B/indications.conf -@unexec if cmp -s %D/etc/asterisk/logger.conf %D/etc/asterisk/logger.conf-dist; then rm -f %D/etc/asterisk/logger.conf; fi -etc/asterisk/logger.conf-dist -@exec [ -f %B/logger.conf ] || cp %B/%f %B/logger.conf -@unexec if cmp -s %D/etc/asterisk/manager.conf %D/etc/asterisk/manager.conf-dist; then rm -f %D/etc/asterisk/manager.conf; fi -etc/asterisk/manager.conf-dist -@exec [ -f %B/manager.conf ] || cp %B/%f %B/manager.conf -@unexec if cmp -s %D/etc/asterisk/meetme.conf %D/etc/asterisk/meetme.conf-dist; then rm -f %D/etc/asterisk/meetme.conf; fi -etc/asterisk/meetme.conf-dist -@exec [ -f %B/meetme.conf ] || cp %B/%f %B/meetme.conf -@unexec if cmp -s %D/etc/asterisk/mgcp.conf %D/etc/asterisk/mgcp.conf-dist; then rm -f %D/etc/asterisk/mgcp.conf; fi -etc/asterisk/mgcp.conf-dist -@exec [ -f %B/mgcp.conf ] || cp %B/%f %B/mgcp.conf -@unexec if cmp -s %D/etc/asterisk/misdn.conf %D/etc/asterisk/misdn.conf-dist; then rm -f %D/etc/asterisk/misdn.conf; fi -etc/asterisk/misdn.conf-dist -@exec [ -f %B/misdn.conf ] || cp %B/%f %B/misdn.conf -@unexec if cmp -s %D/etc/asterisk/modem.conf %D/etc/asterisk/modem.conf-dist; then rm -f %D/etc/asterisk/modem.conf; fi -etc/asterisk/modem.conf-dist -@exec [ -f %B/modem.conf ] || cp %B/%f %B/modem.conf -@unexec if cmp -s %D/etc/asterisk/modules.conf %D/etc/asterisk/modules.conf-dist; then rm -f %D/etc/asterisk/modules.conf; fi -etc/asterisk/modules.conf-dist -@exec [ -f %B/modules.conf ] || cp %B/%f %B/modules.conf -@unexec if cmp -s %D/etc/asterisk/musiconhold.conf %D/etc/asterisk/musiconhold.conf-dist; then rm -f %D/etc/asterisk/musiconhold.conf; fi -etc/asterisk/musiconhold.conf-dist -@exec [ -f %B/musiconhold.conf ] || cp %B/%f %B/musiconhold.conf -@unexec if cmp -s %D/etc/asterisk/osp.conf %D/etc/asterisk/osp.conf-dist; then rm -f %D/etc/asterisk/osp.conf; fi -etc/asterisk/osp.conf-dist -@exec [ -f %B/osp.conf ] || cp %B/%f %B/osp.conf -@unexec if cmp -s %D/etc/asterisk/oss.conf %D/etc/asterisk/oss.conf-dist; then rm -f %D/etc/asterisk/oss.conf; fi -etc/asterisk/oss.conf-dist -@exec [ -f %B/oss.conf ] || cp %B/%f %B/oss.conf -@unexec if cmp -s %D/etc/asterisk/phone.conf %D/etc/asterisk/phone.conf-dist; then rm -f %D/etc/asterisk/phone.conf; fi -etc/asterisk/phone.conf-dist -@exec [ -f %B/phone.conf ] || cp %B/%f %B/phone.conf -@unexec if cmp -s %D/etc/asterisk/privacy.conf %D/etc/asterisk/privacy.conf-dist; then rm -f %D/etc/asterisk/privacy.conf; fi -etc/asterisk/privacy.conf-dist -@exec [ -f %B/privacy.conf ] || cp %B/%f %B/privacy.conf -@unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi -etc/asterisk/queues.conf-dist -@exec [ -f %B/queues.conf ] || cp %B/%f %B/queues.conf -@unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi -etc/asterisk/res_odbc.conf-dist -@exec [ -f %B/res_odbc.conf ] || cp %B/%f %B/res_odbc.conf -@unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi -etc/asterisk/rpt.conf-dist -@exec [ -f %B/rpt.conf ] || cp %B/%f %B/rpt.conf -@unexec if cmp -s %D/etc/asterisk/rtp.conf %D/etc/asterisk/rtp.conf-dist; then rm -f %D/etc/asterisk/rtp.conf; fi -etc/asterisk/rtp.conf-dist -@exec [ -f %B/rtp.conf ] || cp %B/%f %B/rtp.conf -@unexec if cmp -s %D/etc/asterisk/sip.conf %D/etc/asterisk/sip.conf-dist; then rm -f %D/etc/asterisk/sip.conf; fi -etc/asterisk/sip.conf-dist -@exec [ -f %B/sip.conf ] || cp %B/%f %B/sip.conf -@unexec if cmp -s %D/etc/asterisk/sip_notify.conf %D/etc/asterisk/sip_notify.conf-dist; then rm -f %D/etc/asterisk/sip_notify.conf; fi -etc/asterisk/sip_notify.conf-dist -@exec [ -f %B/sip_notify.conf ] || cp %B/%f %B/sip_notify.conf -@unexec if cmp -s %D/etc/asterisk/skinny.conf %D/etc/asterisk/skinny.conf-dist; then rm -f %D/etc/asterisk/skinny.conf; fi -etc/asterisk/skinny.conf-dist -@exec [ -f %B/skinny.conf ] || cp %B/%f %B/skinny.conf -@unexec if cmp -s %D/etc/asterisk/telcordia-1.adsi %D/etc/asterisk/telcordia-1.adsi-dist; then rm -f %D/etc/asterisk/telcordia-1.adsi; fi -etc/asterisk/telcordia-1.adsi-dist -@exec [ -f %B/telcordia-1.adsi ] || cp %B/%f %B/telcordia-1.adsi -@unexec if cmp -s %D/etc/asterisk/voicemail.conf %D/etc/asterisk/voicemail.conf-dist; then rm -f %D/etc/asterisk/voicemail.conf; fi -etc/asterisk/voicemail.conf-dist -@exec [ -f %B/voicemail.conf ] || cp %B/%f %B/voicemail.conf -@unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi -etc/asterisk/vpb.conf-dist -@exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf -@unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi -etc/asterisk/zapata.conf-dist -@exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf -include/asterisk/acl.h -include/asterisk/adsi.h -include/asterisk/aes.h -include/asterisk/agi.h -include/asterisk/alaw.h -include/asterisk/app.h -include/asterisk/ast_expr.h -include/asterisk/astdb.h -include/asterisk/astmm.h -include/asterisk/astobj.h -include/asterisk/astosp.h -include/asterisk/build.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/chanspy.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/compat.h -include/asterisk/config.h -include/asterisk/compiler.h -include/asterisk/crypto.h -include/asterisk/devicestate.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dnsmgr.h -include/asterisk/doxyref.h -include/asterisk/dsp.h -include/asterisk/dundi.h -include/asterisk/enum.h -include/asterisk/endian.h -include/asterisk/features.h -include/asterisk/file.h -include/asterisk/frame.h -include/asterisk/fskmodem.h -include/asterisk/image.h -include/asterisk/indications.h -include/asterisk/inline_api.h -include/asterisk/io.h -include/asterisk/linkedlists.h -include/asterisk/localtime.h -include/asterisk/lock.h -include/asterisk/logger.h -include/asterisk/manager.h -include/asterisk/md5.h -include/asterisk/module.h -include/asterisk/monitor.h -include/asterisk/musiconhold.h -include/asterisk/netsock.h -include/asterisk/options.h -include/asterisk/pbx.h -include/asterisk/plc.h -include/asterisk/poll-compat.h -include/asterisk/privacy.h -include/asterisk/res_odbc.h -include/asterisk/rtp.h -include/asterisk/say.h -include/asterisk/sched.h -include/asterisk/slinfactory.h -include/asterisk/srv.h -include/asterisk/strings.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/time.h -include/asterisk/transcap.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/unaligned.h -include/asterisk/utils.h -include/asterisk/version.h -include/asterisk/vmodem.h -lib/asterisk/modules/app_adsiprog.so -lib/asterisk/modules/app_alarmreceiver.so -lib/asterisk/modules/app_authenticate.so -lib/asterisk/modules/app_cdr.so -lib/asterisk/modules/app_chanisavail.so -lib/asterisk/modules/app_chanspy.so -lib/asterisk/modules/app_controlplayback.so -lib/asterisk/modules/app_curl.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_dictate.so -lib/asterisk/modules/app_directed_pickup.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.so -lib/asterisk/modules/app_dumpchan.so -lib/asterisk/modules/app_echo.so -lib/asterisk/modules/app_enumlookup.so -lib/asterisk/modules/app_eval.so -lib/asterisk/modules/app_exec.so -lib/asterisk/modules/app_externalivr.so -lib/asterisk/modules/app_festival.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_flash.so -lib/asterisk/modules/app_forkcdr.so -lib/asterisk/modules/app_getcpeid.so -lib/asterisk/modules/app_groupcount.so -lib/asterisk/modules/app_hasnewvoicemail.so -lib/asterisk/modules/app_ices.so -lib/asterisk/modules/app_image.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -lib/asterisk/modules/app_math.so -lib/asterisk/modules/app_md5.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mixmonitor.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_page.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_readfile.so -lib/asterisk/modules/app_realtime.so -lib/asterisk/modules/app_record.so -%%WITH_FAX%%lib/asterisk/modules/app_rxfax.so -lib/asterisk/modules/app_sayunixtime.so -lib/asterisk/modules/app_senddtmf.so -lib/asterisk/modules/app_sendtext.so -lib/asterisk/modules/app_setcallerid.so -lib/asterisk/modules/app_setcdruserfield.so -lib/asterisk/modules/app_setcidname.so -lib/asterisk/modules/app_setcidnum.so -lib/asterisk/modules/app_setrdnis.so -lib/asterisk/modules/app_settransfercapability.so -lib/asterisk/modules/app_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_stack.so -lib/asterisk/modules/app_system.so -lib/asterisk/modules/app_talkdetect.so -lib/asterisk/modules/app_test.so -lib/asterisk/modules/app_transfer.so -%%WITH_FAX%%lib/asterisk/modules/app_txfax.so -lib/asterisk/modules/app_txtcidname.so -lib/asterisk/modules/app_url.so -lib/asterisk/modules/app_userevent.so -lib/asterisk/modules/app_verbose.so -lib/asterisk/modules/app_voicemail.so -lib/asterisk/modules/app_waitforring.so -lib/asterisk/modules/app_waitforsilence.so -lib/asterisk/modules/app_while.so -lib/asterisk/modules/app_zapateller.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapbarge.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapras.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so -lib/asterisk/modules/cdr_csv.so -lib/asterisk/modules/cdr_custom.so -lib/asterisk/modules/cdr_manager.so -%%WITH_ODBC%%lib/asterisk/modules/cdr_odbc.so -lib/asterisk/modules/chan_agent.so -lib/asterisk/modules/chan_features.so -%%WITH_H323%%lib/asterisk/modules/chan_h323.so -lib/asterisk/modules/chan_iax2.so -lib/asterisk/modules/chan_local.so -lib/asterisk/modules/chan_mgcp.so -lib/asterisk/modules/chan_oss.so -lib/asterisk/modules/chan_sip.so -lib/asterisk/modules/chan_skinny.so -%%WITH_ZAPTEL%%lib/asterisk/modules/chan_zap.so -lib/asterisk/modules/codec_a_mu.so -lib/asterisk/modules/codec_adpcm.so -lib/asterisk/modules/codec_alaw.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_gsm.so -lib/asterisk/modules/codec_ilbc.so -lib/asterisk/modules/codec_lpc10.so -lib/asterisk/modules/codec_speex.so -lib/asterisk/modules/codec_ulaw.so -lib/asterisk/modules/format_au.so -lib/asterisk/modules/format_g723_1.so -lib/asterisk/modules/format_g726.so -lib/asterisk/modules/format_g729.so -lib/asterisk/modules/format_gsm.so -lib/asterisk/modules/format_h263.so -lib/asterisk/modules/format_ilbc.so -lib/asterisk/modules/format_jpeg.so -lib/asterisk/modules/format_pcm.so -lib/asterisk/modules/format_pcm_alaw.so -lib/asterisk/modules/format_sln.so -lib/asterisk/modules/format_vox.so -lib/asterisk/modules/format_wav.so -lib/asterisk/modules/format_wav_gsm.so -lib/asterisk/modules/func_callerid.so -lib/asterisk/modules/func_enum.so -lib/asterisk/modules/func_uri.so -lib/asterisk/modules/pbx_ael.so -lib/asterisk/modules/pbx_config.so -lib/asterisk/modules/pbx_dundi.so -lib/asterisk/modules/pbx_functions.so -lib/asterisk/modules/pbx_loopback.so -lib/asterisk/modules/pbx_realtime.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.so -%%NEWGCC%%lib/asterisk/modules/res_config_odbc.so -lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_features.so -lib/asterisk/modules/res_indications.so -lib/asterisk/modules/res_monitor.so -lib/asterisk/modules/res_odbc.so -lib/asterisk/modules/res_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/autosupport -sbin/rasterisk -sbin/safe_asterisk -sbin/smsq -sbin/stereorize -sbin/streamplayer -%%DATADIR%%/agi-bin/agi-test.agi -%%DATADIR%%/agi-bin/eagi-sphinx-test -%%DATADIR%%/agi-bin/eagi-test -%%DATADIR%%/firmware/iax/iaxy.bin -%%DATADIR%%/images/asterisk-intro.jpg -%%DATADIR%%/keys/freeworlddialup.pub -%%DATADIR%%/keys/iaxtel.pub -%%DATADIR%%/mohmp3/fpm-calm-river.mp3 -%%DATADIR%%/mohmp3/fpm-sunshine.mp3 -%%DATADIR%%/mohmp3/fpm-world-mix.mp3 -%%DATADIR%%/sounds/agent-alreadyon.gsm -%%DATADIR%%/sounds/agent-incorrect.gsm -%%DATADIR%%/sounds/agent-loggedoff.gsm -%%DATADIR%%/sounds/agent-loginok.gsm -%%DATADIR%%/sounds/agent-newlocation.gsm -%%DATADIR%%/sounds/agent-pass.gsm -%%DATADIR%%/sounds/agent-user.gsm -%%DATADIR%%/sounds/auth-incorrect.gsm -%%DATADIR%%/sounds/auth-thankyou.gsm -%%DATADIR%%/sounds/beep.gsm -%%DATADIR%%/sounds/beeperr.gsm -%%DATADIR%%/sounds/conf-adminmenu.gsm -%%DATADIR%%/sounds/conf-enteringno.gsm -%%DATADIR%%/sounds/conf-errormenu.gsm -%%DATADIR%%/sounds/conf-getchannel.gsm -%%DATADIR%%/sounds/conf-getconfno.gsm -%%DATADIR%%/sounds/conf-getpin.gsm -%%DATADIR%%/sounds/conf-hasjoin.gsm -%%DATADIR%%/sounds/conf-hasleft.gsm -%%DATADIR%%/sounds/conf-invalid.gsm -%%DATADIR%%/sounds/conf-invalidpin.gsm -%%DATADIR%%/sounds/conf-kicked.gsm -%%DATADIR%%/sounds/conf-leaderhasleft.gsm -%%DATADIR%%/sounds/conf-locked.gsm -%%DATADIR%%/sounds/conf-lockednow.gsm -%%DATADIR%%/sounds/conf-muted.gsm -%%DATADIR%%/sounds/conf-noempty.gsm -%%DATADIR%%/sounds/conf-onlyone.gsm -%%DATADIR%%/sounds/conf-onlyperson.gsm -%%DATADIR%%/sounds/conf-otherinparty.gsm -%%DATADIR%%/sounds/conf-placeintoconf.gsm -%%DATADIR%%/sounds/conf-thereare.gsm -%%DATADIR%%/sounds/conf-unlockednow.gsm -%%DATADIR%%/sounds/conf-unmuted.gsm -%%DATADIR%%/sounds/conf-usermenu.gsm -%%DATADIR%%/sounds/conf-userswilljoin.gsm -%%DATADIR%%/sounds/conf-userwilljoin.gsm -%%DATADIR%%/sounds/conf-waitforleader.gsm -%%DATADIR%%/sounds/demo-abouttotry.gsm -%%DATADIR%%/sounds/demo-congrats.gsm -%%DATADIR%%/sounds/demo-echodone.gsm -%%DATADIR%%/sounds/demo-echotest.gsm -%%DATADIR%%/sounds/demo-enterkeywords.gsm -%%DATADIR%%/sounds/demo-instruct.gsm -%%DATADIR%%/sounds/demo-moreinfo.gsm -%%DATADIR%%/sounds/demo-nogo.gsm -%%DATADIR%%/sounds/demo-nomatch.gsm -%%DATADIR%%/sounds/demo-thanks.gsm -%%DATADIR%%/sounds/dictate/both_help.gsm -%%DATADIR%%/sounds/dictate/enter_filename.gsm -%%DATADIR%%/sounds/dictate/forhelp.gsm -%%DATADIR%%/sounds/dictate/pause.gsm -%%DATADIR%%/sounds/dictate/paused.gsm -%%DATADIR%%/sounds/dictate/play_help.gsm -%%DATADIR%%/sounds/dictate/playback.gsm -%%DATADIR%%/sounds/dictate/playback_mode.gsm -%%DATADIR%%/sounds/dictate/record.gsm -%%DATADIR%%/sounds/dictate/record_help.gsm -%%DATADIR%%/sounds/dictate/record_mode.gsm -%%DATADIR%%/sounds/dictate/truncating_audio.gsm -%%DATADIR%%/sounds/digits/0.gsm -%%DATADIR%%/sounds/digits/1.gsm -%%DATADIR%%/sounds/digits/10.gsm -%%DATADIR%%/sounds/digits/11.gsm -%%DATADIR%%/sounds/digits/12.gsm -%%DATADIR%%/sounds/digits/13.gsm -%%DATADIR%%/sounds/digits/14.gsm -%%DATADIR%%/sounds/digits/15.gsm -%%DATADIR%%/sounds/digits/16.gsm -%%DATADIR%%/sounds/digits/17.gsm -%%DATADIR%%/sounds/digits/18.gsm -%%DATADIR%%/sounds/digits/19.gsm -%%DATADIR%%/sounds/digits/2.gsm -%%DATADIR%%/sounds/digits/20.gsm -%%DATADIR%%/sounds/digits/3.gsm -%%DATADIR%%/sounds/digits/30.gsm -%%DATADIR%%/sounds/digits/4.gsm -%%DATADIR%%/sounds/digits/40.gsm -%%DATADIR%%/sounds/digits/5.gsm -%%DATADIR%%/sounds/digits/50.gsm -%%DATADIR%%/sounds/digits/6.gsm -%%DATADIR%%/sounds/digits/60.gsm -%%DATADIR%%/sounds/digits/7.gsm -%%DATADIR%%/sounds/digits/70.gsm -%%DATADIR%%/sounds/digits/8.gsm -%%DATADIR%%/sounds/digits/80.gsm -%%DATADIR%%/sounds/digits/9.gsm -%%DATADIR%%/sounds/digits/90.gsm -%%DATADIR%%/sounds/digits/a-m.gsm -%%DATADIR%%/sounds/digits/at.gsm -%%DATADIR%%/sounds/digits/day-0.gsm -%%DATADIR%%/sounds/digits/day-1.gsm -%%DATADIR%%/sounds/digits/day-2.gsm -%%DATADIR%%/sounds/digits/day-3.gsm -%%DATADIR%%/sounds/digits/day-4.gsm -%%DATADIR%%/sounds/digits/day-5.gsm -%%DATADIR%%/sounds/digits/day-6.gsm -%%DATADIR%%/sounds/digits/dollars.gsm -%%DATADIR%%/sounds/digits/h-1.gsm -%%DATADIR%%/sounds/digits/h-10.gsm -%%DATADIR%%/sounds/digits/h-11.gsm -%%DATADIR%%/sounds/digits/h-12.gsm -%%DATADIR%%/sounds/digits/h-13.gsm -%%DATADIR%%/sounds/digits/h-14.gsm -%%DATADIR%%/sounds/digits/h-15.gsm -%%DATADIR%%/sounds/digits/h-16.gsm -%%DATADIR%%/sounds/digits/h-17.gsm -%%DATADIR%%/sounds/digits/h-18.gsm -%%DATADIR%%/sounds/digits/h-19.gsm -%%DATADIR%%/sounds/digits/h-2.gsm -%%DATADIR%%/sounds/digits/h-20.gsm -%%DATADIR%%/sounds/digits/h-3.gsm -%%DATADIR%%/sounds/digits/h-30.gsm -%%DATADIR%%/sounds/digits/h-4.gsm -%%DATADIR%%/sounds/digits/h-5.gsm -%%DATADIR%%/sounds/digits/h-6.gsm -%%DATADIR%%/sounds/digits/h-7.gsm -%%DATADIR%%/sounds/digits/h-8.gsm -%%DATADIR%%/sounds/digits/h-9.gsm -%%DATADIR%%/sounds/digits/hundred.gsm -%%DATADIR%%/sounds/digits/million.gsm -%%DATADIR%%/sounds/digits/minus.gsm -%%DATADIR%%/sounds/digits/mon-0.gsm -%%DATADIR%%/sounds/digits/mon-1.gsm -%%DATADIR%%/sounds/digits/mon-10.gsm -%%DATADIR%%/sounds/digits/mon-11.gsm -%%DATADIR%%/sounds/digits/mon-2.gsm -%%DATADIR%%/sounds/digits/mon-3.gsm -%%DATADIR%%/sounds/digits/mon-4.gsm -%%DATADIR%%/sounds/digits/mon-5.gsm -%%DATADIR%%/sounds/digits/mon-6.gsm -%%DATADIR%%/sounds/digits/mon-7.gsm -%%DATADIR%%/sounds/digits/mon-8.gsm -%%DATADIR%%/sounds/digits/mon-9.gsm -%%DATADIR%%/sounds/digits/oclock.gsm -%%DATADIR%%/sounds/digits/oh.gsm -%%DATADIR%%/sounds/digits/p-m.gsm -%%DATADIR%%/sounds/digits/pound.gsm -%%DATADIR%%/sounds/digits/star.gsm -%%DATADIR%%/sounds/digits/thousand.gsm -%%DATADIR%%/sounds/digits/today.gsm -%%DATADIR%%/sounds/digits/tomorrow.gsm -%%DATADIR%%/sounds/digits/yesterday.gsm -%%DATADIR%%/sounds/dir-instr.gsm -%%DATADIR%%/sounds/dir-intro-fn.gsm -%%DATADIR%%/sounds/dir-intro.gsm -%%DATADIR%%/sounds/dir-nomatch.gsm -%%DATADIR%%/sounds/dir-nomore.gsm -%%DATADIR%%/sounds/hello-world.gsm -%%DATADIR%%/sounds/invalid.gsm -%%DATADIR%%/sounds/letters/a.gsm -%%DATADIR%%/sounds/letters/at.gsm -%%DATADIR%%/sounds/letters/b.gsm -%%DATADIR%%/sounds/letters/c.gsm -%%DATADIR%%/sounds/letters/d.gsm -%%DATADIR%%/sounds/letters/dash.gsm -%%DATADIR%%/sounds/letters/dollar.gsm -%%DATADIR%%/sounds/letters/dot.gsm -%%DATADIR%%/sounds/letters/e.gsm -%%DATADIR%%/sounds/letters/equals.gsm -%%DATADIR%%/sounds/letters/exclaimation-point.gsm -%%DATADIR%%/sounds/letters/f.gsm -%%DATADIR%%/sounds/letters/g.gsm -%%DATADIR%%/sounds/letters/h.gsm -%%DATADIR%%/sounds/letters/i.gsm -%%DATADIR%%/sounds/letters/j.gsm -%%DATADIR%%/sounds/letters/k.gsm -%%DATADIR%%/sounds/letters/l.gsm -%%DATADIR%%/sounds/letters/m.gsm -%%DATADIR%%/sounds/letters/n.gsm -%%DATADIR%%/sounds/letters/o.gsm -%%DATADIR%%/sounds/letters/p.gsm -%%DATADIR%%/sounds/letters/plus.gsm -%%DATADIR%%/sounds/letters/q.gsm -%%DATADIR%%/sounds/letters/r.gsm -%%DATADIR%%/sounds/letters/s.gsm -%%DATADIR%%/sounds/letters/slash.gsm -%%DATADIR%%/sounds/letters/space.gsm -%%DATADIR%%/sounds/letters/t.gsm -%%DATADIR%%/sounds/letters/u.gsm -%%DATADIR%%/sounds/letters/v.gsm -%%DATADIR%%/sounds/letters/w.gsm -%%DATADIR%%/sounds/letters/x.gsm -%%DATADIR%%/sounds/letters/y.gsm -%%DATADIR%%/sounds/letters/z.gsm -%%DATADIR%%/sounds/letters/zed.gsm -%%DATADIR%%/sounds/pbx-invalid.gsm -%%DATADIR%%/sounds/pbx-invalidpark.gsm -%%DATADIR%%/sounds/pbx-transfer.gsm -%%DATADIR%%/sounds/phonetic/9_p.gsm -%%DATADIR%%/sounds/phonetic/a_p.gsm -%%DATADIR%%/sounds/phonetic/b_p.gsm -%%DATADIR%%/sounds/phonetic/c_p.gsm -%%DATADIR%%/sounds/phonetic/d_p.gsm -%%DATADIR%%/sounds/phonetic/e_p.gsm -%%DATADIR%%/sounds/phonetic/f_p.gsm -%%DATADIR%%/sounds/phonetic/g_p.gsm -%%DATADIR%%/sounds/phonetic/h_p.gsm -%%DATADIR%%/sounds/phonetic/i_p.gsm -%%DATADIR%%/sounds/phonetic/j_p.gsm -%%DATADIR%%/sounds/phonetic/k_p.gsm -%%DATADIR%%/sounds/phonetic/l_p.gsm -%%DATADIR%%/sounds/phonetic/m_p.gsm -%%DATADIR%%/sounds/phonetic/n_p.gsm -%%DATADIR%%/sounds/phonetic/o_p.gsm -%%DATADIR%%/sounds/phonetic/p_p.gsm -%%DATADIR%%/sounds/phonetic/q_p.gsm -%%DATADIR%%/sounds/phonetic/r_p.gsm -%%DATADIR%%/sounds/phonetic/s_p.gsm -%%DATADIR%%/sounds/phonetic/t_p.gsm -%%DATADIR%%/sounds/phonetic/u_p.gsm -%%DATADIR%%/sounds/phonetic/v_p.gsm -%%DATADIR%%/sounds/phonetic/w_p.gsm -%%DATADIR%%/sounds/phonetic/x_p.gsm -%%DATADIR%%/sounds/phonetic/y_p.gsm -%%DATADIR%%/sounds/phonetic/z_p.gsm -%%DATADIR%%/sounds/priv-callee-options.gsm -%%DATADIR%%/sounds/priv-callpending.gsm -%%DATADIR%%/sounds/priv-introsaved.gsm -%%DATADIR%%/sounds/priv-recordintro.gsm -%%DATADIR%%/sounds/privacy-incorrect.gsm -%%DATADIR%%/sounds/privacy-prompt.gsm -%%DATADIR%%/sounds/privacy-thankyou.gsm -%%DATADIR%%/sounds/privacy-unident.gsm -%%DATADIR%%/sounds/queue-callswaiting.gsm -%%DATADIR%%/sounds/queue-holdtime.gsm -%%DATADIR%%/sounds/queue-less-than.gsm -%%DATADIR%%/sounds/queue-minutes.gsm -%%DATADIR%%/sounds/queue-periodic-announce.gsm -%%DATADIR%%/sounds/queue-reporthold.gsm -%%DATADIR%%/sounds/queue-seconds.gsm -%%DATADIR%%/sounds/queue-thankyou.gsm -%%DATADIR%%/sounds/queue-thereare.gsm -%%DATADIR%%/sounds/queue-youarenext.gsm -%%DATADIR%%/sounds/screen-callee-options.gsm -%%DATADIR%%/sounds/spy-agent.gsm -%%DATADIR%%/sounds/spy-h323.gsm -%%DATADIR%%/sounds/spy-iax.gsm -%%DATADIR%%/sounds/spy-iax2.gsm -%%DATADIR%%/sounds/spy-mgcp.gsm -%%DATADIR%%/sounds/spy-sip.gsm -%%DATADIR%%/sounds/spy-skinny.gsm -%%DATADIR%%/sounds/spy-zap.gsm -%%DATADIR%%/sounds/ss-noservice.gsm -%%DATADIR%%/sounds/transfer.gsm -%%DATADIR%%/sounds/tt-allbusy.gsm -%%DATADIR%%/sounds/tt-monkeys.gsm -%%DATADIR%%/sounds/tt-monkeysintro.gsm -%%DATADIR%%/sounds/tt-somethingwrong.gsm -%%DATADIR%%/sounds/tt-weasels.gsm -%%DATADIR%%/sounds/vm-Cust1.gsm -%%DATADIR%%/sounds/vm-Cust2.gsm -%%DATADIR%%/sounds/vm-Cust3.gsm -%%DATADIR%%/sounds/vm-Cust4.gsm -%%DATADIR%%/sounds/vm-Cust5.gsm -%%DATADIR%%/sounds/vm-Family.gsm -%%DATADIR%%/sounds/vm-Friends.gsm -%%DATADIR%%/sounds/vm-INBOX.gsm -%%DATADIR%%/sounds/vm-Old.gsm -%%DATADIR%%/sounds/vm-Work.gsm -%%DATADIR%%/sounds/vm-advopts.gsm -%%DATADIR%%/sounds/vm-and.gsm -%%DATADIR%%/sounds/vm-calldiffnum.gsm -%%DATADIR%%/sounds/vm-changeto.gsm -%%DATADIR%%/sounds/vm-delete.gsm -%%DATADIR%%/sounds/vm-deleted.gsm -%%DATADIR%%/sounds/vm-dialout.gsm -%%DATADIR%%/sounds/vm-enter-num-to-call.gsm -%%DATADIR%%/sounds/vm-extension.gsm -%%DATADIR%%/sounds/vm-first.gsm -%%DATADIR%%/sounds/vm-for.gsm -%%DATADIR%%/sounds/vm-forward.gsm -%%DATADIR%%/sounds/vm-forwardoptions.gsm -%%DATADIR%%/sounds/vm-from-extension.gsm -%%DATADIR%%/sounds/vm-from-phonenumber.gsm -%%DATADIR%%/sounds/vm-from.gsm -%%DATADIR%%/sounds/vm-goodbye.gsm -%%DATADIR%%/sounds/vm-helpexit.gsm -%%DATADIR%%/sounds/vm-incorrect-mailbox.gsm -%%DATADIR%%/sounds/vm-incorrect.gsm -%%DATADIR%%/sounds/vm-instructions.gsm -%%DATADIR%%/sounds/vm-intro.gsm -%%DATADIR%%/sounds/vm-isonphone.gsm -%%DATADIR%%/sounds/vm-isunavail.gsm -%%DATADIR%%/sounds/vm-last.gsm -%%DATADIR%%/sounds/vm-leavemsg.gsm -%%DATADIR%%/sounds/vm-login.gsm -%%DATADIR%%/sounds/vm-mailboxfull.gsm -%%DATADIR%%/sounds/vm-message.gsm -%%DATADIR%%/sounds/vm-messages.gsm -%%DATADIR%%/sounds/vm-minutes.gsm -%%DATADIR%%/sounds/vm-mismatch.gsm -%%DATADIR%%/sounds/vm-msginstruct.gsm -%%DATADIR%%/sounds/vm-msgsaved.gsm -%%DATADIR%%/sounds/vm-newpassword.gsm -%%DATADIR%%/sounds/vm-newuser.gsm -%%DATADIR%%/sounds/vm-next.gsm -%%DATADIR%%/sounds/vm-no.gsm -%%DATADIR%%/sounds/vm-nobodyavail.gsm -%%DATADIR%%/sounds/vm-nobox.gsm -%%DATADIR%%/sounds/vm-nomore.gsm -%%DATADIR%%/sounds/vm-nonumber.gsm -%%DATADIR%%/sounds/vm-num-i-have.gsm -%%DATADIR%%/sounds/vm-onefor.gsm -%%DATADIR%%/sounds/vm-options.gsm -%%DATADIR%%/sounds/vm-opts.gsm -%%DATADIR%%/sounds/vm-passchanged.gsm -%%DATADIR%%/sounds/vm-password.gsm -%%DATADIR%%/sounds/vm-press.gsm -%%DATADIR%%/sounds/vm-prev.gsm -%%DATADIR%%/sounds/vm-reachoper.gsm -%%DATADIR%%/sounds/vm-rec-busy.gsm -%%DATADIR%%/sounds/vm-rec-name.gsm -%%DATADIR%%/sounds/vm-rec-temp.gsm -%%DATADIR%%/sounds/vm-rec-unv.gsm -%%DATADIR%%/sounds/vm-received.gsm -%%DATADIR%%/sounds/vm-reenterpassword.gsm -%%DATADIR%%/sounds/vm-repeat.gsm -%%DATADIR%%/sounds/vm-review.gsm -%%DATADIR%%/sounds/vm-saved.gsm -%%DATADIR%%/sounds/vm-savedto.gsm -%%DATADIR%%/sounds/vm-savefolder.gsm -%%DATADIR%%/sounds/vm-savemessage.gsm -%%DATADIR%%/sounds/vm-saveoper.gsm -%%DATADIR%%/sounds/vm-sorry.gsm -%%DATADIR%%/sounds/vm-star-cancel.gsm -%%DATADIR%%/sounds/vm-starmain.gsm -%%DATADIR%%/sounds/vm-tempgreeting.gsm -%%DATADIR%%/sounds/vm-tempgreeting2.gsm -%%DATADIR%%/sounds/vm-tempremoved.gsm -%%DATADIR%%/sounds/vm-then-pound.gsm -%%DATADIR%%/sounds/vm-theperson.gsm -%%DATADIR%%/sounds/vm-tocallback.gsm -%%DATADIR%%/sounds/vm-tocallnum.gsm -%%DATADIR%%/sounds/vm-tocancel.gsm -%%DATADIR%%/sounds/vm-tocancelmsg.gsm -%%DATADIR%%/sounds/vm-toenternumber.gsm -%%DATADIR%%/sounds/vm-toforward.gsm -%%DATADIR%%/sounds/vm-tohearenv.gsm -%%DATADIR%%/sounds/vm-tomakecall.gsm -%%DATADIR%%/sounds/vm-tooshort.gsm -%%DATADIR%%/sounds/vm-toreply.gsm -%%DATADIR%%/sounds/vm-torerecord.gsm -%%DATADIR%%/sounds/vm-undelete.gsm -%%DATADIR%%/sounds/vm-undeleted.gsm -%%DATADIR%%/sounds/vm-unknown-caller.gsm -%%DATADIR%%/sounds/vm-whichbox.gsm -%%DATADIR%%/sounds/vm-youhave.gsm -%%DATADIR%%/sounds/voicemail -@dirrm %%DATADIR%%/sounds/dictate -@dirrm %%DATADIR%%/sounds/phonetic -@dirrm %%DATADIR%%/sounds/letters -@dirrm %%DATADIR%%/sounds/digits -@dirrm %%DATADIR%%/sounds/priv-callerintros -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/mohmp3 -@dirrm %%DATADIR%%/keys -@dirrm %%DATADIR%%/images -@dirrm %%DATADIR%%/firmware/iax -@dirrm %%DATADIR%%/firmware -@dirrm %%DATADIR%%/agi-bin -@dirrm %%DATADIR%% -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/%%DATADIR%%/astdb -@cwd /var -spool/asterisk/voicemail/default/1234/busy.gsm -spool/asterisk/voicemail/default/1234/unavail.gsm -@exec mkdir -p %D/log/asterisk/cdr-csv -@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/dictate -@dirrm spool/asterisk/meetme -@dirrm spool/asterisk/monitor -@dirrm spool/asterisk/system -@dirrm spool/asterisk/voicemail/default/1234/INBOX -@dirrm spool/asterisk/voicemail/default/1234 -@dirrm spool/asterisk/voicemail/default -@dirrm spool/asterisk/voicemail -@dirrm spool/asterisk/tmp -@dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk diff --git a/net/callgen323/Makefile b/net/callgen323/Makefile deleted file mode 100644 index a41cc54adccf..000000000000 --- a/net/callgen323/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Ports collection makefile for: callgen -# Whom: Jakub Klausa <jacke@bofh.pl> -# Date created: January 15 2004 -# -# $FreeBSD$ - -PORTNAME= callgen -PORTVERSION= 1.2.6 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://www.openh323.org/bin/ -DISTNAME= callgen323_${PORTVERSION} - -MAINTAINER= jacke@bofh.pl -COMMENT= H.323 Call Generator - -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:configure - -NOCLEANDEPENDS= yes -USE_GMAKE= yes -WRKSRC= ${WRKDIR}/callgen323 -MAKE_ENV= PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323 -THE_MACHTYPE= ${ARCH:S/i386/x86/} - -PLIST_FILES= bin/callgen323 - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - -.if ${ARCH} == "amd64" -BROKEN= "Does not build on amd64 (shared libraries must be compiled with -fPIC)" -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_d/callgen323 ${PREFIX}/bin - -.include <bsd.port.post.mk> diff --git a/net/callgen323/distinfo b/net/callgen323/distinfo deleted file mode 100644 index 2652817bb400..000000000000 --- a/net/callgen323/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (callgen323_1.2.6.tar.gz) = 1428f738e3ad43e5c57aa99e132065dc -SHA256 (callgen323_1.2.6.tar.gz) = aefb35f13f9f4920c687f22e0b3bdcc8e9c1d21ddd7bdf9102f8d07a8c5d0581 -SIZE (callgen323_1.2.6.tar.gz) = 12846 diff --git a/net/callgen323/pkg-descr b/net/callgen323/pkg-descr deleted file mode 100644 index e54d34b07922..000000000000 --- a/net/callgen323/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -Callgen323 is a simple H.323 capable call generator. It supports the -following: - - - spawning an exact number of calls. - - receiving an exact number of calls. - - adjust the delay between each batch of calls. - - set the number of batches to repeat. - - The only capability supported is G.711 ULaw 64k and user - indication. - -It makes use of PWLib and the OpenH323 stack from Equivalence Ltd Pty - -WWW: http://www.openh323.org/ diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile deleted file mode 100644 index 678f406aa1b1..000000000000 --- a/net/citrix_xenapp/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# New ports collection makefile for: Citrix(R) ICA(R) Client -# Date created: 20 Sep 1998 -# Whom: msmith -# -# $FreeBSD$ -# - -PORTNAME= citrix_ica -PORTVERSION= 9.00 -PORTREVISION= 2 -CATEGORIES= net comms linux -MASTER_SITES= -DISTNAME= ${PORTNAME}-linuxx86-${PORTVERSION} - -MAINTAINER= mbr@FreeBSD.org -COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server - -RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.3:${PORTSDIR}/x11-toolkits/linux-openmotif - -ONLY_FOR_ARCHS= i386 -USE_LINUX= yes -#USE_X_PREFIX= yes -RESTRICTED= "License prohibits redistribution" -IS_INTERACTIVE= "Noisy license agreement ignores stdin" - -NO_WRKSUBDIR= yes -NO_BUILD= yes - -CDIR= ${PREFIX}/ICAClient -BINDIR= ${PREFIX}/bin - -NSCP= /usr/local/libexec/netscape \ - /usr/local/libexec/netscape-linux \ - /usr/local/netscape \ - /usr/local/netscape-linux \ - /usr/local/lib/netscape \ - /usr/local/lib/netscape-linux \ - ${MOZILLA_HOME} - -PLIST_SUB= MOZILLA_HOME=${MOZILLA_HOME} - -.include <bsd.port.pre.mk> - -.if exists(${PREFIX}/bin/kde-config) -HAVE_KDE= "\\ny" -.endif - -.if defined(BATCH) || defined(PACKAGE_BUILDING) -IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.' -.endif - -do-fetch: -.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) - @${ECHO} "" - @${ECHO} "You have to fetch the file manually after reading and" - @${ECHO} "agreeing to the license at:" - @${ECHO} "" - @${ECHO} "http://www.citrix.com/download/bin/license.asp?client=linux" - @${ECHO} "" - @${ECHO} "Once linuxx86.tar.gz has been downloaded move it to" - @${ECHO} "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} and restart the build." - @${ECHO} "" - @${FALSE} -.endif - -do-install: - @if (test -d "${CDIR}") ; \ - then \ - ${ECHO} "-----------------------------------------------------------" ; \ - ${ECHO} "" ; \ - ${ECHO} "A ${CDIR} installation does already exist." ; \ - ${ECHO} "Please move it away or delete the old port" ; \ - ${ECHO} "" ; \ - ${ECHO} "-----------------------------------------------------------" ; \ - ${FALSE} ; \ - fi - ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfcmgr \ - > ${WRKSRC}/wfcmgr.x - ${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/wfica \ - > ${WRKSRC}/wfica.x - cd ${WRKSRC} && /bin/sh -c './setupwfc' - ${INSTALL_SCRIPT} ${WRKSRC}/wfcmgr.x ${PREFIX}/bin/wfcmgr - ${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica -# XXX: This is missing a "${BRANDELF} -t Linux <executables>". - -.include <bsd.port.post.mk> diff --git a/net/citrix_xenapp/distinfo b/net/citrix_xenapp/distinfo deleted file mode 100644 index 7de73c010cfe..000000000000 --- a/net/citrix_xenapp/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (citrix_ica-linuxx86-9.00.tar.gz) = df3194f942e03b8c700907a3406aef76 -SIZE (citrix_ica-linuxx86-9.00.tar.gz) = 1356273 diff --git a/net/citrix_xenapp/files/patch-linuxx86::hinst b/net/citrix_xenapp/files/patch-linuxx86::hinst deleted file mode 100644 index 9df7a9bd661b..000000000000 --- a/net/citrix_xenapp/files/patch-linuxx86::hinst +++ /dev/null @@ -1,166 +0,0 @@ ---- linuxx86/hinst.orig Fri Apr 8 19:52:59 2005 -+++ linuxx86/hinst Wed May 18 14:07:10 2005 -@@ -75,7 +75,7 @@ - fi - - # Install in here by default. --DefaultInstallDir=/usr/lib/ICAClient -+DefaultInstallDir=/usr/local/ICAClient - - # Default CDROM mount point - DefaultCDSourceDir=/cdrom -@@ -2166,7 +2166,7 @@ - - # rm -f $m_filename $mf_filename $o_filename $of_filename - -- /bin/true -+ /usr/bin/true - } - - ############################################################################### -@@ -2217,10 +2217,34 @@ - # - ############################################################################### - -+check_for_ns() { -+ BIN=`/usr/bin/file $1/plugins/libnullplugin.so | /usr/bin/awk '{print $11}'` -+ case ${BIN} in -+ \(SYSV\),) -+ NETSCAPE_DIR="$1" -+ PLUGIN_PATH="$s/plugins" -+ FOUND_NS="TRUE" -+ esac -+} -+ -+NSCP="/usr/local/libexec/netscape \ -+ /usr/local/libexec/netscape-linux \ -+ /usr/local/netscape \ -+ /usr/local/netscape-linux \ -+ /usr/local/lib/netscape \ -+ /usr/local/lib/netscape-linux \ -+ /usr/local/lib/linux-mozilla \ -+ /usr/local/lib/mozilla \ -+ $MOZILLA_HOME" -+ -+for dir in ${NSCP}; do -+ if [ -e $dir/plugins/libnullplugin.so ]; then -+ check_for_ns $dir; -+ fi -+done -+ - INST_DIR=$ICAInstDir - TMP_NAME=/tmp/ICAnetscape.$$ --NETSCAPE_DIR="/usr/local/lib/netscape" --PLUGIN_PATH="/usr/local/netscape/plugins" - PLUGIN_NAME=npica.so - PLUGIN_CLASS=ICAClObj.class - MAILCAP_FILE=mailcap -@@ -2293,26 +2317,19 @@ - - netscape_integrate() - { -- user_echo $integrate_netscape1 - if test -z "$SU_INSTALL" - then - set_npui_variables - found_netscape - else - search_ok=0 -- EXTRA_BROWSERS=`find_browsers` -- -- if test -d "/usr/lib/netscape"\ -- || test -d "/usr/local/netscape"\ -- || test -d "/opt/netscape"\ -- || test -d "/usr/local/lib/netscape"\ -- || test -d "/usr/dt/appconfig/netscape"\ -- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\ -- || test "$EXTRA_BROWSERS" != "" -- then -+ -+ case ${FOUND_NS} in -+ TRUE) - user_echo $integrate_netscape3 - found_netscape -- else -+ ;; -+ *) - user_prompt $integrate_netscape2 - getyesno $INSTALLER_NO - if [ "$ANSWER" = "$INSTALLER_YES" ] -@@ -2321,9 +2338,9 @@ - else - user_echo $integrate_netscape6 - fi -+ ;; -+ esac - fi -- fi -- - # Create utility script files in install root. - create_wfica_script - create_wfica_assoc_script -@@ -2953,55 +2970,6 @@ - echo "$BINDIR" - } - --################################################################################ --# --# find_browsers --# --# Returns a list of directories containing new-style mozilla-based browsers --# that may be launched by files on the $PATH. --# --################################################################################ --find_browsers() --{ -- PROGS="netscape mozilla firefox" -- DIST_BIN_DIR="" -- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla" -- -- case $op_system in -- SunOS) if -- /usr/bin/pkginfo -q $SOLARIS_PACKAGE_NAME -- then -- relocation_base=`/usr/bin/pkginfo -r $SOLARIS_PACKAGE_NAME` -- STANDARD_DIRS="$STANDARD_DIRS $relocation_base/$SOLARIS_PACKAGE_DIRECTORY" -- -- # N.B. the Netscape 7 packages for SOLARIS 9 have an extended installation path built-in! -- case `uname -r` in -- 5.9) STANDARD_DIRS="$STANDARD_DIRS $relocation_base/dt/appconfig/$SOLARIS_PACKAGE_DIRECTORY" -- ;; -- *) ;; -- esac -- fi;; -- *) ;; -- esac -- -- for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS -- do -- echo $d -- done | sort -u | while read d -- do -- for p in $PROGS -- do -- # Find the each instance of each named browser -- PROG=$d/$p -- if test -f $PROG -- then -- # Where is the installation and what version is it? -- find_extra_bin_dirs $PROG -- fi -- done -- done | sort -u --} -- - BROWSER_LIST_KEY="BROWSER_DIR" - ################################################################################ - # -@@ -3226,6 +3194,8 @@ - wfcmgr_ja_NAME='MetaFrame UNIX クライアント' - - DEFAULT_GNOME_TARGET_DIRS="/usr/share/applications \ -+ /usr/local/share/applnk/Internet \ -+ /usr/local/share/applnk/Networking \ - /etc/opt/gnome/SuSE/Internet" - DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk/Applications \ - /usr/share/applnk-redhat/Internet \ diff --git a/net/citrix_xenapp/files/patch-setupwfc b/net/citrix_xenapp/files/patch-setupwfc deleted file mode 100644 index 0d1b30ea8bfa..000000000000 --- a/net/citrix_xenapp/files/patch-setupwfc +++ /dev/null @@ -1,11 +0,0 @@ ---- setupwfc.orig Wed Apr 17 18:32:45 2002 -+++ setupwfc Mon Jul 8 18:28:31 2002 -@@ -382,7 +382,7 @@ - # We assume that an Intel-based linux system will have an x86 - # processor. We also assume that this is reported by uname -m - # "ix86" where x is some number. -- if uname -m | grep 86 2>&1 >/dev/null ;then -+ if uname -m | grep i[3456]86 2>&1 >/dev/null ;then - PLATFORM=linuxx86 - DISP_PLATFORM="Linux (x86)" - elif uname -m | grep -i arm 2>&1 >/dev/null ;then diff --git a/net/citrix_xenapp/files/wfcmgr b/net/citrix_xenapp/files/wfcmgr deleted file mode 100644 index 70248171d687..000000000000 --- a/net/citrix_xenapp/files/wfcmgr +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export ICAROOT=DESTINATION -exec $ICAROOT/wfcmgr diff --git a/net/citrix_xenapp/files/wfica b/net/citrix_xenapp/files/wfica deleted file mode 100644 index e0279ba0d816..000000000000 --- a/net/citrix_xenapp/files/wfica +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export ICAROOT=DESTINATION -exec $ICAROOT/wfica "$@" diff --git a/net/citrix_xenapp/pkg-descr b/net/citrix_xenapp/pkg-descr deleted file mode 100644 index 35b3b42ba57d..000000000000 --- a/net/citrix_xenapp/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Citrix(R) MetaFrame(TM) is thin-client/server system software for -Microsoft's Windows NT Server 4.0, Terminal Server Edition. -MetaFrame(TM) delivers a comprehensive thin-client/server solution to -the enterprise by extending Windows Terminal Server with additional -client and server functionality - including support for heterogeneous -computing environments, enterprise-scale management and seamless -desktop integration. MetaFrame(TM) transforms the way organizations -deploy, manage and access business applications by providing improved -application manageability, access, performance and security. Citrix(R) -MetaFrame(TM) system software, which incorporates Citrix's Independent -Computing Architecture (ICA)(R), provides a complete -thin-client/server computing solution for multi-user NT 4.0 -environments. - -WWW: http://www.citrix.com/products/metaframe.asp diff --git a/net/citrix_xenapp/pkg-plist b/net/citrix_xenapp/pkg-plist deleted file mode 100644 index 9ad900bd5c55..000000000000 --- a/net/citrix_xenapp/pkg-plist +++ /dev/null @@ -1,139 +0,0 @@ -@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -f ${dir}/mime.types ]; then (/bin/cat ${dir}/mime.types | /usr/bin/grep -v "application/x-ica" > ${dir}/mime.types.tmp; mv ${dir}/mime.types.tmp ${dir}/mime.types); fi ; done -@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -f ${dir}/mailcap ]; then (/bin/cat ${dir}/mailcap | /usr/bin/grep -v "application/x-ica" > ${dir}/mailcap.tmp; /bin/mv ${dir}/mailcap.tmp ${dir}/mailcap); fi ; done -@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -e ${dir}/plugins/npica.so ]; then (/bin/rm ${dir}/plugins/npica.so); fi ; done -ICAClient/.config/appsrv.ini -ICAClient/.config/keyboard.ini -ICAClient/.config/module.ini -ICAClient/.config/wfclient.ini -ICAClient/libctxssl.so -ICAClient/Npica -ICAClient/Npica.ad -ICAClient/CHARICONV.DLL -ICAClient/NDS.DLL -ICAClient/PDCRYPT1.DLL -ICAClient/PDCRYPT2.DLL -ICAClient/TW1.DLL -ICAClient/VDCM.DLL -ICAClient/VDSCARD.DLL -ICAClient/Wfcmgr -ICAClient/Wfcmgr.ad -ICAClient/Wfica -ICAClient/Wfica.ad -ICAClient/config/.server -ICAClient/config/appsrv.ini -ICAClient/config/module.ini -ICAClient/config/wfclient.ini -ICAClient/desktop/wfcmgr.desktop -ICAClient/desktop/Citrix_PNA.desktop -ICAClient/eula.txt -ICAClient/help/index.htm -ICAClient/icons/citrix16.xpm -ICAClient/icons/citrix32.xpm -ICAClient/icons/citrix48.xpm -ICAClient/install.txt -ICAClient/keyboard/age2.kbd -ICAClient/keyboard/agex2.kbd -ICAClient/keyboard/automatic.kbd -ICAClient/keyboard/dcint401.kbd -ICAClient/keyboard/dcintpcx.kbd -ICAClient/keyboard/dcus401.kbd -ICAClient/keyboard/dcuspcx.kbd -ICAClient/keyboard/dec401.kbd -ICAClient/keyboard/dec401uk.kbd -ICAClient/keyboard/decpcx.kbd -ICAClient/keyboard/decpcxuk.kbd -ICAClient/keyboard/dg.kbd -ICAClient/keyboard/dgfr.kbd -ICAClient/keyboard/dggr.kbd -ICAClient/keyboard/dguk.kbd -ICAClient/keyboard/dgus.kbd -ICAClient/keyboard/hp101.kbd -ICAClient/keyboard/hpfritf.kbd -ICAClient/keyboard/hpgritf.kbd -ICAClient/keyboard/hpint101.kbd -ICAClient/keyboard/hpintps2.kbd -ICAClient/keyboard/hpitf.kbd -ICAClient/keyboard/hpps2.kbd -ICAClient/keyboard/hpuk101.kbd -ICAClient/keyboard/hpukitf.kbd -ICAClient/keyboard/hpukps2.kbd -ICAClient/keyboard/hpus101.kbd -ICAClient/keyboard/hpusitf.kbd -ICAClient/keyboard/hpusps2.kbd -ICAClient/keyboard/ibm.kbd -ICAClient/keyboard/keyboard.ini -ICAClient/keyboard/linux.kbd -ICAClient/keyboard/linux-ja.kbd -ICAClient/keyboard/mac101.kbd -ICAClient/keyboard/ncdn-101.kbd -ICAClient/keyboard/ncdn-102.kbd -ICAClient/keyboard/netbsd.kbd -ICAClient/keyboard/scoos5.kbd -ICAClient/keyboard/scouw2.kbd -ICAClient/keyboard/sg.kbd -ICAClient/keyboard/sgindy.kbd -ICAClient/keyboard/sgindyfr.kbd -ICAClient/keyboard/sgindygr.kbd -ICAClient/keyboard/sgindyuk.kbd -ICAClient/keyboard/sgindyus.kbd -ICAClient/keyboard/sngr.kbd -ICAClient/keyboard/sparc3.kbd -ICAClient/keyboard/sparc4.kbd -ICAClient/keyboard/sparc5.kbd -ICAClient/keyboard/sparc6usb.kbd -ICAClient/keyboard/sparcfr4.kbd -ICAClient/keyboard/sparcfr5.kbd -ICAClient/keyboard/sparcgr4.kbd -ICAClient/keyboard/sparcgr5.kbd -ICAClient/keyboard/sparcuk4.kbd -ICAClient/keyboard/sparcuk5.kbd -ICAClient/keyboard/sparcus3.kbd -ICAClient/keyboard/sparcus4.kbd -ICAClient/keyboard/sparcus5.kbd -ICAClient/keyboard/trimodal.kbd -ICAClient/keystore/cacerts/BTCTRoot.crt -ICAClient/keystore/cacerts/Class3PCA_G2_v2.crt -ICAClient/keystore/cacerts/Class4PCA_G2_v2.crt -ICAClient/keystore/cacerts/GTECTGlobalRoot.crt -ICAClient/keystore/cacerts/GTECTRoot.crt -ICAClient/keystore/cacerts/Pcs3ss_v4.crt -ICAClient/keystore/cacerts/SecureServer.crt -ICAClient/nls/C -ICAClient/nls/en/pna.nls -ICAClient/npica.so -ICAClient/pkginf/F.core.linuxx86 -ICAClient/pkginf/Ver.core.linuxx86 -ICAClient/pkginf/changeno.dat -ICAClient/readme.txt -ICAClient/setupwfc -ICAClient/util/XCapture -ICAClient/util/XCapture.ad -ICAClient/util/echo_cmd -ICAClient/util/hinst -ICAClient/util/icalicense.sh -ICAClient/util/nslaunch -ICAClient/util/pacexec -ICAClient/util/pac.js -ICAClient/util/xcapture -ICAClient/wfcmgr -ICAClient/wfica -ICAClient/wfica.sh -ICAClient/wfica_assoc.sh -bin/wfcmgr -bin/wfica -@dirrm ICAClient/.config -@dirrm ICAClient/cache/zlcache -@unexec find %D/ICAClient/cache/ -type f -exec rm {} \; 2>&1 >/dev/null || true -@dirrm ICAClient/cache -@dirrm ICAClient/config -@dirrm ICAClient/desktop -@dirrm ICAClient/help -@dirrm ICAClient/icons -@dirrm ICAClient/keyboard -@dirrm ICAClient/keystore/cacerts -@dirrm ICAClient/keystore -@dirrm ICAClient/nls/en -@dirrm ICAClient/nls -@dirrm ICAClient/pkginf -@dirrm ICAClient/util -@dirrm ICAClient diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile deleted file mode 100644 index 1d2708a6808a..000000000000 --- a/net/ekiga/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# Ports collection Makefile for: gnomemeeting -# Date created: 24/07/2001 -# Whom: roger@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= gnomemeeting -PORTVERSION= 0.98.5 -PORTREVISION= 7 -CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.98 - -MAINTAINER= kwm@FreeBSD.org -COMMENT= GNOME H323 Video Conferencing program, similar to NetMeeting - -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build - -BROKEN= Incomplete dependency list - -# note, we do not want to clean openh323, otherwise it has to build -# it all over again which can take several hours. -NOCLEANDEPENDS= yes - -USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GMAKE= yes -USE_GNOME= libgnomeui libbonobo gnomeprefix gnomehack -USE_REINPLACE= yes -USE_OPENLDAP= yes -USE_BISON= yes -# Clear configure target so we stop getting binaries prefixed with i386-portbld-freebsd46 -CONFIGURE_TARGET= -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV= OSTYPE=${OPSYS} \ - LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ - PTLIBDIR=${PWLIBDIR} \ - OPENH323DIR=${OPENH323DIR} \ - SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \ - CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" - -CONFIGURE_ARGS= --with-ptlib-includes=${PWLIBDIR}/include/ptlib \ - --with-ptlib-libs=${PWLIBDIR}/lib \ - --with-openh323-includes=${OPENH323DIR}/include \ - --with-openh323-libs=${OPENH323DIR}/lib \ - --with-ldap-includes=${LOCALBASE}/include \ - --with-openldap-libs=${LOCALBASE}/lib - -GCONF_SCHEMAS= gnomemeeting.schemas -MAN1= gnomemeeting.1 - -.include <bsd.port.pre.mk> - -PWLIBDIR!= cd ${PORTSDIR}/devel/pwlib152 && make -V WRKSRC -OPENH323DIR!= cd ${PORTSDIR}/net/openh323-112 && make -V WRKSRC - -.if ${ARCH} != "i386" -BROKEN= "Configure fails on !i386" -.endif - -post-patch: - ${REINPLACE_CMD} -E -e 's=-D[[:punct:][:alnum:]]+_DISABLE_DEPRECATED==g' \ - ${WRKSRC}/src/Makefile.am \ - ${WRKSRC}/src/Makefile.in - -.include <bsd.port.post.mk> diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo deleted file mode 100644 index 6812dc8c14ed..000000000000 --- a/net/ekiga/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnomemeeting-0.98.5.tar.bz2) = fa11d5f3e6adb924f91aaa92099b6269 -SHA256 (gnomemeeting-0.98.5.tar.bz2) = fc9b18d2bbd18ef515b4d320038242e816df70b583e5d97092776a4e0283d663 -SIZE (gnomemeeting-0.98.5.tar.bz2) = 1739613 diff --git a/net/ekiga/files/patch-endpoint b/net/ekiga/files/patch-endpoint deleted file mode 100644 index c906400224db..000000000000 --- a/net/ekiga/files/patch-endpoint +++ /dev/null @@ -1,37 +0,0 @@ -*** src/endpoint.cpp.orig Thu Jul 31 17:26:36 2003 ---- src/endpoint.cpp Fri Sep 5 11:40:58 2003 -*************** GMH323EndPoint::GMH323EndPoint () -*** 176,183 **** - - /* Use IPv6 address family by default if available. */ - #ifdef P_HAS_IPV6 -! if (PIPSocket::IsIpAddressFamilyV6Supported()) -! PIPSocket::SetDefaultIpAddressFamilyV6(); - #endif - - rtp_port_range = ---- 176,185 ---- - - /* Use IPv6 address family by default if available. */ - #ifdef P_HAS_IPV6 -! // ENABLING THIS CAUSES PWLIB TO GIVE AN ASSERTION WHEN THERE IS AN -! // INCOMING CALL -! // if (PIPSocket::IsIpAddressFamilyV6Supported()) -! // PIPSocket::SetDefaultIpAddressFamilyV6(); - #endif - - rtp_port_range = -*************** GMH323EndPoint::TranslateTCPAddress(PIPS -*** 682,687 **** ---- 684,694 ---- - - && !((remoteAddr.Byte1() == 172) - && ((remoteAddr.Byte2() >= 16)&&(remoteAddr.Byte2()<=31))) -+ -+ && !((remoteAddr.Byte1() == 127) -+ &&(remoteAddr.Byte2()== 0) -+ &&(remoteAddr.Byte3()==0) -+ &&(remoteAddr.Byte4()==1)) - - && !(remoteAddr.Byte1() == 10)) { - diff --git a/net/ekiga/files/patch-lib_xdap_xdap.c b/net/ekiga/files/patch-lib_xdap_xdap.c deleted file mode 100644 index 6ee81f64df0d..000000000000 --- a/net/ekiga/files/patch-lib_xdap_xdap.c +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/xdap/xdap.c.orig Tue Oct 28 21:28:24 2003 -+++ lib/xdap/xdap.c Tue Oct 28 21:49:59 2003 -@@ -159,7 +159,7 @@ - xmlSAXHandler sax; - - memset (&sax, 0, sizeof sax); -- sax = xmlDefaultSAXHandler; /* Copy original handler */ -+ xmlSAX2InitDefaultSAXHandler (&sax, 0); - *oldgetent = sax.getEntity; /* Substitute entity handling */ - if (noerr) { - sax.error = NULL; /* Disable errors and warnings */ diff --git a/net/ekiga/files/patch-src_sound_handling.cpp b/net/ekiga/files/patch-src_sound_handling.cpp deleted file mode 100644 index 8af2fe631bbc..000000000000 --- a/net/ekiga/files/patch-src_sound_handling.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sound_handling.cpp.orig Thu Jan 27 14:47:01 2005 -+++ src/sound_handling.cpp Thu Jan 27 14:57:07 2005 -@@ -466,7 +466,7 @@ - dialog = - gtk_dialog_new_with_buttons ("Audio test running...", - GTK_WINDOW (gw->druid_window), -- (enum GtkDialogFlags) (GTK_DIALOG_DESTROY_WITH_PARENT), -+ (GtkDialogFlags) (GTK_DIALOG_DESTROY_WITH_PARENT), - GTK_STOCK_OK, - GTK_RESPONSE_ACCEPT, - NULL); diff --git a/net/ekiga/pkg-descr b/net/ekiga/pkg-descr deleted file mode 100644 index 9a8d6e495a8d..000000000000 --- a/net/ekiga/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Gnomemeeting is a Video Conferencing application which uses the H323 -protocol and the OpenH323 libraries. - -It can connect to a variety of other H323 applications including -Microsoft NetMeeting, OpenMCU, OpenAM, OhPhone and CPhone. - -WWW: http://www.gnomemeeting.org/ - -Roger Hardiman <roger@freebsd.org> diff --git a/net/ekiga/pkg-plist b/net/ekiga/pkg-plist deleted file mode 100644 index b0c86c53ac98..000000000000 --- a/net/ekiga/pkg-plist +++ /dev/null @@ -1,56 +0,0 @@ -bin/gnomemeeting -bin/gnomemeeting-config-tool -etc/sound/events/gnomemeeting.soundlist -libdata/bonobo/servers/gnomemeeting.server -share/gnome/applications/gnomemeeting.desktop -share/gnome/gnomemeeting/xdap/ils_nm_mod.xml -share/gnome/gnomemeeting/xdap/ils_nm_reg.xml -share/gnome/gnomemeeting/xdap/ils_nm_unreg.xml -share/gnome/pixmaps/gnomemeeting-logo-icon.png -share/gnome/pixmaps/gnomemeeting-logo.png -share/gnome/pixmaps/gnomemeeting-splash.png -share/gnome/sounds/gnomemeeting/gnomemeeting.wav -share/locale/am/LC_MESSAGES/gnomemeeting.mo -share/locale/az/LC_MESSAGES/gnomemeeting.mo -share/locale/be/LC_MESSAGES/gnomemeeting.mo -share/locale/ca/LC_MESSAGES/gnomemeeting.mo -share/locale/cs/LC_MESSAGES/gnomemeeting.mo -share/locale/cy/LC_MESSAGES/gnomemeeting.mo -share/locale/da/LC_MESSAGES/gnomemeeting.mo -share/locale/de/LC_MESSAGES/gnomemeeting.mo -share/locale/el/LC_MESSAGES/gnomemeeting.mo -share/locale/es/LC_MESSAGES/gnomemeeting.mo -share/locale/fi/LC_MESSAGES/gnomemeeting.mo -share/locale/fr/LC_MESSAGES/gnomemeeting.mo -share/locale/ga/LC_MESSAGES/gnomemeeting.mo -share/locale/gl/LC_MESSAGES/gnomemeeting.mo -share/locale/hi/LC_MESSAGES/gnomemeeting.mo -share/locale/hu/LC_MESSAGES/gnomemeeting.mo -share/locale/it/LC_MESSAGES/gnomemeeting.mo -share/locale/ja/LC_MESSAGES/gnomemeeting.mo -share/locale/ko/LC_MESSAGES/gnomemeeting.mo -share/locale/lv/LC_MESSAGES/gnomemeeting.mo -share/locale/ml/LC_MESSAGES/gnomemeeting.mo -share/locale/ms/LC_MESSAGES/gnomemeeting.mo -share/locale/nl/LC_MESSAGES/gnomemeeting.mo -share/locale/no/LC_MESSAGES/gnomemeeting.mo -share/locale/pl/LC_MESSAGES/gnomemeeting.mo -share/locale/pt/LC_MESSAGES/gnomemeeting.mo -share/locale/pt_BR/LC_MESSAGES/gnomemeeting.mo -share/locale/ro/LC_MESSAGES/gnomemeeting.mo -share/locale/ru/LC_MESSAGES/gnomemeeting.mo -share/locale/sk/LC_MESSAGES/gnomemeeting.mo -share/locale/sq/LC_MESSAGES/gnomemeeting.mo -share/locale/sr/LC_MESSAGES/gnomemeeting.mo -share/locale/sr@Latn/LC_MESSAGES/gnomemeeting.mo -share/locale/sv/LC_MESSAGES/gnomemeeting.mo -share/locale/ta/LC_MESSAGES/gnomemeeting.mo -share/locale/tr/LC_MESSAGES/gnomemeeting.mo -share/locale/uk/LC_MESSAGES/gnomemeeting.mo -share/locale/vi/LC_MESSAGES/gnomemeeting.mo -share/locale/wa/LC_MESSAGES/gnomemeeting.mo -share/locale/zh_CN/LC_MESSAGES/gnomemeeting.mo -share/locale/zh_TW/LC_MESSAGES/gnomemeeting.mo -@dirrm share/gnome/sounds/gnomemeeting -@dirrm share/gnome/gnomemeeting/xdap -@dirrm share/gnome/gnomemeeting diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile deleted file mode 100644 index 5d9b7bd4fe68..000000000000 --- a/net/freeradius2/Makefile +++ /dev/null @@ -1,194 +0,0 @@ -# New ports collection makefile for: freeradius -# Date created: May 9 2002 -# Whom: Brian Somers <brian@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= freeradius -PORTVERSION= 1.1.0 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \ - http://freeradius.portal-to-web.de/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= A free RADIUS server implementation - -LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm - -LOGDIR?= /var/log - -CONFLICTS= gnu-radius-1.* openradius-0.* radiusd-cistron-1.* - -USE_RC_SUBR= radiusd.sh -USE_AUTOTOOLS= libltdl:15 -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_PERL5= yes -USE_OPENSSL= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \ - --localstatedir=/var \ - --disable-ltdl-install \ - --with-ltdl-include=${LOCALBASE}/include \ - --with-ltdl-lib=${LOCALBASE}/lib \ - --with-large-files --without-rlm_sql_unixodbc \ - --without-rlm_sql_oracle --without-rlm_sql_iodbc \ - --without-rlm_sql_db2 -MAKE_ARGS+= LDFLAGS=-L${LOCALBASE}/lib - -PLIST_SUB= PORTVERSION=${PORTVERSION} - -OPTIONS= KERBEROS "With Kerberos support" off \ - HEIMDAL "With Heimdal Kerberos support" off \ - LDAP "With LDAP user database" off \ - MYSQL "With MySQL user database" off \ - PGSQL "With PostgreSQL use database" off \ - SNMP "With SNMP support" off \ - EXPERIMENTAL "Build experimental modules" off - -.include <bsd.port.pre.mk> - -.if ${ARCH} == amd64 -CFLAGS+= -fPIC -.endif - -.if defined(WITH_HEIMDAL) && !defined(WITH_KERBEROS) -WITH_KERBEROS= yes -.endif - -.ifdef(WITH_KERBEROS) -.ifdef(WITH_HEIMDAL) -LIB_DEPENDS+= krb5.20:${PORTSDIR}/security/heimdal -CONFIGURE_ARGS+=--enable-heimdal-krb5 -.else -LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 -.endif -CONFIGURE_ARGS+=--with-rlm-krb5-lib-dir=${LOCALBASE}/lib -CONFIGURE_ARGS+=--with-rlm-krb5-include-dir=${LOCALBASE}/include -PLIST_SUB+= KRB5="" -.else -CONFIGURE_ARGS+=--without-rlm_krb5 -PLIST_SUB+= KRB5="@comment " -.endif - -.ifdef(WITH_LDAP) -USE_OPENLDAP= YES -PLIST_SUB+= LDAP="" -.else -CONFIGURE_ARGS+=--without-rlm_ldap -PLIST_SUB+= LDAP="@comment " -.endif - -.ifdef(WITH_MYSQL) -USE_MYSQL= YES -PLIST_SUB+= MYSQL="" -.else -CONFIGURE_ARGS+=--without-rlm_sql_mysql -PLIST_SUB+= MYSQL="@comment " -.endif - -.ifdef(WITH_PGSQL) -USE_PGSQL= YES -PLIST_SUB+= PGSQL="" -.else -CONFIGURE_ARGS+=--without-rlm_sql_postgresql -PLIST_SUB+= PGSQL="@comment " -.endif - -.ifdef(WITH_SNMP) -LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 -.else -CONFIGURE_ARGS+=--without-snmp -.endif - -.ifdef(WITH_EXPERIMENTAL) -USE_PYTHON= yes -# hack to get the dependency -.include "${PORTSDIR}/Mk/bsd.python.mk" -CONFIGURE_ARGS+=--with-experimental-modules -PLIST_SUB+= EXPM="" -.else -PLIST_SUB+= EXPM="@comment " -.endif - -.if defined(NOPORTDOCS) -MAKE_ENV+= NOPORTDOCS=yes -.endif - -# rlm_x99_token seems broken -#CONFIGURE_ARGS+=--without-rlm_x99_token -PLIST_SUB+= TOKEN="" - -# rlm_perl does not build on 4.x -.if ${OSVERSION} < 500000 -PLIST_SUB+= RLMPERL="@comment " -.else -PLIST_SUB+= RLMPERL="" -.endif - -.if ${ARCH} == "amd64" -CONFIGURE_ARGS+= --with-pic -CFLAGS+= -fPIC -.endif - -INSTALLS_SHLIB= yes - -MAN1= radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \ - radzap.1 -MAN5= acct_users.5 clients.5 clients.conf.5 dictionary.5 naslist.5 \ - radiusd.conf.5 rlm_acct_unique.5 rlm_always.5 \ - rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 \ - rlm_detail.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 \ - rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_sql_log.5 rlm_unix.5 users.5 -MAN8= radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 rlm_ippool_tool.8 - -DICTS= dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \ - dictionary.airespace dictionary.alcatel dictionary.alteon \ - dictionary.altiga dictionary.aptis dictionary.aruba dictionary.ascend \ - dictionary.avaya dictionary.bay dictionary.bintec dictionary.bristol \ - dictionary.cablelabs dictionary.cabletron dictionary.cisco \ - dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \ - dictionary.colubris dictionary.columbia_university dictionary.compat \ - dictionary.cosine dictionary.digest dictionary.epygi \ - dictionary.ericsson dictionary.erx dictionary.extreme \ - dictionary.fortinet dictionary.foundry dictionary.freeradius \ - dictionary.freeradius.internal dictionary.gandalf dictionary.garderos \ - dictionary.gemtek dictionary.ipunplugged dictionary.issanni \ - dictionary.itk dictionary.juniper dictionary.karlnet \ - dictionary.livingston dictionary.localweb dictionary.lucent \ - dictionary.merit dictionary.microsoft dictionary.mikrotik \ - dictionary.motorola dictionary.navini dictionary.netscreen \ - dictionary.nokia dictionary.nomadix dictionary.ntua \ - dictionary.packeteer dictionary.propel dictionary.quintum \ - dictionary.redback dictionary.redcreek dictionary.rfc2865 \ - dictionary.rfc2866 dictionary.rfc2867 dictionary.rfc2868 \ - dictionary.rfc2869 dictionary.rfc3162 dictionary.rfc3576 \ - dictionary.rfc3580 dictionary.roaringpenguin dictionary.shasta \ - dictionary.shiva dictionary.sonicwall dictionary.springtide \ - dictionary.starent dictionary.t_systems_nova dictionary.telebit \ - dictionary.trapeze dictionary.unix dictionary.usr dictionary.valemount \ - dictionary.versanet dictionary.waverider dictionary.wispr \ - dictionary.xedia dictionary.xylan dictionary.zyxel - -post-patch: - @${RM} ${WRKSRC}/doc/Makefile.orig - -post-install: - @${MKDIR} ${PREFIX}/etc/raddb ${DATADIR} ${EXAMPLESDIR} -.for dict in ${DICTS} - ${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict} -.endfor -.ifdef(WITH_MYSQL) - ${INSTALL_DATA} \ - ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql \ - ${EXAMPLESDIR}/db_mysql.sql -.endif - -.ifdef(WITH_PGSQL) - ${INSTALL_DATA} \ - ${WRKSRC}/src/modules/rlm_sql/drivers/rlm_sql_postgresql/db_postgresql.sql \ - ${EXAMPLESDIR}/db_postgresql.sql -.endif - -.include <bsd.port.post.mk> diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo deleted file mode 100644 index e7c1417796a8..000000000000 --- a/net/freeradius2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (freeradius-1.1.0.tar.gz) = e04ec8a07b8c8dc96e28ef7fdce261e7 -SHA256 (freeradius-1.1.0.tar.gz) = d8710cdf66fdab458d8df6f8d5ab84a5c4b7d2343817bc940927de915c0f31c4 -SIZE (freeradius-1.1.0.tar.gz) = 2351660 diff --git a/net/freeradius2/files/patch-4.11-fix b/net/freeradius2/files/patch-4.11-fix deleted file mode 100644 index b58a4d5c91e4..000000000000 --- a/net/freeradius2/files/patch-4.11-fix +++ /dev/null @@ -1,48 +0,0 @@ ---- src/modules/rlm_otp/cardops/cryptocard.c.ORIG Thu Dec 8 02:30:54 2005 -+++ src/modules/rlm_otp/cardops/cryptocard.c Sat Feb 4 18:30:55 2006 -@@ -20,6 +20,10 @@ - */ - - #include <inttypes.h> -+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) -+#define PRIx32 "x" /* uint32_t */ -+#define SCNx32 "x" /* uint32_t */ -+#endif - #include <string.h> - #include <time.h> - ---- src/modules/rlm_otp/otp_state.c.ORIG Sat Feb 4 18:22:14 2006 -+++ src/modules/rlm_otp/otp_state.c Sat Feb 4 18:33:48 2006 -@@ -28,6 +28,10 @@ - - #include <errno.h> - #include <inttypes.h> -+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) -+#define PRIx32 "x" /* uint32_t */ -+#define SCNx32 "x" /* uint32_t */ -+#endif - #include <stdio.h> - #include <string.h> - #include <sys/types.h> ---- src/modules/rlm_otp/otp_cardops.c.ORIG Thu Dec 8 02:30:50 2005 -+++ src/modules/rlm_otp/otp_cardops.c Sat Feb 4 18:37:22 2006 -@@ -30,6 +30,9 @@ - #endif - #include <dlfcn.h> - #include <inttypes.h> -+#if (defined(__FreeBSD__) && __FreeBSD_version < 500000) -+#define INT32_MAX 0x7fffffff -+#endif - #include <limits.h> - #include <stdlib.h> - #include <string.h> ---- src/modules/rlm_otp/Makefile.in.ORIG Thu Dec 8 02:30:48 2005 -+++ src/modules/rlm_otp/Makefile.in Sat Feb 4 18:44:06 2006 -@@ -34,7 +34,7 @@ - include ../rules.mak - - # Not part of RLM_CFLAGS to avoid propagation to subdirs --CFLAGS += -Wno-unused-label -Wno-cast-qual -+CFLAGS += -Wno-cast-qual - - $(STATIC_OBJS): $(HEADERS) $(CARDOPS_LTLIBS) diff --git a/net/freeradius2/files/patch-Make.inc.in b/net/freeradius2/files/patch-Make.inc.in deleted file mode 100644 index 7174d585d5bf..000000000000 --- a/net/freeradius2/files/patch-Make.inc.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Make.inc.in.orig Sat Feb 19 14:33:58 2005 -+++ Make.inc.in Sat Feb 19 14:33:07 2005 -@@ -25,7 +25,7 @@ - CC = @CC@ - RANLIB = @RANLIB@ - INCLUDE = --CFLAGS = $(INCLUDE) @CFLAGS@ @LFS_CFLAGS@ -+CFLAGS = $(INCLUDE) @CFLAGS@ @CPPFLAGS@ @LFS_CFLAGS@ - LIBPREFIX = @LIBPREFIX@ - EXEEXT = @EXEEXT@ - diff --git a/net/freeradius2/files/patch-ab b/net/freeradius2/files/patch-ab deleted file mode 100644 index 67f06dd8a2de..000000000000 --- a/net/freeradius2/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ ---- src/modules/rlm_mschap/rlm_mschap.c.orig Thu Aug 19 10:20:28 2004 -+++ src/modules/rlm_mschap/rlm_mschap.c Thu Aug 19 10:21:16 2004 -@@ -220,10 +220,15 @@ - SHA1_CTX Context; - char hash[20]; - -+ const char *name; -+ -+ name = strchr(user_name, '\\'); -+ name = name == NULL ? user_name : name + 1; -+ - SHA1Init(&Context); - SHA1Update(&Context, peer_challenge, 16); - SHA1Update(&Context, auth_challenge, 16); -- SHA1Update(&Context, user_name, strlen(user_name)); -+ SHA1Update(&Context, name, strlen(name)); - SHA1Final(hash, &Context); - memcpy(challenge, hash, 8); - } diff --git a/net/freeradius2/files/patch-doc::Makefile b/net/freeradius2/files/patch-doc::Makefile deleted file mode 100644 index a465b2500691..000000000000 --- a/net/freeradius2/files/patch-doc::Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- doc/Makefile.orig Sat Aug 13 00:41:24 2005 -+++ doc/Makefile Wed Oct 5 10:57:06 2005 -@@ -17,14 +17,16 @@ - @rm -f *~ - - install: -+ifndef NOPORTDOCS - $(INSTALL) -d -m 755 $(R)$(datadir)/doc -- $(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION) -+ $(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius - for file in *[!~]; do \ - if [ -f $$file -a $$file != Makefile ]; then \ -- $(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION); \ -+ $(INSTALL) -m 644 $$file $(R)$(datadir)/doc/freeradius; \ - fi; \ - done - @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common -+endif - - common: - @for dir in $(SUBDIRS); do \ diff --git a/net/freeradius2/files/patch-doc::rfc::Makefile b/net/freeradius2/files/patch-doc::rfc::Makefile deleted file mode 100644 index cce186e1c302..000000000000 --- a/net/freeradius2/files/patch-doc::rfc::Makefile +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/rfc/Makefile.orig Thu Nov 20 14:42:52 2003 -+++ doc/rfc/Makefile Thu Nov 20 14:43:03 2003 -@@ -16,7 +16,7 @@ - rm -f refs rfc*.html *~ .rewrite index.html - - install: -- $(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc -+ $(INSTALL) -d -m 755 $(R)$(datadir)/doc/freeradius/rfc - for i in `ls -1 *.txt *.html`; do \ -- $(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION)/rfc; \ -+ $(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius/rfc; \ - done diff --git a/net/freeradius2/files/patch-raddb-Makefile b/net/freeradius2/files/patch-raddb-Makefile deleted file mode 100644 index b8bf554bd14b..000000000000 --- a/net/freeradius2/files/patch-raddb-Makefile +++ /dev/null @@ -1,34 +0,0 @@ ---- raddb/Makefile.orig Wed Jan 25 13:01:45 2006 -+++ raddb/Makefile Wed Jan 25 13:22:54 2006 -@@ -15,26 +15,11 @@ - $(INSTALL) -d -m 755 $(R)$(raddbdir) - @echo "Creating/updating files in $(R)$(raddbdir)"; \ - for i in $(FILES); do \ -- [ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 644 $$i $(R)$(raddbdir); \ -- if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \ -- echo "** $(R)$(raddbdir)/$$i"; \ -- nt=1; \ -- fi; \ -- done; \ -- if [ "$$nt" ]; then \ -- echo "**";\ -- echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\ -- echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\ -- echo "**";\ -- echo "** The sample configuration files in `pwd`";\ -- echo "** are newer than those in $(R)$(raddbdir)";\ -- echo "**";\ -- echo "** Please investigate and manually copy (if appropriate) the files listed above.";\ -- echo "**";\ -- echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\ -- echo "** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING ** WARNING **";\ -- fi -- chmod 640 $(R)$(raddbdir)/naspasswd $(R)$(raddbdir)/clients $(R)$(raddbdir)/clients.conf -+ $(INSTALL) -m 644 $$i $(R)$(raddbdir)/$$i.sample; \ -+ done -+ chmod 640 $(R)$(raddbdir)/naspasswd.sample \ -+ $(R)$(raddbdir)/clients.sample \ -+ $(R)$(raddbdir)/clients.conf.sample - if [ ! -d $(R)$(raddbdir)/certs ]; then \ - mkdir $(R)$(raddbdir)/certs; \ - mkdir $(R)$(raddbdir)/certs/demoCA; \ diff --git a/net/freeradius2/files/patch-src-lib-dict.c b/net/freeradius2/files/patch-src-lib-dict.c deleted file mode 100644 index ace7044307be..000000000000 --- a/net/freeradius2/files/patch-src-lib-dict.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/dict.c.orig Mon Feb 6 10:15:41 2006 -+++ src/lib/dict.c Mon Feb 6 10:16:07 2006 -@@ -1207,7 +1207,7 @@ - if (!name) return NULL; - - hash = dict_hashname(name); -- hash = lrad_hash_update(&attr, sizeof(&attr), hash); -+ hash = lrad_hash_update(&attr, sizeof(attr), hash); - - return lrad_hash_table_finddata(values_byname, hash); - } diff --git a/net/freeradius2/files/patch-src-main-Makefile.in b/net/freeradius2/files/patch-src-main-Makefile.in deleted file mode 100644 index 0b318acd4128..000000000000 --- a/net/freeradius2/files/patch-src-main-Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ ---- src/main/Makefile.in.orig Fri Jun 10 04:35:36 2005 -+++ src/main/Makefile.in Sat Jun 18 11:06:37 2005 -@@ -14,7 +14,7 @@ - CFLAGS += -DHOSTINFO=\"${HOSTINFO}\" - CFLAGS += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\" - CFLAGS += $(SNMP_INCLUDE) --LDFLAGS += -L../lib -+LDFLAGS_MAIN = -L../lib $(LDFLAGS) - MODULE_LIBS = $(STATIC_MODULES) - MODULE_OBJS = - VFLAGS = -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION) -@@ -52,7 +52,7 @@ - - radiusd: $(SERVER_OBJS) ../lib/libradius.a $(MODULE_OBJS) - $(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \ -- $(CFLAGS) $(LDFLAGS) -o $@ \ -+ $(CFLAGS) $(LDFLAGS_MAIN) -o $@ \ - $(SERVER_OBJS) $(LCRYPT) $(MODULE_LIBS) $(LIBS) \ - $(PTHREADLIB) $(LIBLTDL) $(LCRYPT) - -@@ -123,13 +123,13 @@ - $(CC) $(CFLAGS) -o radius_snmp.o -c radius_snmp.c - - radclient: radclient.o ../lib/libradius.a -- $(CC) $(CFLAGS) $(LDFLAGS) -o radclient radclient.o $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS_MAIN) -o radclient radclient.o $(LIBS) - - radclient.o: radclient.c $(INCLUDES) - $(CC) $(CFLAGS) -c radclient.c - - radrelay: radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o ../lib/libradius.a -- $(CC) $(CFLAGS) $(LDFLAGS) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS_MAIN) -o radrelay radrelay.o mainconfig.o util.o nas.o client.o log.o conffile.o files.o xlat.o $(LIBS) - - radrelay.o: radrelay.c $(INCLUDES) - $(CC) $(CFLAGS) -c radrelay.c -@@ -138,7 +138,7 @@ - $(CC) $(CFLAGS) -c radwho.c - - radwho: radwho.o util.o log.o conffile.o ../lib/libradius.a -- $(CC) $(LDFLAGS) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT) -+ $(CC) $(LDFLAGS_MAIN) -o radwho radwho.o util.o log.o conffile.o $(LIBS) $(LCRYPT) - - clean: - rm -rf *.o *.so *~ $(BINARIES) .libs diff --git a/net/freeradius2/files/patch-src-modules-rlm_attr_rewrite-rlm_attr_rewrite.c b/net/freeradius2/files/patch-src-modules-rlm_attr_rewrite-rlm_attr_rewrite.c deleted file mode 100644 index 87dc2eb821e2..000000000000 --- a/net/freeradius2/files/patch-src-modules-rlm_attr_rewrite-rlm_attr_rewrite.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c.orig Sat Jun 18 14:29:43 2005 -+++ src/modules/rlm_attr_rewrite/rlm_attr_rewrite.c Sat Jun 18 14:31:48 2005 -@@ -27,6 +27,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <sys/types.h> - #ifdef HAVE_REGEX_H - # include <regex.h> - #endif diff --git a/net/freeradius2/files/patch-src-modules-rlm_otp-otp-state.c b/net/freeradius2/files/patch-src-modules-rlm_otp-otp-state.c deleted file mode 100644 index 4bb9083cb16a..000000000000 --- a/net/freeradius2/files/patch-src-modules-rlm_otp-otp-state.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/rlm_otp/otp_state.c.orig Wed Jan 25 13:35:45 2006 -+++ src/modules/rlm_otp/otp_state.c Wed Jan 25 15:02:47 2006 -@@ -35,7 +35,7 @@ - #include <fcntl.h> - #include <unistd.h> - #include <sys/socket.h> --#if defined(__linux__) || defined(__APPLE__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi) || defined(__OpenBSD__) - #include <sys/un.h> - #endif - diff --git a/net/freeradius2/files/patch-src::modules::rlm_ippool::Makefile.in b/net/freeradius2/files/patch-src::modules::rlm_ippool::Makefile.in deleted file mode 100644 index 236b4b080838..000000000000 --- a/net/freeradius2/files/patch-src::modules::rlm_ippool::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/rlm_ippool/Makefile.in.orig Sat Feb 19 14:57:57 2005 -+++ src/modules/rlm_ippool/Makefile.in Sat Feb 19 14:58:28 2005 -@@ -9,7 +9,7 @@ - include ../rules.mak - - rlm_ippool_tool: rlm_ippool_tool.o -- $(LIBTOOL) --mode=link $(CC) $^ $(LIBS) $(RLM_LIBS) -o $@ -+ $(LIBTOOL) --mode=link $(CC) $^ $(LDFLAGS) $(LIBS) $(RLM_LIBS) -o $@ - - rlm_ippool_tool.8: rlm_ippool_tool.pod - pod2man --release=" " --date="October 2nd, 2003" --center="FreeRADIUS Daemon" --section=8 rlm_ippool_tool.pod > rlm_ippool_tool.8 diff --git a/net/freeradius2/files/patch-src::modules::rlm_sql::rules.mak b/net/freeradius2/files/patch-src::modules::rlm_sql::rules.mak deleted file mode 100644 index cc34d6136b6d..000000000000 --- a/net/freeradius2/files/patch-src::modules::rlm_sql::rules.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/rlm_sql/drivers/rules.mak.orig Sat Feb 19 15:07:59 2005 -+++ src/modules/rlm_sql/drivers/rules.mak Sat Feb 19 15:08:22 2005 -@@ -93,7 +93,7 @@ - $(TARGET).la: $(DYNAMIC_OBJS) - $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ - -module $(LINK_MODE) $(CFLAGS) \ -- $(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(RLM_SQL_LIBS) -+ $(RLM_SQL_CFLAGS) -o $@ -rpath $(libdir) $^ $(LDFLAGS) $(RLM_SQL_LIBS) - - ####################################################################### - # diff --git a/net/freeradius2/files/patch-src::modules::rules.mak b/net/freeradius2/files/patch-src::modules::rules.mak deleted file mode 100644 index b4bb5e2e21d6..000000000000 --- a/net/freeradius2/files/patch-src::modules::rules.mak +++ /dev/null @@ -1,11 +0,0 @@ ---- src/modules/rules.mak.orig Sun Jul 31 22:48:01 2005 -+++ src/modules/rules.mak Wed Oct 5 10:57:50 2005 -@@ -96,7 +96,7 @@ - - $(TARGET).la: $(DYNAMIC_OBJS) - $(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \ -- -module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) \ -+ -module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) \ - -o $@ -rpath $(libdir) $^ $(RLM_LIBS) $(LIBS) - - ####################################################################### diff --git a/net/freeradius2/files/radiusd.sh.in b/net/freeradius2/files/radiusd.sh.in deleted file mode 100644 index 48a301cc8658..000000000000 --- a/net/freeradius2/files/radiusd.sh.in +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# PROVIDE: radiusd -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable radiusd: -# -# radiusd_enable="YES" -# - -. %%RC_SUBR%% - -name=radiusd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/radiusd -radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/radiusd.conf"} -required_files=${radiusd_config} -pidfile=/var/run/radiusd/radiusd.pid - -radiusd_enable=${radiusd_enable-"NO"} - -load_rc_config $name -run_rc_command "$1" diff --git a/net/freeradius2/pkg-descr b/net/freeradius2/pkg-descr deleted file mode 100644 index 044d72cbf88d..000000000000 --- a/net/freeradius2/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ - All code in this server was written from scratch. - The server is mostly compatible with livingston radiusd-2.01 - (no menus or s/key support though) but with more feautures, such as: - - o Can limit max. number of simultaneous logins on a per-user basis! - o Multiple DEFAULT entries, that can optionally fall-through. - o In fact, every entry can fall-through - o Deny/permit access based on huntgroup users dials into - o Set certain parameters (such as static IP address) based on huntgroup - o Extra "hints" file that can select SLIP/PPP/rlogin based on - username pattern (Puser or user.ppp is PPP, plain "user" is rlogin etc). - o Can execute an external program when user has authenticated (for example - to run a sendmail queue). - o Can use `$INCLUDE filename' in radiusd.conf, users, and dictionary files - o Can act as a proxy server, relaying requests to a remote server - o Supports Vendor-Specific attributes - o No good documentation at all, just like the original radiusd 1.16! - - Then of course for general RADIUS questions, especially if you are using - Livingston / Lucent RABU equipment, there is the portmaster-radius mailing - list. Send mail to portmaster-radius-request@livingston.com to find - out how to subscribe. - -WWW: http://www.freeradius.org/ diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist deleted file mode 100644 index e2a51b096b59..000000000000 --- a/net/freeradius2/pkg-plist +++ /dev/null @@ -1,489 +0,0 @@ -@unexec %D/etc/rc.d/radiusd.sh forcestop 2>/dev/null || true -bin/radclient -bin/radeapclient -bin/radlast -bin/radrelay -bin/radsqlrelay -bin/radtest -bin/radwho -bin/radzap -bin/rlm_dbm_cat -bin/rlm_dbm_parser -bin/rlm_ippool_tool -bin/smbencrypt -etc/raddb/certs/demoCA/serial.old -etc/raddb/certs/demoCA/serial -etc/raddb/certs/demoCA/index.txt.old -etc/raddb/certs/demoCA/index.txt -etc/raddb/certs/demoCA/cacert.pem -etc/raddb/certs/root.p12 -etc/raddb/certs/root.der -etc/raddb/certs/random -etc/raddb/certs/newreq.pem -etc/raddb/certs/newcert.pem -etc/raddb/certs/dh -etc/raddb/certs/cert-srv.pem -etc/raddb/certs/cert-srv.p12 -etc/raddb/certs/cert-srv.der -etc/raddb/certs/cert-clt.pem -etc/raddb/certs/cert-clt.p12 -etc/raddb/certs/cert-clt.der -etc/raddb/certs/root.pem -etc/raddb/certs/README -etc/raddb/acct_users.sample -etc/raddb/attrs.sample -etc/raddb/clients.sample -etc/raddb/clients.conf.sample -etc/raddb/dictionary.sample -etc/raddb/example.pl -etc/raddb/experimental.conf.sample -etc/raddb/eap.conf.sample -etc/raddb/hints.sample -etc/raddb/huntgroups.sample -etc/raddb/ldap.attrmap.sample -etc/raddb/mssql.conf.sample -etc/raddb/naslist.sample -etc/raddb/naspasswd.sample -etc/raddb/oraclesql.conf.sample -etc/raddb/otp.conf.sample -etc/raddb/otppasswd.sample.sample -etc/raddb/postgresql.conf.sample -etc/raddb/preproxy_users.sample -etc/raddb/proxy.conf.sample -etc/raddb/radiusd.conf.sample -etc/raddb/realms.sample -etc/raddb/snmp.conf.sample -etc/raddb/sql.conf.sample -etc/raddb/users.sample -lib/libeap-%%PORTVERSION%%.la -lib/libeap-%%PORTVERSION%%.so -lib/libeap.a -lib/libeap.la -lib/libeap.so -lib/libradius-%%PORTVERSION%%.la -lib/libradius-%%PORTVERSION%%.so -lib/libradius.a -lib/libradius.la -lib/libradius.so -lib/rlm_acct_unique-%%PORTVERSION%%.la -lib/rlm_acct_unique-%%PORTVERSION%%.so -lib/rlm_acct_unique.a -lib/rlm_acct_unique.la -lib/rlm_acct_unique.so -lib/rlm_always-%%PORTVERSION%%.la -lib/rlm_always-%%PORTVERSION%%.so -lib/rlm_always.a -lib/rlm_always.la -lib/rlm_always.so -lib/rlm_attr_filter-%%PORTVERSION%%.la -lib/rlm_attr_filter-%%PORTVERSION%%.so -lib/rlm_attr_filter.a -lib/rlm_attr_filter.la -lib/rlm_attr_filter.so -lib/rlm_attr_rewrite-%%PORTVERSION%%.la -lib/rlm_attr_rewrite-%%PORTVERSION%%.so -lib/rlm_attr_rewrite.a -lib/rlm_attr_rewrite.la -lib/rlm_attr_rewrite.so -lib/rlm_chap-%%PORTVERSION%%.la -lib/rlm_chap-%%PORTVERSION%%.so -lib/rlm_chap.a -lib/rlm_chap.la -lib/rlm_chap.so -lib/rlm_checkval-%%PORTVERSION%%.la -lib/rlm_checkval-%%PORTVERSION%%.so -lib/rlm_checkval.a -lib/rlm_checkval.la -lib/rlm_checkval.so -lib/rlm_counter-%%PORTVERSION%%.la -lib/rlm_counter-%%PORTVERSION%%.so -lib/rlm_counter.a -lib/rlm_counter.la -lib/rlm_counter.so -%%EXPM%%lib/rlm_cram-%%PORTVERSION%%.la -%%EXPM%%lib/rlm_cram-%%PORTVERSION%%.so -%%EXPM%%lib/rlm_cram.a -%%EXPM%%lib/rlm_cram.la -%%EXPM%%lib/rlm_cram.so -lib/rlm_dbm-%%PORTVERSION%%.la -lib/rlm_dbm-%%PORTVERSION%%.so -lib/rlm_dbm.a -lib/rlm_dbm.la -lib/rlm_dbm.so -lib/rlm_detail-%%PORTVERSION%%.la -lib/rlm_detail-%%PORTVERSION%%.so -lib/rlm_detail.a -lib/rlm_detail.la -lib/rlm_detail.so -lib/rlm_digest-%%PORTVERSION%%.la -lib/rlm_digest-%%PORTVERSION%%.so -lib/rlm_digest.a -lib/rlm_digest.la -lib/rlm_digest.so -lib/rlm_eap-%%PORTVERSION%%.la -lib/rlm_eap-%%PORTVERSION%%.so -lib/rlm_eap.a -lib/rlm_eap.la -lib/rlm_eap.so -lib/rlm_eap_gtc-%%PORTVERSION%%.la -lib/rlm_eap_gtc-%%PORTVERSION%%.so -lib/rlm_eap_gtc.a -lib/rlm_eap_gtc.la -lib/rlm_eap_gtc.so -lib/rlm_eap_leap-%%PORTVERSION%%.la -lib/rlm_eap_leap-%%PORTVERSION%%.so -lib/rlm_eap_leap.a -lib/rlm_eap_leap.la -lib/rlm_eap_leap.so -lib/rlm_eap_md5-%%PORTVERSION%%.la -lib/rlm_eap_md5-%%PORTVERSION%%.so -lib/rlm_eap_md5.a -lib/rlm_eap_md5.la -lib/rlm_eap_md5.so -lib/rlm_eap_mschapv2-%%PORTVERSION%%.la -lib/rlm_eap_mschapv2-%%PORTVERSION%%.so -lib/rlm_eap_mschapv2.a -lib/rlm_eap_mschapv2.la -lib/rlm_eap_mschapv2.so -lib/rlm_eap_peap-%%PORTVERSION%%.la -lib/rlm_eap_peap-%%PORTVERSION%%.so -lib/rlm_eap_peap.a -lib/rlm_eap_peap.la -lib/rlm_eap_peap.so -lib/rlm_eap_sim-%%PORTVERSION%%.la -lib/rlm_eap_sim-%%PORTVERSION%%.so -lib/rlm_eap_sim.a -lib/rlm_eap_sim.la -lib/rlm_eap_sim.so -lib/rlm_eap_tls-%%PORTVERSION%%.la -lib/rlm_eap_tls-%%PORTVERSION%%.so -lib/rlm_eap_tls.a -lib/rlm_eap_tls.la -lib/rlm_eap_tls.so -lib/rlm_eap_ttls-%%PORTVERSION%%.la -lib/rlm_eap_ttls-%%PORTVERSION%%.so -lib/rlm_eap_ttls.a -lib/rlm_eap_ttls.la -lib/rlm_eap_ttls.so -%%EXPM%%lib/rlm_example-%%PORTVERSION%%.la -%%EXPM%%lib/rlm_example-%%PORTVERSION%%.so -%%EXPM%%lib/rlm_example.a -%%EXPM%%lib/rlm_example.la -%%EXPM%%lib/rlm_example.so -lib/rlm_exec-%%PORTVERSION%%.la -lib/rlm_exec-%%PORTVERSION%%.so -lib/rlm_exec.a -lib/rlm_exec.la -lib/rlm_exec.so -lib/rlm_expr-%%PORTVERSION%%.la -lib/rlm_expr-%%PORTVERSION%%.so -lib/rlm_expr.a -lib/rlm_expr.la -lib/rlm_expr.so -lib/rlm_fastusers-%%PORTVERSION%%.la -lib/rlm_fastusers-%%PORTVERSION%%.so -lib/rlm_fastusers.a -lib/rlm_fastusers.la -lib/rlm_fastusers.so -lib/rlm_files-%%PORTVERSION%%.la -lib/rlm_files-%%PORTVERSION%%.so -lib/rlm_files.a -lib/rlm_files.la -lib/rlm_files.so -lib/rlm_ippool-%%PORTVERSION%%.la -lib/rlm_ippool-%%PORTVERSION%%.so -lib/rlm_ippool.a -lib/rlm_ippool.la -lib/rlm_ippool.so -%%KRB5%%lib/rlm_krb5-%%PORTVERSION%%.la -%%KRB5%%lib/rlm_krb5-%%PORTVERSION%%.so -%%KRB5%%lib/rlm_krb5.a -%%KRB5%%lib/rlm_krb5.la -%%KRB5%%lib/rlm_krb5.so -%%LDAP%%lib/rlm_ldap-%%PORTVERSION%%.la -%%LDAP%%lib/rlm_ldap-%%PORTVERSION%%.so -%%LDAP%%lib/rlm_ldap.a -%%LDAP%%lib/rlm_ldap.la -%%LDAP%%lib/rlm_ldap.so -lib/rlm_mschap-%%PORTVERSION%%.la -lib/rlm_mschap-%%PORTVERSION%%.so -lib/rlm_mschap.a -lib/rlm_mschap.la -lib/rlm_mschap.so -lib/rlm_ns_mta_md5-%%PORTVERSION%%.la -lib/rlm_ns_mta_md5-%%PORTVERSION%%.so -lib/rlm_ns_mta_md5.a -lib/rlm_ns_mta_md5.la -lib/rlm_ns_mta_md5.so -lib/rlm_otp-%%PORTVERSION%%.la -lib/rlm_otp-%%PORTVERSION%%.so -lib/rlm_otp.a -lib/rlm_otp.la -lib/rlm_otp.so -lib/rlm_pam-%%PORTVERSION%%.la -lib/rlm_pam-%%PORTVERSION%%.so -lib/rlm_pam.a -lib/rlm_pam.la -lib/rlm_pam.so -lib/rlm_pap-%%PORTVERSION%%.la -lib/rlm_pap-%%PORTVERSION%%.so -lib/rlm_pap.a -lib/rlm_pap.la -lib/rlm_pap.so -lib/rlm_passwd-%%PORTVERSION%%.la -lib/rlm_passwd-%%PORTVERSION%%.so -lib/rlm_passwd.a -lib/rlm_passwd.la -lib/rlm_passwd.so -%%RLMPERL%%lib/rlm_perl-%%PORTVERSION%%.la -%%RLMPERL%%lib/rlm_perl-%%PORTVERSION%%.so -%%RLMPERL%%lib/rlm_perl.a -%%RLMPERL%%lib/rlm_perl.la -%%RLMPERL%%lib/rlm_perl.so -lib/rlm_preprocess-%%PORTVERSION%%.la -lib/rlm_preprocess-%%PORTVERSION%%.so -lib/rlm_preprocess.a -lib/rlm_preprocess.la -lib/rlm_preprocess.so -%%EXPM%%lib/rlm_python-%%PORTVERSION%%.la -%%EXPM%%lib/rlm_python-%%PORTVERSION%%.so -%%EXPM%%lib/rlm_python.a -%%EXPM%%lib/rlm_python.la -%%EXPM%%lib/rlm_python.so -lib/rlm_radutmp-%%PORTVERSION%%.la -lib/rlm_radutmp-%%PORTVERSION%%.so -lib/rlm_radutmp.a -lib/rlm_radutmp.la -lib/rlm_radutmp.so -lib/rlm_realm-%%PORTVERSION%%.la -lib/rlm_realm-%%PORTVERSION%%.so -lib/rlm_realm.a -lib/rlm_realm.la -lib/rlm_realm.so -%%EXPM%%lib/rlm_sim_files-%%PORTVERSION%%.la -%%EXPM%%lib/rlm_sim_files-%%PORTVERSION%%.so -%%EXPM%%lib/rlm_sim_files.a -%%EXPM%%lib/rlm_sim_files.la -%%EXPM%%lib/rlm_sim_files.so -%%EXPM%%lib/rlm_smb-%%PORTVERSION%%.la -%%EXPM%%lib/rlm_smb-%%PORTVERSION%%.so -%%EXPM%%lib/rlm_smb.a -%%EXPM%%lib/rlm_smb.la -%%EXPM%%lib/rlm_smb.so -lib/rlm_sql-%%PORTVERSION%%.la -lib/rlm_sql-%%PORTVERSION%%.so -lib/rlm_sql.a -lib/rlm_sql.la -lib/rlm_sql.so -lib/rlm_sql_log-%%PORTVERSION%%.la -lib/rlm_sql_log-%%PORTVERSION%%.so -lib/rlm_sql_log.a -lib/rlm_sql_log.la -lib/rlm_sql_log.so -lib/rlm_sqlcounter-%%PORTVERSION%%.la -lib/rlm_sqlcounter-%%PORTVERSION%%.so -lib/rlm_sqlcounter.a -lib/rlm_sqlcounter.la -lib/rlm_sqlcounter.so -%%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.so -%%MYSQL%%lib/rlm_sql_mysql.a -%%MYSQL%%lib/rlm_sql_mysql.la -%%MYSQL%%lib/rlm_sql_mysql.so -%%PGSQL%%lib/rlm_sql_postgresql-%%PORTVERSION%%.so -%%PGSQL%%lib/rlm_sql_postgresql.a -%%PGSQL%%lib/rlm_sql_postgresql.la -%%PGSQL%%lib/rlm_sql_postgresql.so -lib/rlm_unix-%%PORTVERSION%%.la -lib/rlm_unix-%%PORTVERSION%%.so -lib/rlm_unix.a -lib/rlm_unix.la -lib/rlm_unix.so -sbin/check-radiusd-config -sbin/checkrad -sbin/radiusd -sbin/radwatch -sbin/rc.radiusd -%%PORTDOCS%%%%DOCSDIR%%/Autz-Type -%%PORTDOCS%%%%DOCSDIR%%/Acct-Type -%%PORTDOCS%%%%DOCSDIR%%/CYGWIN -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/DIFFS -%%PORTDOCS%%%%DOCSDIR%%/MACOSX -%%PORTDOCS%%%%DOCSDIR%%/OS2 -%%PORTDOCS%%%%DOCSDIR%%/Post-Auth-Type -%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAP.schema -%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAPv3.schema -%%PORTDOCS%%%%DOCSDIR%%/RADIUS-SQL.schema -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/Session-Type -%%PORTDOCS%%%%DOCSDIR%%/Simultaneous-Use -%%PORTDOCS%%%%DOCSDIR%%/aaa.txt -%%PORTDOCS%%%%DOCSDIR%%/ascend -%%PORTDOCS%%%%DOCSDIR%%/bay -%%PORTDOCS%%%%DOCSDIR%%/bugs -%%PORTDOCS%%%%DOCSDIR%%/cisco -%%PORTDOCS%%%%DOCSDIR%%/coding-methods.txt -%%PORTDOCS%%%%DOCSDIR%%/configurable_failover -%%PORTDOCS%%%%DOCSDIR%%/duplicate-users -%%PORTDOCS%%%%DOCSDIR%%/ldap_howto.txt -%%PORTDOCS%%%%DOCSDIR%%/load-balance.txt -%%PORTDOCS%%%%DOCSDIR%%/misc-nas -%%PORTDOCS%%%%DOCSDIR%%/module_interface -%%PORTDOCS%%%%DOCSDIR%%/performance-testing -%%PORTDOCS%%%%DOCSDIR%%/processing_users_file -%%PORTDOCS%%%%DOCSDIR%%/proxy -%%PORTDOCS%%%%DOCSDIR%%/radrelay -%%PORTDOCS%%%%DOCSDIR%%/release-method.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/attributes.html -%%PORTDOCS%%%%DOCSDIR%%/rfc/draft-kamath-pppext-eap-mschapv2-00.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/draft-sterman-aaa-sip-00.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/leap.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/pppext-eap-sim-12.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1157.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1227.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1448.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1901.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1905.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2058.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2059.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2138.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2139.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2243.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2289.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2433.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2548.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2618.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2619.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2620.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2621.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2716.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2759.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2809.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2865.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2866.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2867.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2868.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2869.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2882.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2924.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3162.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3575.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3576.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3579.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3580.txt -%%PORTDOCS%%%%DOCSDIR%%/rlm_attr_filter -%%PORTDOCS%%%%DOCSDIR%%/rlm_dbm -%%PORTDOCS%%%%DOCSDIR%%/rlm_digest -%%PORTDOCS%%%%DOCSDIR%%/rlm_eap -%%PORTDOCS%%%%DOCSDIR%%/rlm_fastusers -%%PORTDOCS%%%%DOCSDIR%%/rlm_krb5 -%%PORTDOCS%%%%DOCSDIR%%/rlm_ldap -%%PORTDOCS%%%%DOCSDIR%%/rlm_otp -%%PORTDOCS%%%%DOCSDIR%%/rlm_pam -%%PORTDOCS%%%%DOCSDIR%%/rlm_passwd -%%PORTDOCS%%%%DOCSDIR%%/rlm_python -%%PORTDOCS%%%%DOCSDIR%%/rlm_sim_triplets -%%PORTDOCS%%%%DOCSDIR%%/rlm_sql -%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter -%%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt -%%PORTDOCS%%%%DOCSDIR%%/tuning_guide -%%PORTDOCS%%%%DOCSDIR%%/variables.txt -%%DATADIR%%/dictionary -%%DATADIR%%/dictionary.3com -%%DATADIR%%/dictionary.3gpp -%%DATADIR%%/dictionary.3gpp2 -%%DATADIR%%/dictionary.acc -%%DATADIR%%/dictionary.airespace -%%DATADIR%%/dictionary.alcatel -%%DATADIR%%/dictionary.alteon -%%DATADIR%%/dictionary.altiga -%%DATADIR%%/dictionary.aptis -%%DATADIR%%/dictionary.aruba -%%DATADIR%%/dictionary.ascend -%%DATADIR%%/dictionary.avaya -%%DATADIR%%/dictionary.bay -%%DATADIR%%/dictionary.bintec -%%DATADIR%%/dictionary.bristol -%%DATADIR%%/dictionary.cablelabs -%%DATADIR%%/dictionary.cabletron -%%DATADIR%%/dictionary.cisco -%%DATADIR%%/dictionary.cisco.bbsm -%%DATADIR%%/dictionary.cisco.vpn3000 -%%DATADIR%%/dictionary.cisco.vpn5000 -%%DATADIR%%/dictionary.colubris -%%DATADIR%%/dictionary.columbia_university -%%DATADIR%%/dictionary.compat -%%DATADIR%%/dictionary.cosine -%%DATADIR%%/dictionary.digest -%%DATADIR%%/dictionary.epygi -%%DATADIR%%/dictionary.ericsson -%%DATADIR%%/dictionary.erx -%%DATADIR%%/dictionary.extreme -%%DATADIR%%/dictionary.fortinet -%%DATADIR%%/dictionary.foundry -%%DATADIR%%/dictionary.freeradius -%%DATADIR%%/dictionary.freeradius.internal -%%DATADIR%%/dictionary.gandalf -%%DATADIR%%/dictionary.garderos -%%DATADIR%%/dictionary.gemtek -%%DATADIR%%/dictionary.ipunplugged -%%DATADIR%%/dictionary.issanni -%%DATADIR%%/dictionary.itk -%%DATADIR%%/dictionary.juniper -%%DATADIR%%/dictionary.karlnet -%%DATADIR%%/dictionary.livingston -%%DATADIR%%/dictionary.localweb -%%DATADIR%%/dictionary.lucent -%%DATADIR%%/dictionary.merit -%%DATADIR%%/dictionary.microsoft -%%DATADIR%%/dictionary.mikrotik -%%DATADIR%%/dictionary.motorola -%%DATADIR%%/dictionary.navini -%%DATADIR%%/dictionary.netscreen -%%DATADIR%%/dictionary.nokia -%%DATADIR%%/dictionary.nomadix -%%DATADIR%%/dictionary.ntua -%%DATADIR%%/dictionary.packeteer -%%DATADIR%%/dictionary.propel -%%DATADIR%%/dictionary.quintum -%%DATADIR%%/dictionary.redback -%%DATADIR%%/dictionary.redcreek -%%DATADIR%%/dictionary.rfc2865 -%%DATADIR%%/dictionary.rfc2866 -%%DATADIR%%/dictionary.rfc2867 -%%DATADIR%%/dictionary.rfc2868 -%%DATADIR%%/dictionary.rfc2869 -%%DATADIR%%/dictionary.rfc3162 -%%DATADIR%%/dictionary.rfc3576 -%%DATADIR%%/dictionary.rfc3580 -%%DATADIR%%/dictionary.roaringpenguin -%%DATADIR%%/dictionary.shasta -%%DATADIR%%/dictionary.shiva -%%DATADIR%%/dictionary.sonicwall -%%DATADIR%%/dictionary.springtide -%%DATADIR%%/dictionary.starent -%%DATADIR%%/dictionary.t_systems_nova -%%DATADIR%%/dictionary.telebit -%%DATADIR%%/dictionary.trapeze -%%DATADIR%%/dictionary.unix -%%DATADIR%%/dictionary.usr -%%DATADIR%%/dictionary.valemount -%%DATADIR%%/dictionary.versanet -%%DATADIR%%/dictionary.waverider -%%DATADIR%%/dictionary.wispr -%%DATADIR%%/dictionary.xedia -%%DATADIR%%/dictionary.xylan -%%DATADIR%%/dictionary.zyxel -%%MYSQL%%%%EXAMPLESDIR%%/db_mysql.sql -%%PGSQL%%%%EXAMPLESDIR%%/db_postgresql.sql -@dirrm %%DATADIR%% -@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm etc/raddb/certs/demoCA -@dirrm etc/raddb/certs -@exec mkdir -p /var/log/raddb -@exec chmod -R og= /var/log/raddb -@exec mkdir -p /var/run/radiusd -@unexec rm -fr /var/run/radiusd -@unexec rmdir %D/etc/raddb 2> /dev/null || echo "You should remove %D/etc/raddb if you don't need it anymore." diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile deleted file mode 100644 index 738abfc7fa33..000000000000 --- a/net/gnome-netstatus/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: gnomenetstatus -# Date Created: 05 December 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/net/gnomenetstatus/Makefile,v 1.39 2005/10/08 19:41:39 marcus Exp $ -# - -PORTNAME= gnomenetstatus -PORTVERSION= 2.12.0 -PORTREVISION= 2 -CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.12 -DISTNAME= gnome-netstatus-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME applet that shows network status - -USE_X_PREFIX= yes -INSTALLS_OMF= yes -INSTALLS_ICONS= yes -USE_BZIP2= yes -GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \ - gnomedocutils -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -GCONF_SCHEMAS= netstatus.schemas - -.include <bsd.port.mk> diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo deleted file mode 100644 index e35e5f4c0ae4..000000000000 --- a/net/gnome-netstatus/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-netstatus-2.12.0.tar.bz2) = a5f23731a3bf232969e82afef8792a36 -SHA256 (gnome2/gnome-netstatus-2.12.0.tar.bz2) = 14118e71b852a77b9cb8cfe290598afb4d267cac4f6606c99b16b0b2fa807dc9 -SIZE (gnome2/gnome-netstatus-2.12.0.tar.bz2) = 473226 diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c deleted file mode 100644 index b674048d5ef2..000000000000 --- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c +++ /dev/null @@ -1,25 +0,0 @@ ---- src/netstatus-sysdeps.c.orig Mon Mar 14 09:34:06 2005 -+++ src/netstatus-sysdeps.c Mon Jan 30 21:44:49 2006 -@@ -430,11 +430,11 @@ static inline char * - get_an_data (const char *iface, - int *signal_strength) - { -+ struct an_ltv_status *sts; -+ struct an_req areq; - #ifdef AN_RID_RSSI_MAP - struct an_ltv_rssi_map an_rssimap; - #endif -- struct an_req areq; -- struct an_ltv_status *sts; - int level; - char *error = NULL; - gboolean rssimap_valid = FALSE; -@@ -548,6 +548,8 @@ netstatus_sysdeps_read_iface_wireless_de - g_strncasecmp (iface, "wi", 2) && - g_strncasecmp (iface, "ath", 3) && - g_strncasecmp (iface, "ndis", 4) && -+ g_strncasecmp (iface, "ural", 4) && -+ g_strncasecmp (iface, "ral", 3) && - g_strncasecmp (iface, "ipw", 3) && - g_strncasecmp (iface, "iwi", 3) && - g_strncasecmp (iface, "acx", 3)) diff --git a/net/gnome-netstatus/pkg-descr b/net/gnome-netstatus/pkg-descr deleted file mode 100644 index 0848cf01ffc2..000000000000 --- a/net/gnome-netstatus/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Gnome-netstatus is a panel applet which provides information about -network interfaces. diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist deleted file mode 100644 index 266c5b3ad9be..000000000000 --- a/net/gnome-netstatus/pkg-plist +++ /dev/null @@ -1,185 +0,0 @@ -libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server -libexec/gnome-netstatus-applet -share/gnome/gnome-2.0/ui/GNOME_NetstatusApplet.xml -share/gnome/gnome-netstatus/gnome-netstatus.glade -share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/C/legal.xml -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/de/legal.xml -share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/fr/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/fr/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/fr/legal.xml -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/it/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/it/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/it/legal.xml -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/ja/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/ja/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/ja/legal.xml -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/ko/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/ko/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/ko/legal.xml -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/sv/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/sv/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/sv/legal.xml -share/gnome/help/gnome-netstatus/uk/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/zh_CN/legal.xml -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/zh_HK/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/zh_HK/legal.xml -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/zh_TW/legal.xml -share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-de.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-es.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-fr.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-it.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-ja.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-ko.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-sv.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-uk.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_CN.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_HK.omf -share/gnome/omf/gnome-netstatus/gnome-netstatus-zh_TW.omf -share/gnome/pixmaps/gnome-netstatus-tx.png -share/icons/hicolor/48x48/apps/gnome-netstatus-0-24.png -share/icons/hicolor/48x48/apps/gnome-netstatus-25-49.png -share/icons/hicolor/48x48/apps/gnome-netstatus-50-74.png -share/icons/hicolor/48x48/apps/gnome-netstatus-75-100.png -share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png -share/icons/hicolor/48x48/apps/gnome-netstatus-error.png -share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png -share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png -share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png -share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png -share/locale/ar/LC_MESSAGES/gnome-netstatus.mo -share/locale/az/LC_MESSAGES/gnome-netstatus.mo -share/locale/bg/LC_MESSAGES/gnome-netstatus.mo -share/locale/bn/LC_MESSAGES/gnome-netstatus.mo -share/locale/bs/LC_MESSAGES/gnome-netstatus.mo -share/locale/ca/LC_MESSAGES/gnome-netstatus.mo -share/locale/cs/LC_MESSAGES/gnome-netstatus.mo -share/locale/cy/LC_MESSAGES/gnome-netstatus.mo -share/locale/da/LC_MESSAGES/gnome-netstatus.mo -share/locale/de/LC_MESSAGES/gnome-netstatus.mo -share/locale/el/LC_MESSAGES/gnome-netstatus.mo -share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo -share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo -share/locale/es/LC_MESSAGES/gnome-netstatus.mo -share/locale/et/LC_MESSAGES/gnome-netstatus.mo -share/locale/eu/LC_MESSAGES/gnome-netstatus.mo -share/locale/fa/LC_MESSAGES/gnome-netstatus.mo -share/locale/fi/LC_MESSAGES/gnome-netstatus.mo -share/locale/fr/LC_MESSAGES/gnome-netstatus.mo -share/locale/ga/LC_MESSAGES/gnome-netstatus.mo -share/locale/gl/LC_MESSAGES/gnome-netstatus.mo -share/locale/gu/LC_MESSAGES/gnome-netstatus.mo -share/locale/hi/LC_MESSAGES/gnome-netstatus.mo -share/locale/hr/LC_MESSAGES/gnome-netstatus.mo -share/locale/hu/LC_MESSAGES/gnome-netstatus.mo -share/locale/id/LC_MESSAGES/gnome-netstatus.mo -share/locale/it/LC_MESSAGES/gnome-netstatus.mo -share/locale/ja/LC_MESSAGES/gnome-netstatus.mo -share/locale/ko/LC_MESSAGES/gnome-netstatus.mo -share/locale/lt/LC_MESSAGES/gnome-netstatus.mo -share/locale/mn/LC_MESSAGES/gnome-netstatus.mo -share/locale/ms/LC_MESSAGES/gnome-netstatus.mo -share/locale/nb/LC_MESSAGES/gnome-netstatus.mo -share/locale/ne/LC_MESSAGES/gnome-netstatus.mo -share/locale/nl/LC_MESSAGES/gnome-netstatus.mo -share/locale/nn/LC_MESSAGES/gnome-netstatus.mo -share/locale/no/LC_MESSAGES/gnome-netstatus.mo -share/locale/pa/LC_MESSAGES/gnome-netstatus.mo -share/locale/pl/LC_MESSAGES/gnome-netstatus.mo -share/locale/pt/LC_MESSAGES/gnome-netstatus.mo -share/locale/pt_BR/LC_MESSAGES/gnome-netstatus.mo -share/locale/ro/LC_MESSAGES/gnome-netstatus.mo -share/locale/ru/LC_MESSAGES/gnome-netstatus.mo -share/locale/rw/LC_MESSAGES/gnome-netstatus.mo -share/locale/sk/LC_MESSAGES/gnome-netstatus.mo -share/locale/sq/LC_MESSAGES/gnome-netstatus.mo -share/locale/sr/LC_MESSAGES/gnome-netstatus.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo -share/locale/sv/LC_MESSAGES/gnome-netstatus.mo -share/locale/ta/LC_MESSAGES/gnome-netstatus.mo -share/locale/th/LC_MESSAGES/gnome-netstatus.mo -share/locale/tr/LC_MESSAGES/gnome-netstatus.mo -share/locale/uk/LC_MESSAGES/gnome-netstatus.mo -share/locale/vi/LC_MESSAGES/gnome-netstatus.mo -share/locale/wa/LC_MESSAGES/gnome-netstatus.mo -share/locale/xh/LC_MESSAGES/gnome-netstatus.mo -share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo -share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo -@dirrm share/gnome/omf/gnome-netstatus -@dirrm share/gnome/help/gnome-netstatus/zh_TW/figures -@dirrm share/gnome/help/gnome-netstatus/zh_TW -@dirrm share/gnome/help/gnome-netstatus/zh_HK/figures -@dirrm share/gnome/help/gnome-netstatus/zh_HK -@dirrm share/gnome/help/gnome-netstatus/zh_CN/figures -@dirrm share/gnome/help/gnome-netstatus/zh_CN -@dirrm share/gnome/help/gnome-netstatus/uk -@dirrm share/gnome/help/gnome-netstatus/sv/figures -@dirrm share/gnome/help/gnome-netstatus/sv -@dirrm share/gnome/help/gnome-netstatus/ko/figures -@dirrm share/gnome/help/gnome-netstatus/ko -@dirrm share/gnome/help/gnome-netstatus/ja/figures -@dirrm share/gnome/help/gnome-netstatus/ja -@dirrm share/gnome/help/gnome-netstatus/it/figures -@dirrm share/gnome/help/gnome-netstatus/it -@dirrm share/gnome/help/gnome-netstatus/fr/figures -@dirrm share/gnome/help/gnome-netstatus/fr -@dirrm share/gnome/help/gnome-netstatus/es -@dirrm share/gnome/help/gnome-netstatus/de/figures -@dirrm share/gnome/help/gnome-netstatus/de -@dirrm share/gnome/help/gnome-netstatus/C -@dirrm share/gnome/help/gnome-netstatus -@dirrm share/gnome/gnome-netstatus diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile deleted file mode 100644 index 64bd2d9d7209..000000000000 --- a/net/gnome-nettool/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: gnomenetwork -# Date Created: 03 June 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/net/gnomenettool/Makefile,v 1.11 2005/10/04 03:12:16 ahze Exp $ -# - -PORTNAME= gnomenettool -PORTVERSION= 1.4.1 -PORTEPOCH= 1 -CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.4 -DISTNAME= gnome-nettool-${PORTVERSION} -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= A GNOME utility that provides network information statistics - -USE_X_PREFIX= yes -USE_BZIP2= yes -USE_GNOME= gnomehack intlhack gnomeprefix libglade2 gconf2 -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CFLAGS+= -DHAVE_SOCKADDR_SA_LEN - -post-install: - ${MKDIR} ${PREFIX}/share/gnome/pixmaps - ${LN} -sf ${PREFIX}/share/gnome/gnome-nettool/pixmaps/gnome-nettool.png \ - ${PREFIX}/share/gnome/pixmaps/gnome-nettool.png - -.include <bsd.port.mk> diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo deleted file mode 100644 index 2062ca84df73..000000000000 --- a/net/gnome-nettool/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (gnome2/gnome-nettool-1.4.1.tar.bz2) = a64f7b39f24b4d3a843d545f2dbb611d -SHA256 (gnome2/gnome-nettool-1.4.1.tar.bz2) = 8b8fc47dcfddf4194c30efba4cdbf6efc96a49b1fd69b3a87461d1af383f4a91 -SIZE (gnome2/gnome-nettool-1.4.1.tar.bz2) = 477548 diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c deleted file mode 100644 index 9b895e8fd67f..000000000000 --- a/net/gnome-nettool/files/patch-src_info.c +++ /dev/null @@ -1,254 +0,0 @@ ---- src/info.c.orig Thu Jan 27 18:26:53 2005 -+++ src/info.c Sun Jul 3 17:46:31 2005 -@@ -20,6 +20,8 @@ - #include <gtk/gtk.h> - #include <glib/gi18n.h> - #include <glib/gprintf.h> -+#include <sys/types.h> -+#include <string.h> - - #ifdef HAVE_CONFIG_H - # include <config.h> -@@ -38,6 +40,11 @@ - #include <sys/ioctl.h> - #include <stdlib.h> - #include <net/if.h> -+#ifdef __FreeBSD__ -+#include <sys/sysctl.h> -+#include <net/if_dl.h> -+#include <net/if_media.h> -+#endif - - #include "info.h" - #include "utils.h" -@@ -58,6 +65,7 @@ static InfoInterfaceDescription info_ifa - { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL }, - { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL }, - { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL }, -+ { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "tun", NULL }, - { N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL }, - { N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL }, - { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL }, -@@ -128,9 +136,42 @@ info_get_interface_from_dev_name (const - { - gint i; - gchar *path; -- -+ gchar *dev_type = NULL; -+#if defined(__FreeBSD__) -+ int s; -+ struct ifmediareq ifmr; -+ -+ if ((s = socket (AF_INET, SOCK_DGRAM, 0)) > -1) { -+ -+ (void) memset (&ifmr, 0, sizeof (ifmr)); -+ (void) strncpy (ifmr.ifm_name, dev_name, sizeof (ifmr.ifm_name)); -+ -+ if (ioctl (s, SIOCGIFMEDIA, (caddr_t) &ifmr) > -1) { -+ switch (IFM_TYPE (ifmr.ifm_active)) { -+ case IFM_ETHER: -+ dev_type = "eth"; -+ break; -+ case IFM_FDDI: -+ case IFM_TOKEN: -+#ifdef IFM_ATM -+ case IFM_ATM: -+#endif -+ dev_type = "other_type"; -+ break; -+ case IFM_IEEE80211: -+ dev_type = "wlan"; -+ break; -+ } -+ } -+ close (s); -+ } -+#endif /* defined(__FreeBSD__) */ -+ -+ if (!dev_type) -+ dev_type = (gchar *) dev_name; -+ - for (i = 0; info_iface_desc[i].name; i++) -- if (strstr (dev_name, info_iface_desc[i].prefix) == dev_name) { -+ if (strstr (dev_type, info_iface_desc[i].prefix) == dev_type) { - (*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name); - if (info_iface_desc[i].pixbuf == NULL) { - path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL); -@@ -217,38 +258,87 @@ info_nic_update_stats (gpointer data) - gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; - */ - gchar iface[30]; /*, flags[30]; */ -- gchar rx_bytes[16], rx_pkt[10], rx_error[10], rx_drop[10], rx_fifo[10]; -- gchar frame[10], compressed[10], multicast[10]; -- gchar tx_bytes[16], tx_pkt[10], tx_error[10], tx_drop[10], tx_fifo[10]; -+ gchar rx_bytes[16], rx_pkt[10], rx_error[10]; -+ gchar tx_bytes[16], tx_pkt[10], tx_error[10]; - gchar collissions[10]; -+#if defined(__linux__) -+ gchar rx_drop[10], rx_fifo[10]; -+ gchar frame[10], compressed[10], multicast[10]; -+ gchar tx_drop[10], tx_fifo[10]; -+#elif defined(__FreeBSD__) -+ char *p; -+ gchar **tokens, **argv; -+ int i; -+ int pipe_out; -+#endif - - GIOChannel *io = NULL; - gchar *line; - gboolean title = TRUE; - const gchar *text; - gchar *text_tx_bytes, *text_rx_bytes; -- -+ - g_return_val_if_fail (info != NULL, FALSE); - - model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo)); - text = info_get_nic (info); - if (!text) - return FALSE; -- -+ - #if defined(__linux__) - io = g_io_channel_new_file ("/proc/net/dev", "r", NULL); -- -+#elif defined(__FreeBSD__) -+ if (!g_shell_parse_argv ("/usr/bin/netstat -in -b -f link", NULL, &argv, NULL)) { -+ return FALSE; -+ } -+ if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, &pipe_out, NULL, NULL)) { -+ g_strfreev (argv); -+ return FALSE; -+ } -+ -+ g_strfreev (argv); -+ -+ io = g_io_channel_unix_new (pipe_out); -+#endif /* defined(__linux__) */ -+ - while (g_io_channel_read_line (io, &line, NULL, NULL, NULL) == G_IO_STATUS_NORMAL) { - if (title) { - title = FALSE; - g_free (line); - continue; - } -+#if defined(__linux__) - line = g_strdelimit (line, ":", ' '); - sscanf (line, "%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s", iface, - rx_bytes, rx_pkt, rx_error, rx_drop, rx_fifo, frame, - compressed, multicast, - tx_bytes, tx_pkt, tx_error, tx_drop, tx_fifo, collissions); -+#elif defined(__FreeBSD__) -+ tokens = (gchar **) g_malloc0 (sizeof (gchar *) * 12); -+ p = strtok (line, " \t\n"); -+ /* We only care about 11 fields for now */ -+ for (i = 0; i < 11 && p; i++, p = strtok (NULL, " \t\n")) { -+ tokens[i] = g_strdup (p); -+ } -+ -+ if (i == 0 || i < 10) { -+ g_free (line); -+ g_strfreev (tokens); -+ continue; -+ } -+ -+ g_strlcpy (iface, tokens[0], sizeof (iface)); -+ -+ g_strlcpy (collissions, tokens[--i], sizeof (collissions)); -+ g_strlcpy (tx_bytes, tokens[--i], sizeof (tx_bytes)); -+ g_strlcpy (tx_error, tokens[--i], sizeof (tx_error)); -+ g_strlcpy (tx_pkt, tokens[--i], sizeof (tx_pkt)); -+ g_strlcpy (rx_bytes, tokens[--i], sizeof (rx_bytes)); -+ g_strlcpy (rx_error, tokens[--i], sizeof (rx_error)); -+ g_strlcpy (rx_pkt, tokens[--i], sizeof (rx_pkt)); -+ -+ g_strfreev (tokens); -+#endif /* defined(__linux__) */ - - if (g_ascii_strcasecmp (iface, text) == 0) { - /* -@@ -276,7 +366,9 @@ info_nic_update_stats (gpointer data) - } - - g_io_channel_unref (io); --#endif /* defined(__linux__) */ -+#if defined(__FreeBSD__) -+ close (pipe_out); -+#endif /* defined(__FreeBSD__) */ - - return TRUE; - } -@@ -405,8 +497,16 @@ info_get_nic_information (const gchar *n - InfoIpAddr *ip; - gint flags; - mii_data_result data; -+#ifdef __FreeBSD__ -+ gint hwmib[6], hwlen; -+ gchar *hwbuf; -+ guchar *hwptr; -+ struct if_msghdr *hwifm; -+ struct sockaddr_dl *hwsinptr; -+#endif - - getifaddrs (&ifa0); -+ memset (&data, 0, sizeof (data)); - - for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { - if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -452,7 +552,9 @@ info_get_nic_information (const gchar *n - ifc.ifc_req = (struct ifreq *) buf; - ioctl (sockfd, SIOCGIFCONF, &ifc); - -+#if defined(__linux__) - data = mii_get_basic (nic); -+#endif /* defined(__linux__) */ - - for (ptr = buf; ptr < buf + ifc.ifc_len;) { - ifr = (struct ifreq *) ptr; -@@ -483,6 +585,45 @@ info_get_nic_information (const gchar *n - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], - (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); -+#elif defined(__FreeBSD__) -+ hwmib[0] = CTL_NET; -+ hwmib[1] = AF_ROUTE; -+ hwmib[2] = 0; -+ hwmib[3] = AF_LINK; -+ hwmib[4] = NET_RT_IFLIST; -+ if ((hwmib[5] = if_nametoindex (nic)) == 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if (sysctl (hwmib, 6, NULL, &hwlen, NULL, 0) < 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if ((hwbuf = g_malloc (hwlen)) == NULL) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ if (sysctl (hwmib, 6, hwbuf, &hwlen, NULL, 0) < 0) { -+ g_sprintf (dst, NOT_AVAILABLE); -+ goto hwfail; -+ } -+ -+ hwifm = (struct if_msghdr *) hwbuf; -+ hwsinptr = (struct sockaddr_dl *) (hwifm + 1); -+ hwptr = (guchar *) LLADDR (hwsinptr); -+ if (*hwptr != 0 || *(hwptr + 1) != 0 || -+ *(hwptr + 2) != 0 || *(hwptr + 3) != 0 || -+ *(hwptr + 4) != 0 || *(hwptr + 5) != 0) { -+ g_sprintf (dst, "%02x:%02x:%02x:%02x:%02x:%02x", -+ *hwptr, *(hwptr + 1), *(hwptr + 2), -+ *(hwptr + 3), *(hwptr + 4), *(hwptr + 5)); -+ } -+ else { -+ g_sprintf (dst, NOT_AVAILABLE); -+ } -+ g_free (hwbuf); -+ -+hwfail: - #else - g_sprintf (dst, NOT_AVAILABLE); - #endif /* SIOCGIFHWADDR */ diff --git a/net/gnome-nettool/files/patch-src_lookup.c b/net/gnome-nettool/files/patch-src_lookup.c deleted file mode 100644 index 9744c13973da..000000000000 --- a/net/gnome-nettool/files/patch-src_lookup.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lookup.c.orig Sun Jul 3 17:47:02 2005 -+++ src/lookup.c Sun Jul 3 17:47:20 2005 -@@ -21,6 +21,7 @@ - #include <gtk/gtk.h> - #include <glib/gi18n.h> - #include <glib/gprintf.h> -+#include <sys/types.h> - - #include "lookup.h" - #include "utils.h" diff --git a/net/gnome-nettool/files/patch-src_netstat.c b/net/gnome-nettool/files/patch-src_netstat.c deleted file mode 100644 index 1eec8492793a..000000000000 --- a/net/gnome-nettool/files/patch-src_netstat.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/netstat.c.orig Tue Jul 6 13:55:25 2004 -+++ src/netstat.c Fri Aug 20 15:55:40 2004 -@@ -108,12 +108,17 @@ - g_return_val_if_fail (netinfo != NULL, NULL); - - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->routing))) { -+#ifdef __FreeBSD__ -+ /* XXX We only support ipv4 now */ -+ option = g_strdup ("-rn -f inet"); -+#else - /* Works for Solaris and Linux */ - if (netinfo_is_ipv6_enable ()) { - option = g_strdup ("-rn -A inet -A inet6"); - } else { - option = g_strdup ("-rn -A inet"); - } -+#endif - - if (netinfo->stbar_text) - g_free (netinfo->stbar_text); diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c deleted file mode 100644 index cae4f648fdf8..000000000000 --- a/net/gnome-nettool/files/patch-src_nettool.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/nettool.c.orig Fri Jan 7 23:13:56 2005 -+++ src/nettool.c Mon Jan 24 21:03:48 2005 -@@ -22,6 +22,7 @@ - #include <glib/gi18n.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <signal.h> - #include <errno.h> - #include <sys/wait.h> -@@ -357,6 +358,10 @@ - len, NULL); - } - -+ g_free (text); -+ -+ return TRUE; -+ - } else if (status == G_IO_STATUS_AGAIN) { - char buf[1]; - -@@ -368,12 +373,13 @@ - } - g_string_append_c (netinfo->command_output, buf[0]); - } -+ -+ g_free (text); -+ return TRUE; - } else if (status == G_IO_STATUS_EOF) { - } - - g_free (text); -- -- return TRUE; - } - - /* The condition is not G_IO_HUP | G_IO_ERR | G_IO_NVAL, so diff --git a/net/gnome-nettool/files/patch-src_utils.c b/net/gnome-nettool/files/patch-src_utils.c deleted file mode 100644 index 921c780498c1..000000000000 --- a/net/gnome-nettool/files/patch-src_utils.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/utils.c.orig Fri May 6 16:10:28 2005 -+++ src/utils.c Sun Jul 3 17:48:12 2005 -@@ -24,6 +24,8 @@ - on GNOME 2.0 */ - - #include "utils.h" -+#include <stdlib.h> -+#include <limits.h> - #include <string.h> - #include <glib/gi18n.h> - -@@ -240,7 +242,7 @@ util_legible_bytes (gchar *bytes) - const gchar *unit = "B"; - gchar *result; - -- sscanf (bytes, "%lld", &rx); -+ rx = strtoull (bytes, (char **)NULL, 10); - short_rx = rx * 10; - - if (rx > 1125899906842624ull) { diff --git a/net/gnome-nettool/pkg-descr b/net/gnome-nettool/pkg-descr deleted file mode 100644 index 5619126feab9..000000000000 --- a/net/gnome-nettool/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Gnome-nettool is a utility for getting network information such as interface -statistics, and for front-ending commands like ping and traceroute. It -is very similar to the MacOS X Network Utility. diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist deleted file mode 100644 index 0d3d6886cd50..000000000000 --- a/net/gnome-nettool/pkg-plist +++ /dev/null @@ -1,73 +0,0 @@ -bin/gnome-nettool -share/gnome/applications/gnome-nettool.desktop -share/gnome/gnome-nettool/dialogs/gnome-nettool.glade -share/gnome/gnome-nettool/pixmaps/16_ethernet.xpm -share/gnome/gnome-nettool/pixmaps/16_loopback.xpm -share/gnome/gnome-nettool/pixmaps/16_plip.xpm -share/gnome/gnome-nettool/pixmaps/16_ppp.xpm -share/gnome/gnome-nettool/pixmaps/gnome-nettool.png -share/gnome/gnome-nettool/pixmaps/irda-16.png -share/gnome/gnome-nettool/pixmaps/network.png -share/gnome/gnome-nettool/pixmaps/wavelan-16.png -share/gnome/pixmaps/gnome-nettool.png -share/locale/ar/LC_MESSAGES/gnome-nettool.mo -share/locale/az/LC_MESSAGES/gnome-nettool.mo -share/locale/bg/LC_MESSAGES/gnome-nettool.mo -share/locale/bn/LC_MESSAGES/gnome-nettool.mo -share/locale/bs/LC_MESSAGES/gnome-nettool.mo -share/locale/ca/LC_MESSAGES/gnome-nettool.mo -share/locale/cs/LC_MESSAGES/gnome-nettool.mo -share/locale/da/LC_MESSAGES/gnome-nettool.mo -share/locale/de/LC_MESSAGES/gnome-nettool.mo -share/locale/el/LC_MESSAGES/gnome-nettool.mo -share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo -share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo -share/locale/es/LC_MESSAGES/gnome-nettool.mo -share/locale/et/LC_MESSAGES/gnome-nettool.mo -share/locale/eu/LC_MESSAGES/gnome-nettool.mo -share/locale/fa/LC_MESSAGES/gnome-nettool.mo -share/locale/fi/LC_MESSAGES/gnome-nettool.mo -share/locale/fr/LC_MESSAGES/gnome-nettool.mo -share/locale/ga/LC_MESSAGES/gnome-nettool.mo -share/locale/gl/LC_MESSAGES/gnome-nettool.mo -share/locale/gu/LC_MESSAGES/gnome-nettool.mo -share/locale/he/LC_MESSAGES/gnome-nettool.mo -share/locale/hr/LC_MESSAGES/gnome-nettool.mo -share/locale/hu/LC_MESSAGES/gnome-nettool.mo -share/locale/id/LC_MESSAGES/gnome-nettool.mo -share/locale/it/LC_MESSAGES/gnome-nettool.mo -share/locale/ja/LC_MESSAGES/gnome-nettool.mo -share/locale/ko/LC_MESSAGES/gnome-nettool.mo -share/locale/lt/LC_MESSAGES/gnome-nettool.mo -share/locale/mk/LC_MESSAGES/gnome-nettool.mo -share/locale/ml/LC_MESSAGES/gnome-nettool.mo -share/locale/mn/LC_MESSAGES/gnome-nettool.mo -share/locale/ms/LC_MESSAGES/gnome-nettool.mo -share/locale/nb/LC_MESSAGES/gnome-nettool.mo -share/locale/ne/LC_MESSAGES/gnome-nettool.mo -share/locale/nl/LC_MESSAGES/gnome-nettool.mo -share/locale/no/LC_MESSAGES/gnome-nettool.mo -share/locale/pa/LC_MESSAGES/gnome-nettool.mo -share/locale/pl/LC_MESSAGES/gnome-nettool.mo -share/locale/pt/LC_MESSAGES/gnome-nettool.mo -share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo -share/locale/ro/LC_MESSAGES/gnome-nettool.mo -share/locale/ru/LC_MESSAGES/gnome-nettool.mo -share/locale/rw/LC_MESSAGES/gnome-nettool.mo -share/locale/sk/LC_MESSAGES/gnome-nettool.mo -share/locale/sq/LC_MESSAGES/gnome-nettool.mo -share/locale/sr/LC_MESSAGES/gnome-nettool.mo -share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo -share/locale/sv/LC_MESSAGES/gnome-nettool.mo -share/locale/ta/LC_MESSAGES/gnome-nettool.mo -share/locale/th/LC_MESSAGES/gnome-nettool.mo -share/locale/tr/LC_MESSAGES/gnome-nettool.mo -share/locale/uk/LC_MESSAGES/gnome-nettool.mo -share/locale/vi/LC_MESSAGES/gnome-nettool.mo -share/locale/wa/LC_MESSAGES/gnome-nettool.mo -share/locale/xh/LC_MESSAGES/gnome-nettool.mo -share/locale/zh_CN/LC_MESSAGES/gnome-nettool.mo -share/locale/zh_TW/LC_MESSAGES/gnome-nettool.mo -@dirrm share/gnome/gnome-nettool/pixmaps -@dirrm share/gnome/gnome-nettool/dialogs -@dirrm share/gnome/gnome-nettool diff --git a/net/gstreamer-plugins-libmms80/Makefile b/net/gstreamer-plugins-libmms80/Makefile deleted file mode 100644 index 7d0d432ce650..000000000000 --- a/net/gstreamer-plugins-libmms80/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: gstreamer-plugins-libmms -# Date created: 8 March 2005 -# Whom: Koop Mast <kwm@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= net -PORTREVISION= 1 - -COMMENT= Gstreamer mms:// and mmsh:// plugin - -GST_PLUGIN= libmms - -MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins - -.include "${MASTERDIR}/Makefile" diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile deleted file mode 100644 index 91e339920bb5..000000000000 --- a/net/haproxy-devel/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# New ports collection Makefile for: haproxy -# Date created: Apr 30, 2003 -# Whom: Clement Laforet -# -# $FreeBSD$ -# - -PORTNAME= haproxy -PORTVERSION= 1.1.32 -CATEGORIES= net www -MASTER_SITES= http://w.ods.org/tools/haproxy/src/ \ - http://w.ods.org/tools/haproxy/src/old/ - -MAINTAINER= clement@FreeBSD.org -COMMENT= High-performance and highly-robust TCP/HTTP load balancer - -USE_REINPLACE= yes -USE_RC_SUBR= yes -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - -STATS_INTERVAL?= 0 -CFLAGS+= -DSTATTIME=${STATS_INTERVAL} - -.if defined(WITH_TPROXY) -CFLAGS+= -DTPROXY -.endif - -.if defined(WITH_PCRE) -PKGNAMESUFFIX= -pcre -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -CFLAGS+= -DUSE_PCRE -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lpcreposix -lpcre -.endif - -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} "Available options:" - @${ECHO_MSG} "WITH_PCRE: Use pcre regex engine" - @${ECHO_MSG} "WITH_TPROXY: Enable Transparent proxy support" - @${ECHO_MSG} "STATS_INTERVAL=###: Statistics interval in milliseconds," - @${ECHO_MSG} " (default to 0, disabled)" - @${ECHO_MSG} "" - -post-patch: - @${REINPLACE_CMD} -e 's!localtime(!localtime((time_t *)!' ${WRKSRC}/haproxy.c - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/haproxy.sh > ${WRKDIR}/haproxy.sh - -do-build: - cd ${WRKSRC} && \ - ${CC} ${CFLAGS} ${LDFLAGS} ${PORTNAME}.c -o ${PORTNAME} - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${PREFIX}/sbin - @${INSTALL_SCRIPT} ${WRKDIR}/haproxy.sh \ - ${PREFIX}/etc/rc.d/haproxy.sh - -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/examples/haproxy.cfg \ - ${EXAMPLESDIR}/haproxy.cfg -.endif - -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo deleted file mode 100644 index 33398c89209e..000000000000 --- a/net/haproxy-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (haproxy-1.1.32.tar.gz) = 300a5c6294f577e3ef68d17caf8277d0 -SHA256 (haproxy-1.1.32.tar.gz) = 4650caba0c3e8954fde67866503fac410ab7a6b0d09ef5e9847c125384909e3f -SIZE (haproxy-1.1.32.tar.gz) = 137540 diff --git a/net/haproxy-devel/files/haproxy.sh b/net/haproxy-devel/files/haproxy.sh deleted file mode 100644 index a69868ffb1e8..000000000000 --- a/net/haproxy-devel/files/haproxy.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: haproxy -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable haproxy: -# haproxy_enable (bool): Set to "NO" by default. -# Set it to "YES" to enable haproxy -# haproxylimits_enable (bool):Set to "NO" by default. -# Set it to yes to run `limits $limits_args` -# just before haproxy starts. -# haproxy_flags (str): Set to "" by default. -# Extra flags passed to start command -# haproxylimits_args (str): Default to "-e -C daemon" -# Arguments of pre-start limits run. -# -. %%RC_SUBR%% - -name="haproxy" -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/haproxy" -pidfile="/var/run/haproxy.pid" -required_files=%%PREFIX%%/etc/haproxy.conf - -[ -z "$haproxy_enable" ] && haproxy_enable="NO" -[ -z "$haproxy_flags" ] && haproxy_flags="-p ${pidfile}" -[ -z "$haproxylimits_enable" ] && haproxylimits_enable="NO" -[ -z "$haproxylimits_args" ] && haproxylimits_args="-e -C daemon" - -load_rc_config $name - -checkyesno haproxylimits_enable && \ - start_precmd="eval `/usr/bin/limits ${haproxylimits_args}` 2>/dev/null" - -sig_gracefulstop=SIGUSR1 - -haproxy_gracefulstop() { - echo "Gracefully shutdown haproxy ($rc_pid)" - kill -${sig_gracefulstop} ${rc_pid} - } - -extra_commands="gracefulstop" -run_rc_command "$1" diff --git a/net/haproxy-devel/pkg-descr b/net/haproxy-devel/pkg-descr deleted file mode 100644 index fa6780fd9794..000000000000 --- a/net/haproxy-devel/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -HAproxy is a high-performance and highly-robust TCP/HTTP load balancer which -provides cookie-based persistence, automatic failover, header insertion, -deletion, modification on the fly, advanced logging contents to help trouble- -shooting buggy applications and/or networks, and a few other features. It uses -its own state machine to achieve up to ten thousands hits per second on modern -hardware, even with thousands simultaneous connections. It currently lacks SSL -and keep-alive, both of which are planned. - -WWW: http://w.ods.org/tools/haproxy/ diff --git a/net/haproxy-devel/pkg-message b/net/haproxy-devel/pkg-message deleted file mode 100644 index 4cb845b4df81..000000000000 --- a/net/haproxy-devel/pkg-message +++ /dev/null @@ -1,3 +0,0 @@ -===> BE CAREFULL HOW TO BOOT on 1.1.28 or after: - To run haproxy from startup, add haproxy_enable="YES" in your - /etc/rc.conf. diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist deleted file mode 100644 index e33e1e21c975..000000000000 --- a/net/haproxy-devel/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -sbin/haproxy -etc/rc.d/haproxy.sh -%%PORTDOCS%%%%DOCSDIR%%/architecture.txt -%%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt -%%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.cfg -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/net/imm/Makefile b/net/imm/Makefile deleted file mode 100644 index 9cf49cf2e12a..000000000000 --- a/net/imm/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# New ports collection makefile for: imm -# Date created: 13 October 1994 -# Whom: wollman -# -# $FreeBSD$ -# - -PORTNAME= imm -PORTVERSION= 3.5a1 -CATEGORIES= mbone tk82 -MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/ -DISTNAME= imm.source -EXTRACT_SUFX= .tar.Z - -MAINTAINER= fenner@FreeBSD.org -COMMENT= Internet Image(or other data) Multicaster (and receiver) - -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 - -WRKSRC= ${WRKDIR}/mnm -USE_X_PREFIX= yes - -.include <bsd.port.pre.mk> - -post-extract: - @${MKDIR} ${WRKSRC}/freebsd - @${CP} ${FILESDIR}/Makefile.work ${WRKSRC}/Makefile - @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/src - -# The included makefile doesn't have an "install" target. -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/imm ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/immserv ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/freebsd/lscomp ${PREFIX}/bin -# and no man pages at all yet. -# But include the very limited documentation - ${MKDIR} ${PREFIX}/share/doc/imm -.if !defined(NOPORTDOCS) - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/imm - ${INSTALL_DATA} ${WRKSRC}/imm_readme.txt ${PREFIX}/share/doc/imm -.endif -# The sdr plugin is pretty much required. - ${INSTALL_DATA} ${WRKSRC}/sdr2.plugin.S53.image.imm ${PREFIX}/share/doc/imm - -.include <bsd.port.post.mk> diff --git a/net/imm/distinfo b/net/imm/distinfo deleted file mode 100644 index 090e9df901b5..000000000000 --- a/net/imm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667 -SHA256 (imm.source.tar.Z) = be66dc74b955cf51de1575662d700b87cb423e3562f163d2f0dc70878b73270b -SIZE (imm.source.tar.Z) = 106067 diff --git a/net/imm/files/Makefile.freebsd b/net/imm/files/Makefile.freebsd deleted file mode 100644 index ae7ce6434e6f..000000000000 --- a/net/imm/files/Makefile.freebsd +++ /dev/null @@ -1,77 +0,0 @@ -# Some versions of make, like SGI's, use the following variable to -# determine which shell to use for executing commands: -SHELL = /bin/sh -INCLUDE_DIR = -I${PREFIX}/include -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2 -# Libraries to use when linking: -LIBS = -lm - -TKLIBS= -L$(PREFIX)/lib -L${LOCALBASE}/lib -ltk82 -ltcl82 -lX11 - -TARGET = ../freebsd - -CFLAGS = -g -DSIG_T=void -DMULTICAST -I. -DERROR_TEST - -CC = gcc -CC_SWITCHES = ${CFLAGS} - -ROBJS = protocol.o utils.o - -SOBJS = protocol.o immserv.o sorttree.o utils.o - -MOBJS = protocol.o mnmserver.o sorttree.o utils.o - -all: $(TARGET)/imm $(TARGET)/immserv $(TARGET)/lscomp - -$(TARGET)/mnm: $(ROBJS) main.o xlopen.o mcl.o - $(CC) $(CFLAGS) main.o xlopen.o mcl.o $(ROBJS) $(LIBS) -o $(TARGET)/mnm - -$(TARGET)/imm: $(ROBJS) tkAppInit.o imm_init.o imm.o xlopen_imm.o - $(CC) $(CFLAGS) tkAppInit.o imm_init.o imm.o xlopen_imm.o $(ROBJS) $(TKLIBS) $(LIBS) -o $(TARGET)/imm - -$(TARGET)/immserv: $(SOBJS) - $(CC) $(CFLAGS) $(SOBJS) $(LIBS) -o $(TARGET)/immserv - -$(TARGET)/lscomp: lscomp.o protocol.o sorttree.o utils.o - $(CC) $(CFLAGS) lscomp.o protocol.o sorttree.o utils.o $(LIBS) -o $(TARGET)/lscomp - -clean: - rm -f *.o tcl2c $(TARGET)/mnm $(TARGET)/lscomp $(TARGET)/imm $(TARGET)/immserv - -tcl2c: tcl2c.c - $(CC) $(CFLAGS) tcl2c.c $(LIBS) -o tcl2c - -imm_init.c: tcl2c imm_def.tcl mcl.tcl Radio.tcl Listbox.tcl viewbox.tcl filebox.tcl mkHostname.tcl - ./tcl2c IMM_Init < imm_def.tcl > imm_init.c - ./tcl2c MCL < mcl.tcl >> imm_init.c - ./tcl2c RADIO < Radio.tcl >> imm_init.c - ./tcl2c LISTBOX < Listbox.tcl >> imm_init.c - ./tcl2c VIEWBOX < viewbox.tcl >> imm_init.c - ./tcl2c FILEBOX < filebox.tcl >> imm_init.c - ./tcl2c HOSTBOX < mkHostname.tcl >> imm_init.c - ./tcl2c SERVERBOX < mnmserv.tcl >> imm_init.c - -imm_init.o: imm_init.c - -main.o: main.c - -mcl.o: mcl.c - -imm.o: mcl.c - gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c mcl.c -o imm.o - -xlopen_imm.o: xlopen.c - gcc $(CFLAGS) -DIMM $(INCLUDE_DIR) -c xlopen.c -o xlopen_imm.o - -tkAppInit.o: tkAppInit.c - gcc $(CFLAGS) $(INCLUDE_DIR) tkAppInit.c -c - -protocol.o: protocol.c - -utils.o: utils.c - -lscomp.o: lscomp.c - -sorttree.o: sorttree.c immserv.h - -immserv.o: immserv.c immserv.h - diff --git a/net/imm/files/Makefile.work b/net/imm/files/Makefile.work deleted file mode 100644 index cb876d343f9e..000000000000 --- a/net/imm/files/Makefile.work +++ /dev/null @@ -1,2 +0,0 @@ -all install: - cd src; ${MAKE} -f Makefile.freebsd $@ diff --git a/net/imm/files/patch-aa b/net/imm/files/patch-aa deleted file mode 100644 index f7cb9a9cefc8..000000000000 --- a/net/imm/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mcl.c.orig Tue Nov 19 12:33:49 1996 -+++ src/mcl.c Tue Nov 19 12:34:23 1996 -@@ -25,7 +25,7 @@ - - #define MAIN - #include "protocol.h" --#include <malloc.h> -+#include <stdlib.h> - #include <fcntl.h> - #include <sys/socket.h> - #include <netinet/in.h> diff --git a/net/imm/files/patch-ab b/net/imm/files/patch-ab deleted file mode 100644 index 4b1f038304da..000000000000 --- a/net/imm/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xlopen.c.orig Tue Nov 19 12:33:53 1996 -+++ src/xlopen.c Tue Nov 19 12:35:01 1996 -@@ -34,7 +34,7 @@ - extern int optind, opterr; - extern int useimageloader; - extern struct hosttype *hosts_tail; --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) /* XXX */ - extern char *sys_errlist[]; - #endif - extern unsigned int total; diff --git a/net/imm/files/patch-ac b/net/imm/files/patch-ac deleted file mode 100644 index 2da9e3a99e12..000000000000 --- a/net/imm/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- src/immserv.c.orig Tue Nov 19 12:36:41 1996 -+++ src/immserv.c Tue Nov 19 12:37:32 1996 -@@ -1407,7 +1407,7 @@ - /******************************************************************************/ - void setackalarm(int nop) {} - /******************************************************************************/ --#ifndef __NetBSD__ -+#if !defined(__NetBSD__) && !defined(__FreeBSD__) /* XXX */ - /* routine to put process to sleep */ - int usleep( wait) - u_int wait; diff --git a/net/imm/files/patch-src::utils.c b/net/imm/files/patch-src::utils.c deleted file mode 100644 index a7db5d4e2d04..000000000000 --- a/net/imm/files/patch-src::utils.c +++ /dev/null @@ -1,200 +0,0 @@ ---- src/utils.c.orig Thu Jul 15 12:37:25 2004 -+++ src/utils.c Thu Jul 15 13:36:09 2004 -@@ -20,7 +20,7 @@ - * These notices must be retained in any copies of any part of this software. - ******************************************************************************/ - #include <stdio.h> --#include <varargs.h> -+#include <stdarg.h> - #include <stdlib.h> - #include <string.h> - #ifdef __NetBSD__ -@@ -40,47 +40,118 @@ - - /*----------------------------------------------------------------------------*/ - --void warn( va_alist ) --va_dcl -+/* Allocate memory for format string buffers */ -+int -+vfsalloc(char *fmt, va_list ap) - { -- va_list args; -- char *fmt; -+ char *s; -+ int i, n = 0, len = 0; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Warning: " ); -- vfprintf( stderr, fmt, args ); -- va_end( args ); -+ if (!fmt) -+ return 0; -+ -+ s = strchr(fmt, '%'); -+ -+ while (s) { -+ ++s; -+ ++n; -+ -+ switch (*s) { -+ case 'd': -+ i = va_arg(ap, int); -+ len += 1 + sizeof(int)<<1; -+ break; -+ case 's': -+ len += strlen(va_arg(ap, char *)); -+ break; -+ } -+ s = strchr(s, '%'); -+ } -+ -+ len += strlen(fmt) - (2 * n); -+ -+ return len; -+} -+ -+void warn( char *fmt, ... ) -+{ -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Warning: %s\n", buf); -+ free(buf); - } - - /*----------------------------------------------------------------------------*/ - --void die( va_alist ) --va_dcl -+void die(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Error: " ); -- vfprintf( stderr, fmt, args ); -- exit( 1 ); -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Error: %s\n", buf); -+ free(buf); -+ exit(1); - } - - /*----------------------------------------------------------------------------*/ - --void fatal( va_alist ) --va_dcl -+void fatal(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, *s; -+ int len; -+ -+ if (!fmt) -+ return; - -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( stderr, "Internal Error: " ); -- vfprintf( stderr, fmt, args ); -- exit( 2 ); -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "Internal error: %s\n", buf); -+ free(buf); -+ exit(2); - } - - /*----------------------------------------------------------------------------*/ -@@ -142,21 +213,34 @@ - - /*----------------------------------------------------------------------------*/ - --void mailmessage( va_alist ) --va_dcl -+void mailmessage(char *fmt, ... ) - { -- va_list args; -- char *fmt; -+ va_list ap; -+ char *buf, s; -+ int len; - FILE *popen(), *fp; - char cmdline[80]; - if (whome == NULL) whome = getlogin(); - sprintf(cmdline,"%s %s",mailprog,whome); - fp = popen(cmdline,"w"); -- va_start( args ); -- fmt = va_arg( args, char * ); -- fprintf( fp, "MNM Warning: " ); -- vfprintf( fp, fmt, args ); -- va_end( args ); -+ -+ if (!fmt) -+ return; -+ -+ va_start(ap, fmt); -+ if (!(len = vfsalloc(fmt, ap))) -+ return; -+ va_end(ap); -+ -+ if (!(buf = malloc(len))) -+ return; -+ -+ va_start(ap, fmt); -+ vsprintf(buf, fmt, ap); -+ va_end(ap); -+ -+ fprintf(fp, "MNM Warning: %s", buf); -+ free(buf); - pclose(fp); - } diff --git a/net/imm/pkg-descr b/net/imm/pkg-descr deleted file mode 100644 index 339f05932750..000000000000 --- a/net/imm/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -IMM has been designed to efficiently replicate files/file directories -using a reliable dissemination protocol framework and provide archiving -and post processing features. The default mode of operation is for imm -to receive and display compressed imagery files (e.g., jpg,gif) using -xv or xloadimage as a post processor. - -This release includes an sdr plug-in, named sdr2.plugin.S53.image.imm, -which must be installed to participate in MBone alpha testing of imm sessions. -Usually in a directory called ~home/.sdr/plugins to be found by sdr. -See the sdr help pages for information on installing plugins. diff --git a/net/imm/pkg-plist b/net/imm/pkg-plist deleted file mode 100644 index f470d0e00c01..000000000000 --- a/net/imm/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -bin/imm -bin/immserv -bin/lscomp -share/doc/imm/README -share/doc/imm/imm_readme.txt -share/doc/imm/sdr2.plugin.S53.image.imm -@dirrm share/doc/imm diff --git a/net/isc-dhcp30-client/Makefile b/net/isc-dhcp30-client/Makefile deleted file mode 100644 index c0799f3e6e54..000000000000 --- a/net/isc-dhcp30-client/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -COMMENT= The ISC Dynamic Host Configuration Protocol client - -# Local variables -# - -SUBSYS= client - -# Local overrides -# - -MASTERDIR= ${.CURDIR}/../isc-dhcp3-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/isc-dhcp30-client/pkg-descr b/net/isc-dhcp30-client/pkg-descr deleted file mode 100644 index 7dc1bc78ea95..000000000000 --- a/net/isc-dhcp30-client/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server - * A DHCP client (this port) - * A DHCP relay agent - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp30-client/pkg-message b/net/isc-dhcp30-client/pkg-message deleted file mode 100644 index b406fd04fbd8..000000000000 --- a/net/isc-dhcp30-client/pkg-message +++ /dev/null @@ -1,10 +0,0 @@ -**** To setup dhclient, you may need to edit /etc/rc.conf to replace the - base system dhclient, such as : - - dhcp_program="%%PREFIX%%/sbin/dhclient" - dhcp_flags="-q" - - See dhclient(8), using the following command, for details about other - possible options: - - MANPATH=%%MAN1PREFIX%%/man man 8 dhclient diff --git a/net/isc-dhcp30-client/pkg-plist b/net/isc-dhcp30-client/pkg-plist deleted file mode 100644 index 6b3488caef92..000000000000 --- a/net/isc-dhcp30-client/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp30-client/Attic/pkg-plist,v 1.3 2004-06-26 08:46:05 eik Exp $ -etc/dhclient.conf.sample -@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf -@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf -sbin/dhclient -sbin/dhclient-script -@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases -@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases diff --git a/net/isc-dhcp30-relay/Makefile b/net/isc-dhcp30-relay/Makefile deleted file mode 100644 index e739f7a0e6db..000000000000 --- a/net/isc-dhcp30-relay/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -COMMENT= The ISC Dynamic Host Configuration Protocol relay - -# Local variables -# - -SUBSYS= relay - -# Local overrides -# - -MASTERDIR= ${.CURDIR}/../isc-dhcp3-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/isc-dhcp30-relay/pkg-descr b/net/isc-dhcp30-relay/pkg-descr deleted file mode 100644 index b764dbf45a19..000000000000 --- a/net/isc-dhcp30-relay/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server - * A DHCP client - * A DHCP relay agent (this port) - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp30-relay/pkg-message b/net/isc-dhcp30-relay/pkg-message deleted file mode 100644 index af6992fb34a5..000000000000 --- a/net/isc-dhcp30-relay/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -**** This port installs dhcp relay daemon, but don't invokes dhcrelay by - default. If you want to invoke dhcrelay at startup, put these lines - into /etc/rc.conf. - - dhcrelay_enable="YES" - dhcrelay_flags="" # command option(s) - dhcrelay_servers="" # dhcrelay server(s) - dhcrelay_ifaces="" # ethernet interface(s) - -**** For instance, rc.conf like variables are still read from - %%PREFIX%%/etc/rc.isc-dhcrelay.conf. They should be move - into /etc/rc.conf. Also, the dhcrelay_options variable - must be renamed dhcrelay_flags. diff --git a/net/isc-dhcp30-relay/pkg-plist b/net/isc-dhcp30-relay/pkg-plist deleted file mode 100644 index 0ec7154333a5..000000000000 --- a/net/isc-dhcp30-relay/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp30-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $ -etc/rc.d/isc-dhcrelay.sh -sbin/dhcrelay diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile deleted file mode 100644 index 77309c5b0304..000000000000 --- a/net/isc-dhcp30-server/Makefile +++ /dev/null @@ -1,357 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 7 Mar 1996 -# Whom: se -# -# $FreeBSD$ -# - -PORTNAME= dhcp -PORTVERSION= 3.0.3 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_ISC} -MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history -PKGNAMEPREFIX= isc- -PKGNAMESUFFIX= 3-${SUBSYS} -DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL} - -MAINTAINER= Joerg.Pulz@frm2.tum.de -COMMENT?= The ISC Dynamic Host Configuration Protocol server - -USE_REINPLACE= yes -USE_RC_SUBR= yes - -SUBSYS?= server - -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} -.if ${SUBSYS} == client -OPTIONS= INTERFACE_POLLING "interface polling support" on -.endif -.if ${SUBSYS} == server -OPTIONS= DHCP_PARANOIA "add -user, -group and -chroot options" on \ - DHCP_JAIL "add -chroot and -jail options" on \ - DHCP_SOCKETS "use sockets instead of /dev/bpf (jail-only)" off \ - DHCP_LDAP "add experimental LDAP backend support" off \ - DHCP_LDAP_SSL "support LDAP connection over SSL/TLS" on \ - OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \ - OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off \ - DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off -.endif - -.include <bsd.port.pre.mk> - -.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP) -# Based on patch from Brian Masney : -PATCH_SITES= http://www.newwave.net/~masneyb/:ldap \ - ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:ldap -PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch:ldap -PATCH_DIST_STRIP= -p1 - -USE_PERL5_RUN= yes -USE_OPENLDAP= yes - -.if !defined(WITHOUT_DHCP_LDAP_SSL) -USE_OPENSSL= yes -# hack to get bsd.openssl.mk included at this late state -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -.endif -.endif - -.if ${SUBSYS} == server && defined(WITH_DHCP_LQ) -# Based on patch from Dmitry Sukhodoev : -PATCH_SITES+= http://bingo.ru/~raven/FreeBSD/patches/:dlq \ - ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:dlq -PATCHFILES+= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch:dlq -.endif - -# Global variables -# - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --subsys ${SUBSYS} -ALL_TARGET= all.${SUBSYS} -INSTALL_TARGET= install.${SUBSYS} -SCRIPTS_ENV+= PKG_PREFIX=${PREFIX} - -.if ${SUBSYS} == client -MAN5= dhclient.conf.5 dhclient.leases.5 -MAN8= dhclient.8 dhclient-script.8 -.elif ${SUBSYS} == server -MAN1= omshell.1 -MAN5= dhcpd.conf.5 dhcpd.leases.5 -MAN8= dhcpd.8 -.elif ${SUBSYS} == relay -MAN8= dhcrelay.8 -.else -MAN3= dhcpctl.3 omapi.3 -.endif -.if ${SUBSYS} != relay -MAN5+= dhcp-eval.5 dhcp-options.5 -.endif - -MSG_FILE= ${.CURDIR}/pkg-message -DESCR= ${.CURDIR}/pkg-descr -PKGINSTALL= ${.CURDIR}/pkg-install -PKGDEINSTALL= ${PKGINSTALL} -PKGMESSAGE= ${WRKDIR}/pkg-message -PLIST= ${.CURDIR}/pkg-plist - -# Local variables -# - -# for instance, possible versions are: -# 1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2 -# which have to become: -# 1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2.3, 1.2 -# so, the magic things are: -VERSION= -PATCHLEVEL= -.if ${PORTVERSION:R:E:M[br]*} != "" -RELEASE= ${PORTVERSION:R:R} -VERSION= ${PORTVERSION:R:E:S/b/beta/:S/r/rc/} -PATCHLEVEL= pl${PORTVERSION:E} -.elif ${PORTVERSION:E:M[br]*} != "" -RELEASE= ${PORTVERSION:R} -VERSION= ${PORTVERSION:E:S/b/beta/:S/r/rc/} -#.elif ${PORTVERSION:R:E} != "" -#RELEASE= ${PORTVERSION:R} -#PATCHLEVEL= pl${PORTVERSION:E} -.else -RELEASE= ${PORTVERSION} -.endif - -PATCH_SUBDIRS= common minires dst omapip -.if ${SUBSYS} == server || ${SUBSYS} == devel -PATCH_SUBDIRS+= dhcpctl -.endif -.if ${SUBSYS} != devel -PATCH_SUBDIRS+= ${SUBSYS} -.endif -.if ${SUBSYS} == server -PATCH_SUBDIRS+= omshell -.endif - -.if !defined(NOPORTDOCS) -PORTDOCS= LICENSE README RELNOTES -.endif -.if ${SUBSYS} == client -BIN_FILES= dhclient -LOCAL_CONF_FILES= dhclient.conf -SAMP_FILES= client/dhclient.conf -DATA_FILES= dhclient.leases -.elif ${SUBSYS} == server -BIN_FILES= dhcpd omshell -RC_FILES= isc-dhcpd -SAMP_FILES= server/dhcpd.conf -DATA_FILES= dhcpd.leases -.if defined(WITH_DHCP_LDAP) -PORTDOCS+= README.ldap -LDAP_SCRIPT= contrib/dhcpd-conf-to-ldap.pl -LDAP_SCHEMA= contrib/dhcp.schema -.endif -.elif ${SUBSYS} == relay -BIN_FILES= dhcrelay -RC_FILES= isc-dhcrelay -.endif - -SAMP_SUFX= .sample - -CONF_DIR= ${PREFIX}/etc -RC_DIR= ${PREFIX}/etc/rc.d -SCHEMA_DIR= ${PREFIX}/share/${PKGBASE} -DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} -DATADIR= /var/db - -PLIST_SUB+= SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" -.if defined(WITH_DHCP_LDAP) -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " -.endif -REINPLACE_SUB= PREFIX=${PREFIX} -RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -.if ${OSVERSION} >= 502100 -RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin -.else -RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin -.endif -.if !defined(WITHOUT_DHCP_PARANOIA) -RCSCRIPTS_SUB+= PARANOIA=YES -.else -RCSCRIPTS_SUB+= PARANOIA=NO -.endif -.if !defined(WITHOUT_DHCP_JAIL) -RCSCRIPTS_SUB+= JAIL=YES -.else -RCSCRIPTS_SUB+= JAIL=NO -.endif -PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ - DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}" - -# Post-extract -# - -post-extract: extract-omshell extract-script - -extract-omshell: - @${MKDIR} ${WRKSRC}/omshell - @${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell - @${CP} ${FILESDIR}/omshell::Makefile.dist \ - ${WRKSRC}/omshell/Makefile.dist - -extract-script: - @${CP} ${FILESDIR}/client::scripts::freebsd ${WRKSRC}/client/scripts/freebsd - -# Post-patch -# - -post-patch: patch-scripts patch-makefile-conf \ - patch-makefiles-dist patch-man-pages \ - patch-pkgmessage patch-site-conf \ - patch-rc-scripts patch-dlq - -patch-scripts: - @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/client/dhclient.conf \ - ${WRKSRC}/client/scripts/freebsd - -patch-site-conf: -.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING) - @${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf -.endif -.if ${SUBSYS} == server -.if !defined(WITHOUT_DHCP_PARANOIA) - @${ECHO_CMD} CFLAGS += -DPARANOIA >> ${WRKSRC}/site.conf -.endif -.if !defined(WITHOUT_DHCP_JAIL) - @${ECHO_CMD} CFLAGS += -DJAIL >> ${WRKSRC}/site.conf -.if defined(WITH_DHCP_SOCKETS) - @${ECHO_CMD} CFLAGS += -DUSE_SOCKETS >> ${WRKSRC}/site.conf -.endif -.endif -.if defined(WITH_DHCP_LDAP) - @${ECHO_CMD} CFLAGS += -I${LOCALBASE}/include >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -L${LOCALBASE}/lib >> ${WRKSRC}/site.conf -.if !defined(WITHOUT_DHCP_LDAP_SSL) - @${ECHO_CMD} CFLAGS += -DUSE_SSL -I${OPENSSLINC} >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -L${OPENSSLLIB} >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -lcrypto -lssl >> ${WRKSRC}/site.conf -.endif -.endif -.endif - -patch-makefile-conf: - @${REINPLACE_CMD} -e 's|^DEBUG[ ]*=|# DEBUG ?=|g' \ - ${WRKSRC}/Makefile.conf - -patch-makefiles-dist: -.for subdir in ${PATCH_SUBDIRS} - @${REINPLACE_CMD} -e 's|^CFLAGS[ ]*=|CFLAGS +=|g' \ - ${WRKSRC}/${subdir}/Makefile.dist -.endfor - -# temporary hack - no patch file needed for this typo. -patch-man-pages: - @${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3 - -patch-rc-scripts: -.for f in ${RC_FILES} - @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh -.endfor - -patch-pkgmessage: -.if ${SUBSYS} != devel - @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${MSG_FILE} > ${PKGMESSAGE} -.if defined(WITH_DHCP_LDAP) - @${REINPLACE_CMD} -e 's|^%%LDAP%%||g' ${PKGMESSAGE} -.else - @${REINPLACE_CMD} -e '/^%%LDAP%%/d' ${PKGMESSAGE} -.endif -.endif - -patch-dlq: -.if ${SUBSYS} == server && defined(WITH_DHCP_LQ) -.if defined(WITH_DHCP_LDAP) - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq-ldap -.else - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq -.endif -.endif - -# Post-install -# - -POST-INSTALL= parallel-post-install configure-package display-message -.ORDER: ${POST-INSTALL} -post-install: ${POST-INSTALL} - -parallel-post-install: \ - strip-binary-files install-startup-files \ - install-doc-files install-ldap-files install-sample-files \ - create-conf-files create-data-files - -strip-binary-files: -.for f in ${BIN_FILES} -.if exists(${PREFIX}/bin/${f}) - @${STRIP_CMD} ${PREFIX}/bin/${f} -.endif -.if exists(${PREFIX}/sbin/${f}) - @${STRIP_CMD} ${PREFIX}/sbin/${f} -.endif -.endfor - -install-startup-files: -.for f in ${RC_FILES} - @${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR} -.endfor - -install-doc-files: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif - -install-ldap-files: -.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP) - @${INSTALL_SCRIPT} ${WRKSRC}/${LDAP_SCRIPT} ${PREFIX}/bin - @${MKDIR} ${SCHEMA_DIR} - @${INSTALL_DATA} ${WRKSRC}/${LDAP_SCHEMA} ${SCHEMA_DIR} -.endif - -install-sample-files: -.for f in ${SAMP_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX} -.endfor - -create-conf-files: -.for f in ${LOCAL_CONF_FILES} -.if !exists(${CONF_DIR}/${f}) - @${TOUCH} ${CONF_DIR}/${f} -.endif -.endfor - -create-data-files: -.for f in ${DATA_FILES} -.if !exists(${DATADIR}/${f}) - @${TOUCH} ${DATADIR}/${f} -.endif -.endfor - -configure-package: -.if ${SUBSYS} == server - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - -display-message: -.if ${SUBSYS} != devel - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} -.endif - -.include <bsd.port.post.mk> diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo deleted file mode 100644 index c97ee828e8ca..000000000000 --- a/net/isc-dhcp30-server/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (dhcp-3.0.3.tar.gz) = f91416a0b8ed3fd0601688cf0b7df58f -SHA256 (dhcp-3.0.3.tar.gz) = c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe -SIZE (dhcp-3.0.3.tar.gz) = 870240 -MD5 (dhcp-3.0.3-ldap-patch) = c0d51532696222f3258ff19e91a39ce4 -SHA256 (dhcp-3.0.3-ldap-patch) = da88f17a7c514bdfb38dc53aa2547ae43f6031b7b6f2973728474d9b8d063bf6 -SIZE (dhcp-3.0.3-ldap-patch) = 153377 -MD5 (dhcp-3.0.3-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b -SHA256 (dhcp-3.0.3-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108 -SIZE (dhcp-3.0.3-dlq-patch) = 7655 diff --git a/net/isc-dhcp30-server/files/client::scripts::freebsd b/net/isc-dhcp30-server/files/client::scripts::freebsd deleted file mode 100644 index 9c4c3d3a6f24..000000000000 --- a/net/isc-dhcp30-server/files/client::scripts::freebsd +++ /dev/null @@ -1,510 +0,0 @@ -#!/bin/sh - -############################################################################# -# -# Copyright (c) 1999, MindStep Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# -############################################################################# -# -# This script was written by Patrick Bihan-Faou, patrick@mindstep.com, -# Please contact us for bug reports, etc. -# -############################################################################# -# $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $ -# $MindStep_Tag: CONTRIB_19991207 $ -# from FreeBSD: src/sbin/dhclient/dhclient-script.sh,v 1.2 2002/02/01 18:46:58 alfred Exp -# $FreeBSD$ -############################################################################# - - -############################################################################# -# hook functions prototypes -# -# The "pre_state_XXX_hook" functions are called before the main -# work is done for the state XXX -# -# The "post_state_XXX_hook" functions are called after the main -# work is done for the state XXX -# -# These functions are meant to be overridden by the user's -# dhclient-enter-hooks file -############################################################################# - -pre_state_MEDIUM_hook () { } -pre_state_PREINIT_hook () { } -pre_state_ARPCHECK_hook () { } -pre_state_ARPSEND_hook () { } -pre_state_RENEW_hook () { } -pre_state_REBIND_hook () { } -pre_state_BOUND_hook () { } -pre_state_REBOOT_hook () { } -pre_state_EXPIRE_hook () { } -pre_state_FAIL_hook () { } -pre_state_TIMEOUT_hook () { } -post_state_MEDIUM_hook () { } -post_state_PREINIT_hook () { } -post_state_ARPCHECK_hook () { } -post_state_ARPSEND_hook () { } -post_state_RENEW_hook () { } -post_state_REBIND_hook () { } -post_state_BOUND_hook () { } -post_state_REBOOT_hook () { } -post_state_EXPIRE_hook () { } -post_state_FAIL_hook () { } -post_state_TIMEOUT_hook () { } - -############################################################################# -# make_resolv_conf -# -# This function is called to update the information related to the -# DNS configuration (the resolver part) -############################################################################# -make_resolv_conf () -{ - if [ "x$new_domain_name" != x ] && [ "x$new_domain_name_servers" != x ]; then - echo search $new_domain_name >/etc/resolv.conf - for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf - done - fi -} - -############################################################################# -# set_XXX -# unset_XXX -# -# These function each deal with one particular setting. -# They are OS dependent and may be overridden in the -# dhclient-enter-hooks file if needed. -# -# These functions are called with either "new" or "old" to indicate which -# set of variables to use (new_ip_address or old_ip_address...) -# -############################################################################# - -update_hostname () -{ - local current_hostname=`/bin/hostname` - - if [ "$current_hostname" = "" ] || \ - [ "$current_hostname" = "$old_host_name" ] - then - if [ "$new_host_name" != "$old_host_name" ] - then - $LOGGER "New Hostname: $new_host_name" - hostname $new_host_name - fi - fi -} - -set_ip_address () -{ - local ip - local mask - local bcast - - if [ $# -lt 1 ] - then - return 1 - fi - - eval ip="\$${1}_ip_address" - eval mask="\$${1}_subnet_mask" - eval bcast="\$${1}_broadcast_address" - - if [ "$ip" != "" ] - then - ifconfig $interface inet $ip netmask $mask broadcast $bcast $medium -# route add $ip 127.0.0.1 > /dev/null 2>&1 - fi -} - -unset_ip_address () -{ - local ip - - if [ $# -lt 1 ] - then - return 1 - fi - - eval ip="\$${1}_ip_address" - - if [ "$ip" != "" ] - then - ifconfig $interface inet -alias $ip $medium -# route delete $ip 127.0.0.1 > /dev/null 2>&1 - fi -} - -set_ip_alias () -{ - if [ "$alias_ip_address" != "" ] - then - ifconfig $interface inet alias $alias_ip_address netmask $alias_subnet_mask -# route add $alias_ip_address 127.0.0.1 - fi -} - -unset_ip_alias () -{ - if [ "$alias_ip_address" != "" ] - then - ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1 -# route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1 - fi -} - -set_routers () -{ - local router_list - - if [ $# -lt 1 ] - then - return 1 - fi - - eval router_list="\$${1}_routers" - - for router in $router_list - do - route add default $router >/dev/null 2>&1 - done -} - -unset_routers () -{ - local router_list - - if [ $# -lt 1 ] - then - return 1 - fi - - eval router_list="\$${1}_routers" - - for router in $router_list - do - route delete default $router >/dev/null 2>&1 - done -} - -set_static_routes () -{ - local static_routes - - if [ $# -lt 1 ] - then - return 1 - fi - - eval static_routes="\$${1}_static_routes" - - set static_routes - - while [ $# -ge 2 ] - do - $LOGGER "New Static Route: $1 -> $2" - route add $1 $2 - shift; shift - done -} - -unset_static_routes () -{ - local static_routes - - if [ $# -lt 1 ] - then - return 1 - fi - - eval static_routes="\$${1}_static_routes" - - set static_routes - - while [ $# -ge 2 ] - do - route delete $1 $2 - shift; shift - done -} - -############################################################################# -# -# utility functions grouping what needs to be done in logical units. -# -############################################################################# - -set_all () -{ - set_ip_address new - set_routers new - set_static_routes new - - if [ "$new_ip_address" != "$alias_ip_address" ] - then - set_ip_alias - fi -} - -set_others () -{ - update_hostname - make_resolv_conf -} - -clear_arp_table () -{ - arp -d -a -} - -unset_all () -{ - if [ "$alias_ip_address" != "$old_ip_address" ] - then - unset_ip_alias - fi - - if [ "$old_ip_address" != "" ] - then - unset_ip_address old - unset_routers old - unset_static_routes old - clear_arp_table - fi -} - -test_new_lease () -{ - local rc - - set $new_routers - - if [ $# -ge 1 ] - then - set_ip_address new - if ping -q -c 1 $1 - then - rc=0 - else - rc=1 - fi - unset_ip_address new - else - rc=1 - fi - return $rc -} - -############################################################################# -# Main State functions. -# -# There is a state function for each state of the DHCP client -# These functions are OS specific and should be be tampered with. -############################################################################# - -in_state_MEDIUM () -{ - ifconfig $interface $medium - ifconfig $interface inet -alias 0.0.0.0 $medium >/dev/null 2>&1 - sleep 1 - exit_status=0 -} - -in_state_PREINIT () -{ - unset_ip_alias - - ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ - broadcast 255.255.255.255 up - exit_status=0 -} - -in_state_ARPCHECK () -{ - exit_status=0 -} - -in_state_ARPSEND () -{ - exit_status=0 -} - -in_state_RENEW () -{ - if [ "$old_ip_address" != "$new_ip_address" ] - then - unset_all - set_all - fi - - set_others -} - -in_state_REBIND () { - in_state_RENEW -} - -in_state_BOUND () { - unset_all - set_all - set_others -} - -in_state_REBOOT () { - in_state_BOUND -} - -in_state_EXPIRE () -{ - unset_all - set_ip_alias - exit_status=0 -} - -in_state_FAIL () { - in_state_EXPIRE -} - -in_state_TIMEOUT () -{ - unset_all - - if test_new_lease - then - set_all - set_others - else - $LOGGER "No good lease information in TIMEOUT state" - set_ip_alias - exit_status=1 - fi -} - -############################################################################# -# Main functions: -# -# dhclient_script_init() parses the optional "enter_hooks" script which can -# override any of the state functions -# -# This function also parses the variables and notifies the detected changes. -############################################################################# -dhclient_script_init () -{ - if [ "$new_network_number" != "" ] - then - $LOGGER "New Network Number: $new_network_number" - fi - - if [ "$new_ip_address" != "" ] - then - $LOGGER "New IP Address: $new_ip_address" - fi - - if [ "$new_broadcast_address" != "" ] - then - $LOGGER "New Broadcast Address: $new_broadcast_address" - fi - - if [ "$new_subnet_mask" != "" ] - then - $LOGGER "New Subnet Mask for $interface: $new_subnet_mask" - fi - - if [ "$alias_subnet_mask" != "" ] - then - fi -} - -############################################################################# -# dhclient_main() does the appropriate work depending on the state of -# the dhcp client -############################################################################# -dhclient_script_main () -{ -# set -x - exit_status=0 - - case $reason in - MEDIUM|\ - PREINIT|\ - ARPCHECK|\ - ARPSEND|\ - RENEW|\ - REBIND|\ - BOUND|\ - REBOOT|\ - EXPIRE|\ - FAIL|\ - TIMEOUT) - pre_state_${reason}_hook - in_state_${reason} - post_state_${reason}_hook - ;; - *) - $LOGGER "dhclient-script called with invalid reason $reason" - exit_status=1 - ;; - esac -} - -############################################################################# -# Let's do the work... -############################################################################# - -if [ -x /usr/bin/logger ]; then - LOGGER="/usr/bin/logger -s -p user.notice -t dhclient" -else - LOGGER=echo -fi - -# Invoke the local dhcp client enter hooks, if they exist. -if [ -x %%PREFIX%%/etc/dhclient-enter-hooks ] -then - exit_status=0 - . %%PREFIX%%/etc/dhclient-enter-hooks - # allow the local script to abort processing of this state - # local script must set exit_status variable to nonzero. - if [ $exit_status -ne 0 ] - then - exit $exit_status - fi -fi - -dhclient_script_init -dhclient_script_main - -# Invokes the local dhcp client exit hooks, if any. -if [ -x %%PREFIX%%/etc/dhclient-exit-hooks ]; then - . %%PREFIX%%/etc/dhclient-exit-hooks -fi - -exit $exit_status - -############################################################################# -# That's all folks -############################################################################# diff --git a/net/isc-dhcp30-server/files/extra-patch-dlq b/net/isc-dhcp30-server/files/extra-patch-dlq deleted file mode 100644 index 5657af491721..000000000000 --- a/net/isc-dhcp30-server/files/extra-patch-dlq +++ /dev/null @@ -1,14 +0,0 @@ ---- server/Makefile.dist.orig Tue Jun 14 09:37:50 2005 -+++ server/Makefile.dist Tue Jun 14 09:37:50 2005 -@@ -25,9 +25,9 @@ - CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 - SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 - SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ -- omapi.c mdb.c stables.c salloc.c ddns.c -+ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c - OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \ -- omapi.o mdb.o stables.o salloc.o ddns.o -+ omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o - PROG = dhcpd - MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - diff --git a/net/isc-dhcp30-server/files/extra-patch-dlq-ldap b/net/isc-dhcp30-server/files/extra-patch-dlq-ldap deleted file mode 100644 index 9b1ffff4c1a9..000000000000 --- a/net/isc-dhcp30-server/files/extra-patch-dlq-ldap +++ /dev/null @@ -1,14 +0,0 @@ ---- server/Makefile.dist.orig Tue Jun 14 09:39:39 2005 -+++ server/Makefile.dist Tue Jun 14 09:39:39 2005 -@@ -25,9 +25,9 @@ - CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 - SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 - SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ -- ldap.c omapi.c mdb.c stables.c salloc.c ddns.c -+ ldap.c omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c - OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \ -- ldap.o omapi.o mdb.o stables.o salloc.o ddns.o -+ ldap.o omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o - PROG = dhcpd - MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - diff --git a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample deleted file mode 100644 index 97e56f5f9b24..000000000000 --- a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample +++ /dev/null @@ -1,722 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcpd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable dhcpd: -# -# dhcpd_enable="YES" -# - -. %%RC_SUBR%% - -name=dhcpd -paranoia=%%PARANOIA%% # compiled in paranoia? -jail=%%JAIL%% # compiled in jail? - -load_rc_config $name - -# override these variables in /etc/rc.conf -dhcpd_enable=${dhcpd_enable:-"NO"} -dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot # command option(s) -dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf} # configuration file -dhcpd_ifaces=${dhcpd_ifaces:-} # ethernet interface(s) -dhcpd_withumask=${dhcpd_withumask:-022} # file creation mask - -dhcpd_chuser_enable=${dhcpd_chuser_enable:-"%%PARANOIA%%"} # runs w/o privileges? -dhcpd_withuser=${dhcpd_withuser:-${name}} # user name to run as -dhcpd_withgroup=${dhcpd_withgroup:-${name}} # group name to run as - -dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"} # runs chrooted? -dhcpd_devfs_enable=${dhcpd_devfs_enable:-"YES"} # devfs if available? -dhcpd_makedev_enable=${dhcpd_makedev_enable:-"NO"} # MAKEDEV instead of devfs? -dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}} # directory to run in -dhcpd_includedir=${dhcpd_includedir:-} # directory for included config files - -# untested -dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"} # runs imprisoned? -dhcpd_hostname=${dhcpd_hostname:-} # jail hostname -dhcpd_ipaddress=${dhcpd_ipaddress:-} # jail ip address - -safe_run () # rc command [args...] -{ - local _rc - - _rc=$1 - shift - - if [ "${_rc}" -eq 0 ]; then - debug safe_run: "$@" - "$@" || _rc=1 - else - warn safe_run: "$@" - fi - return ${_rc} -} - -precious () # entry... -{ - local _entry _rc - - _rc=0 - for _entry; do - # do nothing if /dev, /var/run or /var/db - echo ${_entry} | egrep -q '^//*(dev|var//*(run|db))?/*$' || _rc=1 - done - debug precious: "$@" rc=${_rc} - return ${_rc} -} - -lsmod () # user group file... -{ - local _entry _user _group _rc - - _user=$1 _group=$2 - shift 2 - - _rc=0 - for _entry; do - ls -ld ${_entry} 2> /dev/null | - awk -v u=${_user} -v g=${_group} '{ - exit ((u && $3 != u) || (g && $4 != g)) - }' || _rc=1 - done - debug lsmod: "$@" rc=${_rc} - return ${_rc} -} - -safe_chmog () # entry... -{ - local _entry _user _group _usergroup _rc - - _user=${dhcpd_withuser} - _group=${dhcpd_withgroup} - - _rc=0 - if [ -n "${_user}" -o -n "${_group}" ]; then - _usergroup=${_user}${_group:+:${_group}} - for _entry; do - if [ -d ${_entry} ] && mounted ${_entry}; then - continue - fi - if [ -e ${_entry} ] && - ! precious ${_entry} && - ! lsmod ${_user} ${_group} ${_entry} && - ! safe_run ${_rc} chown ${_usergroup} ${_entry}; then - warn "unable to change permissions of ${_entry}" - _rc=1 - fi - done - fi - return ${_rc} -} - -safe_mkdir () # dir... -{ - local _dir _rc - - _rc=0 - for _dir; do - if [ ! -d ${_dir} ] && - ! precious ${_dir} && - ! safe_run ${_rc} mkdir -p ${_dir}; then - err 1 "unable to create directory ${_dir}" - _rc=1 - fi - done - safe_run ${_rc} safe_chmog "$@" || _rc=1 - return ${_rc} -} - -safe_rmdir () # dir... -{ - local _dir _rc - - _rc=0 - for _dir; do - if [ -d ${_dir} ] && - ! precious ${_dir} && - ! mounted ${_dir}; then - if safe_run ${_rc} rmdir ${_dir}; then - safe_run ${_rc} safe_rmdir ${_dir%/*} || _rc=1 - else - warn "unable to remove directory ${_dir}" - _rc=1 - fi - fi - done - return ${_rc} -} - -safe_touch () # file... -{ - local _file _rc - - _rc=0 - for _file; do - if [ ! -e ${_file} ] && - ! safe_run ${_rc} touch ${_file}; then - err 1 "unable to create file ${_file}" - _rc=1 - fi - done - safe_run ${_rc} safe_chmog "$@" || _rc=1 - return ${_rc} -} - -safe_remove () # entry... -{ - local _entry _rc - - _rc=0 - for _entry; do - if [ -f ${_entry} ]; then - if ! safe_run ${_rc} rm -f ${_entry}; then - warn "unable to remove file ${_entry}" - _rc=1 - fi - elif [ -d ${_entry} ] && - ! precious ${_entry} && - ! mounted ${_entry}; then - if ! safe_run ${_rc} rm -rf ${_entry}; then - warn "unable to remove directory ${_entry}" - _rc=1 - fi - fi - done - return ${_rc} -} - -safe_copy () # src dst -{ - local _src _dst _rc - - _src=$1 _dst=$2 - - _rc=0 - if [ -f ${_src} ]; then - if ! safe_run ${_rc} safe_remove ${_dst} || - ! safe_run ${_rc} cp -p ${_src} ${_dst}; then - err 1 "unable to copy file ${_src} to ${_dst}" - _rc=1 - fi - safe_run ${_rc} safe_chmog ${_dst} || _rc=1 - elif [ -d ${_src} ] && - ! precious ${_dst} && - ! mounted ${_dst}; then - if ! safe_run ${_rc} pax -rw -pe -ts "|^${_src}||" \ - ${_src} ${_dst}; then - err 1 "unable to copy directory ${_src} to ${_dst}" - _rc=1 - fi - else - err 1 "unable to copy ${_src} to ${_dst}" \ - "-- not a file or a directory" - _rc=1 - fi - return ${_rc} -} - -mounted () # dir... -{ - local _rc - - _rc=1 - if checkyesno dhcpd_devfs_enable || - checkyesno dhcpd_jail_enable; then - mount -t devfs | awk ' - BEGIN { n = ARGC; ARGC = 2 } - { for (i = 2; i != n; i++) if ($3 == ARGV[i]) exit 1 } - ' - "$@" || _rc=0 - fi - debug mounted: "$@" rc=${_rc} - return ${_rc} -} - -safe_mount () # dir -{ - local _dir _rc - - _dir=$1 - - _rc=0 - if checkyesno dhcpd_devfs_enable && - ! mounted ${_dir} && - ! safe_run ${_rc} mount -t devfs devfs ${_dir}; then - err 1 "unable to mount ${_dir}" - _rc=1 - fi - return ${_rc} -} - -safe_umount () # dir -{ - local _dir _rc - - _dir=$1 - - _rc=0 - if checkyesno dhcpd_devfs_enable && - mounted ${_dir} && - ! safe_run ${_rc} umount ${_dir}; then - warn "unable to unmount ${_dir}" - _rc=1 - fi - return ${_rc} -} - -safe_useradd () -{ - local _user _group _home _shell _gecos - - _user=$1 _group=$2 _gecos=${3:-"& daemon"} - _home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%} - - if [ -n "${_group}" ]; then - if pw group show ${_group} 2>/dev/null; then - echo "You already have a group \"${_group}\"," \ - "so I will use it." - elif pw groupadd ${_group} -h -; then - echo "Added group \"${_group}\"." - else - echo "Adding group \"${_group}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi - if [ -n "${_user}" ]; then - if pw user show ${_user} 2>/dev/null; then - echo "You already have a user \"${_user}\"," \ - "so I will use it." - elif pw useradd ${_user} -g ${_group} -h - \ - -d ${_home} -s ${_shell} -c "${_gecos}"; then - echo "Added user \"${_user}\"." - else - echo "Adding user \"${_user}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi -} - -check_chuser () -{ - if checkyesno paranoia; then - if checkyesno dhcpd_chuser_enable && - [ -z "${dhcpd_withuser}" -a -z "${dhcpd_withgroup}" ]; then - err 1 "one of dhcpd_withuser and dhcpd_withgroup" \ - "must be set if dhcpd_chuser_enable is enabled" - fi - else - if checkyesno dhcpd_chuser_enable; then - warn "dhcpd_chuser_enable disabled -- not compiled in" - dhcpd_chuser_enable=NO - fi - fi -} - -check_jail () -{ - if checkyesno paranoia && checkyesno jail; then - if checkyesno dhcpd_jail_enable && - ! checkyesno dhcpd_chroot_enable; then - warn "dhcpd_chroot_enable implied by dhcpd_jail_enable" - dhcpd_chroot_enable=YES - fi - if checkyesno dhcpd_jail_enable && - [ -n "${dhcpd_hostname}" -a -z "${dhcpd_ipaddress}" ] || - [ -z "${dhcpd_hostname}" -a -n "${dhcpd_ipaddress}" ]; then - err 1 "both dhcpd_hostname and dhcpd_ipaddress" \ - "must be set if dhcpd_jail_enable is enabled" - fi - else - if checkyesno dhcpd_jail_enable; then - warn "dhcpd_jail_enable disabled -- not compiled in" - dhcpd_jail_enable=NO - fi - fi -} - -check_chroot () -{ - if checkyesno paranoia; then - if checkyesno dhcpd_chroot_enable; then - if [ -z "${dhcpd_rootdir}" ]; then - err 1 "dhcpd_rootdir must be set" \ - "if dhcpd_chroot_enable is enabled" - fi - if checkyesno dhcpd_devfs_enable && - checkyesno dhcpd_makedev_enable; then - err 1 "dhcpd_devfs_enable and dhcpd_makedev_enable" \ - "are mutually exclusive. enable only one!" - fi - if checkyesno dhcpd_devfs_enable && - ! ( type mount_devfs ) > /dev/null 2>&1; then - warn "dhcpd_devfs_enable disabled" \ - "-- not available" - dhcpd_devfs_enable=NO - fi - if checkyesno dhcpd_makedev_enable && - ! [ -x ${__dhcpd_devdir}/MAKEDEV ]; then - warn "dhcpd_makedev_enable disabled" \ - "-- not available" - dhcpd_makedev_enable=NO - fi - else - dhcpd_devfs_enable=NO - dhcpd_makedev_enable=NO - fi - else - if checkyesno dhcpd_chroot_enable; then - warn "dhcpd_chroot_enable disabled -- not compiled in" - dhcpd_chroot_enable=NO - fi - dhcpd_devfs_enable=NO - dhcpd_makedev_enable=NO - fi -} - -rcvar_chuser () -{ - if checkyesno paranoia && checkyesno dhcpd_chuser_enable; then - dhcpd_piddir=${__dhcpd_piddir}/${name} - dhcpd_leasesdir=${__dhcpd_leasesdir}/${name} - else - dhcpd_withuser= dhcpd_withgroup= - fi -} - -rcvar_jail () -{ - if ! checkyesno paranoia || ! checkyesno jail || - ! checkyesno dhcpd_jail_enable; then - dhcpd_hostname= dhcpd_ipaddress= - fi -} - -rcvar_chroot () -{ - if ! checkyesno paranoia || ! checkyesno dhcpd_chroot_enable; then - dhcpd_rootdir= - elif checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - dhcpd_devdir=${__dhcpd_devdir} - dhcpd_etcdir=${__dhcpd_etcdir} - fi -} - -rcvar_pidnleases () -{ - if ! checkyesno dhcpd_chuser_enable; then - dhcpd_piddir=${__dhcpd_piddir} - dhcpd_leasesdir=${__dhcpd_leasesdir} - fi - dhcpd_pidfile=${dhcpd_piddir}/${name}.pid - dhcpd_leasesfile=${dhcpd_leasesdir}/${name}.leases - dhcpd_conffile=${dhcpd_conf} # for convenience only - dhcpd_confdir=$(dirname ${dhcpd_conffile}) -} - -rcvar_rooted () -{ - _dhcpd_rootdir=${dhcpd_rootdir} - _dhcpd_devdir=${dhcpd_rootdir}${dhcpd_devdir} - _dhcpd_etcdir=${dhcpd_rootdir}${dhcpd_etcdir} - _dhcpd_confdir=${dhcpd_rootdir}${dhcpd_confdir} - _dhcpd_includedir=${dhcpd_rootdir}${dhcpd_includedir} - _dhcpd_piddir=${dhcpd_rootdir}${dhcpd_piddir} - _dhcpd_leasesdir=${dhcpd_rootdir}${dhcpd_leasesdir} - _dhcpd_conffile=${dhcpd_rootdir}${dhcpd_conffile} - _dhcpd_pidfile=${dhcpd_rootdir}${dhcpd_pidfile} - _dhcpd_leasesfile=${dhcpd_rootdir}${dhcpd_leasesfile} -} - -setup_compat () -{ - local dhcpd_rcconf - - # suck in old configuration file and variables - # - dhcpd_rcconf=${dhcpd_confdir}/rc.isc-dhcpd.conf - - if [ -f ${dhcpd_rcconf} ]; then - warn "${dhcpd_rcconf} is obsolete, use /etc/rc.conf and/or" \ - "/etc/rc.conf.d/${name} instead." - . ${dhcpd_rcconf} - - if [ -n "${dhcpd_options}" -a -z "${rc_flags}" ]; then - warn "dhcpd_options is obsolete," \ - "use dhcpd_flags instead." - rc_flags=${dhcpd_options} - fi - fi -} - -setup_umask () -{ - if [ -n "${dhcpd_withumask}" ]; then - umask ${dhcpd_withumask} - fi -} - -setup_chroot () -{ - local _mdev _hconf _hosts _ltime _rconf - - _mdev=MAKEDEV - _hconf=host.conf - _hosts=hosts - _ltime=localtime - _rconf=resolv.conf - - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - if ! mounted ${_dhcpd_devdir}; then - safe_mkdir ${_dhcpd_devdir}/_ - # XXX /_ hack! so, .../dev is root owned. - fi - safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_etcdir}/_ ${_dhcpd_confdir} - # XXX /_ hack! so, .../etc is root owned. - if checkyesno dhcpd_devfs_enable; then - safe_mount ${_dhcpd_devdir} - elif checkyesno dhcpd_makedev_enable; then - safe_copy ${dhcpd_devdir}/$_mdev ${_dhcpd_devdir}/$_mdev - safe_run 0 sh -c "cd ${_dhcpd_devdir} && ./$_mdev jail bpf4" - else - safe_copy ${dhcpd_devdir} ${_dhcpd_devdir} - fi - safe_copy ${dhcpd_conffile} ${_dhcpd_conffile} - safe_copy ${dhcpd_etcdir}/$_hconf ${_dhcpd_etcdir}/$_hconf - safe_copy ${dhcpd_etcdir}/$_hosts ${_dhcpd_etcdir}/$_hosts - safe_copy ${dhcpd_etcdir}/$_ltime ${_dhcpd_etcdir}/$_ltime - safe_copy ${dhcpd_etcdir}/$_rconf ${_dhcpd_etcdir}/$_rconf - # copy dhcpd_includedir if defined and available - if [ -d "${dhcpd_includedir}" ]; then - safe_mkdir ${_dhcpd_includedir} - safe_copy ${dhcpd_includedir} ${_dhcpd_includedir} - fi - fi -} - -setup_chuser () -{ - if checkyesno paranoia && { - checkyesno dhcpd_chuser_enable || checkyesno dhcpd_chroot_enable - }; then - safe_mkdir ${_dhcpd_piddir} ${_dhcpd_leasesdir} - fi -} - -setup_leases () -{ - safe_touch ${_dhcpd_leasesfile} -} - -setup_flags () -{ - if [ -n "${dhcpd_conf}" ]; then - rc_flags="${rc_flags} -cf ${dhcpd_conf}" - fi - if [ -n "${dhcpd_leasesfile}" ]; then - rc_flags="${rc_flags} -lf ${dhcpd_leasesfile}" - fi - if [ -n "${dhcpd_pidfile}" ]; then - rc_flags="${rc_flags} -pf ${dhcpd_pidfile}" - fi - if [ -n "${dhcpd_withuser}" ]; then - rc_flags="${rc_flags} -user ${dhcpd_withuser}" - fi - if [ -n "${dhcpd_withgroup}" ]; then - rc_flags="${rc_flags} -group ${dhcpd_withgroup}" - fi - if [ -n "${dhcpd_rootdir}" ]; then - rc_flags="${rc_flags} -chroot ${dhcpd_rootdir}" - fi - if [ -n "${dhcpd_hostname}" -a -n "${dhcpd_ipaddress}" ]; then - rc_flags="${rc_flags} -jail ${dhcpd_hostname} ${dhcpd_ipaddress}" - fi - rc_flags="${rc_flags} ${dhcpd_ifaces}" -} - -cleanup_chroot () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_umount ${_dhcpd_devdir} - fi -} - -dhcpd_stop () -{ - if sh $0 forcestatus; then - sh $0 forcestop - fi -} - -remove_pid () -{ - if [ -e ${_dhcpd_pidfile} ]; then - warn "${_dhcpd_pidfile} still exists! -- removing anyway" - fi - safe_remove ${_dhcpd_pidfile} -} - -remove_leases () -{ - if [ -s ${_dhcpd_leasesfile} ]; then - warn "${_dhcpd_leasesfile} not empty -- not removed --" \ - "futher warning messages expected, don't care." - else - safe_remove ${_dhcpd_leasesfile} ${_dhcpd_leasesfile}~ - fi -} - -remove_chuser () -{ - if checkyesno paranoia && { - checkyesno dhcpd_chuser_enable || checkyesno dhcpd_chroot_enable - }; then - safe_rmdir ${_dhcpd_piddir} ${_dhcpd_leasesdir} - fi -} - -remove_chroot () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_remove ${_dhcpd_conffile} ${_dhcpd_includedir} \ - ${_dhcpd_etcdir} - if checkyesno dhcpd_devfs_enable; then - safe_umount ${_dhcpd_devdir} - safe_rmdir ${_dhcpd_devdir}/_ # XXX /_ hack! - elif checkyesno dhcpd_jail_enable; then - if ! mounted ${_dhcpd_devdir}; then - safe_remove ${_dhcpd_devdir} - fi - else - safe_remove ${_dhcpd_devdir} - fi - safe_rmdir ${_dhcpd_confdir} ${_dhcpd_rootdir} # XXX /_ hack! - fi -} - -dhcpd_check () -{ - check_chuser - check_jail - check_chroot -} - -dhcpd_rcvar () -{ - rcvar_chuser - rcvar_jail - rcvar_chroot - rcvar_pidnleases - rcvar_rooted -} - -dhcpd_precmd () -{ - setup_compat - setup_umask - setup_chroot - setup_chuser - setup_leases - setup_flags -} - -dhcpd_postcmd () -{ - cleanup_chroot -} - -dhcpd_install () -{ - if checkyesno paranoia; then - safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \ - "DHCP Daemon" - fi -} - -_dhcpd_uninstall () # user group root -{ - local _user _group _root - - _user=$1 _group=$2 _root=$3 - - if [ -n "${_user}" -o -n "${_group}" ]; then - dhcpd_chuser_enable=YES - dhcpd_withuser=${_user} - dhcpd_withgroup=${_group} - else - dhcpd_chuser_enable=NO - fi - if [ -n "${_root}" ]; then - dhcpd_chroot_enable=YES - dhcpd_rootdir=${_root} - else - dhcpd_chroot_enable=NO - fi - dhcpd_check - dhcpd_rcvar - dhcpd_uninstall -} - -dhcpd_uninstall () -{ - if checkyesno __dhcpd_uninstall; then - dhcpd_stop - remove_pid - remove_leases - remove_chuser - remove_chroot - else - local _user _group _root - - __dhcpd_uninstall=YES - - _user=${dhcpd_withuser} - _group=${dhcpd_withgroup} - _root=${dhcpd_rootdir} - - _dhcpd_uninstall "" "" "" - - if checkyesno paranoia; then - if [ -n "${_user}" -o -n "${_group}" ]; then - _dhcpd_uninstall "${_user}" "${_group}" "" - fi - if [ -n "${_root}" ]; then - _dhcpd_uninstall "" "" "${_root}" - fi - if [ -n "${_user}" -o -n "${_group}" ] && - [ -n "${_root}" ]; then - _dhcpd_uninstall "${_user}" "${_group}" "${_root}" - fi - fi - fi -} - -rcvar=$(set_rcvar) -load_rc_config ${name} - -__dhcpd_uninstall="NO" # internal use only -__dhcpd_devdir=/dev # devices directory -__dhcpd_etcdir=/etc # etc directory -__dhcpd_piddir=/var/run # pid file directory -__dhcpd_leasesdir=/var/db # leases file directory -#__dhcpd_rootdir=/var/db/${name} # root directory - -dhcpd_check -dhcpd_rcvar - -command=%%PREFIX%%/sbin/${name} -pidfile=${_dhcpd_pidfile} -required_files=${dhcpd_conf} -start_precmd=${name}_precmd -stop_postcmd=${name}_postcmd -install_cmd=dhcpd_install -uninstall_cmd=dhcpd_uninstall -extra_commands="install uninstall" - -run_rc_command "$1" diff --git a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample deleted file mode 100644 index 11c9b00b3133..000000000000 --- a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcrelay -# REQUIRE: DAEMON -# -# Add the following line to /etc/rc.conf to enable dhcrelay: -# -# dhcrelay_enable="YES" -# - -# override these variables in /etc/rc.conf -dhcrelay_enable=${dhcrelay_enable:-"NO"} -dhcrelay_flags=${dhcrelay_flags:-} # command option(s) -dhcrelay_servers=${dhcrelay_servers:-} # dhcrelay server(s) -dhcrelay_ifaces=${dhcrelay_ifaces:-} # ethernet interface(s) - -dhcrelay_precmd () -{ - local ifaces - - dhcrelay_rcconf=%%PREFIX%%/etc/rc.isc-dhcrelay.conf - - if [ -f ${dhcrelay_rcconf} ]; then - warn "${dhcrelay_rcconf} is obsolete, use /etc/rc.conf instead." - . ${dhcrelay_rcconf} - - if [ -n "${dhcrelay_options}" -a -z "${rc_flags}" ]; then - warn "dhcrelay_options is obsolete, use dhcrelay_flags instead." - rc_flags=${dhcrelay_options} - fi - fi - - if [ -z "${dhcrelay_servers}" ]; then - err 1 "no dhcrelay server(s) configured." - fi - - ifaces= - for iface in ${dhcrelay_ifaces}; do - ifaces="${ifaces} -i ${iface}" - done - - rc_flags="${rc_flags} ${ifaces} ${dhcrelay_servers}" -} - -. %%RC_SUBR%% - -name=dhcrelay -rcvar=$(set_rcvar) - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid -start_precmd=${name}_precmd - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net/isc-dhcp30-server/files/omshell::Makefile.dist b/net/isc-dhcp30-server/files/omshell::Makefile.dist deleted file mode 100644 index 34c90a2e7f53..000000000000 --- a/net/isc-dhcp30-server/files/omshell::Makefile.dist +++ /dev/null @@ -1,80 +0,0 @@ -# Makefile.dist -# -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: -# -# http://www.isc.org/isc-license-1.0.html. -# -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. -# -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# - -CATMANPAGES = omshell.cat1 -SEDMANPAGES = omshell.man1 -SRCS = omshell.c -OBJS = omshell.o -PROG = omshell -MAN = omshell.1 - -INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes -CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) -DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \ - ../omapip/libomapi.a ../dst/libdst.a - -all: $(PROG) $(CATMANPAGES) - -$(PROG): $(OBJS) $(DHCPCTLLIBS) - $(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS) - -install: all $(CATMANPAGES) - for dir in $(USRMANDIR) $(USERBINDIR); do \ - foo=""; \ - for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ - foo=$${foo}/$$bar; \ - if [ ! -d $$foo ]; then \ - mkdir $$foo; \ - chmod 755 $$foo; \ - fi; \ - done; \ - done - $(INSTALL) omshell $(DESTDIR)$(USERBINDIR) - $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell - $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \ - $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT) - -depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS) - -clean: - -rm -f $(OBJS) - -realclean: clean - -rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #* - -distclean: realclean - -rm -f Makefile - -links: - @for foo in $(SRCS) $(MAN); do \ - if [ ! -b $$foo ]; then \ - rm -f $$foo; \ - fi; \ - ln -s $(TOP)/omshell/$$foo $$foo; \ - done - -omshell.cat1: omshell.man1 - nroff -man omshell.man1 >omshell.cat1 - -omshell.man1: omshell.1 - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ - -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 - -# Dependencies (semi-automatically-generated) diff --git a/net/isc-dhcp30-server/files/patch-Makefile b/net/isc-dhcp30-server/files/patch-Makefile deleted file mode 100644 index 7a8df08b137b..000000000000 --- a/net/isc-dhcp30-server/files/patch-Makefile +++ /dev/null @@ -1,76 +0,0 @@ ---- Makefile.orig Fri Nov 8 00:10:07 2002 -+++ Makefile Mon Apr 28 15:04:50 2003 -@@ -38,59 +38,59 @@ - # ``http://www.nominum.com''. - # - --all: -+all all.devel all.server all.relay all.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make all); \ -+ (cd work.$$sysname; make $@); \ - fi - --install: -+install install.devel install.server install.relay install.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make install); \ -+ (cd work.$$sysname; make $@); \ - fi - --depend: -+depend depend.devel depend.server depend.relay depend.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make depend); \ -+ (cd work.$$sysname; make $@); \ - fi - --clean: -+clean clean.devel clean.server clean.relay clean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make clean); \ -+ (cd work.$$sysname; make $@); \ - fi - --realclean: -+realclean realclean.devel realclean.server realclean.relay realclean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make realclean); \ -+ (cd work.$$sysname; make $@); \ - fi - --distclean: -+distclean distclean.devel distclean.server distclean.relay distclean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make distclean); \ -+ (cd work.$$sysname; make $@); \ - fi - --links: -+links links.devel links.server links.relay links.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make links); \ -+ (cd work.$$sysname; make $@); \ - fi - diff --git a/net/isc-dhcp30-server/files/patch-Makefile.dist b/net/isc-dhcp30-server/files/patch-Makefile.dist deleted file mode 100644 index 0c09997023cc..000000000000 --- a/net/isc-dhcp30-server/files/patch-Makefile.dist +++ /dev/null @@ -1,226 +0,0 @@ ---- Makefile.dist.orig Fri Nov 8 00:10:08 2002 -+++ Makefile.dist Tue Apr 29 00:07:43 2003 -@@ -17,47 +17,200 @@ - # http://www.isc.org for more information. - # - --SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl -+COMMON_SUBDIRS= common -+DEVEL_SUBDIRS= $(MINIRES) dst omapip dhcpctl -+SERVER_SUBDIRS= omshell server -+RELAY_SUBDIRS= relay -+CLIENT_SUBDIRS= client -+ -+DEVEL_BUILD_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS} -+SERVER_BUILD_SUBDIRS= ${SERVER_SUBDIRS} -+RELAY_BUILD_SUBDIRS= ${RELAY_SUBDIRS} -+CLIENT_BUILD_SUBDIRS= ${CLIENT_SUBDIRS} -+ -+DEVEL_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS} -+SERVER_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${SERVER_SUBDIRS} -+RELAY_INSTALL_SUBDIRS= ${RELAY_SUBDIRS} -+CLIENT_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${CLIENT_SUBDIRS} - --all: -- @for dir in ${SUBDIRS}; do \ -+all: all.server all.relay all.client -+ -+all.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.server: all.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.relay: all.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.client: all.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Making all in $$dir"; \ - (cd $$dir; $(MAKE) all) || exit 1; \ -- done -+ done -+ -+install: install.devel install.server install.relay install.client -+ -+install.devel: -+ @for dir in ${DEVEL_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done - --install: -- @for dir in ${SUBDIRS}; do \ -+install.server: -+ @for dir in ${SERVER_INSTALL_SUBDIRS}; do \ - echo "Installing in $$dir"; \ - (cd $$dir; $(MAKE) install) || exit 1; \ -- done -+ done - --depend: -- @for dir in ${SUBDIRS}; do \ -+install.relay: -+ @for dir in ${RELAY_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done -+ -+install.client: -+ @for dir in ${CLIENT_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done -+ -+depend: depend.server depend.relay depend.client -+ -+depend.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+depend.server: depend.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+depend.relay: depend.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ - echo "Making dependencies in $$dir"; \ - (cd $$dir; $(MAKE) depend) || exit 1; \ -- done -+ done -+ -+depend.client: depend.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+clean: clean.server clean.relay clean.client -+ -+clean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done -+ -+clean.server: clean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done -+ -+clean.relay: clean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done - --clean: -- @for dir in ${SUBDIRS}; do \ -+clean.client: clean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Cleaning in $$dir"; \ - (cd $$dir; $(MAKE) clean) || exit 1; \ -- done -+ done -+ -+realclean: realclean.server realclean.relay realclean.client -+ -+realclean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done - --realclean: -- @for dir in ${SUBDIRS}; do \ -+realclean.server: realclean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ - echo "Really cleaning in $$dir"; \ - (cd $$dir; $(MAKE) realclean) || exit 1; \ -- done -+ done - --distclean: -- @for dir in ${SUBDIRS}; do \ -+realclean.relay: realclean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done -+ -+realclean.client: realclean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done -+ -+distclean: distclean.server distclean.relay distclean.client -+ -+distclean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ - echo "Really, really cleaning in $$dir"; \ - (cd $$dir; $(MAKE) distclean) || exit 1; \ -- done -- @rm -f Makefile -+ done -+ -+distclean.server: distclean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+distclean.relay: distclean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+distclean.client: distclean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+links: links.server links.relay links.client -+ -+links.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done -+ -+links.server: links.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done -+ -+links.relay: links.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done - --links: -- @for dir in ${SUBDIRS}; do \ -+links.client: links.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Making links in $$dir"; \ - (cd $$dir; $(MAKE) links) || exit 1; \ -- done -+ done diff --git a/net/isc-dhcp30-server/files/patch-client::clparse.c b/net/isc-dhcp30-server/files/patch-client::clparse.c deleted file mode 100644 index 4140cc6e3109..000000000000 --- a/net/isc-dhcp30-server/files/patch-client::clparse.c +++ /dev/null @@ -1,11 +0,0 @@ ---- client/clparse.c.orig Mon Feb 10 01:39:57 2003 -+++ client/clparse.c Wed Mar 3 01:35:39 2004 -@@ -785,7 +785,7 @@ - if (status != ISC_R_SUCCESS) - log_fatal ("Can't record interface %s: %s", - name, isc_result_totext (status)); -- strcpy (ip -> name, name); -+ strlcpy (ip -> name, name, IFNAMSIZ); - if (dummy_interfaces) { - interface_reference (&ip -> next, - dummy_interfaces, MDL); diff --git a/net/isc-dhcp30-server/files/patch-client::dhclient.8 b/net/isc-dhcp30-server/files/patch-client::dhclient.8 deleted file mode 100644 index 4e6096f5aa86..000000000000 --- a/net/isc-dhcp30-server/files/patch-client::dhclient.8 +++ /dev/null @@ -1,83 +0,0 @@ ---- client/dhclient.8.orig Sun Nov 17 03:25:43 2002 -+++ client/dhclient.8 Wed Mar 3 02:06:52 2004 -@@ -18,6 +18,10 @@ - .\" - .\" from Id: dhclient.8,v 1.12.2.8 2004/06/10 17:59:12 dhankins Exp - .\" -+.\" Portions copyright (c) 2000 David E. O'Brien. -+.\" All rights reserved. -+.\" $FreeBSD$ -+.\" - .TH dhclient 8 - .SH NAME - dhclient - Dynamic Host Configuration Protocol Client -@@ -28,12 +32,18 @@ - .I port - ] - [ -+.B -D -+] -+[ - .B -d - ] - [ - .B -q - ] - [ -+.B -v -+] -+[ - .B -1 - ] - [ -@@ -64,6 +74,10 @@ - relay - ] - [ -+.B -i -+interval -+] -+[ - .B -n - ] - [ -@@ -148,6 +162,15 @@ - configuration file or on the command line, and will ignore all other - interfaces. - .PP -+The -+.B -D -+flag causes -+.B dhclient -+to save the script it creates for use in conjunction with -+.B dhclient-script -+in -+.IR /tmp. -+.PP - If the DHCP client should listen and transmit on a port other than the - standard (port 68), the - .B -p -@@ -171,6 +194,12 @@ - flag, followed by the IP address to send. This is only useful for testing, - and should not be expected to work in any consistent or useful way. - .PP -+On FreeBSD, dhclient can be enabled to automatically handle the -+link status of the network card. Normally polling is done every -+five seconds. The polling interval can be set using the -+.B -i -+flag, followed by the numbers of seconds. Minimum is one second. -+.PP - The DHCP client will normally run in the foreground until it has - configured an interface, and then will revert to running in the - background. To run force dhclient to always run as a foreground -@@ -188,6 +217,10 @@ - .B -q - flag prevents any messages other than errors from being printed to the - standard error descriptor. -+.B -v -+flag turns on all messages. -+Opposite of -+.B -q . - .PP - The client normally doesn't release the current lease as it is not - required by the DHCP protocol. Some cable ISPs require their clients diff --git a/net/isc-dhcp30-server/files/patch-client::dhclient.c b/net/isc-dhcp30-server/files/patch-client::dhclient.c deleted file mode 100644 index 7345bfaf057d..000000000000 --- a/net/isc-dhcp30-server/files/patch-client::dhclient.c +++ /dev/null @@ -1,545 +0,0 @@ ---- client/dhclient.c.orig Wed Nov 24 18:39:14 2004 -+++ client/dhclient.c Tue Mar 8 14:06:59 2005 -@@ -38,6 +38,13 @@ - #include "dhcpd.h" - #include "version.h" - -+#if __FreeBSD_version > 502010 -+#include <sys/ioctl.h> -+#include <net/if_media.h> -+#include <net80211/ieee80211_ioctl.h> -+#include <net80211/ieee80211.h> -+#endif -+ - TIME default_lease_time = 43200; /* 12 hours... */ - TIME max_lease_time = 86400; /* 24 hours... */ - -@@ -72,8 +79,11 @@ - struct string_list *client_env=NULL; - int client_env_count=0; - int onetry=0; --int quiet=0; -+int quiet=1; - int nowait=0; -+#ifdef ENABLE_POLLING_MODE -+int polling_interval = 5; -+#endif - - static void usage PROTO ((void)); - -@@ -174,6 +184,9 @@ - } else if (!strcmp (argv [i], "-q")) { - quiet = 1; - quiet_interface_discovery = 1; -+ } else if (!strcmp (argv [i], "-v")) { -+ quiet = 0; -+ quiet_interface_discovery = 0; - } else if (!strcmp (argv [i], "-s")) { - if (++i == argc) - usage (); -@@ -187,6 +200,19 @@ - } else if (!strcmp (argv [i], "-n")) { - /* do not start up any interfaces */ - interfaces_requested = 1; -+#ifdef ENABLE_POLLING_MODE -+ } else if (!strcmp (argv [i], "-i")) { -+ if (++i == argc) -+ usage (); -+ polling_interval = (int)strtol (argv [i], -+ (char **)NULL, 10); -+ if (polling_interval <= 0) { -+ log_info ("Incorrect polling interval %d", -+ polling_interval); -+ log_info ("Using a default of 5 seconds"); -+ polling_interval = 5; -+ } -+#endif - } else if (!strcmp (argv [i], "-w")) { - /* do not exit if there are no broadcast interfaces. */ - persist = 1; -@@ -215,7 +241,16 @@ - if (strlen (argv [i]) > sizeof tmp -> name) - log_fatal ("%s: interface name too long (max %ld)", - argv [i], (long)strlen (argv [i])); -- strcpy (tmp -> name, argv [i]); -+ strlcpy (tmp -> name, argv [i], IFNAMSIZ); -+#if __FreeBSD_version > 502010 -+ set_ieee80211 (tmp); -+#endif -+ /* Init some interface vars, enable polling */ -+#ifdef ENABLE_POLLING_MODE -+ tmp -> forcediscover = 0; -+ tmp -> linkstate = HAVELINK; -+ tmp -> polling = 1; -+#endif /* ifdef ENABLE_POLLING_MODE */ - if (interfaces) { - interface_reference (&tmp -> next, - interfaces, MDL); -@@ -375,6 +410,16 @@ - INTERFACE_AUTOMATIC)) != - INTERFACE_REQUESTED)) - continue; -+#if __FreeBSD_version > 502010 -+ set_ieee80211 (ip); -+#endif -+#ifdef ENABLE_POLLING_MODE -+ ip -> forcediscover = 0; -+ if (ip -> client -> config -> media != NULL) -+ ip -> havemedia = 1; -+ else -+ ip -> havemedia = 0; -+#endif - script_init (ip -> client, - "PREINIT", (struct string_list *)0); - if (ip -> client -> alias) -@@ -417,8 +462,13 @@ - client -> state = S_INIT; - /* Set up a timeout to start the initialization - process. */ -+#ifdef ENABLE_POLLING_MODE -+ add_timeout (cur_time + random () % 5 + 2, -+ state_polling, client, 0, 0); -+#else - add_timeout (cur_time + random () % 5, - state_reboot, client, 0, 0); -+#endif - } - } - } -@@ -476,9 +526,9 @@ - log_info (arr); - log_info (url); - -- log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s", -- "[-s server]"); -- log_error (" [-cf config-file] [-lf lease-file]%s", -+ log_error ("Usage: dhclient [-1Ddqrv] [-i polling-interval] %s", -+ "[-nw] [-p <port>] [-s server]"); -+ log_error (" [-cf config-file] [-lf lease-file] %s", - "[-pf pid-file] [-e VAR=val]"); - log_fatal (" [-sf script-file] [interface]"); - } -@@ -881,6 +931,15 @@ - /* Write out the new lease. */ - write_client_lease (client, client -> new, 0, 0); - -+ /* -+ * It's now possible that state_reboot can be called -+ * after a interface link went down and is up again. -+ * To prevent tons of equal leases saved on disk, we rewrite -+ * them. -+ */ -+ read_client_leases (); -+ rewrite_client_leases (); -+ - /* Replace the old active lease with the new one. */ - if (client -> active) - destroy_client_lease (client -> active); -@@ -895,6 +954,12 @@ - piaddr (client -> active -> address), - (long)(client -> active -> renewal - cur_time)); - client -> state = S_BOUND; -+#ifdef ENABLE_POLLING_MODE -+ /* Init some interface vars, enable polling */ -+ client -> interface -> linkstate = HAVELINK; -+ client -> interface -> forcediscover = 0; -+ client -> interface -> polling = 1; -+#endif /* ifdef ENABLE_POLLING_MODE */ - reinitialize_interfaces (); - go_daemon (); - if (client -> config -> do_forward_update) { -@@ -1359,6 +1424,11 @@ - int interval; - int increase = 1; - -+#ifdef ENABLE_POLLING_MODE -+ /* Disable polling for this interface */ -+ client -> interface -> polling = 0; -+#endif -+ - /* Figure out how long it's been since we started transmitting. */ - interval = cur_time - client -> first_sending; - -@@ -1464,6 +1534,9 @@ - struct client_lease *loop; - struct client_lease *lp; - -+ if (client -> interface -> linkstate == NOLINK) -+ return; -+ - loop = lp = client -> active; - - log_info ("No DHCPOFFERS received."); -@@ -1496,6 +1569,10 @@ - log_info ("bound: renewal in %ld %s.", - (long)(client -> active -> renewal - - cur_time), "seconds"); -+#ifdef ENABLE_POLLING_MODE -+ /* Enable polling for this interface */ -+ client -> interface -> polling = 1; -+#endif - add_timeout (client -> active -> renewal, - state_bound, client, 0, 0); - } else { -@@ -1503,6 +1580,11 @@ - log_info ("bound: immediate renewal."); - state_bound (client); - } -+ /* -+ * Set the link status back to nolink, even -+ * if we have media settings. -+ */ -+ client -> interface -> linkstate = NOLINK; - reinitialize_interfaces (); - go_daemon (); - return; -@@ -1548,6 +1630,12 @@ - } - - log_info ("No working leases in persistent database - sleeping."); -+ -+#ifdef ENABLE_POLLING_MODE -+ /* Enable polling for this interface */ -+ client -> interface -> polling = 1; -+#endif -+ - script_init (client, "FAIL", (struct string_list *)0); - if (client -> alias) - script_write_params (client, "alias_", client -> alias); -@@ -1689,6 +1777,18 @@ - client -> packet.secs = htons (65535); - } - -+ /* -+ * Only try the first ten seconds to renew a lease from a -+ * given dhcp-server adress. After that, fall back to use -+ * state_reboot with INADDR_BROADCAST. -+ */ -+ if (destination.sin_addr.s_addr != INADDR_BROADCAST && -+ (client -> state == S_RENEWING || client -> state == S_REBINDING)) { -+ if (client -> active && client -> active -> expiry > cur_time && -+ interval >= 10) -+ goto cancel; -+ } -+ - log_info ("DHCPREQUEST on %s to %s port %d", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (destination.sin_addr), -@@ -1710,6 +1810,16 @@ - from, &destination, - (struct hardware *)0); - -+ /* -+ * If sendto() for a direct request fails, fall back to use -+ * state_reboot with INADDR_BROADCAST. -+ */ -+ if (result == -1 && destination.sin_addr.s_addr != INADDR_BROADCAST && -+ (client -> state == S_RENEWING || client -> state == S_REBINDING)) { -+ if (client -> active && client -> active -> expiry > cur_time) -+ goto cancel; -+ } -+ - add_timeout (cur_time + client -> interval, - send_request, client, 0, 0); - } -@@ -2607,6 +2717,13 @@ - wstatus = 0; - } - } else { -+ if ((i = open(_PATH_DEVNULL, O_RDWR)) != -1) { -+ dup2(i, STDIN_FILENO); -+ dup2(i, STDOUT_FILENO); -+ dup2(i, STDERR_FILENO); -+ if (i > STDERR_FILENO) -+ close(i); -+ } - execve (scriptName, argv, envp); - log_error ("execve (%s, ...): %m", scriptName); - exit (0); -@@ -2793,8 +2910,10 @@ - case S_STOPPED: - break; - } -+#ifndef ENABLE_POLLING_MODE - client -> state = S_INIT; - state_reboot (client); -+#endif - } - } - } -@@ -3022,7 +3141,9 @@ - break; - - case server_awaken: -+#ifndef ENABLE_POLLING_MODE - state_reboot (client); -+#endif - break; - } - } -@@ -3160,3 +3281,265 @@ - data_string_forget (&ddns_dhcid, MDL); - return rcode; - } -+ -+/* Check to see if there's a wire plugged in */ -+int -+interface_active(struct interface_info *ip) { -+#if __FreeBSD_version > 502010 -+ struct ifmediareq ifmr; -+ int *media_list, i; -+ char *ifname; -+ int sock; -+ -+ ifname = ip -> name; -+ -+ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) -+ log_fatal ("Can't create interface_active socket"); -+ -+ (void) memset (&ifmr, 0, sizeof (ifmr)); -+ (void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name)); -+ -+ if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { -+ /* -+ * Interface doesn't support SIOCGIFMEDIA, presume okay -+ */ -+ close (sock); -+ return (HAVELINK); -+ } -+ close (sock); -+ -+ if (ifmr.ifm_count == 0) { -+ /* -+ * Assume that this means interface -+ * does not support SIOCGIFMEDIA -+ */ -+ log_fatal ("%s: no media types?", ifname); -+ return (HAVELINK); -+ } -+ -+ if (ifmr.ifm_status & IFM_AVALID) { -+ if (ip -> ieee80211) { -+ /* -+ * Wavelan devices need to be checked if they are -+ * associated. -+ */ -+ if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) && -+ (ifmr.ifm_status & IFM_ACTIVE)) { -+ return (HAVELINK); -+ } -+ } else { -+ if (ifmr.ifm_status & IFM_ACTIVE) { -+ return (HAVELINK); -+ } -+ } -+ /* -+ * We really have no link. -+ */ -+ return (NOLINK); -+ } -+ /* -+ * IFM_AVALID is not set. We cannot check -+ * the link state. Assume HAVELINK. -+ */ -+ -+#endif /* Other OSs */ -+ /* -+ * Always return a successful link if the OS -+ * is not supported. -+ */ -+ return (HAVELINK); -+} -+ -+#if __FreeBSD_version > 502010 -+void -+set_ieee80211 (struct interface_info *ip) { -+ -+ struct ieee80211req ireq; -+ u_int8_t data[32]; -+ int associated = 0; -+ int *media_list, i; -+ char *ifname; -+ int sock; -+ -+ ifname = ip -> name; -+ -+ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) -+ log_fatal ("Can't create interface_active socket"); -+ -+ (void) memset (&ireq, 0, sizeof (ireq)); -+ (void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name)); -+ ireq.i_data = &data; -+ ireq.i_type = IEEE80211_IOC_SSID; -+ ireq.i_val = -1; -+ /* -+ * If we can't get the SSID, -+ * this isn't an 802.11 device. -+ */ -+ if (ioctl (sock, SIOCG80211, &ireq) < 0) -+ ip -> ieee80211 = 0; -+ else { -+#ifdef DEBUG -+ printf ("Device %s has 802.11\n", ifname); -+#endif -+ ip -> ieee80211 = 1; -+ } -+ close (sock); -+ } -+#endif /* __FreeBSD_version */ -+ -+#ifdef ENABLE_POLLING_MODE -+/* Go to background after some time */ -+void state_background (cpp) -+ void *cpp; -+{ -+ go_daemon (); -+} -+ -+/* Check the state of the NICs if we have link */ -+void state_polling (cpp) -+ void *cpp; -+{ -+ static int doinitcheck = 0; -+ struct interface_info *ip; -+ struct client_state *client; -+ int result; -+ -+ for (ip = interfaces; ip; ip = ip -> next) { -+ if (! ip -> polling) -+ continue; -+#ifdef DEBUG -+ printf ("%s: Polling interface state\n", ip -> name); -+ for (client = ip -> client; -+ client; client = client -> next) { -+ printf ("%s: client state of %d\n", ip -> name, ip -> client -> state); -+ printf ("%s: link = %d\n", ip -> name, ip -> linkstate); -+ } -+#endif -+ -+ result = interface_active (ip); -+ /* -+ * If dhclient.conf contains media settings, we cannot -+ * abort if the interface is not set to active mode. -+ */ -+ if (ip -> havemedia && ip -> client -> state != S_BOUND) { -+ if (result == HAVELINK) -+ ip -> forcediscover = 1; -+ result = HAVELINK; -+ } -+ -+ /* -+ * The last status of the interface tells us -+ * the we've got no link ... -+ */ -+ if (ip -> linkstate == NOLINK || ! doinitcheck) { -+ /* -+ * ... but we have now link. Let's send -+ * requests. -+ */ -+ if (result == HAVELINK) { -+#ifdef DEBUG -+ if (ip -> havemedia) -+ printf ("%s: Trying media settings on interface\n", -+ ip -> name); -+ else -+ printf ("%s: Found Link on interface\n", ip -> name); -+#endif -+ /* -+ * Set the interface to state_bound. We assume that we have -+ * a working link. If we cannot reach the server directly, -+ * INADDR_BROADCAST is used. -+ */ -+ for (client = ip -> client; -+ client; client = client -> next) { -+ cancel_timeout (state_init, client); -+ cancel_timeout (state_reboot, client); -+ cancel_timeout (state_selecting, client); -+ if (client -> active) { -+ add_timeout (cur_time + random () % 5, -+ state_bound, client, 0, 0); -+ } else { -+ add_timeout (cur_time + random () % 5, -+ state_reboot, client, 0, 0); -+ } -+ } -+ ip -> linkstate = HAVELINK; -+ } else { -+#ifdef DEBUG -+ printf ("%s: No link on interface\n", ip -> name); -+#endif -+ for (client = ip -> client; -+ client; client = client -> next) { -+ /* -+ * Without this add_timout(), dhclient does -+ * not poll on a interface if there -+ * is no cable plugged in at startup -+ * time. Because we add one additional second -+ * to the time of a normal timeout, we always -+ * skip and block a running one. This prevents -+ * that polling is done twice at the same time. -+ */ -+ if (client -> state == S_INIT) { -+ add_timeout (cur_time + (polling_interval + 1), -+ state_polling, client, 0, 0); -+ } -+ } -+ ip -> linkstate = NOLINK; -+ /* -+ * Automatically go into the background after -+ * some time. Do this only if there are no -+ * media options available for a interface. -+ */ -+ if (! ip -> havemedia && ! doinitcheck) { -+ add_timeout (cur_time + (polling_interval * 2), -+ state_background, client, 0, 0); -+ } -+ } -+ } -+ -+ /* -+ * The last status of the interface tells us -+ * the we previously had link. -+ */ -+ if (ip -> linkstate == HAVELINK && doinitcheck) { -+ if (result == NOLINK) { -+ /* -+ * We lost link on the interface, or it isn't -+ * associated anymore. -+ */ -+#ifdef DEBUG -+ printf ("%s: Lost Link on interface\n", ip -> name); -+#endif -+ /* -+ * After we lost link, cycle again through the -+ * different media settings if available. Else -+ * set NOLINK. -+ */ -+ if (ip -> havemedia) -+ ip -> forcediscover = 1; -+ else -+ ip -> linkstate = NOLINK; -+ } -+ /* -+ * If we happen to have a real link, but no -+ * active lease, force the interface into -+ * state_reboot. Do the same if media settings -+ * are available. -+ */ -+ if (ip -> forcediscover) { -+ for (client = ip -> client; -+ client; client = client -> next) { -+ if (client -> state != S_REBOOTING && -+ client -> state != S_SELECTING) { -+ add_timeout (cur_time + random () % 5, -+ state_reboot, client, 0, 0); -+ } -+ } -+ ip -> forcediscover = 0; -+ ip -> linkstate = HAVELINK; -+ } -+ /* We still have link, do nothing. */ -+ } -+ } -+ doinitcheck = 1; -+} -+#endif /* ifdef ENABLE_POLLING_MODE */ diff --git a/net/isc-dhcp30-server/files/patch-client::dhclient.conf b/net/isc-dhcp30-server/files/patch-client::dhclient.conf deleted file mode 100644 index 2d9560f43bf8..000000000000 --- a/net/isc-dhcp30-server/files/patch-client::dhclient.conf +++ /dev/null @@ -1,11 +0,0 @@ ---- client/dhclient.conf.orig Tue Jun 3 00:50:44 1997 -+++ client/dhclient.conf Wed Mar 3 02:20:41 2004 -@@ -11,7 +11,7 @@ - reboot 10; - select-timeout 5; - initial-interval 2; --script "/etc/dhclient-script"; -+script "%%PREFIX%%/sbin/dhclient-script"; - media "-link0 -link1 -link2", "link0 link1"; - reject 192.33.137.209; - diff --git a/net/isc-dhcp30-server/files/patch-common::dhcp-options.5 b/net/isc-dhcp30-server/files/patch-common::dhcp-options.5 deleted file mode 100644 index 9d936cfffeee..000000000000 --- a/net/isc-dhcp30-server/files/patch-common::dhcp-options.5 +++ /dev/null @@ -1,32 +0,0 @@ ---- common/dhcp-options.5.orig Sun Feb 23 04:27:42 2003 -+++ common/dhcp-options.5 Wed Mar 3 02:12:13 2004 -@@ -431,7 +431,10 @@ - the domain-name option to specify the domain name). See RFC 1035 for - character set restrictions. This option is only honored by - .B dhclient-script(8) --if the hostname for the client machine is not set. -+if the hostname for the client machine is not set (i.e., set to the empty -+string in -+.B rc.conf(5) -+). - .RE - .PP - .B option \fBieee802-3-encapsulation\fR \fIflag\fR\fB;\fR -@@ -654,7 +657,7 @@ - This option specifies whether the client should configure its IP - layer to allow forwarding of datagrams with non-local source routes - (see Section 3.3.5 of [4] for a discussion of this topic). A value --of false means disallow forwarding of such datagrams, and a value of true -+of 0 means disallow forwarding of such datagrams, and a value of true - means allow forwarding. - .RE - .PP -@@ -948,7 +951,7 @@ - .PP - This option specifies whether or not the client should negotiate the - use of trailers (RFC 893 [14]) when using the ARP protocol. A value --of false indicates that the client should not attempt to use trailers. A -+of 0 indicates that the client should not attempt to use trailers. A - value of true means that the client should attempt to use trailers. - .RE - .PP diff --git a/net/isc-dhcp30-server/files/patch-common::discover.c b/net/isc-dhcp30-server/files/patch-common::discover.c deleted file mode 100644 index 1cfcc2094098..000000000000 --- a/net/isc-dhcp30-server/files/patch-common::discover.c +++ /dev/null @@ -1,238 +0,0 @@ ---- common/discover.c.orig Fri Jul 25 21:44:15 2003 -+++ common/discover.c Fri Mar 5 23:33:04 2004 -@@ -47,6 +47,7 @@ - #endif /* not lint */ - - #include "dhcpd.h" -+#include <ifaddrs.h> - #include <sys/ioctl.h> - - struct interface_info *interfaces, *dummy_interfaces, *fallback_interface; -@@ -135,10 +136,7 @@ - { - struct interface_info *tmp, *ip; - struct interface_info *last, *next; -- char buf [2048]; -- struct ifconf ic; -- struct ifreq ifr; -- int i; -+ struct ifaddrs *ifap, *ifa; - int sock; - int address_count = 0; - struct subnet *subnet; -@@ -157,61 +155,6 @@ - if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) - log_fatal ("Can't create addrlist socket"); - -- /* Get the interface configuration information... */ -- --#ifdef SIOCGIFCONF_ZERO_PROBE -- /* linux will only tell us how long a buffer it wants if we give it -- * a null buffer first. So, do a dry run to figure out the length. -- * -- * XXX this code is duplicated from below because trying to fold -- * the logic into the if statement and goto resulted in excesssive -- * obfuscation. The intent is that unless you run Linux you shouldn't -- * have to deal with this. */ -- -- ic.ifc_len = 0; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)NULL; --#else -- /* otherwise, we just feed it a starting size, and it'll tell us if -- * it needs more */ -- -- ic.ifc_len = sizeof buf; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; --#endif -- -- gifconf_again: -- i = ioctl(sock, SIOCGIFCONF, &ic); -- -- if (i < 0) -- log_fatal ("ioctl: SIOCGIFCONF: %m"); -- --#ifdef SIOCGIFCONF_ZERO_PROBE -- /* Workaround for SIOCGIFCONF bug on some Linux versions. */ -- if (ic.ifc_ifcu.ifcu_buf == 0 && ic.ifc_len == 0) { -- ic.ifc_len = sizeof buf; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; -- goto gifconf_again; -- } --#endif -- -- /* If the SIOCGIFCONF resulted in more data than would fit in -- a buffer, allocate a bigger buffer. */ -- if ((ic.ifc_ifcu.ifcu_buf == buf --#ifdef SIOCGIFCONF_ZERO_PROBE -- || ic.ifc_ifcu.ifcu_buf == 0 --#endif -- ) && ic.ifc_len > sizeof buf) { -- ic.ifc_ifcu.ifcu_buf = dmalloc ((size_t)ic.ifc_len, MDL); -- if (!ic.ifc_ifcu.ifcu_buf) -- log_fatal ("Can't allocate SIOCGIFCONF buffer."); -- goto gifconf_again; --#ifdef SIOCGIFCONF_ZERO_PROBE -- } else if (ic.ifc_ifcu.ifcu_buf == 0) { -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; -- ic.ifc_len = sizeof buf; -- goto gifconf_again; --#endif -- } -- - - /* If we already have a list of interfaces, and we're running as - a DHCP server, the interfaces were requested. */ -@@ -224,51 +167,38 @@ - else - ir = INTERFACE_REQUESTED; - -+ if (getifaddrs(&ifap) != 0) -+ log_fatal ("getifaddrs failed"); -+ - /* Cycle through the list of interfaces looking for IP addresses. */ -- for (i = 0; i < ic.ifc_len;) { -- struct ifreq *ifp = (struct ifreq *)((caddr_t)ic.ifc_req + i); --#ifdef HAVE_SA_LEN -- if (ifp -> ifr_addr.sa_len > sizeof (struct sockaddr)) -- i += (sizeof ifp -> ifr_name) + ifp -> ifr_addr.sa_len; -- else --#endif -- i += sizeof *ifp; -+ for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) { - - #ifdef ALIAS_NAMES_PERMUTED -- if ((s = strrchr (ifp -> ifr_name, ':'))) { -+ if ((s = strrchr (ifa -> ifa_name, ':'))) { - *s = 0; - } - #endif - - #ifdef SKIP_DUMMY_INTERFACES -- if (!strncmp (ifp -> ifr_name, "dummy", 5)) -+ if (!strncmp (ifa -> ifa_name, "dummy", 5)) - continue; - #endif - -- -- /* See if this is the sort of interface we want to -- deal with. */ -- strcpy (ifr.ifr_name, ifp -> ifr_name); -- if (ioctl (sock, SIOCGIFFLAGS, &ifr) < 0) -- log_fatal ("Can't get interface flags for %s: %m", -- ifr.ifr_name); -- - /* See if we've seen an interface that matches this one. */ - for (tmp = interfaces; tmp; tmp = tmp -> next) -- if (!strcmp (tmp -> name, ifp -> ifr_name)) -+ if (!strcmp (tmp -> name, ifa -> ifa_name)) - break; - -- /* Skip non broadcast interfaces (plus loopback and -- point-to-point in case an OS incorrectly marks them -- as broadcast). Also skip down interfaces unless we're -+ /* See if this is the sort of interface we want to -+ deal with. Skip loopback, point-to-point and down -+ interfaces, except don't skip down interfaces if we're - trying to get a list of configurable interfaces. */ -- if (((!(ifr.ifr_flags & IFF_BROADCAST) || -- ifr.ifr_flags & IFF_LOOPBACK || -- ifr.ifr_flags & IFF_POINTOPOINT) && !tmp) || -- (!(ifr.ifr_flags & IFF_UP) && -+ if ((ifa->ifa_flags & IFF_LOOPBACK) || -+ (ifa->ifa_flags & IFF_POINTOPOINT) || -+ (!(ifa->ifa_flags & IFF_UP) && - state != DISCOVER_UNCONFIGURED)) - continue; -- -+ - /* If there isn't already an interface by this name, - allocate one. */ - if (!tmp) { -@@ -276,9 +206,9 @@ - status = interface_allocate (&tmp, MDL); - if (status != ISC_R_SUCCESS) - log_fatal ("Error allocating interface %s: %s", -- ifp -> ifr_name, -+ ifa -> ifa_name, - isc_result_totext (status)); -- strcpy (tmp -> name, ifp -> ifr_name); -+ strcpy (tmp -> name, ifa -> ifa_name); - interface_snorf (tmp, ir); - interface_dereference (&tmp, MDL); - tmp = interfaces; /* XXX */ -@@ -290,9 +220,9 @@ - /* If we have the capability, extract link information - and record it in a linked list. */ - #ifdef HAVE_AF_LINK -- if (ifp -> ifr_addr.sa_family == AF_LINK) { -+ if (ifa -> ifa_addr->sa_family == AF_LINK) { - struct sockaddr_dl *foo = ((struct sockaddr_dl *) -- (&ifp -> ifr_addr)); -+ (ifa -> ifa_addr)); - #if defined (HAVE_SIN_LEN) - tmp -> hw_address.hlen = foo -> sdl_alen; - #else -@@ -305,12 +235,11 @@ - } else - #endif /* AF_LINK */ - -- if (ifp -> ifr_addr.sa_family == AF_INET) { -+ if (ifa -> ifa_addr->sa_family == AF_INET) { - struct iaddr addr; - - /* Get a pointer to the address... */ -- memcpy (&foo, &ifp -> ifr_addr, -- sizeof ifp -> ifr_addr); -+ bcopy(ifa->ifa_addr, &foo, sizeof(foo)); - - /* We don't want the loopback interface. */ - if (foo.sin_addr.s_addr == htonl (INADDR_LOOPBACK) && -@@ -323,16 +252,15 @@ - found, keep a pointer to ifreq structure in - which we found it. */ - if (!tmp -> ifp) { --#ifdef HAVE_SA_LEN -- unsigned len = ((sizeof ifp -> ifr_name) + -- ifp -> ifr_addr.sa_len); --#else -- unsigned len = sizeof *ifp; --#endif -+ -+ int len = (IFNAMSIZ + -+ ifa -> ifa_addr->sa_len); - tif = (struct ifreq *)dmalloc (len, MDL); - if (!tif) - log_fatal ("no space for ifp."); -- memcpy (tif, ifp, len); -+ strlcpy(tif->ifr_name, ifa->ifa_name, IFNAMSIZ); -+ memcpy(&tif->ifr_addr, ifa->ifa_addr, -+ ifa->ifa_addr->sa_len); - tmp -> ifp = tif; - tmp -> primary_address = foo.sin_addr; - } -@@ -346,9 +274,6 @@ - } - } - -- /* If we allocated a buffer, free it. */ -- if (ic.ifc_ifcu.ifcu_buf != buf) -- dfree (ic.ifc_ifcu.ifcu_buf, MDL); - - #if defined (LINUX_SLASHPROC_DISCOVERY) - /* On Linux, interfaces that don't have IP addresses don't -@@ -529,6 +454,7 @@ - be able to configure, we can quit now. */ - if (state == DISCOVER_UNCONFIGURED) { - close (sock); -+ freeifaddrs(ifap); - return; - } - -@@ -674,6 +600,7 @@ - } - - close (sock); -+ freeifaddrs(ifap); - - if (state == DISCOVER_SERVER && wifcount == 0) { - log_info ("%s", ""); diff --git a/net/isc-dhcp30-server/files/patch-common::dispatch.c b/net/isc-dhcp30-server/files/patch-common::dispatch.c deleted file mode 100644 index 0aa709cf0860..000000000000 --- a/net/isc-dhcp30-server/files/patch-common::dispatch.c +++ /dev/null @@ -1,29 +0,0 @@ ---- common/dispatch.c.orig Sun Nov 17 03:26:57 2002 -+++ common/dispatch.c Wed Mar 3 16:20:15 2004 -@@ -95,11 +95,26 @@ - void dispatch () - { - struct timeval tv, *tvp; -+#ifdef ENABLE_POLLING_MODE -+ struct timeval *tvp_new; -+#endif - isc_result_t status; -+ TIME cur_time; - -+ tvp = NULL; -+#ifdef ENABLE_POLLING_MODE -+ tvp_new = NULL; -+#endif - /* Wait for a packet or a timeout... XXX */ - do { - tvp = process_outstanding_timeouts (&tv); -+#ifdef ENABLE_POLLING_MODE -+ GET_TIME (&cur_time); -+ add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0); -+ tvp_new = process_outstanding_timeouts(&tv); -+ if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec)) -+ tvp = tvp_new; -+#endif /* ENABLE_POLLING_MODE */ - status = omapi_one_dispatch (0, tvp); - } while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS); - log_fatal ("omapi_one_dispatch failed: %s -- exiting.", diff --git a/net/isc-dhcp30-server/files/patch-common::parse.c b/net/isc-dhcp30-server/files/patch-common::parse.c deleted file mode 100644 index 637d69e7f41b..000000000000 --- a/net/isc-dhcp30-server/files/patch-common::parse.c +++ /dev/null @@ -1,22 +0,0 @@ ---- common/parse.c.orig 2 Sep 2003 11:01:23 -0000 -+++ common/parse.c 22 Feb 2004 10:44:52 -0000 -@@ -414,6 +414,7 @@ - { - const char *val; - enum dhcp_token token; -+ int32_t num; - - token = next_token (&val, (unsigned *)0, cfile); - if (token != NUMBER) { -@@ -421,9 +422,9 @@ - skip_to_semi (cfile); - return; - } -- convert_num (cfile, (unsigned char *)timep, val, 10, 32); -+ convert_num (cfile, (unsigned char *)&num, val, 10, 32); - /* Unswap the number - convert_num returns stuff in NBO. */ -- *timep = ntohl (*timep); /* XXX */ -+ *timep = ntohl (num); - - parse_semi (cfile); - } diff --git a/net/isc-dhcp30-server/files/patch-configure b/net/isc-dhcp30-server/files/patch-configure deleted file mode 100644 index 5aff6909acce..000000000000 --- a/net/isc-dhcp30-server/files/patch-configure +++ /dev/null @@ -1,41 +0,0 @@ ---- configure.orig Sat Apr 20 23:44:13 2002 -+++ configure Mon Apr 28 23:02:10 2003 -@@ -13,6 +13,9 @@ - elif [ x$1 = x--dirs ]; then - dirs=$2 - shift -+ elif [ x$1 = x--subsys ]; then -+ subsys=$2 -+ shift - elif [ x$1 = x--no-links ]; then - nolinks=YES - elif [ x$1 = x--copts ]; then -@@ -233,7 +236,14 @@ - fi - - if [ x"$dirs" = x ]; then -- dirs=". client server relay common omapip dhcpctl minires dst" -+ dirs=". common minires dst omapip dhcpctl" -+ if [ x$subsys = x ]; then -+ dirs="$dirs server omshell client relay" -+ elif [ x$subsys = xserver ]; then -+ dirs="$dirs server omshell" -+ elif [ x$subsys = xclient -o x$subsys = xrelay ]; then -+ dirs="$dirs $subsys" -+ fi - fi - - for foo in $dirs; do -@@ -253,7 +263,11 @@ - - # Make the link tree in which to actually build. - if [ x$nolinks = x ]; then -- make links -+ if [ x$subsys = x ]; then -+ make links -+ else -+ make links.$subsys -+ fi - fi - - exit 0 diff --git a/net/isc-dhcp30-server/files/patch-dhcpctl::Makefile.dist b/net/isc-dhcp30-server/files/patch-dhcpctl::Makefile.dist deleted file mode 100644 index f840cfba6278..000000000000 --- a/net/isc-dhcp30-server/files/patch-dhcpctl::Makefile.dist +++ /dev/null @@ -1,79 +0,0 @@ ---- dhcpctl/Makefile.dist.orig Thu Mar 3 17:55:23 2005 -+++ dhcpctl/Makefile.dist Mon Jul 25 08:33:33 2005 -@@ -22,11 +22,11 @@ - # http://www.isc.org/ - # - --CATMANPAGES = dhcpctl.cat3 omshell.cat1 --SEDMANPAGES = dhcpctl.man3 omshell.man1 -+CATMANPAGES = dhcpctl.cat3 -+SEDMANPAGES = dhcpctl.man3 - SRC = dhcpctl.c callback.c remote.c - OBJ = dhcpctl.o callback.o remote.o --MAN = dhcpctl.3 omshell.1 -+MAN = dhcpctl.3 - HDRS = dhcpctl.h - - INCLUDES = $(BINDINC) -I$(TOP)/includes -@@ -34,10 +34,7 @@ - DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \ - ../omapip/libomapi.a ../dst/libdst.a - --all: libdhcpctl.a omshell cltest $(CATMANPAGES) -- --omshell: omshell.o $(DHCPCTLLIBS) -- $(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS) -+all: libdhcpctl.a cltest $(CATMANPAGES) - - cltest: cltest.o $(DHCPCTLLIBS) - $(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS) -@@ -48,8 +45,7 @@ - $(RANLIB) libdhcpctl.a - - install: all $(CATMANPAGES) -- for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \ -- $(USERBINDIR); do \ -+ for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR); do \ - foo=""; \ - for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ - foo=$${foo}/$$bar; \ -@@ -69,16 +65,12 @@ - $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \ - $(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \ - done -- $(INSTALL) omshell $(DESTDIR)$(USERBINDIR) -- $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell -- $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \ -- $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT) - - depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC) - - clean: -- -rm -f $(OBJ) omshell.o omshell cltest.o cltest -+ -rm -f $(OBJ) cltest.o cltest - - realclean: clean - -rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES) -@@ -87,7 +79,7 @@ - -rm -f Makefile - - links: -- @for foo in $(SRC) $(MAN) omshell.c cltest.c $(HDRS); do \ -+ @for foo in $(SRC) $(MAN) cltest.c $(HDRS); do \ - if [ ! -b $$foo ]; then \ - rm -f $$foo; \ - fi; \ -@@ -100,12 +92,5 @@ - dhcpctl.man3: dhcpctl.3 - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ - -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3 -- --omshell.cat1: omshell.man1 -- nroff -man omshell.man1 >omshell.cat1 -- --omshell.man1: omshell.1 -- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ -- -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 - - # Dependencies (semi-automatically-generated) diff --git a/net/isc-dhcp30-server/files/patch-dhcpd.conf b/net/isc-dhcp30-server/files/patch-dhcpd.conf deleted file mode 100644 index 030e89874d8d..000000000000 --- a/net/isc-dhcp30-server/files/patch-dhcpd.conf +++ /dev/null @@ -1,12 +0,0 @@ ---- server/dhcpd.conf.orig Thu Jan 25 03:33:11 2001 -+++ server/dhcpd.conf Wed Jan 30 22:06:52 2002 -@@ -14,6 +14,9 @@ - # network, the authoritative directive should be uncommented. - #authoritative; - -+# ad-hoc DNS update scheme - set to "none" to disable dynamic DNS updates. -+ddns-update-style ad-hoc; -+ - # Use this to send dhcp log messages to a different log file (you also - # have to hack syslog.conf to complete the redirection). - log-facility local7; diff --git a/net/isc-dhcp30-server/files/patch-dst::Makefile.dist b/net/isc-dhcp30-server/files/patch-dst::Makefile.dist deleted file mode 100644 index ad45436b1629..000000000000 --- a/net/isc-dhcp30-server/files/patch-dst::Makefile.dist +++ /dev/null @@ -1,29 +0,0 @@ ---- dst/Makefile.dist.orig Sun Nov 17 03:27:43 2002 -+++ dst/Makefile.dist Fri Mar 5 23:40:45 2004 -@@ -26,12 +26,24 @@ - - all: libdst.a - --install: -- - libdst.a: $(OBJ) - rm -f dst.a - ar cruv libdst.a $(OBJ) - $(RANLIB) libdst.a -+ -+install: all -+ for dir in $(LIBDIR);\ -+ do \ -+ foo=""; \ -+ for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ -+ foo=$${foo}/$$bar; \ -+ if [ ! -d $$foo ]; then \ -+ mkdir $$foo; \ -+ chmod 755 $$foo; \ -+ fi; \ -+ done; \ -+ done -+ $(INSTALL) libdst.a $(DESTDIR)$(LIBDIR) - - depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC) diff --git a/net/isc-dhcp30-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp30-server/files/patch-includes::cf::freebsd.h deleted file mode 100644 index 9a3f4c636b09..000000000000 --- a/net/isc-dhcp30-server/files/patch-includes::cf::freebsd.h +++ /dev/null @@ -1,62 +0,0 @@ ---- includes/cf/freebsd.h.orig Wed Mar 3 02:32:39 2004 -+++ includes/cf/freebsd.h Wed Mar 3 02:31:56 2004 -@@ -42,7 +42,7 @@ - */ - - #include <syslog.h> --#include <sys/types.h> -+#include <sys/param.h> - #include <string.h> - #include <paths.h> - #include <errno.h> -@@ -101,6 +101,10 @@ - #define SOCKLEN_T int - #endif - -+#ifdef RESCUE -+#define _PATH_DHCLIENT_SCRIPT "/rescue/dhclient-script" -+#endif -+ - #if defined (USE_DEFAULT_NETWORK) - # define USE_BPF - #endif -@@ -111,6 +115,9 @@ - #endif /* HAVE_DEV_RANDOM */ - - const char *cmds[] = { -+#ifndef RESCUE -+ /* rescue environment can't rely on these ... */ -+ /* Actually, /sbin/dhclient shouldn't use these, either. */ - "/bin/ps -axlw 2>&1", - "/usr/sbin/arp -an 2>&1", - "/usr/bin/netstat -an 2>&1", -@@ -121,10 +128,12 @@ - "/usr/sbin/iostat 2>&1", - "/usr/bin/vmstat 2>&1", - "/usr/bin/w 2>&1", -+#endif - NULL - }; - - const char *dirs[] = { -+#ifndef RESCUE - "/tmp", - "/usr/tmp", - ".", -@@ -134,13 +143,16 @@ - "/var/mail", - "/home", - "/usr/home", -+#endif - NULL - }; - - const char *files[] = { -+#ifndef RESCUE - "/var/log/messages", - "/var/log/wtmp", - "/var/log/lastlog", -+#endif - NULL - }; - #endif /* NEED_PRAND_CONF */ diff --git a/net/isc-dhcp30-server/files/patch-includes::dhcpd.h b/net/isc-dhcp30-server/files/patch-includes::dhcpd.h deleted file mode 100644 index 1933e0b4037a..000000000000 --- a/net/isc-dhcp30-server/files/patch-includes::dhcpd.h +++ /dev/null @@ -1,56 +0,0 @@ ---- includes/dhcpd.h.orig Mon Feb 10 02:22:46 2003 -+++ includes/dhcpd.h Wed Mar 3 16:20:09 2004 -@@ -99,6 +99,9 @@ - (((x) >> OPTION_HASH_EXP) & \ - (OPTION_HASH_PTWO - 1))) % OPTION_HASH_SIZE; - -+#define NOLINK 0 -+#define HAVELINK 1 -+ - enum dhcp_shutdown_state { - shutdown_listeners, - shutdown_omapi_connections, -@@ -783,6 +786,11 @@ - unsigned remote_id_len; /* Length of Remote ID. */ - - char name [IFNAMSIZ]; /* Its name... */ -+ int ieee80211; /* True if media is ieee802.11 */ -+ int havemedia; /* True if we have a media table */ -+ int linkstate; /* True if we have link */ -+ int polling; /* True if polling is enabled */ -+ int forcediscover; /* True if a discover is needed */ - int index; /* Its index. */ - int rfdesc; /* Its read file descriptor. */ - int wfdesc; /* Its write file descriptor, if -@@ -1845,6 +1853,9 @@ - extern const char *path_dhclient_pid; - extern char *path_dhclient_script; - extern int interfaces_requested; -+#ifdef ENABLE_POLLING_MODE -+extern int polling_interval; -+#endif - - extern struct client_config top_level_config; - -@@ -1858,12 +1869,21 @@ - void send_decline PROTO ((void *)); - - void state_reboot PROTO ((void *)); -+#ifdef ENABLE_POLLING_MODE -+void state_background PROTO ((void *)); -+void state_polling PROTO ((void *)); -+#endif - void state_init PROTO ((void *)); - void state_selecting PROTO ((void *)); - void state_requesting PROTO ((void *)); - void state_bound PROTO ((void *)); - void state_stop PROTO ((void *)); - void state_panic PROTO ((void *)); -+ -+#if __FreeBSD_version > 502010 -+void set_ieee80211 PROTO ((struct interface_info *)); -+#endif -+int interface_active PROTO ((struct interface_info *)); - - void bind_lease PROTO ((struct client_state *)); - diff --git a/net/isc-dhcp30-server/files/patch-server::dhcpd.c b/net/isc-dhcp30-server/files/patch-server::dhcpd.c deleted file mode 100644 index e2e6e24e814e..000000000000 --- a/net/isc-dhcp30-server/files/patch-server::dhcpd.c +++ /dev/null @@ -1,288 +0,0 @@ ---- server/dhcpd.c.orig Thu Jun 10 19:59:52 2004 -+++ server/dhcpd.c Fri Jun 25 15:49:09 2004 -@@ -47,6 +47,22 @@ - #include "version.h" - #include <omapip/omapip_p.h> - -+#if defined (PARANOIA) -+#include <sys/types.h> -+#include <unistd.h> -+#include <pwd.h> -+/* get around the ISC declaration of group */ -+#define group real_group -+#include <grp.h> -+#undef group -+#endif /* PARANOIA */ -+#if defined (JAIL) -+#include <sys/param.h> -+#include <sys/jail.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#endif /* JAIL */ -+ - static void usage PROTO ((void)); - - TIME cur_time; -@@ -195,6 +211,35 @@ - omapi_object_dereference (&listener, MDL); - } - -+#if defined (PARANOIA) -+/* to be used in one of two possible scenarios */ -+static void setup_chroot (char *chroot_dir) -+{ -+ if (geteuid ()) -+ log_fatal ("you must be root to use chroot"); -+ if (chroot (chroot_dir)) -+ log_fatal ("chroot(\"%s\"): %m", chroot_dir); -+ if (chdir ("/")) -+ /* probably permission denied */ -+ log_fatal ("chdir(\"/\"): %m"); -+} -+#endif /* PARANOIA */ -+ -+#if defined (JAIL) -+static void setup_jail (char *chroot_dir, char *hostname, u_int32_t ip_number) -+{ -+ struct jail j; -+ -+ j.version = 0; -+ j.path = chroot_dir; -+ j.hostname = hostname; -+ j.ip_number = ip_number; -+ -+ if (jail (&j) < 0) -+ log_fatal ("jail(%s, %s): %m", chroot_dir, hostname); -+} -+#endif /* JAIL */ -+ - int main (argc, argv, envp) - int argc; - char **argv, **envp; -@@ -227,6 +272,25 @@ - char *traceinfile = (char *)0; - char *traceoutfile = (char *)0; - #endif -+#if defined (PARANOIA) -+ char *set_user = 0; -+ char *set_group = 0; -+ uid_t set_uid = 0; -+ gid_t set_gid = 0; -+ int early_chroot = 0; -+ int no_dhcpd_user = 0; -+ int no_dhcpd_group = 0; -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ char *set_chroot = 0; -+ int no_dhcpd_chroot = 0; -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ char *set_jail = 0; -+ u_int32_t jail_ip_address = 0; /* Good as long as it's IPv4 ... */ -+ int no_dhcpd_jail = 0; -+ char *s2; -+#endif /* JAIL */ - - /* Make sure we have stdin, stdout and stderr. */ - status = open ("/dev/null", O_RDWR); -@@ -289,6 +353,39 @@ - if (++i == argc) - usage (); - server = argv [i]; -+#if defined (PARANOIA) -+ } else if (!strcmp (argv [i], "-user")) { -+ if (++i == argc) -+ usage (); -+ set_user = argv [i]; -+ no_dhcpd_user = 1; -+ } else if (!strcmp (argv [i], "-group")) { -+ if (++i == argc) -+ usage (); -+ set_group = argv [i]; -+ no_dhcpd_group = 1; -+ } else if (!strcmp (argv [i], "-early_chroot")) { -+ early_chroot = 1; -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ } else if (!strcmp (argv [i], "-chroot")) { -+ if (++i == argc) -+ usage (); -+ set_chroot = argv [i]; -+ no_dhcpd_chroot = 1; -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ } else if (!strcmp (argv [i], "-jail")) { -+ if (++i == argc) -+ usage (); -+ set_jail = argv [i]; -+ if (++i == argc) -+ usage (); -+ if (ascii2addr (AF_INET, argv[i], &jail_ip_address) < 0) -+ log_fatal ("invalid ip address: %s", argv[i]); -+ jail_ip_address = ntohl (jail_ip_address); -+ no_dhcpd_jail = 1; -+#endif /* JAIL */ - } else if (!strcmp (argv [i], "-cf")) { - if (++i == argc) - usage (); -@@ -366,6 +463,28 @@ - if (!no_dhcpd_pid && (s = getenv ("PATH_DHCPD_PID"))) { - path_dhcpd_pid = s; - } -+#if defined (PARANOIA) -+ if (!no_dhcpd_user && (s = getenv ("DHCPD_USER"))) { -+ set_user = s; -+ } -+ if (!no_dhcpd_group && (s = getenv ("DHCPD_GROUP"))) { -+ set_group = s; -+ } -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ if (!no_dhcpd_chroot && (s = getenv ("PATH_DHCPD_CHROOT"))) { -+ set_chroot = s; -+ } -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ if (!no_dhcpd_jail && (s = getenv ("DHCPD_JAIL_HOSTNAME")) && -+ (s2 = getenv ("DHCPD_JAIL_IPADDRESS"))) { -+ set_jail = s; -+ if (ascii2addr (AF_INET, s2, &jail_ip_address) < 0) -+ log_fatal ("invalid ip address: %s", s2); -+ jail_ip_address = ntohl (jail_ip_address); -+ } -+#endif /* JAIL */ - - if (!quiet) { - log_info ("%s %s", message, DHCP_VERSION); -@@ -388,6 +507,57 @@ - trace_seed_stop, MDL); - #endif - -+#if defined (PARANOIA) -+ /* get user and group info if those options were given */ -+ if (set_user) { -+ struct passwd *tmp_pwd; -+ -+ if (geteuid ()) -+ log_fatal ("you must be root to set user"); -+ -+ if (!(tmp_pwd = getpwnam (set_user))) -+ log_fatal ("no such user: %s", set_user); -+ -+ set_uid = tmp_pwd->pw_uid; -+ -+ /* use the user's group as the default gid */ -+ if (!set_group) -+ set_gid = tmp_pwd->pw_gid; -+ } -+ -+ if (set_group) { -+/* get around the ISC declaration of group */ -+#define group real_group -+ struct group *tmp_grp; -+ -+ if (geteuid ()) -+ log_fatal ("you must be root to set group"); -+ -+ if (!(tmp_grp = getgrnam (set_group))) -+ log_fatal ("no such group: %s", set_group); -+ -+ set_gid = tmp_grp->gr_gid; -+#undef group -+ } -+#endif /* PARANOIA */ -+#if defined (JAIL) -+ if (set_jail) { -+ /* Initialize icmp support... */ -+ if (!cftest && !lftest) -+ icmp_startup (1, lease_pinged); -+ if(!set_chroot) -+ set_chroot = "/"; -+ setup_jail (set_chroot, set_jail, jail_ip_address); -+ } -+#endif /* JAIL */ -+#if defined (PARANOIA) && defined (JAIL) -+ else -+#endif /* PARANOIA && JAIL */ -+#if defined (PARANOIA) -+ if (early_chroot && set_chroot) -+ setup_chroot (set_chroot); -+#endif /* PARANOIA */ -+ - /* Default to the DHCP/BOOTP port. */ - if (!local_port) - { -@@ -462,6 +632,9 @@ - #endif - - /* Initialize icmp support... */ -+#if defined (JAIL) -+ if (!set_jail) -+#endif /* JAIL */ - if (!cftest && !lftest) - icmp_startup (1, lease_pinged); - -@@ -491,6 +664,14 @@ - - postconf_initialization (quiet); - -+#if defined (PARANOIA) -+#if defined (JAIL) -+ if (!set_jail) -+#endif /* JAIL */ -+ if (!early_chroot && set_chroot) -+ setup_chroot (set_chroot); -+#endif /* PARANOIA */ -+ - /* test option should cause an early exit */ - if (cftest && !lftest) - exit(0); -@@ -533,7 +714,22 @@ - else if (pid) - exit (0); - } -+ -+#if defined (PARANOIA) -+ /* change uid to the specified one */ -+ if (set_gid) { -+ if (setgroups (0, (void *)0)) -+ log_fatal ("setgroups: %m"); -+ if (setgid (set_gid)) -+ log_fatal ("setgid(%d): %m", (int) set_gid); -+ } - -+ if (set_uid) { -+ if (setuid (set_uid)) -+ log_fatal ("setuid(%d): %m", (int) set_uid); -+ } -+#endif /* PARANOIA */ -+ - /* Read previous pid file. */ - if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) { - status = read (i, pbuf, (sizeof pbuf) - 1); -@@ -877,8 +1073,24 @@ - log_info (copyright); - log_info (arr); - -- log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s", -+ log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s%s%s%s", - "\n [-cf config-file] [-lf lease-file]", -+ -+#if defined (PARANOIA) -+ /* meld into the following string */ -+ "\n [-user user] [-group group]", -+ "\n [-chroot dir] [-early_chroot]", -+#else /* PARANOIA */ -+ "", "", -+#endif /* PARANOIA */ -+ -+#if defined (JAIL) -+ /* then also these ones */ -+ "\n [-jail name ip]", -+#else /* JAIL */ -+ "", -+#endif /* JAIL */ -+ - #if defined (TRACING) - "\n [-tf trace-output-file]", - "\n [-play trace-input-file]", diff --git a/net/isc-dhcp30-server/files/patch-site.conf b/net/isc-dhcp30-server/files/patch-site.conf deleted file mode 100644 index 1149e0c7925c..000000000000 --- a/net/isc-dhcp30-server/files/patch-site.conf +++ /dev/null @@ -1,42 +0,0 @@ ---- site.conf.orig Wed Jul 7 17:20:10 1999 -+++ site.conf Wed Mar 3 14:00:14 2004 -@@ -1,2 +1,39 @@ - # Put local site configuration stuff here to override the default - # settings in Makefile.conf -+ -+PREFIX ?= /usr/local -+ -+USERBINDIR = $(PREFIX)/bin -+BINDIR = $(PREFIX)/sbin -+CLIENTBINDIR = $(PREFIX)/sbin -+ADMMANDIR = $(PREFIX)/man/man8 -+ADMMANEXT = .8 -+FFMANDIR = $(PREFIX)/man/man5 -+FFMANEXT = .5 -+LIBMANDIR = $(PREFIX)/man/man3 -+LIBMANEXT = .3 -+USRMANDIR = $(PREFIX)/man/man1 -+USRMANEXT = .1 -+MANCAT = man -+# INSTALL = ${INSTALL_DATA} -+# MANINSTALL = ${INSTALL_MAN} -+ETC = $(PREFIX)/etc -+LIBDIR = ${PREFIX}/lib -+INCDIR = ${PREFIX}/include -+CLIENT_PATH = \"PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin\" -+ -+DEBUG ?= #none -+ -+CFLAGS += -D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\" -+CFLAGS += -D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\" -+CFLAGS += -D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\" -+ -+CFLAGS += -D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\" -+ -+CFLAGS += -D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\" -+CFLAGS += -D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\" -+CFLAGS += -D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\" -+CFLAGS += -D_PATH_DHCLIENT_PID=\"$(VARRUN)/dhclient.pid\" -+ -+CFLAGS += -Dwarn=dhcp_warn -+CFLAGS += -DNOMINUM diff --git a/net/isc-dhcp30-server/pkg-descr b/net/isc-dhcp30-server/pkg-descr deleted file mode 100644 index 86bbb3cc62f0..000000000000 --- a/net/isc-dhcp30-server/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server (this port) - * A DHCP client - * A DHCP relay agent - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp30-server/pkg-install b/net/isc-dhcp30-server/pkg-install deleted file mode 100644 index 8bafd2bed768..000000000000 --- a/net/isc-dhcp30-server/pkg-install +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -[ $# != 2 ] && exit 1 -[ -z "${PKG_PREFIX}" ] && exit 1 -[ -n "${BATCH}" ] && exit 0 - -case $2 in -POST-INSTALL) - ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall - ;; -DEINSTALL) - ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall - ;; -POST-DEINSTALL|PRE-INSTALL) - ;; -*) - echo "usage: $0 <PKG_NAME> {PRE-INSTALL|POST-INSTALL|DEINSTALL|POST-DEINSTALL}" >&2 - exit 1 - ;; -esac diff --git a/net/isc-dhcp30-server/pkg-message b/net/isc-dhcp30-server/pkg-message deleted file mode 100644 index 754d49ae331f..000000000000 --- a/net/isc-dhcp30-server/pkg-message +++ /dev/null @@ -1,53 +0,0 @@ -**** To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample - to %%PREFIX%%/etc/dhcpd.conf for editing. - -**** This port installs dhcp daemon, but don't invokes dhcpd by default. If - you want to invoke dhcpd at startup, put these lines into /etc/rc.conf. - - dhcpd_enable="YES" # dhcpd enabled? - dhcpd_flags="-q" # command option(s) - dhcpd_conf="%%PREFIX%%/etc/dhcpd.conf" # configuration file - dhcpd_ifaces="" # ethernet interface(s) - dhcpd_withumask="022" # file creation mask - -**** If compiled with paranoia support (the default), the following lines - are also supported: - - dhcpd_chuser_enable="YES" # runs w/o privileges? - dhcpd_withuser="dhcpd" # user name to run as - dhcpd_withgroup="dhcpd" # group name to run as - dhcpd_chroot_enable="YES" # runs chrooted? - dhcpd_devfs_enable="YES" # use devfs if available? - dhcpd_makedev_enable="YES" # use MAKEDEV instead? - dhcpd_rootdir="/var/db/dhcpd" # directory to run in - dhcpd_includedir="<some_dir>" # directory with config- - files to include - dhcpd_flags="-early_chroot" # needs full root - - WARNING: -early_chroot requires a jail(8) like environment to work. - - WARNING: dhcpd_devfs_enable and dhcpd_makedev_enable are mutually - exclusive - dhcpd_makedev_enable make NO sense on FreeBSD 5.x and up! - -**** If compiled with jail support (the default), the following lines are - also supported (-early_chroot and dhcpd_chroot_enable=YES are implied): - - dhcpd_jail_enable="YES" # runs imprisoned? - dhcpd_hostname="<hostname>" # jail hostname - dhcpd_ipaddress="<ip address>" # jail ip address - - WARNING: dhcpd_rootdir needs to point to a full jail(8) environment. - -**** WARNING: never edit the chrooted or jailed dhcpd.conf file but - %%PREFIX%%/etc/dhcpd.conf instead which is always copied where - needed upon startup. - -**** WARNING: %%PREFIX%%/etc/rc.isc-dhcpd.conf is obsolete. rc.conf like - variables are still read there but should be moved /etc/rc.conf or - /etc/rc.conf.d/dhcpd instead. Also, the dhcpd_options variable must - be renamed dhcpd_flags if any. -%%LDAP%% -%%LDAP%%**** You have requested support for the LDAP configuration backend. -%%LDAP%% The OpenLDAP schema file is installed as %%SCHEMA_DIR%%/dhcp.schema. -%%LDAP%% See %%DOCSDIR%%/README.ldap for further LDAP configuration details. diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist deleted file mode 100644 index 3daff57c0e42..000000000000 --- a/net/isc-dhcp30-server/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -@comment $FreeBSD$ -bin/omshell -%%LDAP%%bin/dhcpd-conf-to-ldap.pl -etc/dhcpd.conf.sample -etc/rc.d/isc-dhcpd.sh -sbin/dhcpd -%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema -%%LDAP%%@dirrm %%SCHEMA_DIR%% diff --git a/net/isc-dhcp31-client/Makefile b/net/isc-dhcp31-client/Makefile deleted file mode 100644 index c0799f3e6e54..000000000000 --- a/net/isc-dhcp31-client/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -COMMENT= The ISC Dynamic Host Configuration Protocol client - -# Local variables -# - -SUBSYS= client - -# Local overrides -# - -MASTERDIR= ${.CURDIR}/../isc-dhcp3-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/isc-dhcp31-client/pkg-descr b/net/isc-dhcp31-client/pkg-descr deleted file mode 100644 index 7dc1bc78ea95..000000000000 --- a/net/isc-dhcp31-client/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server - * A DHCP client (this port) - * A DHCP relay agent - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp31-client/pkg-message b/net/isc-dhcp31-client/pkg-message deleted file mode 100644 index b406fd04fbd8..000000000000 --- a/net/isc-dhcp31-client/pkg-message +++ /dev/null @@ -1,10 +0,0 @@ -**** To setup dhclient, you may need to edit /etc/rc.conf to replace the - base system dhclient, such as : - - dhcp_program="%%PREFIX%%/sbin/dhclient" - dhcp_flags="-q" - - See dhclient(8), using the following command, for details about other - possible options: - - MANPATH=%%MAN1PREFIX%%/man man 8 dhclient diff --git a/net/isc-dhcp31-client/pkg-plist b/net/isc-dhcp31-client/pkg-plist deleted file mode 100644 index 1c8e80e6c6eb..000000000000 --- a/net/isc-dhcp31-client/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-client/Attic/pkg-plist,v 1.3 2004-06-26 08:46:05 eik Exp $ -etc/dhclient.conf.sample -@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf -@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf -sbin/dhclient -sbin/dhclient-script -@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases -@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases diff --git a/net/isc-dhcp31-relay/Makefile b/net/isc-dhcp31-relay/Makefile deleted file mode 100644 index e739f7a0e6db..000000000000 --- a/net/isc-dhcp31-relay/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -COMMENT= The ISC Dynamic Host Configuration Protocol relay - -# Local variables -# - -SUBSYS= relay - -# Local overrides -# - -MASTERDIR= ${.CURDIR}/../isc-dhcp3-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/isc-dhcp31-relay/pkg-descr b/net/isc-dhcp31-relay/pkg-descr deleted file mode 100644 index b764dbf45a19..000000000000 --- a/net/isc-dhcp31-relay/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server - * A DHCP client - * A DHCP relay agent (this port) - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp31-relay/pkg-message b/net/isc-dhcp31-relay/pkg-message deleted file mode 100644 index af6992fb34a5..000000000000 --- a/net/isc-dhcp31-relay/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -**** This port installs dhcp relay daemon, but don't invokes dhcrelay by - default. If you want to invoke dhcrelay at startup, put these lines - into /etc/rc.conf. - - dhcrelay_enable="YES" - dhcrelay_flags="" # command option(s) - dhcrelay_servers="" # dhcrelay server(s) - dhcrelay_ifaces="" # ethernet interface(s) - -**** For instance, rc.conf like variables are still read from - %%PREFIX%%/etc/rc.isc-dhcrelay.conf. They should be move - into /etc/rc.conf. Also, the dhcrelay_options variable - must be renamed dhcrelay_flags. diff --git a/net/isc-dhcp31-relay/pkg-plist b/net/isc-dhcp31-relay/pkg-plist deleted file mode 100644 index fc8db48c3d96..000000000000 --- a/net/isc-dhcp31-relay/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $ -etc/rc.d/isc-dhcrelay.sh -sbin/dhcrelay diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile deleted file mode 100644 index 77309c5b0304..000000000000 --- a/net/isc-dhcp31-server/Makefile +++ /dev/null @@ -1,357 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 7 Mar 1996 -# Whom: se -# -# $FreeBSD$ -# - -PORTNAME= dhcp -PORTVERSION= 3.0.3 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_ISC} -MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history -PKGNAMEPREFIX= isc- -PKGNAMESUFFIX= 3-${SUBSYS} -DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL} - -MAINTAINER= Joerg.Pulz@frm2.tum.de -COMMENT?= The ISC Dynamic Host Configuration Protocol server - -USE_REINPLACE= yes -USE_RC_SUBR= yes - -SUBSYS?= server - -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} -.if ${SUBSYS} == client -OPTIONS= INTERFACE_POLLING "interface polling support" on -.endif -.if ${SUBSYS} == server -OPTIONS= DHCP_PARANOIA "add -user, -group and -chroot options" on \ - DHCP_JAIL "add -chroot and -jail options" on \ - DHCP_SOCKETS "use sockets instead of /dev/bpf (jail-only)" off \ - DHCP_LDAP "add experimental LDAP backend support" off \ - DHCP_LDAP_SSL "support LDAP connection over SSL/TLS" on \ - OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \ - OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off \ - DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off -.endif - -.include <bsd.port.pre.mk> - -.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP) -# Based on patch from Brian Masney : -PATCH_SITES= http://www.newwave.net/~masneyb/:ldap \ - ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:ldap -PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch:ldap -PATCH_DIST_STRIP= -p1 - -USE_PERL5_RUN= yes -USE_OPENLDAP= yes - -.if !defined(WITHOUT_DHCP_LDAP_SSL) -USE_OPENSSL= yes -# hack to get bsd.openssl.mk included at this late state -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -.endif -.endif - -.if ${SUBSYS} == server && defined(WITH_DHCP_LQ) -# Based on patch from Dmitry Sukhodoev : -PATCH_SITES+= http://bingo.ru/~raven/FreeBSD/patches/:dlq \ - ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:dlq -PATCHFILES+= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch:dlq -.endif - -# Global variables -# - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --subsys ${SUBSYS} -ALL_TARGET= all.${SUBSYS} -INSTALL_TARGET= install.${SUBSYS} -SCRIPTS_ENV+= PKG_PREFIX=${PREFIX} - -.if ${SUBSYS} == client -MAN5= dhclient.conf.5 dhclient.leases.5 -MAN8= dhclient.8 dhclient-script.8 -.elif ${SUBSYS} == server -MAN1= omshell.1 -MAN5= dhcpd.conf.5 dhcpd.leases.5 -MAN8= dhcpd.8 -.elif ${SUBSYS} == relay -MAN8= dhcrelay.8 -.else -MAN3= dhcpctl.3 omapi.3 -.endif -.if ${SUBSYS} != relay -MAN5+= dhcp-eval.5 dhcp-options.5 -.endif - -MSG_FILE= ${.CURDIR}/pkg-message -DESCR= ${.CURDIR}/pkg-descr -PKGINSTALL= ${.CURDIR}/pkg-install -PKGDEINSTALL= ${PKGINSTALL} -PKGMESSAGE= ${WRKDIR}/pkg-message -PLIST= ${.CURDIR}/pkg-plist - -# Local variables -# - -# for instance, possible versions are: -# 1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2 -# which have to become: -# 1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2.3, 1.2 -# so, the magic things are: -VERSION= -PATCHLEVEL= -.if ${PORTVERSION:R:E:M[br]*} != "" -RELEASE= ${PORTVERSION:R:R} -VERSION= ${PORTVERSION:R:E:S/b/beta/:S/r/rc/} -PATCHLEVEL= pl${PORTVERSION:E} -.elif ${PORTVERSION:E:M[br]*} != "" -RELEASE= ${PORTVERSION:R} -VERSION= ${PORTVERSION:E:S/b/beta/:S/r/rc/} -#.elif ${PORTVERSION:R:E} != "" -#RELEASE= ${PORTVERSION:R} -#PATCHLEVEL= pl${PORTVERSION:E} -.else -RELEASE= ${PORTVERSION} -.endif - -PATCH_SUBDIRS= common minires dst omapip -.if ${SUBSYS} == server || ${SUBSYS} == devel -PATCH_SUBDIRS+= dhcpctl -.endif -.if ${SUBSYS} != devel -PATCH_SUBDIRS+= ${SUBSYS} -.endif -.if ${SUBSYS} == server -PATCH_SUBDIRS+= omshell -.endif - -.if !defined(NOPORTDOCS) -PORTDOCS= LICENSE README RELNOTES -.endif -.if ${SUBSYS} == client -BIN_FILES= dhclient -LOCAL_CONF_FILES= dhclient.conf -SAMP_FILES= client/dhclient.conf -DATA_FILES= dhclient.leases -.elif ${SUBSYS} == server -BIN_FILES= dhcpd omshell -RC_FILES= isc-dhcpd -SAMP_FILES= server/dhcpd.conf -DATA_FILES= dhcpd.leases -.if defined(WITH_DHCP_LDAP) -PORTDOCS+= README.ldap -LDAP_SCRIPT= contrib/dhcpd-conf-to-ldap.pl -LDAP_SCHEMA= contrib/dhcp.schema -.endif -.elif ${SUBSYS} == relay -BIN_FILES= dhcrelay -RC_FILES= isc-dhcrelay -.endif - -SAMP_SUFX= .sample - -CONF_DIR= ${PREFIX}/etc -RC_DIR= ${PREFIX}/etc/rc.d -SCHEMA_DIR= ${PREFIX}/share/${PKGBASE} -DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} -DATADIR= /var/db - -PLIST_SUB+= SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" -.if defined(WITH_DHCP_LDAP) -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " -.endif -REINPLACE_SUB= PREFIX=${PREFIX} -RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -.if ${OSVERSION} >= 502100 -RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin -.else -RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin -.endif -.if !defined(WITHOUT_DHCP_PARANOIA) -RCSCRIPTS_SUB+= PARANOIA=YES -.else -RCSCRIPTS_SUB+= PARANOIA=NO -.endif -.if !defined(WITHOUT_DHCP_JAIL) -RCSCRIPTS_SUB+= JAIL=YES -.else -RCSCRIPTS_SUB+= JAIL=NO -.endif -PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ - DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}" - -# Post-extract -# - -post-extract: extract-omshell extract-script - -extract-omshell: - @${MKDIR} ${WRKSRC}/omshell - @${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell - @${CP} ${FILESDIR}/omshell::Makefile.dist \ - ${WRKSRC}/omshell/Makefile.dist - -extract-script: - @${CP} ${FILESDIR}/client::scripts::freebsd ${WRKSRC}/client/scripts/freebsd - -# Post-patch -# - -post-patch: patch-scripts patch-makefile-conf \ - patch-makefiles-dist patch-man-pages \ - patch-pkgmessage patch-site-conf \ - patch-rc-scripts patch-dlq - -patch-scripts: - @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/client/dhclient.conf \ - ${WRKSRC}/client/scripts/freebsd - -patch-site-conf: -.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING) - @${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf -.endif -.if ${SUBSYS} == server -.if !defined(WITHOUT_DHCP_PARANOIA) - @${ECHO_CMD} CFLAGS += -DPARANOIA >> ${WRKSRC}/site.conf -.endif -.if !defined(WITHOUT_DHCP_JAIL) - @${ECHO_CMD} CFLAGS += -DJAIL >> ${WRKSRC}/site.conf -.if defined(WITH_DHCP_SOCKETS) - @${ECHO_CMD} CFLAGS += -DUSE_SOCKETS >> ${WRKSRC}/site.conf -.endif -.endif -.if defined(WITH_DHCP_LDAP) - @${ECHO_CMD} CFLAGS += -I${LOCALBASE}/include >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -L${LOCALBASE}/lib >> ${WRKSRC}/site.conf -.if !defined(WITHOUT_DHCP_LDAP_SSL) - @${ECHO_CMD} CFLAGS += -DUSE_SSL -I${OPENSSLINC} >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -L${OPENSSLLIB} >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -lcrypto -lssl >> ${WRKSRC}/site.conf -.endif -.endif -.endif - -patch-makefile-conf: - @${REINPLACE_CMD} -e 's|^DEBUG[ ]*=|# DEBUG ?=|g' \ - ${WRKSRC}/Makefile.conf - -patch-makefiles-dist: -.for subdir in ${PATCH_SUBDIRS} - @${REINPLACE_CMD} -e 's|^CFLAGS[ ]*=|CFLAGS +=|g' \ - ${WRKSRC}/${subdir}/Makefile.dist -.endfor - -# temporary hack - no patch file needed for this typo. -patch-man-pages: - @${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3 - -patch-rc-scripts: -.for f in ${RC_FILES} - @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh -.endfor - -patch-pkgmessage: -.if ${SUBSYS} != devel - @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${MSG_FILE} > ${PKGMESSAGE} -.if defined(WITH_DHCP_LDAP) - @${REINPLACE_CMD} -e 's|^%%LDAP%%||g' ${PKGMESSAGE} -.else - @${REINPLACE_CMD} -e '/^%%LDAP%%/d' ${PKGMESSAGE} -.endif -.endif - -patch-dlq: -.if ${SUBSYS} == server && defined(WITH_DHCP_LQ) -.if defined(WITH_DHCP_LDAP) - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq-ldap -.else - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq -.endif -.endif - -# Post-install -# - -POST-INSTALL= parallel-post-install configure-package display-message -.ORDER: ${POST-INSTALL} -post-install: ${POST-INSTALL} - -parallel-post-install: \ - strip-binary-files install-startup-files \ - install-doc-files install-ldap-files install-sample-files \ - create-conf-files create-data-files - -strip-binary-files: -.for f in ${BIN_FILES} -.if exists(${PREFIX}/bin/${f}) - @${STRIP_CMD} ${PREFIX}/bin/${f} -.endif -.if exists(${PREFIX}/sbin/${f}) - @${STRIP_CMD} ${PREFIX}/sbin/${f} -.endif -.endfor - -install-startup-files: -.for f in ${RC_FILES} - @${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR} -.endfor - -install-doc-files: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif - -install-ldap-files: -.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP) - @${INSTALL_SCRIPT} ${WRKSRC}/${LDAP_SCRIPT} ${PREFIX}/bin - @${MKDIR} ${SCHEMA_DIR} - @${INSTALL_DATA} ${WRKSRC}/${LDAP_SCHEMA} ${SCHEMA_DIR} -.endif - -install-sample-files: -.for f in ${SAMP_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX} -.endfor - -create-conf-files: -.for f in ${LOCAL_CONF_FILES} -.if !exists(${CONF_DIR}/${f}) - @${TOUCH} ${CONF_DIR}/${f} -.endif -.endfor - -create-data-files: -.for f in ${DATA_FILES} -.if !exists(${DATADIR}/${f}) - @${TOUCH} ${DATADIR}/${f} -.endif -.endfor - -configure-package: -.if ${SUBSYS} == server - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - -display-message: -.if ${SUBSYS} != devel - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} -.endif - -.include <bsd.port.post.mk> diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo deleted file mode 100644 index c97ee828e8ca..000000000000 --- a/net/isc-dhcp31-server/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (dhcp-3.0.3.tar.gz) = f91416a0b8ed3fd0601688cf0b7df58f -SHA256 (dhcp-3.0.3.tar.gz) = c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe -SIZE (dhcp-3.0.3.tar.gz) = 870240 -MD5 (dhcp-3.0.3-ldap-patch) = c0d51532696222f3258ff19e91a39ce4 -SHA256 (dhcp-3.0.3-ldap-patch) = da88f17a7c514bdfb38dc53aa2547ae43f6031b7b6f2973728474d9b8d063bf6 -SIZE (dhcp-3.0.3-ldap-patch) = 153377 -MD5 (dhcp-3.0.3-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b -SHA256 (dhcp-3.0.3-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108 -SIZE (dhcp-3.0.3-dlq-patch) = 7655 diff --git a/net/isc-dhcp31-server/files/client::scripts::freebsd b/net/isc-dhcp31-server/files/client::scripts::freebsd deleted file mode 100644 index 9c4c3d3a6f24..000000000000 --- a/net/isc-dhcp31-server/files/client::scripts::freebsd +++ /dev/null @@ -1,510 +0,0 @@ -#!/bin/sh - -############################################################################# -# -# Copyright (c) 1999, MindStep Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# -############################################################################# -# -# This script was written by Patrick Bihan-Faou, patrick@mindstep.com, -# Please contact us for bug reports, etc. -# -############################################################################# -# $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $ -# $MindStep_Tag: CONTRIB_19991207 $ -# from FreeBSD: src/sbin/dhclient/dhclient-script.sh,v 1.2 2002/02/01 18:46:58 alfred Exp -# $FreeBSD$ -############################################################################# - - -############################################################################# -# hook functions prototypes -# -# The "pre_state_XXX_hook" functions are called before the main -# work is done for the state XXX -# -# The "post_state_XXX_hook" functions are called after the main -# work is done for the state XXX -# -# These functions are meant to be overridden by the user's -# dhclient-enter-hooks file -############################################################################# - -pre_state_MEDIUM_hook () { } -pre_state_PREINIT_hook () { } -pre_state_ARPCHECK_hook () { } -pre_state_ARPSEND_hook () { } -pre_state_RENEW_hook () { } -pre_state_REBIND_hook () { } -pre_state_BOUND_hook () { } -pre_state_REBOOT_hook () { } -pre_state_EXPIRE_hook () { } -pre_state_FAIL_hook () { } -pre_state_TIMEOUT_hook () { } -post_state_MEDIUM_hook () { } -post_state_PREINIT_hook () { } -post_state_ARPCHECK_hook () { } -post_state_ARPSEND_hook () { } -post_state_RENEW_hook () { } -post_state_REBIND_hook () { } -post_state_BOUND_hook () { } -post_state_REBOOT_hook () { } -post_state_EXPIRE_hook () { } -post_state_FAIL_hook () { } -post_state_TIMEOUT_hook () { } - -############################################################################# -# make_resolv_conf -# -# This function is called to update the information related to the -# DNS configuration (the resolver part) -############################################################################# -make_resolv_conf () -{ - if [ "x$new_domain_name" != x ] && [ "x$new_domain_name_servers" != x ]; then - echo search $new_domain_name >/etc/resolv.conf - for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf - done - fi -} - -############################################################################# -# set_XXX -# unset_XXX -# -# These function each deal with one particular setting. -# They are OS dependent and may be overridden in the -# dhclient-enter-hooks file if needed. -# -# These functions are called with either "new" or "old" to indicate which -# set of variables to use (new_ip_address or old_ip_address...) -# -############################################################################# - -update_hostname () -{ - local current_hostname=`/bin/hostname` - - if [ "$current_hostname" = "" ] || \ - [ "$current_hostname" = "$old_host_name" ] - then - if [ "$new_host_name" != "$old_host_name" ] - then - $LOGGER "New Hostname: $new_host_name" - hostname $new_host_name - fi - fi -} - -set_ip_address () -{ - local ip - local mask - local bcast - - if [ $# -lt 1 ] - then - return 1 - fi - - eval ip="\$${1}_ip_address" - eval mask="\$${1}_subnet_mask" - eval bcast="\$${1}_broadcast_address" - - if [ "$ip" != "" ] - then - ifconfig $interface inet $ip netmask $mask broadcast $bcast $medium -# route add $ip 127.0.0.1 > /dev/null 2>&1 - fi -} - -unset_ip_address () -{ - local ip - - if [ $# -lt 1 ] - then - return 1 - fi - - eval ip="\$${1}_ip_address" - - if [ "$ip" != "" ] - then - ifconfig $interface inet -alias $ip $medium -# route delete $ip 127.0.0.1 > /dev/null 2>&1 - fi -} - -set_ip_alias () -{ - if [ "$alias_ip_address" != "" ] - then - ifconfig $interface inet alias $alias_ip_address netmask $alias_subnet_mask -# route add $alias_ip_address 127.0.0.1 - fi -} - -unset_ip_alias () -{ - if [ "$alias_ip_address" != "" ] - then - ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1 -# route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1 - fi -} - -set_routers () -{ - local router_list - - if [ $# -lt 1 ] - then - return 1 - fi - - eval router_list="\$${1}_routers" - - for router in $router_list - do - route add default $router >/dev/null 2>&1 - done -} - -unset_routers () -{ - local router_list - - if [ $# -lt 1 ] - then - return 1 - fi - - eval router_list="\$${1}_routers" - - for router in $router_list - do - route delete default $router >/dev/null 2>&1 - done -} - -set_static_routes () -{ - local static_routes - - if [ $# -lt 1 ] - then - return 1 - fi - - eval static_routes="\$${1}_static_routes" - - set static_routes - - while [ $# -ge 2 ] - do - $LOGGER "New Static Route: $1 -> $2" - route add $1 $2 - shift; shift - done -} - -unset_static_routes () -{ - local static_routes - - if [ $# -lt 1 ] - then - return 1 - fi - - eval static_routes="\$${1}_static_routes" - - set static_routes - - while [ $# -ge 2 ] - do - route delete $1 $2 - shift; shift - done -} - -############################################################################# -# -# utility functions grouping what needs to be done in logical units. -# -############################################################################# - -set_all () -{ - set_ip_address new - set_routers new - set_static_routes new - - if [ "$new_ip_address" != "$alias_ip_address" ] - then - set_ip_alias - fi -} - -set_others () -{ - update_hostname - make_resolv_conf -} - -clear_arp_table () -{ - arp -d -a -} - -unset_all () -{ - if [ "$alias_ip_address" != "$old_ip_address" ] - then - unset_ip_alias - fi - - if [ "$old_ip_address" != "" ] - then - unset_ip_address old - unset_routers old - unset_static_routes old - clear_arp_table - fi -} - -test_new_lease () -{ - local rc - - set $new_routers - - if [ $# -ge 1 ] - then - set_ip_address new - if ping -q -c 1 $1 - then - rc=0 - else - rc=1 - fi - unset_ip_address new - else - rc=1 - fi - return $rc -} - -############################################################################# -# Main State functions. -# -# There is a state function for each state of the DHCP client -# These functions are OS specific and should be be tampered with. -############################################################################# - -in_state_MEDIUM () -{ - ifconfig $interface $medium - ifconfig $interface inet -alias 0.0.0.0 $medium >/dev/null 2>&1 - sleep 1 - exit_status=0 -} - -in_state_PREINIT () -{ - unset_ip_alias - - ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ - broadcast 255.255.255.255 up - exit_status=0 -} - -in_state_ARPCHECK () -{ - exit_status=0 -} - -in_state_ARPSEND () -{ - exit_status=0 -} - -in_state_RENEW () -{ - if [ "$old_ip_address" != "$new_ip_address" ] - then - unset_all - set_all - fi - - set_others -} - -in_state_REBIND () { - in_state_RENEW -} - -in_state_BOUND () { - unset_all - set_all - set_others -} - -in_state_REBOOT () { - in_state_BOUND -} - -in_state_EXPIRE () -{ - unset_all - set_ip_alias - exit_status=0 -} - -in_state_FAIL () { - in_state_EXPIRE -} - -in_state_TIMEOUT () -{ - unset_all - - if test_new_lease - then - set_all - set_others - else - $LOGGER "No good lease information in TIMEOUT state" - set_ip_alias - exit_status=1 - fi -} - -############################################################################# -# Main functions: -# -# dhclient_script_init() parses the optional "enter_hooks" script which can -# override any of the state functions -# -# This function also parses the variables and notifies the detected changes. -############################################################################# -dhclient_script_init () -{ - if [ "$new_network_number" != "" ] - then - $LOGGER "New Network Number: $new_network_number" - fi - - if [ "$new_ip_address" != "" ] - then - $LOGGER "New IP Address: $new_ip_address" - fi - - if [ "$new_broadcast_address" != "" ] - then - $LOGGER "New Broadcast Address: $new_broadcast_address" - fi - - if [ "$new_subnet_mask" != "" ] - then - $LOGGER "New Subnet Mask for $interface: $new_subnet_mask" - fi - - if [ "$alias_subnet_mask" != "" ] - then - fi -} - -############################################################################# -# dhclient_main() does the appropriate work depending on the state of -# the dhcp client -############################################################################# -dhclient_script_main () -{ -# set -x - exit_status=0 - - case $reason in - MEDIUM|\ - PREINIT|\ - ARPCHECK|\ - ARPSEND|\ - RENEW|\ - REBIND|\ - BOUND|\ - REBOOT|\ - EXPIRE|\ - FAIL|\ - TIMEOUT) - pre_state_${reason}_hook - in_state_${reason} - post_state_${reason}_hook - ;; - *) - $LOGGER "dhclient-script called with invalid reason $reason" - exit_status=1 - ;; - esac -} - -############################################################################# -# Let's do the work... -############################################################################# - -if [ -x /usr/bin/logger ]; then - LOGGER="/usr/bin/logger -s -p user.notice -t dhclient" -else - LOGGER=echo -fi - -# Invoke the local dhcp client enter hooks, if they exist. -if [ -x %%PREFIX%%/etc/dhclient-enter-hooks ] -then - exit_status=0 - . %%PREFIX%%/etc/dhclient-enter-hooks - # allow the local script to abort processing of this state - # local script must set exit_status variable to nonzero. - if [ $exit_status -ne 0 ] - then - exit $exit_status - fi -fi - -dhclient_script_init -dhclient_script_main - -# Invokes the local dhcp client exit hooks, if any. -if [ -x %%PREFIX%%/etc/dhclient-exit-hooks ]; then - . %%PREFIX%%/etc/dhclient-exit-hooks -fi - -exit $exit_status - -############################################################################# -# That's all folks -############################################################################# diff --git a/net/isc-dhcp31-server/files/extra-patch-dlq b/net/isc-dhcp31-server/files/extra-patch-dlq deleted file mode 100644 index 5657af491721..000000000000 --- a/net/isc-dhcp31-server/files/extra-patch-dlq +++ /dev/null @@ -1,14 +0,0 @@ ---- server/Makefile.dist.orig Tue Jun 14 09:37:50 2005 -+++ server/Makefile.dist Tue Jun 14 09:37:50 2005 -@@ -25,9 +25,9 @@ - CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 - SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 - SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ -- omapi.c mdb.c stables.c salloc.c ddns.c -+ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c - OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \ -- omapi.o mdb.o stables.o salloc.o ddns.o -+ omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o - PROG = dhcpd - MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - diff --git a/net/isc-dhcp31-server/files/extra-patch-dlq-ldap b/net/isc-dhcp31-server/files/extra-patch-dlq-ldap deleted file mode 100644 index 9b1ffff4c1a9..000000000000 --- a/net/isc-dhcp31-server/files/extra-patch-dlq-ldap +++ /dev/null @@ -1,14 +0,0 @@ ---- server/Makefile.dist.orig Tue Jun 14 09:39:39 2005 -+++ server/Makefile.dist Tue Jun 14 09:39:39 2005 -@@ -25,9 +25,9 @@ - CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 - SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 - SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ -- ldap.c omapi.c mdb.c stables.c salloc.c ddns.c -+ ldap.c omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c - OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \ -- ldap.o omapi.o mdb.o stables.o salloc.o ddns.o -+ ldap.o omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o - PROG = dhcpd - MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample deleted file mode 100644 index 97e56f5f9b24..000000000000 --- a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample +++ /dev/null @@ -1,722 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcpd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable dhcpd: -# -# dhcpd_enable="YES" -# - -. %%RC_SUBR%% - -name=dhcpd -paranoia=%%PARANOIA%% # compiled in paranoia? -jail=%%JAIL%% # compiled in jail? - -load_rc_config $name - -# override these variables in /etc/rc.conf -dhcpd_enable=${dhcpd_enable:-"NO"} -dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot # command option(s) -dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf} # configuration file -dhcpd_ifaces=${dhcpd_ifaces:-} # ethernet interface(s) -dhcpd_withumask=${dhcpd_withumask:-022} # file creation mask - -dhcpd_chuser_enable=${dhcpd_chuser_enable:-"%%PARANOIA%%"} # runs w/o privileges? -dhcpd_withuser=${dhcpd_withuser:-${name}} # user name to run as -dhcpd_withgroup=${dhcpd_withgroup:-${name}} # group name to run as - -dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"} # runs chrooted? -dhcpd_devfs_enable=${dhcpd_devfs_enable:-"YES"} # devfs if available? -dhcpd_makedev_enable=${dhcpd_makedev_enable:-"NO"} # MAKEDEV instead of devfs? -dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}} # directory to run in -dhcpd_includedir=${dhcpd_includedir:-} # directory for included config files - -# untested -dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"} # runs imprisoned? -dhcpd_hostname=${dhcpd_hostname:-} # jail hostname -dhcpd_ipaddress=${dhcpd_ipaddress:-} # jail ip address - -safe_run () # rc command [args...] -{ - local _rc - - _rc=$1 - shift - - if [ "${_rc}" -eq 0 ]; then - debug safe_run: "$@" - "$@" || _rc=1 - else - warn safe_run: "$@" - fi - return ${_rc} -} - -precious () # entry... -{ - local _entry _rc - - _rc=0 - for _entry; do - # do nothing if /dev, /var/run or /var/db - echo ${_entry} | egrep -q '^//*(dev|var//*(run|db))?/*$' || _rc=1 - done - debug precious: "$@" rc=${_rc} - return ${_rc} -} - -lsmod () # user group file... -{ - local _entry _user _group _rc - - _user=$1 _group=$2 - shift 2 - - _rc=0 - for _entry; do - ls -ld ${_entry} 2> /dev/null | - awk -v u=${_user} -v g=${_group} '{ - exit ((u && $3 != u) || (g && $4 != g)) - }' || _rc=1 - done - debug lsmod: "$@" rc=${_rc} - return ${_rc} -} - -safe_chmog () # entry... -{ - local _entry _user _group _usergroup _rc - - _user=${dhcpd_withuser} - _group=${dhcpd_withgroup} - - _rc=0 - if [ -n "${_user}" -o -n "${_group}" ]; then - _usergroup=${_user}${_group:+:${_group}} - for _entry; do - if [ -d ${_entry} ] && mounted ${_entry}; then - continue - fi - if [ -e ${_entry} ] && - ! precious ${_entry} && - ! lsmod ${_user} ${_group} ${_entry} && - ! safe_run ${_rc} chown ${_usergroup} ${_entry}; then - warn "unable to change permissions of ${_entry}" - _rc=1 - fi - done - fi - return ${_rc} -} - -safe_mkdir () # dir... -{ - local _dir _rc - - _rc=0 - for _dir; do - if [ ! -d ${_dir} ] && - ! precious ${_dir} && - ! safe_run ${_rc} mkdir -p ${_dir}; then - err 1 "unable to create directory ${_dir}" - _rc=1 - fi - done - safe_run ${_rc} safe_chmog "$@" || _rc=1 - return ${_rc} -} - -safe_rmdir () # dir... -{ - local _dir _rc - - _rc=0 - for _dir; do - if [ -d ${_dir} ] && - ! precious ${_dir} && - ! mounted ${_dir}; then - if safe_run ${_rc} rmdir ${_dir}; then - safe_run ${_rc} safe_rmdir ${_dir%/*} || _rc=1 - else - warn "unable to remove directory ${_dir}" - _rc=1 - fi - fi - done - return ${_rc} -} - -safe_touch () # file... -{ - local _file _rc - - _rc=0 - for _file; do - if [ ! -e ${_file} ] && - ! safe_run ${_rc} touch ${_file}; then - err 1 "unable to create file ${_file}" - _rc=1 - fi - done - safe_run ${_rc} safe_chmog "$@" || _rc=1 - return ${_rc} -} - -safe_remove () # entry... -{ - local _entry _rc - - _rc=0 - for _entry; do - if [ -f ${_entry} ]; then - if ! safe_run ${_rc} rm -f ${_entry}; then - warn "unable to remove file ${_entry}" - _rc=1 - fi - elif [ -d ${_entry} ] && - ! precious ${_entry} && - ! mounted ${_entry}; then - if ! safe_run ${_rc} rm -rf ${_entry}; then - warn "unable to remove directory ${_entry}" - _rc=1 - fi - fi - done - return ${_rc} -} - -safe_copy () # src dst -{ - local _src _dst _rc - - _src=$1 _dst=$2 - - _rc=0 - if [ -f ${_src} ]; then - if ! safe_run ${_rc} safe_remove ${_dst} || - ! safe_run ${_rc} cp -p ${_src} ${_dst}; then - err 1 "unable to copy file ${_src} to ${_dst}" - _rc=1 - fi - safe_run ${_rc} safe_chmog ${_dst} || _rc=1 - elif [ -d ${_src} ] && - ! precious ${_dst} && - ! mounted ${_dst}; then - if ! safe_run ${_rc} pax -rw -pe -ts "|^${_src}||" \ - ${_src} ${_dst}; then - err 1 "unable to copy directory ${_src} to ${_dst}" - _rc=1 - fi - else - err 1 "unable to copy ${_src} to ${_dst}" \ - "-- not a file or a directory" - _rc=1 - fi - return ${_rc} -} - -mounted () # dir... -{ - local _rc - - _rc=1 - if checkyesno dhcpd_devfs_enable || - checkyesno dhcpd_jail_enable; then - mount -t devfs | awk ' - BEGIN { n = ARGC; ARGC = 2 } - { for (i = 2; i != n; i++) if ($3 == ARGV[i]) exit 1 } - ' - "$@" || _rc=0 - fi - debug mounted: "$@" rc=${_rc} - return ${_rc} -} - -safe_mount () # dir -{ - local _dir _rc - - _dir=$1 - - _rc=0 - if checkyesno dhcpd_devfs_enable && - ! mounted ${_dir} && - ! safe_run ${_rc} mount -t devfs devfs ${_dir}; then - err 1 "unable to mount ${_dir}" - _rc=1 - fi - return ${_rc} -} - -safe_umount () # dir -{ - local _dir _rc - - _dir=$1 - - _rc=0 - if checkyesno dhcpd_devfs_enable && - mounted ${_dir} && - ! safe_run ${_rc} umount ${_dir}; then - warn "unable to unmount ${_dir}" - _rc=1 - fi - return ${_rc} -} - -safe_useradd () -{ - local _user _group _home _shell _gecos - - _user=$1 _group=$2 _gecos=${3:-"& daemon"} - _home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%} - - if [ -n "${_group}" ]; then - if pw group show ${_group} 2>/dev/null; then - echo "You already have a group \"${_group}\"," \ - "so I will use it." - elif pw groupadd ${_group} -h -; then - echo "Added group \"${_group}\"." - else - echo "Adding group \"${_group}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi - if [ -n "${_user}" ]; then - if pw user show ${_user} 2>/dev/null; then - echo "You already have a user \"${_user}\"," \ - "so I will use it." - elif pw useradd ${_user} -g ${_group} -h - \ - -d ${_home} -s ${_shell} -c "${_gecos}"; then - echo "Added user \"${_user}\"." - else - echo "Adding user \"${_user}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi -} - -check_chuser () -{ - if checkyesno paranoia; then - if checkyesno dhcpd_chuser_enable && - [ -z "${dhcpd_withuser}" -a -z "${dhcpd_withgroup}" ]; then - err 1 "one of dhcpd_withuser and dhcpd_withgroup" \ - "must be set if dhcpd_chuser_enable is enabled" - fi - else - if checkyesno dhcpd_chuser_enable; then - warn "dhcpd_chuser_enable disabled -- not compiled in" - dhcpd_chuser_enable=NO - fi - fi -} - -check_jail () -{ - if checkyesno paranoia && checkyesno jail; then - if checkyesno dhcpd_jail_enable && - ! checkyesno dhcpd_chroot_enable; then - warn "dhcpd_chroot_enable implied by dhcpd_jail_enable" - dhcpd_chroot_enable=YES - fi - if checkyesno dhcpd_jail_enable && - [ -n "${dhcpd_hostname}" -a -z "${dhcpd_ipaddress}" ] || - [ -z "${dhcpd_hostname}" -a -n "${dhcpd_ipaddress}" ]; then - err 1 "both dhcpd_hostname and dhcpd_ipaddress" \ - "must be set if dhcpd_jail_enable is enabled" - fi - else - if checkyesno dhcpd_jail_enable; then - warn "dhcpd_jail_enable disabled -- not compiled in" - dhcpd_jail_enable=NO - fi - fi -} - -check_chroot () -{ - if checkyesno paranoia; then - if checkyesno dhcpd_chroot_enable; then - if [ -z "${dhcpd_rootdir}" ]; then - err 1 "dhcpd_rootdir must be set" \ - "if dhcpd_chroot_enable is enabled" - fi - if checkyesno dhcpd_devfs_enable && - checkyesno dhcpd_makedev_enable; then - err 1 "dhcpd_devfs_enable and dhcpd_makedev_enable" \ - "are mutually exclusive. enable only one!" - fi - if checkyesno dhcpd_devfs_enable && - ! ( type mount_devfs ) > /dev/null 2>&1; then - warn "dhcpd_devfs_enable disabled" \ - "-- not available" - dhcpd_devfs_enable=NO - fi - if checkyesno dhcpd_makedev_enable && - ! [ -x ${__dhcpd_devdir}/MAKEDEV ]; then - warn "dhcpd_makedev_enable disabled" \ - "-- not available" - dhcpd_makedev_enable=NO - fi - else - dhcpd_devfs_enable=NO - dhcpd_makedev_enable=NO - fi - else - if checkyesno dhcpd_chroot_enable; then - warn "dhcpd_chroot_enable disabled -- not compiled in" - dhcpd_chroot_enable=NO - fi - dhcpd_devfs_enable=NO - dhcpd_makedev_enable=NO - fi -} - -rcvar_chuser () -{ - if checkyesno paranoia && checkyesno dhcpd_chuser_enable; then - dhcpd_piddir=${__dhcpd_piddir}/${name} - dhcpd_leasesdir=${__dhcpd_leasesdir}/${name} - else - dhcpd_withuser= dhcpd_withgroup= - fi -} - -rcvar_jail () -{ - if ! checkyesno paranoia || ! checkyesno jail || - ! checkyesno dhcpd_jail_enable; then - dhcpd_hostname= dhcpd_ipaddress= - fi -} - -rcvar_chroot () -{ - if ! checkyesno paranoia || ! checkyesno dhcpd_chroot_enable; then - dhcpd_rootdir= - elif checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - dhcpd_devdir=${__dhcpd_devdir} - dhcpd_etcdir=${__dhcpd_etcdir} - fi -} - -rcvar_pidnleases () -{ - if ! checkyesno dhcpd_chuser_enable; then - dhcpd_piddir=${__dhcpd_piddir} - dhcpd_leasesdir=${__dhcpd_leasesdir} - fi - dhcpd_pidfile=${dhcpd_piddir}/${name}.pid - dhcpd_leasesfile=${dhcpd_leasesdir}/${name}.leases - dhcpd_conffile=${dhcpd_conf} # for convenience only - dhcpd_confdir=$(dirname ${dhcpd_conffile}) -} - -rcvar_rooted () -{ - _dhcpd_rootdir=${dhcpd_rootdir} - _dhcpd_devdir=${dhcpd_rootdir}${dhcpd_devdir} - _dhcpd_etcdir=${dhcpd_rootdir}${dhcpd_etcdir} - _dhcpd_confdir=${dhcpd_rootdir}${dhcpd_confdir} - _dhcpd_includedir=${dhcpd_rootdir}${dhcpd_includedir} - _dhcpd_piddir=${dhcpd_rootdir}${dhcpd_piddir} - _dhcpd_leasesdir=${dhcpd_rootdir}${dhcpd_leasesdir} - _dhcpd_conffile=${dhcpd_rootdir}${dhcpd_conffile} - _dhcpd_pidfile=${dhcpd_rootdir}${dhcpd_pidfile} - _dhcpd_leasesfile=${dhcpd_rootdir}${dhcpd_leasesfile} -} - -setup_compat () -{ - local dhcpd_rcconf - - # suck in old configuration file and variables - # - dhcpd_rcconf=${dhcpd_confdir}/rc.isc-dhcpd.conf - - if [ -f ${dhcpd_rcconf} ]; then - warn "${dhcpd_rcconf} is obsolete, use /etc/rc.conf and/or" \ - "/etc/rc.conf.d/${name} instead." - . ${dhcpd_rcconf} - - if [ -n "${dhcpd_options}" -a -z "${rc_flags}" ]; then - warn "dhcpd_options is obsolete," \ - "use dhcpd_flags instead." - rc_flags=${dhcpd_options} - fi - fi -} - -setup_umask () -{ - if [ -n "${dhcpd_withumask}" ]; then - umask ${dhcpd_withumask} - fi -} - -setup_chroot () -{ - local _mdev _hconf _hosts _ltime _rconf - - _mdev=MAKEDEV - _hconf=host.conf - _hosts=hosts - _ltime=localtime - _rconf=resolv.conf - - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - if ! mounted ${_dhcpd_devdir}; then - safe_mkdir ${_dhcpd_devdir}/_ - # XXX /_ hack! so, .../dev is root owned. - fi - safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_etcdir}/_ ${_dhcpd_confdir} - # XXX /_ hack! so, .../etc is root owned. - if checkyesno dhcpd_devfs_enable; then - safe_mount ${_dhcpd_devdir} - elif checkyesno dhcpd_makedev_enable; then - safe_copy ${dhcpd_devdir}/$_mdev ${_dhcpd_devdir}/$_mdev - safe_run 0 sh -c "cd ${_dhcpd_devdir} && ./$_mdev jail bpf4" - else - safe_copy ${dhcpd_devdir} ${_dhcpd_devdir} - fi - safe_copy ${dhcpd_conffile} ${_dhcpd_conffile} - safe_copy ${dhcpd_etcdir}/$_hconf ${_dhcpd_etcdir}/$_hconf - safe_copy ${dhcpd_etcdir}/$_hosts ${_dhcpd_etcdir}/$_hosts - safe_copy ${dhcpd_etcdir}/$_ltime ${_dhcpd_etcdir}/$_ltime - safe_copy ${dhcpd_etcdir}/$_rconf ${_dhcpd_etcdir}/$_rconf - # copy dhcpd_includedir if defined and available - if [ -d "${dhcpd_includedir}" ]; then - safe_mkdir ${_dhcpd_includedir} - safe_copy ${dhcpd_includedir} ${_dhcpd_includedir} - fi - fi -} - -setup_chuser () -{ - if checkyesno paranoia && { - checkyesno dhcpd_chuser_enable || checkyesno dhcpd_chroot_enable - }; then - safe_mkdir ${_dhcpd_piddir} ${_dhcpd_leasesdir} - fi -} - -setup_leases () -{ - safe_touch ${_dhcpd_leasesfile} -} - -setup_flags () -{ - if [ -n "${dhcpd_conf}" ]; then - rc_flags="${rc_flags} -cf ${dhcpd_conf}" - fi - if [ -n "${dhcpd_leasesfile}" ]; then - rc_flags="${rc_flags} -lf ${dhcpd_leasesfile}" - fi - if [ -n "${dhcpd_pidfile}" ]; then - rc_flags="${rc_flags} -pf ${dhcpd_pidfile}" - fi - if [ -n "${dhcpd_withuser}" ]; then - rc_flags="${rc_flags} -user ${dhcpd_withuser}" - fi - if [ -n "${dhcpd_withgroup}" ]; then - rc_flags="${rc_flags} -group ${dhcpd_withgroup}" - fi - if [ -n "${dhcpd_rootdir}" ]; then - rc_flags="${rc_flags} -chroot ${dhcpd_rootdir}" - fi - if [ -n "${dhcpd_hostname}" -a -n "${dhcpd_ipaddress}" ]; then - rc_flags="${rc_flags} -jail ${dhcpd_hostname} ${dhcpd_ipaddress}" - fi - rc_flags="${rc_flags} ${dhcpd_ifaces}" -} - -cleanup_chroot () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_umount ${_dhcpd_devdir} - fi -} - -dhcpd_stop () -{ - if sh $0 forcestatus; then - sh $0 forcestop - fi -} - -remove_pid () -{ - if [ -e ${_dhcpd_pidfile} ]; then - warn "${_dhcpd_pidfile} still exists! -- removing anyway" - fi - safe_remove ${_dhcpd_pidfile} -} - -remove_leases () -{ - if [ -s ${_dhcpd_leasesfile} ]; then - warn "${_dhcpd_leasesfile} not empty -- not removed --" \ - "futher warning messages expected, don't care." - else - safe_remove ${_dhcpd_leasesfile} ${_dhcpd_leasesfile}~ - fi -} - -remove_chuser () -{ - if checkyesno paranoia && { - checkyesno dhcpd_chuser_enable || checkyesno dhcpd_chroot_enable - }; then - safe_rmdir ${_dhcpd_piddir} ${_dhcpd_leasesdir} - fi -} - -remove_chroot () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_remove ${_dhcpd_conffile} ${_dhcpd_includedir} \ - ${_dhcpd_etcdir} - if checkyesno dhcpd_devfs_enable; then - safe_umount ${_dhcpd_devdir} - safe_rmdir ${_dhcpd_devdir}/_ # XXX /_ hack! - elif checkyesno dhcpd_jail_enable; then - if ! mounted ${_dhcpd_devdir}; then - safe_remove ${_dhcpd_devdir} - fi - else - safe_remove ${_dhcpd_devdir} - fi - safe_rmdir ${_dhcpd_confdir} ${_dhcpd_rootdir} # XXX /_ hack! - fi -} - -dhcpd_check () -{ - check_chuser - check_jail - check_chroot -} - -dhcpd_rcvar () -{ - rcvar_chuser - rcvar_jail - rcvar_chroot - rcvar_pidnleases - rcvar_rooted -} - -dhcpd_precmd () -{ - setup_compat - setup_umask - setup_chroot - setup_chuser - setup_leases - setup_flags -} - -dhcpd_postcmd () -{ - cleanup_chroot -} - -dhcpd_install () -{ - if checkyesno paranoia; then - safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \ - "DHCP Daemon" - fi -} - -_dhcpd_uninstall () # user group root -{ - local _user _group _root - - _user=$1 _group=$2 _root=$3 - - if [ -n "${_user}" -o -n "${_group}" ]; then - dhcpd_chuser_enable=YES - dhcpd_withuser=${_user} - dhcpd_withgroup=${_group} - else - dhcpd_chuser_enable=NO - fi - if [ -n "${_root}" ]; then - dhcpd_chroot_enable=YES - dhcpd_rootdir=${_root} - else - dhcpd_chroot_enable=NO - fi - dhcpd_check - dhcpd_rcvar - dhcpd_uninstall -} - -dhcpd_uninstall () -{ - if checkyesno __dhcpd_uninstall; then - dhcpd_stop - remove_pid - remove_leases - remove_chuser - remove_chroot - else - local _user _group _root - - __dhcpd_uninstall=YES - - _user=${dhcpd_withuser} - _group=${dhcpd_withgroup} - _root=${dhcpd_rootdir} - - _dhcpd_uninstall "" "" "" - - if checkyesno paranoia; then - if [ -n "${_user}" -o -n "${_group}" ]; then - _dhcpd_uninstall "${_user}" "${_group}" "" - fi - if [ -n "${_root}" ]; then - _dhcpd_uninstall "" "" "${_root}" - fi - if [ -n "${_user}" -o -n "${_group}" ] && - [ -n "${_root}" ]; then - _dhcpd_uninstall "${_user}" "${_group}" "${_root}" - fi - fi - fi -} - -rcvar=$(set_rcvar) -load_rc_config ${name} - -__dhcpd_uninstall="NO" # internal use only -__dhcpd_devdir=/dev # devices directory -__dhcpd_etcdir=/etc # etc directory -__dhcpd_piddir=/var/run # pid file directory -__dhcpd_leasesdir=/var/db # leases file directory -#__dhcpd_rootdir=/var/db/${name} # root directory - -dhcpd_check -dhcpd_rcvar - -command=%%PREFIX%%/sbin/${name} -pidfile=${_dhcpd_pidfile} -required_files=${dhcpd_conf} -start_precmd=${name}_precmd -stop_postcmd=${name}_postcmd -install_cmd=dhcpd_install -uninstall_cmd=dhcpd_uninstall -extra_commands="install uninstall" - -run_rc_command "$1" diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample deleted file mode 100644 index 11c9b00b3133..000000000000 --- a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcrelay -# REQUIRE: DAEMON -# -# Add the following line to /etc/rc.conf to enable dhcrelay: -# -# dhcrelay_enable="YES" -# - -# override these variables in /etc/rc.conf -dhcrelay_enable=${dhcrelay_enable:-"NO"} -dhcrelay_flags=${dhcrelay_flags:-} # command option(s) -dhcrelay_servers=${dhcrelay_servers:-} # dhcrelay server(s) -dhcrelay_ifaces=${dhcrelay_ifaces:-} # ethernet interface(s) - -dhcrelay_precmd () -{ - local ifaces - - dhcrelay_rcconf=%%PREFIX%%/etc/rc.isc-dhcrelay.conf - - if [ -f ${dhcrelay_rcconf} ]; then - warn "${dhcrelay_rcconf} is obsolete, use /etc/rc.conf instead." - . ${dhcrelay_rcconf} - - if [ -n "${dhcrelay_options}" -a -z "${rc_flags}" ]; then - warn "dhcrelay_options is obsolete, use dhcrelay_flags instead." - rc_flags=${dhcrelay_options} - fi - fi - - if [ -z "${dhcrelay_servers}" ]; then - err 1 "no dhcrelay server(s) configured." - fi - - ifaces= - for iface in ${dhcrelay_ifaces}; do - ifaces="${ifaces} -i ${iface}" - done - - rc_flags="${rc_flags} ${ifaces} ${dhcrelay_servers}" -} - -. %%RC_SUBR%% - -name=dhcrelay -rcvar=$(set_rcvar) - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid -start_precmd=${name}_precmd - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net/isc-dhcp31-server/files/omshell::Makefile.dist b/net/isc-dhcp31-server/files/omshell::Makefile.dist deleted file mode 100644 index 34c90a2e7f53..000000000000 --- a/net/isc-dhcp31-server/files/omshell::Makefile.dist +++ /dev/null @@ -1,80 +0,0 @@ -# Makefile.dist -# -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: -# -# http://www.isc.org/isc-license-1.0.html. -# -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. -# -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# - -CATMANPAGES = omshell.cat1 -SEDMANPAGES = omshell.man1 -SRCS = omshell.c -OBJS = omshell.o -PROG = omshell -MAN = omshell.1 - -INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes -CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) -DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \ - ../omapip/libomapi.a ../dst/libdst.a - -all: $(PROG) $(CATMANPAGES) - -$(PROG): $(OBJS) $(DHCPCTLLIBS) - $(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS) - -install: all $(CATMANPAGES) - for dir in $(USRMANDIR) $(USERBINDIR); do \ - foo=""; \ - for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ - foo=$${foo}/$$bar; \ - if [ ! -d $$foo ]; then \ - mkdir $$foo; \ - chmod 755 $$foo; \ - fi; \ - done; \ - done - $(INSTALL) omshell $(DESTDIR)$(USERBINDIR) - $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell - $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \ - $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT) - -depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS) - -clean: - -rm -f $(OBJS) - -realclean: clean - -rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #* - -distclean: realclean - -rm -f Makefile - -links: - @for foo in $(SRCS) $(MAN); do \ - if [ ! -b $$foo ]; then \ - rm -f $$foo; \ - fi; \ - ln -s $(TOP)/omshell/$$foo $$foo; \ - done - -omshell.cat1: omshell.man1 - nroff -man omshell.man1 >omshell.cat1 - -omshell.man1: omshell.1 - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ - -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 - -# Dependencies (semi-automatically-generated) diff --git a/net/isc-dhcp31-server/files/patch-Makefile b/net/isc-dhcp31-server/files/patch-Makefile deleted file mode 100644 index 7a8df08b137b..000000000000 --- a/net/isc-dhcp31-server/files/patch-Makefile +++ /dev/null @@ -1,76 +0,0 @@ ---- Makefile.orig Fri Nov 8 00:10:07 2002 -+++ Makefile Mon Apr 28 15:04:50 2003 -@@ -38,59 +38,59 @@ - # ``http://www.nominum.com''. - # - --all: -+all all.devel all.server all.relay all.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make all); \ -+ (cd work.$$sysname; make $@); \ - fi - --install: -+install install.devel install.server install.relay install.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make install); \ -+ (cd work.$$sysname; make $@); \ - fi - --depend: -+depend depend.devel depend.server depend.relay depend.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make depend); \ -+ (cd work.$$sysname; make $@); \ - fi - --clean: -+clean clean.devel clean.server clean.relay clean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make clean); \ -+ (cd work.$$sysname; make $@); \ - fi - --realclean: -+realclean realclean.devel realclean.server realclean.relay realclean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make realclean); \ -+ (cd work.$$sysname; make $@); \ - fi - --distclean: -+distclean distclean.devel distclean.server distclean.relay distclean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make distclean); \ -+ (cd work.$$sysname; make $@); \ - fi - --links: -+links links.devel links.server links.relay links.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make links); \ -+ (cd work.$$sysname; make $@); \ - fi - diff --git a/net/isc-dhcp31-server/files/patch-Makefile.dist b/net/isc-dhcp31-server/files/patch-Makefile.dist deleted file mode 100644 index 0c09997023cc..000000000000 --- a/net/isc-dhcp31-server/files/patch-Makefile.dist +++ /dev/null @@ -1,226 +0,0 @@ ---- Makefile.dist.orig Fri Nov 8 00:10:08 2002 -+++ Makefile.dist Tue Apr 29 00:07:43 2003 -@@ -17,47 +17,200 @@ - # http://www.isc.org for more information. - # - --SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl -+COMMON_SUBDIRS= common -+DEVEL_SUBDIRS= $(MINIRES) dst omapip dhcpctl -+SERVER_SUBDIRS= omshell server -+RELAY_SUBDIRS= relay -+CLIENT_SUBDIRS= client -+ -+DEVEL_BUILD_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS} -+SERVER_BUILD_SUBDIRS= ${SERVER_SUBDIRS} -+RELAY_BUILD_SUBDIRS= ${RELAY_SUBDIRS} -+CLIENT_BUILD_SUBDIRS= ${CLIENT_SUBDIRS} -+ -+DEVEL_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS} -+SERVER_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${SERVER_SUBDIRS} -+RELAY_INSTALL_SUBDIRS= ${RELAY_SUBDIRS} -+CLIENT_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${CLIENT_SUBDIRS} - --all: -- @for dir in ${SUBDIRS}; do \ -+all: all.server all.relay all.client -+ -+all.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.server: all.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.relay: all.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.client: all.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Making all in $$dir"; \ - (cd $$dir; $(MAKE) all) || exit 1; \ -- done -+ done -+ -+install: install.devel install.server install.relay install.client -+ -+install.devel: -+ @for dir in ${DEVEL_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done - --install: -- @for dir in ${SUBDIRS}; do \ -+install.server: -+ @for dir in ${SERVER_INSTALL_SUBDIRS}; do \ - echo "Installing in $$dir"; \ - (cd $$dir; $(MAKE) install) || exit 1; \ -- done -+ done - --depend: -- @for dir in ${SUBDIRS}; do \ -+install.relay: -+ @for dir in ${RELAY_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done -+ -+install.client: -+ @for dir in ${CLIENT_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done -+ -+depend: depend.server depend.relay depend.client -+ -+depend.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+depend.server: depend.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+depend.relay: depend.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ - echo "Making dependencies in $$dir"; \ - (cd $$dir; $(MAKE) depend) || exit 1; \ -- done -+ done -+ -+depend.client: depend.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+clean: clean.server clean.relay clean.client -+ -+clean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done -+ -+clean.server: clean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done -+ -+clean.relay: clean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done - --clean: -- @for dir in ${SUBDIRS}; do \ -+clean.client: clean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Cleaning in $$dir"; \ - (cd $$dir; $(MAKE) clean) || exit 1; \ -- done -+ done -+ -+realclean: realclean.server realclean.relay realclean.client -+ -+realclean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done - --realclean: -- @for dir in ${SUBDIRS}; do \ -+realclean.server: realclean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ - echo "Really cleaning in $$dir"; \ - (cd $$dir; $(MAKE) realclean) || exit 1; \ -- done -+ done - --distclean: -- @for dir in ${SUBDIRS}; do \ -+realclean.relay: realclean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done -+ -+realclean.client: realclean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done -+ -+distclean: distclean.server distclean.relay distclean.client -+ -+distclean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ - echo "Really, really cleaning in $$dir"; \ - (cd $$dir; $(MAKE) distclean) || exit 1; \ -- done -- @rm -f Makefile -+ done -+ -+distclean.server: distclean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+distclean.relay: distclean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+distclean.client: distclean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+links: links.server links.relay links.client -+ -+links.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done -+ -+links.server: links.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done -+ -+links.relay: links.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done - --links: -- @for dir in ${SUBDIRS}; do \ -+links.client: links.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Making links in $$dir"; \ - (cd $$dir; $(MAKE) links) || exit 1; \ -- done -+ done diff --git a/net/isc-dhcp31-server/files/patch-client::clparse.c b/net/isc-dhcp31-server/files/patch-client::clparse.c deleted file mode 100644 index 4140cc6e3109..000000000000 --- a/net/isc-dhcp31-server/files/patch-client::clparse.c +++ /dev/null @@ -1,11 +0,0 @@ ---- client/clparse.c.orig Mon Feb 10 01:39:57 2003 -+++ client/clparse.c Wed Mar 3 01:35:39 2004 -@@ -785,7 +785,7 @@ - if (status != ISC_R_SUCCESS) - log_fatal ("Can't record interface %s: %s", - name, isc_result_totext (status)); -- strcpy (ip -> name, name); -+ strlcpy (ip -> name, name, IFNAMSIZ); - if (dummy_interfaces) { - interface_reference (&ip -> next, - dummy_interfaces, MDL); diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.8 b/net/isc-dhcp31-server/files/patch-client::dhclient.8 deleted file mode 100644 index 4e6096f5aa86..000000000000 --- a/net/isc-dhcp31-server/files/patch-client::dhclient.8 +++ /dev/null @@ -1,83 +0,0 @@ ---- client/dhclient.8.orig Sun Nov 17 03:25:43 2002 -+++ client/dhclient.8 Wed Mar 3 02:06:52 2004 -@@ -18,6 +18,10 @@ - .\" - .\" from Id: dhclient.8,v 1.12.2.8 2004/06/10 17:59:12 dhankins Exp - .\" -+.\" Portions copyright (c) 2000 David E. O'Brien. -+.\" All rights reserved. -+.\" $FreeBSD$ -+.\" - .TH dhclient 8 - .SH NAME - dhclient - Dynamic Host Configuration Protocol Client -@@ -28,12 +32,18 @@ - .I port - ] - [ -+.B -D -+] -+[ - .B -d - ] - [ - .B -q - ] - [ -+.B -v -+] -+[ - .B -1 - ] - [ -@@ -64,6 +74,10 @@ - relay - ] - [ -+.B -i -+interval -+] -+[ - .B -n - ] - [ -@@ -148,6 +162,15 @@ - configuration file or on the command line, and will ignore all other - interfaces. - .PP -+The -+.B -D -+flag causes -+.B dhclient -+to save the script it creates for use in conjunction with -+.B dhclient-script -+in -+.IR /tmp. -+.PP - If the DHCP client should listen and transmit on a port other than the - standard (port 68), the - .B -p -@@ -171,6 +194,12 @@ - flag, followed by the IP address to send. This is only useful for testing, - and should not be expected to work in any consistent or useful way. - .PP -+On FreeBSD, dhclient can be enabled to automatically handle the -+link status of the network card. Normally polling is done every -+five seconds. The polling interval can be set using the -+.B -i -+flag, followed by the numbers of seconds. Minimum is one second. -+.PP - The DHCP client will normally run in the foreground until it has - configured an interface, and then will revert to running in the - background. To run force dhclient to always run as a foreground -@@ -188,6 +217,10 @@ - .B -q - flag prevents any messages other than errors from being printed to the - standard error descriptor. -+.B -v -+flag turns on all messages. -+Opposite of -+.B -q . - .PP - The client normally doesn't release the current lease as it is not - required by the DHCP protocol. Some cable ISPs require their clients diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.c b/net/isc-dhcp31-server/files/patch-client::dhclient.c deleted file mode 100644 index 7345bfaf057d..000000000000 --- a/net/isc-dhcp31-server/files/patch-client::dhclient.c +++ /dev/null @@ -1,545 +0,0 @@ ---- client/dhclient.c.orig Wed Nov 24 18:39:14 2004 -+++ client/dhclient.c Tue Mar 8 14:06:59 2005 -@@ -38,6 +38,13 @@ - #include "dhcpd.h" - #include "version.h" - -+#if __FreeBSD_version > 502010 -+#include <sys/ioctl.h> -+#include <net/if_media.h> -+#include <net80211/ieee80211_ioctl.h> -+#include <net80211/ieee80211.h> -+#endif -+ - TIME default_lease_time = 43200; /* 12 hours... */ - TIME max_lease_time = 86400; /* 24 hours... */ - -@@ -72,8 +79,11 @@ - struct string_list *client_env=NULL; - int client_env_count=0; - int onetry=0; --int quiet=0; -+int quiet=1; - int nowait=0; -+#ifdef ENABLE_POLLING_MODE -+int polling_interval = 5; -+#endif - - static void usage PROTO ((void)); - -@@ -174,6 +184,9 @@ - } else if (!strcmp (argv [i], "-q")) { - quiet = 1; - quiet_interface_discovery = 1; -+ } else if (!strcmp (argv [i], "-v")) { -+ quiet = 0; -+ quiet_interface_discovery = 0; - } else if (!strcmp (argv [i], "-s")) { - if (++i == argc) - usage (); -@@ -187,6 +200,19 @@ - } else if (!strcmp (argv [i], "-n")) { - /* do not start up any interfaces */ - interfaces_requested = 1; -+#ifdef ENABLE_POLLING_MODE -+ } else if (!strcmp (argv [i], "-i")) { -+ if (++i == argc) -+ usage (); -+ polling_interval = (int)strtol (argv [i], -+ (char **)NULL, 10); -+ if (polling_interval <= 0) { -+ log_info ("Incorrect polling interval %d", -+ polling_interval); -+ log_info ("Using a default of 5 seconds"); -+ polling_interval = 5; -+ } -+#endif - } else if (!strcmp (argv [i], "-w")) { - /* do not exit if there are no broadcast interfaces. */ - persist = 1; -@@ -215,7 +241,16 @@ - if (strlen (argv [i]) > sizeof tmp -> name) - log_fatal ("%s: interface name too long (max %ld)", - argv [i], (long)strlen (argv [i])); -- strcpy (tmp -> name, argv [i]); -+ strlcpy (tmp -> name, argv [i], IFNAMSIZ); -+#if __FreeBSD_version > 502010 -+ set_ieee80211 (tmp); -+#endif -+ /* Init some interface vars, enable polling */ -+#ifdef ENABLE_POLLING_MODE -+ tmp -> forcediscover = 0; -+ tmp -> linkstate = HAVELINK; -+ tmp -> polling = 1; -+#endif /* ifdef ENABLE_POLLING_MODE */ - if (interfaces) { - interface_reference (&tmp -> next, - interfaces, MDL); -@@ -375,6 +410,16 @@ - INTERFACE_AUTOMATIC)) != - INTERFACE_REQUESTED)) - continue; -+#if __FreeBSD_version > 502010 -+ set_ieee80211 (ip); -+#endif -+#ifdef ENABLE_POLLING_MODE -+ ip -> forcediscover = 0; -+ if (ip -> client -> config -> media != NULL) -+ ip -> havemedia = 1; -+ else -+ ip -> havemedia = 0; -+#endif - script_init (ip -> client, - "PREINIT", (struct string_list *)0); - if (ip -> client -> alias) -@@ -417,8 +462,13 @@ - client -> state = S_INIT; - /* Set up a timeout to start the initialization - process. */ -+#ifdef ENABLE_POLLING_MODE -+ add_timeout (cur_time + random () % 5 + 2, -+ state_polling, client, 0, 0); -+#else - add_timeout (cur_time + random () % 5, - state_reboot, client, 0, 0); -+#endif - } - } - } -@@ -476,9 +526,9 @@ - log_info (arr); - log_info (url); - -- log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s", -- "[-s server]"); -- log_error (" [-cf config-file] [-lf lease-file]%s", -+ log_error ("Usage: dhclient [-1Ddqrv] [-i polling-interval] %s", -+ "[-nw] [-p <port>] [-s server]"); -+ log_error (" [-cf config-file] [-lf lease-file] %s", - "[-pf pid-file] [-e VAR=val]"); - log_fatal (" [-sf script-file] [interface]"); - } -@@ -881,6 +931,15 @@ - /* Write out the new lease. */ - write_client_lease (client, client -> new, 0, 0); - -+ /* -+ * It's now possible that state_reboot can be called -+ * after a interface link went down and is up again. -+ * To prevent tons of equal leases saved on disk, we rewrite -+ * them. -+ */ -+ read_client_leases (); -+ rewrite_client_leases (); -+ - /* Replace the old active lease with the new one. */ - if (client -> active) - destroy_client_lease (client -> active); -@@ -895,6 +954,12 @@ - piaddr (client -> active -> address), - (long)(client -> active -> renewal - cur_time)); - client -> state = S_BOUND; -+#ifdef ENABLE_POLLING_MODE -+ /* Init some interface vars, enable polling */ -+ client -> interface -> linkstate = HAVELINK; -+ client -> interface -> forcediscover = 0; -+ client -> interface -> polling = 1; -+#endif /* ifdef ENABLE_POLLING_MODE */ - reinitialize_interfaces (); - go_daemon (); - if (client -> config -> do_forward_update) { -@@ -1359,6 +1424,11 @@ - int interval; - int increase = 1; - -+#ifdef ENABLE_POLLING_MODE -+ /* Disable polling for this interface */ -+ client -> interface -> polling = 0; -+#endif -+ - /* Figure out how long it's been since we started transmitting. */ - interval = cur_time - client -> first_sending; - -@@ -1464,6 +1534,9 @@ - struct client_lease *loop; - struct client_lease *lp; - -+ if (client -> interface -> linkstate == NOLINK) -+ return; -+ - loop = lp = client -> active; - - log_info ("No DHCPOFFERS received."); -@@ -1496,6 +1569,10 @@ - log_info ("bound: renewal in %ld %s.", - (long)(client -> active -> renewal - - cur_time), "seconds"); -+#ifdef ENABLE_POLLING_MODE -+ /* Enable polling for this interface */ -+ client -> interface -> polling = 1; -+#endif - add_timeout (client -> active -> renewal, - state_bound, client, 0, 0); - } else { -@@ -1503,6 +1580,11 @@ - log_info ("bound: immediate renewal."); - state_bound (client); - } -+ /* -+ * Set the link status back to nolink, even -+ * if we have media settings. -+ */ -+ client -> interface -> linkstate = NOLINK; - reinitialize_interfaces (); - go_daemon (); - return; -@@ -1548,6 +1630,12 @@ - } - - log_info ("No working leases in persistent database - sleeping."); -+ -+#ifdef ENABLE_POLLING_MODE -+ /* Enable polling for this interface */ -+ client -> interface -> polling = 1; -+#endif -+ - script_init (client, "FAIL", (struct string_list *)0); - if (client -> alias) - script_write_params (client, "alias_", client -> alias); -@@ -1689,6 +1777,18 @@ - client -> packet.secs = htons (65535); - } - -+ /* -+ * Only try the first ten seconds to renew a lease from a -+ * given dhcp-server adress. After that, fall back to use -+ * state_reboot with INADDR_BROADCAST. -+ */ -+ if (destination.sin_addr.s_addr != INADDR_BROADCAST && -+ (client -> state == S_RENEWING || client -> state == S_REBINDING)) { -+ if (client -> active && client -> active -> expiry > cur_time && -+ interval >= 10) -+ goto cancel; -+ } -+ - log_info ("DHCPREQUEST on %s to %s port %d", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (destination.sin_addr), -@@ -1710,6 +1810,16 @@ - from, &destination, - (struct hardware *)0); - -+ /* -+ * If sendto() for a direct request fails, fall back to use -+ * state_reboot with INADDR_BROADCAST. -+ */ -+ if (result == -1 && destination.sin_addr.s_addr != INADDR_BROADCAST && -+ (client -> state == S_RENEWING || client -> state == S_REBINDING)) { -+ if (client -> active && client -> active -> expiry > cur_time) -+ goto cancel; -+ } -+ - add_timeout (cur_time + client -> interval, - send_request, client, 0, 0); - } -@@ -2607,6 +2717,13 @@ - wstatus = 0; - } - } else { -+ if ((i = open(_PATH_DEVNULL, O_RDWR)) != -1) { -+ dup2(i, STDIN_FILENO); -+ dup2(i, STDOUT_FILENO); -+ dup2(i, STDERR_FILENO); -+ if (i > STDERR_FILENO) -+ close(i); -+ } - execve (scriptName, argv, envp); - log_error ("execve (%s, ...): %m", scriptName); - exit (0); -@@ -2793,8 +2910,10 @@ - case S_STOPPED: - break; - } -+#ifndef ENABLE_POLLING_MODE - client -> state = S_INIT; - state_reboot (client); -+#endif - } - } - } -@@ -3022,7 +3141,9 @@ - break; - - case server_awaken: -+#ifndef ENABLE_POLLING_MODE - state_reboot (client); -+#endif - break; - } - } -@@ -3160,3 +3281,265 @@ - data_string_forget (&ddns_dhcid, MDL); - return rcode; - } -+ -+/* Check to see if there's a wire plugged in */ -+int -+interface_active(struct interface_info *ip) { -+#if __FreeBSD_version > 502010 -+ struct ifmediareq ifmr; -+ int *media_list, i; -+ char *ifname; -+ int sock; -+ -+ ifname = ip -> name; -+ -+ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) -+ log_fatal ("Can't create interface_active socket"); -+ -+ (void) memset (&ifmr, 0, sizeof (ifmr)); -+ (void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name)); -+ -+ if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { -+ /* -+ * Interface doesn't support SIOCGIFMEDIA, presume okay -+ */ -+ close (sock); -+ return (HAVELINK); -+ } -+ close (sock); -+ -+ if (ifmr.ifm_count == 0) { -+ /* -+ * Assume that this means interface -+ * does not support SIOCGIFMEDIA -+ */ -+ log_fatal ("%s: no media types?", ifname); -+ return (HAVELINK); -+ } -+ -+ if (ifmr.ifm_status & IFM_AVALID) { -+ if (ip -> ieee80211) { -+ /* -+ * Wavelan devices need to be checked if they are -+ * associated. -+ */ -+ if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) && -+ (ifmr.ifm_status & IFM_ACTIVE)) { -+ return (HAVELINK); -+ } -+ } else { -+ if (ifmr.ifm_status & IFM_ACTIVE) { -+ return (HAVELINK); -+ } -+ } -+ /* -+ * We really have no link. -+ */ -+ return (NOLINK); -+ } -+ /* -+ * IFM_AVALID is not set. We cannot check -+ * the link state. Assume HAVELINK. -+ */ -+ -+#endif /* Other OSs */ -+ /* -+ * Always return a successful link if the OS -+ * is not supported. -+ */ -+ return (HAVELINK); -+} -+ -+#if __FreeBSD_version > 502010 -+void -+set_ieee80211 (struct interface_info *ip) { -+ -+ struct ieee80211req ireq; -+ u_int8_t data[32]; -+ int associated = 0; -+ int *media_list, i; -+ char *ifname; -+ int sock; -+ -+ ifname = ip -> name; -+ -+ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) -+ log_fatal ("Can't create interface_active socket"); -+ -+ (void) memset (&ireq, 0, sizeof (ireq)); -+ (void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name)); -+ ireq.i_data = &data; -+ ireq.i_type = IEEE80211_IOC_SSID; -+ ireq.i_val = -1; -+ /* -+ * If we can't get the SSID, -+ * this isn't an 802.11 device. -+ */ -+ if (ioctl (sock, SIOCG80211, &ireq) < 0) -+ ip -> ieee80211 = 0; -+ else { -+#ifdef DEBUG -+ printf ("Device %s has 802.11\n", ifname); -+#endif -+ ip -> ieee80211 = 1; -+ } -+ close (sock); -+ } -+#endif /* __FreeBSD_version */ -+ -+#ifdef ENABLE_POLLING_MODE -+/* Go to background after some time */ -+void state_background (cpp) -+ void *cpp; -+{ -+ go_daemon (); -+} -+ -+/* Check the state of the NICs if we have link */ -+void state_polling (cpp) -+ void *cpp; -+{ -+ static int doinitcheck = 0; -+ struct interface_info *ip; -+ struct client_state *client; -+ int result; -+ -+ for (ip = interfaces; ip; ip = ip -> next) { -+ if (! ip -> polling) -+ continue; -+#ifdef DEBUG -+ printf ("%s: Polling interface state\n", ip -> name); -+ for (client = ip -> client; -+ client; client = client -> next) { -+ printf ("%s: client state of %d\n", ip -> name, ip -> client -> state); -+ printf ("%s: link = %d\n", ip -> name, ip -> linkstate); -+ } -+#endif -+ -+ result = interface_active (ip); -+ /* -+ * If dhclient.conf contains media settings, we cannot -+ * abort if the interface is not set to active mode. -+ */ -+ if (ip -> havemedia && ip -> client -> state != S_BOUND) { -+ if (result == HAVELINK) -+ ip -> forcediscover = 1; -+ result = HAVELINK; -+ } -+ -+ /* -+ * The last status of the interface tells us -+ * the we've got no link ... -+ */ -+ if (ip -> linkstate == NOLINK || ! doinitcheck) { -+ /* -+ * ... but we have now link. Let's send -+ * requests. -+ */ -+ if (result == HAVELINK) { -+#ifdef DEBUG -+ if (ip -> havemedia) -+ printf ("%s: Trying media settings on interface\n", -+ ip -> name); -+ else -+ printf ("%s: Found Link on interface\n", ip -> name); -+#endif -+ /* -+ * Set the interface to state_bound. We assume that we have -+ * a working link. If we cannot reach the server directly, -+ * INADDR_BROADCAST is used. -+ */ -+ for (client = ip -> client; -+ client; client = client -> next) { -+ cancel_timeout (state_init, client); -+ cancel_timeout (state_reboot, client); -+ cancel_timeout (state_selecting, client); -+ if (client -> active) { -+ add_timeout (cur_time + random () % 5, -+ state_bound, client, 0, 0); -+ } else { -+ add_timeout (cur_time + random () % 5, -+ state_reboot, client, 0, 0); -+ } -+ } -+ ip -> linkstate = HAVELINK; -+ } else { -+#ifdef DEBUG -+ printf ("%s: No link on interface\n", ip -> name); -+#endif -+ for (client = ip -> client; -+ client; client = client -> next) { -+ /* -+ * Without this add_timout(), dhclient does -+ * not poll on a interface if there -+ * is no cable plugged in at startup -+ * time. Because we add one additional second -+ * to the time of a normal timeout, we always -+ * skip and block a running one. This prevents -+ * that polling is done twice at the same time. -+ */ -+ if (client -> state == S_INIT) { -+ add_timeout (cur_time + (polling_interval + 1), -+ state_polling, client, 0, 0); -+ } -+ } -+ ip -> linkstate = NOLINK; -+ /* -+ * Automatically go into the background after -+ * some time. Do this only if there are no -+ * media options available for a interface. -+ */ -+ if (! ip -> havemedia && ! doinitcheck) { -+ add_timeout (cur_time + (polling_interval * 2), -+ state_background, client, 0, 0); -+ } -+ } -+ } -+ -+ /* -+ * The last status of the interface tells us -+ * the we previously had link. -+ */ -+ if (ip -> linkstate == HAVELINK && doinitcheck) { -+ if (result == NOLINK) { -+ /* -+ * We lost link on the interface, or it isn't -+ * associated anymore. -+ */ -+#ifdef DEBUG -+ printf ("%s: Lost Link on interface\n", ip -> name); -+#endif -+ /* -+ * After we lost link, cycle again through the -+ * different media settings if available. Else -+ * set NOLINK. -+ */ -+ if (ip -> havemedia) -+ ip -> forcediscover = 1; -+ else -+ ip -> linkstate = NOLINK; -+ } -+ /* -+ * If we happen to have a real link, but no -+ * active lease, force the interface into -+ * state_reboot. Do the same if media settings -+ * are available. -+ */ -+ if (ip -> forcediscover) { -+ for (client = ip -> client; -+ client; client = client -> next) { -+ if (client -> state != S_REBOOTING && -+ client -> state != S_SELECTING) { -+ add_timeout (cur_time + random () % 5, -+ state_reboot, client, 0, 0); -+ } -+ } -+ ip -> forcediscover = 0; -+ ip -> linkstate = HAVELINK; -+ } -+ /* We still have link, do nothing. */ -+ } -+ } -+ doinitcheck = 1; -+} -+#endif /* ifdef ENABLE_POLLING_MODE */ diff --git a/net/isc-dhcp31-server/files/patch-client::dhclient.conf b/net/isc-dhcp31-server/files/patch-client::dhclient.conf deleted file mode 100644 index 2d9560f43bf8..000000000000 --- a/net/isc-dhcp31-server/files/patch-client::dhclient.conf +++ /dev/null @@ -1,11 +0,0 @@ ---- client/dhclient.conf.orig Tue Jun 3 00:50:44 1997 -+++ client/dhclient.conf Wed Mar 3 02:20:41 2004 -@@ -11,7 +11,7 @@ - reboot 10; - select-timeout 5; - initial-interval 2; --script "/etc/dhclient-script"; -+script "%%PREFIX%%/sbin/dhclient-script"; - media "-link0 -link1 -link2", "link0 link1"; - reject 192.33.137.209; - diff --git a/net/isc-dhcp31-server/files/patch-common::dhcp-options.5 b/net/isc-dhcp31-server/files/patch-common::dhcp-options.5 deleted file mode 100644 index 9d936cfffeee..000000000000 --- a/net/isc-dhcp31-server/files/patch-common::dhcp-options.5 +++ /dev/null @@ -1,32 +0,0 @@ ---- common/dhcp-options.5.orig Sun Feb 23 04:27:42 2003 -+++ common/dhcp-options.5 Wed Mar 3 02:12:13 2004 -@@ -431,7 +431,10 @@ - the domain-name option to specify the domain name). See RFC 1035 for - character set restrictions. This option is only honored by - .B dhclient-script(8) --if the hostname for the client machine is not set. -+if the hostname for the client machine is not set (i.e., set to the empty -+string in -+.B rc.conf(5) -+). - .RE - .PP - .B option \fBieee802-3-encapsulation\fR \fIflag\fR\fB;\fR -@@ -654,7 +657,7 @@ - This option specifies whether the client should configure its IP - layer to allow forwarding of datagrams with non-local source routes - (see Section 3.3.5 of [4] for a discussion of this topic). A value --of false means disallow forwarding of such datagrams, and a value of true -+of 0 means disallow forwarding of such datagrams, and a value of true - means allow forwarding. - .RE - .PP -@@ -948,7 +951,7 @@ - .PP - This option specifies whether or not the client should negotiate the - use of trailers (RFC 893 [14]) when using the ARP protocol. A value --of false indicates that the client should not attempt to use trailers. A -+of 0 indicates that the client should not attempt to use trailers. A - value of true means that the client should attempt to use trailers. - .RE - .PP diff --git a/net/isc-dhcp31-server/files/patch-common::discover.c b/net/isc-dhcp31-server/files/patch-common::discover.c deleted file mode 100644 index 1cfcc2094098..000000000000 --- a/net/isc-dhcp31-server/files/patch-common::discover.c +++ /dev/null @@ -1,238 +0,0 @@ ---- common/discover.c.orig Fri Jul 25 21:44:15 2003 -+++ common/discover.c Fri Mar 5 23:33:04 2004 -@@ -47,6 +47,7 @@ - #endif /* not lint */ - - #include "dhcpd.h" -+#include <ifaddrs.h> - #include <sys/ioctl.h> - - struct interface_info *interfaces, *dummy_interfaces, *fallback_interface; -@@ -135,10 +136,7 @@ - { - struct interface_info *tmp, *ip; - struct interface_info *last, *next; -- char buf [2048]; -- struct ifconf ic; -- struct ifreq ifr; -- int i; -+ struct ifaddrs *ifap, *ifa; - int sock; - int address_count = 0; - struct subnet *subnet; -@@ -157,61 +155,6 @@ - if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) - log_fatal ("Can't create addrlist socket"); - -- /* Get the interface configuration information... */ -- --#ifdef SIOCGIFCONF_ZERO_PROBE -- /* linux will only tell us how long a buffer it wants if we give it -- * a null buffer first. So, do a dry run to figure out the length. -- * -- * XXX this code is duplicated from below because trying to fold -- * the logic into the if statement and goto resulted in excesssive -- * obfuscation. The intent is that unless you run Linux you shouldn't -- * have to deal with this. */ -- -- ic.ifc_len = 0; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)NULL; --#else -- /* otherwise, we just feed it a starting size, and it'll tell us if -- * it needs more */ -- -- ic.ifc_len = sizeof buf; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; --#endif -- -- gifconf_again: -- i = ioctl(sock, SIOCGIFCONF, &ic); -- -- if (i < 0) -- log_fatal ("ioctl: SIOCGIFCONF: %m"); -- --#ifdef SIOCGIFCONF_ZERO_PROBE -- /* Workaround for SIOCGIFCONF bug on some Linux versions. */ -- if (ic.ifc_ifcu.ifcu_buf == 0 && ic.ifc_len == 0) { -- ic.ifc_len = sizeof buf; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; -- goto gifconf_again; -- } --#endif -- -- /* If the SIOCGIFCONF resulted in more data than would fit in -- a buffer, allocate a bigger buffer. */ -- if ((ic.ifc_ifcu.ifcu_buf == buf --#ifdef SIOCGIFCONF_ZERO_PROBE -- || ic.ifc_ifcu.ifcu_buf == 0 --#endif -- ) && ic.ifc_len > sizeof buf) { -- ic.ifc_ifcu.ifcu_buf = dmalloc ((size_t)ic.ifc_len, MDL); -- if (!ic.ifc_ifcu.ifcu_buf) -- log_fatal ("Can't allocate SIOCGIFCONF buffer."); -- goto gifconf_again; --#ifdef SIOCGIFCONF_ZERO_PROBE -- } else if (ic.ifc_ifcu.ifcu_buf == 0) { -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; -- ic.ifc_len = sizeof buf; -- goto gifconf_again; --#endif -- } -- - - /* If we already have a list of interfaces, and we're running as - a DHCP server, the interfaces were requested. */ -@@ -224,51 +167,38 @@ - else - ir = INTERFACE_REQUESTED; - -+ if (getifaddrs(&ifap) != 0) -+ log_fatal ("getifaddrs failed"); -+ - /* Cycle through the list of interfaces looking for IP addresses. */ -- for (i = 0; i < ic.ifc_len;) { -- struct ifreq *ifp = (struct ifreq *)((caddr_t)ic.ifc_req + i); --#ifdef HAVE_SA_LEN -- if (ifp -> ifr_addr.sa_len > sizeof (struct sockaddr)) -- i += (sizeof ifp -> ifr_name) + ifp -> ifr_addr.sa_len; -- else --#endif -- i += sizeof *ifp; -+ for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) { - - #ifdef ALIAS_NAMES_PERMUTED -- if ((s = strrchr (ifp -> ifr_name, ':'))) { -+ if ((s = strrchr (ifa -> ifa_name, ':'))) { - *s = 0; - } - #endif - - #ifdef SKIP_DUMMY_INTERFACES -- if (!strncmp (ifp -> ifr_name, "dummy", 5)) -+ if (!strncmp (ifa -> ifa_name, "dummy", 5)) - continue; - #endif - -- -- /* See if this is the sort of interface we want to -- deal with. */ -- strcpy (ifr.ifr_name, ifp -> ifr_name); -- if (ioctl (sock, SIOCGIFFLAGS, &ifr) < 0) -- log_fatal ("Can't get interface flags for %s: %m", -- ifr.ifr_name); -- - /* See if we've seen an interface that matches this one. */ - for (tmp = interfaces; tmp; tmp = tmp -> next) -- if (!strcmp (tmp -> name, ifp -> ifr_name)) -+ if (!strcmp (tmp -> name, ifa -> ifa_name)) - break; - -- /* Skip non broadcast interfaces (plus loopback and -- point-to-point in case an OS incorrectly marks them -- as broadcast). Also skip down interfaces unless we're -+ /* See if this is the sort of interface we want to -+ deal with. Skip loopback, point-to-point and down -+ interfaces, except don't skip down interfaces if we're - trying to get a list of configurable interfaces. */ -- if (((!(ifr.ifr_flags & IFF_BROADCAST) || -- ifr.ifr_flags & IFF_LOOPBACK || -- ifr.ifr_flags & IFF_POINTOPOINT) && !tmp) || -- (!(ifr.ifr_flags & IFF_UP) && -+ if ((ifa->ifa_flags & IFF_LOOPBACK) || -+ (ifa->ifa_flags & IFF_POINTOPOINT) || -+ (!(ifa->ifa_flags & IFF_UP) && - state != DISCOVER_UNCONFIGURED)) - continue; -- -+ - /* If there isn't already an interface by this name, - allocate one. */ - if (!tmp) { -@@ -276,9 +206,9 @@ - status = interface_allocate (&tmp, MDL); - if (status != ISC_R_SUCCESS) - log_fatal ("Error allocating interface %s: %s", -- ifp -> ifr_name, -+ ifa -> ifa_name, - isc_result_totext (status)); -- strcpy (tmp -> name, ifp -> ifr_name); -+ strcpy (tmp -> name, ifa -> ifa_name); - interface_snorf (tmp, ir); - interface_dereference (&tmp, MDL); - tmp = interfaces; /* XXX */ -@@ -290,9 +220,9 @@ - /* If we have the capability, extract link information - and record it in a linked list. */ - #ifdef HAVE_AF_LINK -- if (ifp -> ifr_addr.sa_family == AF_LINK) { -+ if (ifa -> ifa_addr->sa_family == AF_LINK) { - struct sockaddr_dl *foo = ((struct sockaddr_dl *) -- (&ifp -> ifr_addr)); -+ (ifa -> ifa_addr)); - #if defined (HAVE_SIN_LEN) - tmp -> hw_address.hlen = foo -> sdl_alen; - #else -@@ -305,12 +235,11 @@ - } else - #endif /* AF_LINK */ - -- if (ifp -> ifr_addr.sa_family == AF_INET) { -+ if (ifa -> ifa_addr->sa_family == AF_INET) { - struct iaddr addr; - - /* Get a pointer to the address... */ -- memcpy (&foo, &ifp -> ifr_addr, -- sizeof ifp -> ifr_addr); -+ bcopy(ifa->ifa_addr, &foo, sizeof(foo)); - - /* We don't want the loopback interface. */ - if (foo.sin_addr.s_addr == htonl (INADDR_LOOPBACK) && -@@ -323,16 +252,15 @@ - found, keep a pointer to ifreq structure in - which we found it. */ - if (!tmp -> ifp) { --#ifdef HAVE_SA_LEN -- unsigned len = ((sizeof ifp -> ifr_name) + -- ifp -> ifr_addr.sa_len); --#else -- unsigned len = sizeof *ifp; --#endif -+ -+ int len = (IFNAMSIZ + -+ ifa -> ifa_addr->sa_len); - tif = (struct ifreq *)dmalloc (len, MDL); - if (!tif) - log_fatal ("no space for ifp."); -- memcpy (tif, ifp, len); -+ strlcpy(tif->ifr_name, ifa->ifa_name, IFNAMSIZ); -+ memcpy(&tif->ifr_addr, ifa->ifa_addr, -+ ifa->ifa_addr->sa_len); - tmp -> ifp = tif; - tmp -> primary_address = foo.sin_addr; - } -@@ -346,9 +274,6 @@ - } - } - -- /* If we allocated a buffer, free it. */ -- if (ic.ifc_ifcu.ifcu_buf != buf) -- dfree (ic.ifc_ifcu.ifcu_buf, MDL); - - #if defined (LINUX_SLASHPROC_DISCOVERY) - /* On Linux, interfaces that don't have IP addresses don't -@@ -529,6 +454,7 @@ - be able to configure, we can quit now. */ - if (state == DISCOVER_UNCONFIGURED) { - close (sock); -+ freeifaddrs(ifap); - return; - } - -@@ -674,6 +600,7 @@ - } - - close (sock); -+ freeifaddrs(ifap); - - if (state == DISCOVER_SERVER && wifcount == 0) { - log_info ("%s", ""); diff --git a/net/isc-dhcp31-server/files/patch-common::dispatch.c b/net/isc-dhcp31-server/files/patch-common::dispatch.c deleted file mode 100644 index 0aa709cf0860..000000000000 --- a/net/isc-dhcp31-server/files/patch-common::dispatch.c +++ /dev/null @@ -1,29 +0,0 @@ ---- common/dispatch.c.orig Sun Nov 17 03:26:57 2002 -+++ common/dispatch.c Wed Mar 3 16:20:15 2004 -@@ -95,11 +95,26 @@ - void dispatch () - { - struct timeval tv, *tvp; -+#ifdef ENABLE_POLLING_MODE -+ struct timeval *tvp_new; -+#endif - isc_result_t status; -+ TIME cur_time; - -+ tvp = NULL; -+#ifdef ENABLE_POLLING_MODE -+ tvp_new = NULL; -+#endif - /* Wait for a packet or a timeout... XXX */ - do { - tvp = process_outstanding_timeouts (&tv); -+#ifdef ENABLE_POLLING_MODE -+ GET_TIME (&cur_time); -+ add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0); -+ tvp_new = process_outstanding_timeouts(&tv); -+ if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec)) -+ tvp = tvp_new; -+#endif /* ENABLE_POLLING_MODE */ - status = omapi_one_dispatch (0, tvp); - } while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS); - log_fatal ("omapi_one_dispatch failed: %s -- exiting.", diff --git a/net/isc-dhcp31-server/files/patch-common::parse.c b/net/isc-dhcp31-server/files/patch-common::parse.c deleted file mode 100644 index 637d69e7f41b..000000000000 --- a/net/isc-dhcp31-server/files/patch-common::parse.c +++ /dev/null @@ -1,22 +0,0 @@ ---- common/parse.c.orig 2 Sep 2003 11:01:23 -0000 -+++ common/parse.c 22 Feb 2004 10:44:52 -0000 -@@ -414,6 +414,7 @@ - { - const char *val; - enum dhcp_token token; -+ int32_t num; - - token = next_token (&val, (unsigned *)0, cfile); - if (token != NUMBER) { -@@ -421,9 +422,9 @@ - skip_to_semi (cfile); - return; - } -- convert_num (cfile, (unsigned char *)timep, val, 10, 32); -+ convert_num (cfile, (unsigned char *)&num, val, 10, 32); - /* Unswap the number - convert_num returns stuff in NBO. */ -- *timep = ntohl (*timep); /* XXX */ -+ *timep = ntohl (num); - - parse_semi (cfile); - } diff --git a/net/isc-dhcp31-server/files/patch-configure b/net/isc-dhcp31-server/files/patch-configure deleted file mode 100644 index 5aff6909acce..000000000000 --- a/net/isc-dhcp31-server/files/patch-configure +++ /dev/null @@ -1,41 +0,0 @@ ---- configure.orig Sat Apr 20 23:44:13 2002 -+++ configure Mon Apr 28 23:02:10 2003 -@@ -13,6 +13,9 @@ - elif [ x$1 = x--dirs ]; then - dirs=$2 - shift -+ elif [ x$1 = x--subsys ]; then -+ subsys=$2 -+ shift - elif [ x$1 = x--no-links ]; then - nolinks=YES - elif [ x$1 = x--copts ]; then -@@ -233,7 +236,14 @@ - fi - - if [ x"$dirs" = x ]; then -- dirs=". client server relay common omapip dhcpctl minires dst" -+ dirs=". common minires dst omapip dhcpctl" -+ if [ x$subsys = x ]; then -+ dirs="$dirs server omshell client relay" -+ elif [ x$subsys = xserver ]; then -+ dirs="$dirs server omshell" -+ elif [ x$subsys = xclient -o x$subsys = xrelay ]; then -+ dirs="$dirs $subsys" -+ fi - fi - - for foo in $dirs; do -@@ -253,7 +263,11 @@ - - # Make the link tree in which to actually build. - if [ x$nolinks = x ]; then -- make links -+ if [ x$subsys = x ]; then -+ make links -+ else -+ make links.$subsys -+ fi - fi - - exit 0 diff --git a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist b/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist deleted file mode 100644 index f840cfba6278..000000000000 --- a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist +++ /dev/null @@ -1,79 +0,0 @@ ---- dhcpctl/Makefile.dist.orig Thu Mar 3 17:55:23 2005 -+++ dhcpctl/Makefile.dist Mon Jul 25 08:33:33 2005 -@@ -22,11 +22,11 @@ - # http://www.isc.org/ - # - --CATMANPAGES = dhcpctl.cat3 omshell.cat1 --SEDMANPAGES = dhcpctl.man3 omshell.man1 -+CATMANPAGES = dhcpctl.cat3 -+SEDMANPAGES = dhcpctl.man3 - SRC = dhcpctl.c callback.c remote.c - OBJ = dhcpctl.o callback.o remote.o --MAN = dhcpctl.3 omshell.1 -+MAN = dhcpctl.3 - HDRS = dhcpctl.h - - INCLUDES = $(BINDINC) -I$(TOP)/includes -@@ -34,10 +34,7 @@ - DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \ - ../omapip/libomapi.a ../dst/libdst.a - --all: libdhcpctl.a omshell cltest $(CATMANPAGES) -- --omshell: omshell.o $(DHCPCTLLIBS) -- $(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS) -+all: libdhcpctl.a cltest $(CATMANPAGES) - - cltest: cltest.o $(DHCPCTLLIBS) - $(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS) -@@ -48,8 +45,7 @@ - $(RANLIB) libdhcpctl.a - - install: all $(CATMANPAGES) -- for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \ -- $(USERBINDIR); do \ -+ for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR); do \ - foo=""; \ - for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ - foo=$${foo}/$$bar; \ -@@ -69,16 +65,12 @@ - $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \ - $(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \ - done -- $(INSTALL) omshell $(DESTDIR)$(USERBINDIR) -- $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell -- $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \ -- $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT) - - depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC) - - clean: -- -rm -f $(OBJ) omshell.o omshell cltest.o cltest -+ -rm -f $(OBJ) cltest.o cltest - - realclean: clean - -rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES) -@@ -87,7 +79,7 @@ - -rm -f Makefile - - links: -- @for foo in $(SRC) $(MAN) omshell.c cltest.c $(HDRS); do \ -+ @for foo in $(SRC) $(MAN) cltest.c $(HDRS); do \ - if [ ! -b $$foo ]; then \ - rm -f $$foo; \ - fi; \ -@@ -100,12 +92,5 @@ - dhcpctl.man3: dhcpctl.3 - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ - -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3 -- --omshell.cat1: omshell.man1 -- nroff -man omshell.man1 >omshell.cat1 -- --omshell.man1: omshell.1 -- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ -- -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 - - # Dependencies (semi-automatically-generated) diff --git a/net/isc-dhcp31-server/files/patch-dhcpd.conf b/net/isc-dhcp31-server/files/patch-dhcpd.conf deleted file mode 100644 index 030e89874d8d..000000000000 --- a/net/isc-dhcp31-server/files/patch-dhcpd.conf +++ /dev/null @@ -1,12 +0,0 @@ ---- server/dhcpd.conf.orig Thu Jan 25 03:33:11 2001 -+++ server/dhcpd.conf Wed Jan 30 22:06:52 2002 -@@ -14,6 +14,9 @@ - # network, the authoritative directive should be uncommented. - #authoritative; - -+# ad-hoc DNS update scheme - set to "none" to disable dynamic DNS updates. -+ddns-update-style ad-hoc; -+ - # Use this to send dhcp log messages to a different log file (you also - # have to hack syslog.conf to complete the redirection). - log-facility local7; diff --git a/net/isc-dhcp31-server/files/patch-dst::Makefile.dist b/net/isc-dhcp31-server/files/patch-dst::Makefile.dist deleted file mode 100644 index ad45436b1629..000000000000 --- a/net/isc-dhcp31-server/files/patch-dst::Makefile.dist +++ /dev/null @@ -1,29 +0,0 @@ ---- dst/Makefile.dist.orig Sun Nov 17 03:27:43 2002 -+++ dst/Makefile.dist Fri Mar 5 23:40:45 2004 -@@ -26,12 +26,24 @@ - - all: libdst.a - --install: -- - libdst.a: $(OBJ) - rm -f dst.a - ar cruv libdst.a $(OBJ) - $(RANLIB) libdst.a -+ -+install: all -+ for dir in $(LIBDIR);\ -+ do \ -+ foo=""; \ -+ for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ -+ foo=$${foo}/$$bar; \ -+ if [ ! -d $$foo ]; then \ -+ mkdir $$foo; \ -+ chmod 755 $$foo; \ -+ fi; \ -+ done; \ -+ done -+ $(INSTALL) libdst.a $(DESTDIR)$(LIBDIR) - - depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC) diff --git a/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h deleted file mode 100644 index 9a3f4c636b09..000000000000 --- a/net/isc-dhcp31-server/files/patch-includes::cf::freebsd.h +++ /dev/null @@ -1,62 +0,0 @@ ---- includes/cf/freebsd.h.orig Wed Mar 3 02:32:39 2004 -+++ includes/cf/freebsd.h Wed Mar 3 02:31:56 2004 -@@ -42,7 +42,7 @@ - */ - - #include <syslog.h> --#include <sys/types.h> -+#include <sys/param.h> - #include <string.h> - #include <paths.h> - #include <errno.h> -@@ -101,6 +101,10 @@ - #define SOCKLEN_T int - #endif - -+#ifdef RESCUE -+#define _PATH_DHCLIENT_SCRIPT "/rescue/dhclient-script" -+#endif -+ - #if defined (USE_DEFAULT_NETWORK) - # define USE_BPF - #endif -@@ -111,6 +115,9 @@ - #endif /* HAVE_DEV_RANDOM */ - - const char *cmds[] = { -+#ifndef RESCUE -+ /* rescue environment can't rely on these ... */ -+ /* Actually, /sbin/dhclient shouldn't use these, either. */ - "/bin/ps -axlw 2>&1", - "/usr/sbin/arp -an 2>&1", - "/usr/bin/netstat -an 2>&1", -@@ -121,10 +128,12 @@ - "/usr/sbin/iostat 2>&1", - "/usr/bin/vmstat 2>&1", - "/usr/bin/w 2>&1", -+#endif - NULL - }; - - const char *dirs[] = { -+#ifndef RESCUE - "/tmp", - "/usr/tmp", - ".", -@@ -134,13 +143,16 @@ - "/var/mail", - "/home", - "/usr/home", -+#endif - NULL - }; - - const char *files[] = { -+#ifndef RESCUE - "/var/log/messages", - "/var/log/wtmp", - "/var/log/lastlog", -+#endif - NULL - }; - #endif /* NEED_PRAND_CONF */ diff --git a/net/isc-dhcp31-server/files/patch-includes::dhcpd.h b/net/isc-dhcp31-server/files/patch-includes::dhcpd.h deleted file mode 100644 index 1933e0b4037a..000000000000 --- a/net/isc-dhcp31-server/files/patch-includes::dhcpd.h +++ /dev/null @@ -1,56 +0,0 @@ ---- includes/dhcpd.h.orig Mon Feb 10 02:22:46 2003 -+++ includes/dhcpd.h Wed Mar 3 16:20:09 2004 -@@ -99,6 +99,9 @@ - (((x) >> OPTION_HASH_EXP) & \ - (OPTION_HASH_PTWO - 1))) % OPTION_HASH_SIZE; - -+#define NOLINK 0 -+#define HAVELINK 1 -+ - enum dhcp_shutdown_state { - shutdown_listeners, - shutdown_omapi_connections, -@@ -783,6 +786,11 @@ - unsigned remote_id_len; /* Length of Remote ID. */ - - char name [IFNAMSIZ]; /* Its name... */ -+ int ieee80211; /* True if media is ieee802.11 */ -+ int havemedia; /* True if we have a media table */ -+ int linkstate; /* True if we have link */ -+ int polling; /* True if polling is enabled */ -+ int forcediscover; /* True if a discover is needed */ - int index; /* Its index. */ - int rfdesc; /* Its read file descriptor. */ - int wfdesc; /* Its write file descriptor, if -@@ -1845,6 +1853,9 @@ - extern const char *path_dhclient_pid; - extern char *path_dhclient_script; - extern int interfaces_requested; -+#ifdef ENABLE_POLLING_MODE -+extern int polling_interval; -+#endif - - extern struct client_config top_level_config; - -@@ -1858,12 +1869,21 @@ - void send_decline PROTO ((void *)); - - void state_reboot PROTO ((void *)); -+#ifdef ENABLE_POLLING_MODE -+void state_background PROTO ((void *)); -+void state_polling PROTO ((void *)); -+#endif - void state_init PROTO ((void *)); - void state_selecting PROTO ((void *)); - void state_requesting PROTO ((void *)); - void state_bound PROTO ((void *)); - void state_stop PROTO ((void *)); - void state_panic PROTO ((void *)); -+ -+#if __FreeBSD_version > 502010 -+void set_ieee80211 PROTO ((struct interface_info *)); -+#endif -+int interface_active PROTO ((struct interface_info *)); - - void bind_lease PROTO ((struct client_state *)); - diff --git a/net/isc-dhcp31-server/files/patch-server::dhcpd.c b/net/isc-dhcp31-server/files/patch-server::dhcpd.c deleted file mode 100644 index e2e6e24e814e..000000000000 --- a/net/isc-dhcp31-server/files/patch-server::dhcpd.c +++ /dev/null @@ -1,288 +0,0 @@ ---- server/dhcpd.c.orig Thu Jun 10 19:59:52 2004 -+++ server/dhcpd.c Fri Jun 25 15:49:09 2004 -@@ -47,6 +47,22 @@ - #include "version.h" - #include <omapip/omapip_p.h> - -+#if defined (PARANOIA) -+#include <sys/types.h> -+#include <unistd.h> -+#include <pwd.h> -+/* get around the ISC declaration of group */ -+#define group real_group -+#include <grp.h> -+#undef group -+#endif /* PARANOIA */ -+#if defined (JAIL) -+#include <sys/param.h> -+#include <sys/jail.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#endif /* JAIL */ -+ - static void usage PROTO ((void)); - - TIME cur_time; -@@ -195,6 +211,35 @@ - omapi_object_dereference (&listener, MDL); - } - -+#if defined (PARANOIA) -+/* to be used in one of two possible scenarios */ -+static void setup_chroot (char *chroot_dir) -+{ -+ if (geteuid ()) -+ log_fatal ("you must be root to use chroot"); -+ if (chroot (chroot_dir)) -+ log_fatal ("chroot(\"%s\"): %m", chroot_dir); -+ if (chdir ("/")) -+ /* probably permission denied */ -+ log_fatal ("chdir(\"/\"): %m"); -+} -+#endif /* PARANOIA */ -+ -+#if defined (JAIL) -+static void setup_jail (char *chroot_dir, char *hostname, u_int32_t ip_number) -+{ -+ struct jail j; -+ -+ j.version = 0; -+ j.path = chroot_dir; -+ j.hostname = hostname; -+ j.ip_number = ip_number; -+ -+ if (jail (&j) < 0) -+ log_fatal ("jail(%s, %s): %m", chroot_dir, hostname); -+} -+#endif /* JAIL */ -+ - int main (argc, argv, envp) - int argc; - char **argv, **envp; -@@ -227,6 +272,25 @@ - char *traceinfile = (char *)0; - char *traceoutfile = (char *)0; - #endif -+#if defined (PARANOIA) -+ char *set_user = 0; -+ char *set_group = 0; -+ uid_t set_uid = 0; -+ gid_t set_gid = 0; -+ int early_chroot = 0; -+ int no_dhcpd_user = 0; -+ int no_dhcpd_group = 0; -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ char *set_chroot = 0; -+ int no_dhcpd_chroot = 0; -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ char *set_jail = 0; -+ u_int32_t jail_ip_address = 0; /* Good as long as it's IPv4 ... */ -+ int no_dhcpd_jail = 0; -+ char *s2; -+#endif /* JAIL */ - - /* Make sure we have stdin, stdout and stderr. */ - status = open ("/dev/null", O_RDWR); -@@ -289,6 +353,39 @@ - if (++i == argc) - usage (); - server = argv [i]; -+#if defined (PARANOIA) -+ } else if (!strcmp (argv [i], "-user")) { -+ if (++i == argc) -+ usage (); -+ set_user = argv [i]; -+ no_dhcpd_user = 1; -+ } else if (!strcmp (argv [i], "-group")) { -+ if (++i == argc) -+ usage (); -+ set_group = argv [i]; -+ no_dhcpd_group = 1; -+ } else if (!strcmp (argv [i], "-early_chroot")) { -+ early_chroot = 1; -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ } else if (!strcmp (argv [i], "-chroot")) { -+ if (++i == argc) -+ usage (); -+ set_chroot = argv [i]; -+ no_dhcpd_chroot = 1; -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ } else if (!strcmp (argv [i], "-jail")) { -+ if (++i == argc) -+ usage (); -+ set_jail = argv [i]; -+ if (++i == argc) -+ usage (); -+ if (ascii2addr (AF_INET, argv[i], &jail_ip_address) < 0) -+ log_fatal ("invalid ip address: %s", argv[i]); -+ jail_ip_address = ntohl (jail_ip_address); -+ no_dhcpd_jail = 1; -+#endif /* JAIL */ - } else if (!strcmp (argv [i], "-cf")) { - if (++i == argc) - usage (); -@@ -366,6 +463,28 @@ - if (!no_dhcpd_pid && (s = getenv ("PATH_DHCPD_PID"))) { - path_dhcpd_pid = s; - } -+#if defined (PARANOIA) -+ if (!no_dhcpd_user && (s = getenv ("DHCPD_USER"))) { -+ set_user = s; -+ } -+ if (!no_dhcpd_group && (s = getenv ("DHCPD_GROUP"))) { -+ set_group = s; -+ } -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ if (!no_dhcpd_chroot && (s = getenv ("PATH_DHCPD_CHROOT"))) { -+ set_chroot = s; -+ } -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ if (!no_dhcpd_jail && (s = getenv ("DHCPD_JAIL_HOSTNAME")) && -+ (s2 = getenv ("DHCPD_JAIL_IPADDRESS"))) { -+ set_jail = s; -+ if (ascii2addr (AF_INET, s2, &jail_ip_address) < 0) -+ log_fatal ("invalid ip address: %s", s2); -+ jail_ip_address = ntohl (jail_ip_address); -+ } -+#endif /* JAIL */ - - if (!quiet) { - log_info ("%s %s", message, DHCP_VERSION); -@@ -388,6 +507,57 @@ - trace_seed_stop, MDL); - #endif - -+#if defined (PARANOIA) -+ /* get user and group info if those options were given */ -+ if (set_user) { -+ struct passwd *tmp_pwd; -+ -+ if (geteuid ()) -+ log_fatal ("you must be root to set user"); -+ -+ if (!(tmp_pwd = getpwnam (set_user))) -+ log_fatal ("no such user: %s", set_user); -+ -+ set_uid = tmp_pwd->pw_uid; -+ -+ /* use the user's group as the default gid */ -+ if (!set_group) -+ set_gid = tmp_pwd->pw_gid; -+ } -+ -+ if (set_group) { -+/* get around the ISC declaration of group */ -+#define group real_group -+ struct group *tmp_grp; -+ -+ if (geteuid ()) -+ log_fatal ("you must be root to set group"); -+ -+ if (!(tmp_grp = getgrnam (set_group))) -+ log_fatal ("no such group: %s", set_group); -+ -+ set_gid = tmp_grp->gr_gid; -+#undef group -+ } -+#endif /* PARANOIA */ -+#if defined (JAIL) -+ if (set_jail) { -+ /* Initialize icmp support... */ -+ if (!cftest && !lftest) -+ icmp_startup (1, lease_pinged); -+ if(!set_chroot) -+ set_chroot = "/"; -+ setup_jail (set_chroot, set_jail, jail_ip_address); -+ } -+#endif /* JAIL */ -+#if defined (PARANOIA) && defined (JAIL) -+ else -+#endif /* PARANOIA && JAIL */ -+#if defined (PARANOIA) -+ if (early_chroot && set_chroot) -+ setup_chroot (set_chroot); -+#endif /* PARANOIA */ -+ - /* Default to the DHCP/BOOTP port. */ - if (!local_port) - { -@@ -462,6 +632,9 @@ - #endif - - /* Initialize icmp support... */ -+#if defined (JAIL) -+ if (!set_jail) -+#endif /* JAIL */ - if (!cftest && !lftest) - icmp_startup (1, lease_pinged); - -@@ -491,6 +664,14 @@ - - postconf_initialization (quiet); - -+#if defined (PARANOIA) -+#if defined (JAIL) -+ if (!set_jail) -+#endif /* JAIL */ -+ if (!early_chroot && set_chroot) -+ setup_chroot (set_chroot); -+#endif /* PARANOIA */ -+ - /* test option should cause an early exit */ - if (cftest && !lftest) - exit(0); -@@ -533,7 +714,22 @@ - else if (pid) - exit (0); - } -+ -+#if defined (PARANOIA) -+ /* change uid to the specified one */ -+ if (set_gid) { -+ if (setgroups (0, (void *)0)) -+ log_fatal ("setgroups: %m"); -+ if (setgid (set_gid)) -+ log_fatal ("setgid(%d): %m", (int) set_gid); -+ } - -+ if (set_uid) { -+ if (setuid (set_uid)) -+ log_fatal ("setuid(%d): %m", (int) set_uid); -+ } -+#endif /* PARANOIA */ -+ - /* Read previous pid file. */ - if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) { - status = read (i, pbuf, (sizeof pbuf) - 1); -@@ -877,8 +1073,24 @@ - log_info (copyright); - log_info (arr); - -- log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s", -+ log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s%s%s%s", - "\n [-cf config-file] [-lf lease-file]", -+ -+#if defined (PARANOIA) -+ /* meld into the following string */ -+ "\n [-user user] [-group group]", -+ "\n [-chroot dir] [-early_chroot]", -+#else /* PARANOIA */ -+ "", "", -+#endif /* PARANOIA */ -+ -+#if defined (JAIL) -+ /* then also these ones */ -+ "\n [-jail name ip]", -+#else /* JAIL */ -+ "", -+#endif /* JAIL */ -+ - #if defined (TRACING) - "\n [-tf trace-output-file]", - "\n [-play trace-input-file]", diff --git a/net/isc-dhcp31-server/files/patch-site.conf b/net/isc-dhcp31-server/files/patch-site.conf deleted file mode 100644 index 1149e0c7925c..000000000000 --- a/net/isc-dhcp31-server/files/patch-site.conf +++ /dev/null @@ -1,42 +0,0 @@ ---- site.conf.orig Wed Jul 7 17:20:10 1999 -+++ site.conf Wed Mar 3 14:00:14 2004 -@@ -1,2 +1,39 @@ - # Put local site configuration stuff here to override the default - # settings in Makefile.conf -+ -+PREFIX ?= /usr/local -+ -+USERBINDIR = $(PREFIX)/bin -+BINDIR = $(PREFIX)/sbin -+CLIENTBINDIR = $(PREFIX)/sbin -+ADMMANDIR = $(PREFIX)/man/man8 -+ADMMANEXT = .8 -+FFMANDIR = $(PREFIX)/man/man5 -+FFMANEXT = .5 -+LIBMANDIR = $(PREFIX)/man/man3 -+LIBMANEXT = .3 -+USRMANDIR = $(PREFIX)/man/man1 -+USRMANEXT = .1 -+MANCAT = man -+# INSTALL = ${INSTALL_DATA} -+# MANINSTALL = ${INSTALL_MAN} -+ETC = $(PREFIX)/etc -+LIBDIR = ${PREFIX}/lib -+INCDIR = ${PREFIX}/include -+CLIENT_PATH = \"PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin\" -+ -+DEBUG ?= #none -+ -+CFLAGS += -D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\" -+CFLAGS += -D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\" -+CFLAGS += -D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\" -+ -+CFLAGS += -D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\" -+ -+CFLAGS += -D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\" -+CFLAGS += -D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\" -+CFLAGS += -D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\" -+CFLAGS += -D_PATH_DHCLIENT_PID=\"$(VARRUN)/dhclient.pid\" -+ -+CFLAGS += -Dwarn=dhcp_warn -+CFLAGS += -DNOMINUM diff --git a/net/isc-dhcp31-server/pkg-descr b/net/isc-dhcp31-server/pkg-descr deleted file mode 100644 index 86bbb3cc62f0..000000000000 --- a/net/isc-dhcp31-server/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server (this port) - * A DHCP client - * A DHCP relay agent - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp31-server/pkg-install b/net/isc-dhcp31-server/pkg-install deleted file mode 100644 index 8bafd2bed768..000000000000 --- a/net/isc-dhcp31-server/pkg-install +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -[ $# != 2 ] && exit 1 -[ -z "${PKG_PREFIX}" ] && exit 1 -[ -n "${BATCH}" ] && exit 0 - -case $2 in -POST-INSTALL) - ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall - ;; -DEINSTALL) - ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall - ;; -POST-DEINSTALL|PRE-INSTALL) - ;; -*) - echo "usage: $0 <PKG_NAME> {PRE-INSTALL|POST-INSTALL|DEINSTALL|POST-DEINSTALL}" >&2 - exit 1 - ;; -esac diff --git a/net/isc-dhcp31-server/pkg-message b/net/isc-dhcp31-server/pkg-message deleted file mode 100644 index 754d49ae331f..000000000000 --- a/net/isc-dhcp31-server/pkg-message +++ /dev/null @@ -1,53 +0,0 @@ -**** To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample - to %%PREFIX%%/etc/dhcpd.conf for editing. - -**** This port installs dhcp daemon, but don't invokes dhcpd by default. If - you want to invoke dhcpd at startup, put these lines into /etc/rc.conf. - - dhcpd_enable="YES" # dhcpd enabled? - dhcpd_flags="-q" # command option(s) - dhcpd_conf="%%PREFIX%%/etc/dhcpd.conf" # configuration file - dhcpd_ifaces="" # ethernet interface(s) - dhcpd_withumask="022" # file creation mask - -**** If compiled with paranoia support (the default), the following lines - are also supported: - - dhcpd_chuser_enable="YES" # runs w/o privileges? - dhcpd_withuser="dhcpd" # user name to run as - dhcpd_withgroup="dhcpd" # group name to run as - dhcpd_chroot_enable="YES" # runs chrooted? - dhcpd_devfs_enable="YES" # use devfs if available? - dhcpd_makedev_enable="YES" # use MAKEDEV instead? - dhcpd_rootdir="/var/db/dhcpd" # directory to run in - dhcpd_includedir="<some_dir>" # directory with config- - files to include - dhcpd_flags="-early_chroot" # needs full root - - WARNING: -early_chroot requires a jail(8) like environment to work. - - WARNING: dhcpd_devfs_enable and dhcpd_makedev_enable are mutually - exclusive - dhcpd_makedev_enable make NO sense on FreeBSD 5.x and up! - -**** If compiled with jail support (the default), the following lines are - also supported (-early_chroot and dhcpd_chroot_enable=YES are implied): - - dhcpd_jail_enable="YES" # runs imprisoned? - dhcpd_hostname="<hostname>" # jail hostname - dhcpd_ipaddress="<ip address>" # jail ip address - - WARNING: dhcpd_rootdir needs to point to a full jail(8) environment. - -**** WARNING: never edit the chrooted or jailed dhcpd.conf file but - %%PREFIX%%/etc/dhcpd.conf instead which is always copied where - needed upon startup. - -**** WARNING: %%PREFIX%%/etc/rc.isc-dhcpd.conf is obsolete. rc.conf like - variables are still read there but should be moved /etc/rc.conf or - /etc/rc.conf.d/dhcpd instead. Also, the dhcpd_options variable must - be renamed dhcpd_flags if any. -%%LDAP%% -%%LDAP%%**** You have requested support for the LDAP configuration backend. -%%LDAP%% The OpenLDAP schema file is installed as %%SCHEMA_DIR%%/dhcp.schema. -%%LDAP%% See %%DOCSDIR%%/README.ldap for further LDAP configuration details. diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist deleted file mode 100644 index 3daff57c0e42..000000000000 --- a/net/isc-dhcp31-server/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -@comment $FreeBSD$ -bin/omshell -%%LDAP%%bin/dhcpd-conf-to-ldap.pl -etc/dhcpd.conf.sample -etc/rc.d/isc-dhcpd.sh -sbin/dhcpd -%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema -%%LDAP%%@dirrm %%SCHEMA_DIR%% diff --git a/net/isc-dhcp40-client/Makefile b/net/isc-dhcp40-client/Makefile deleted file mode 100644 index c0799f3e6e54..000000000000 --- a/net/isc-dhcp40-client/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -COMMENT= The ISC Dynamic Host Configuration Protocol client - -# Local variables -# - -SUBSYS= client - -# Local overrides -# - -MASTERDIR= ${.CURDIR}/../isc-dhcp3-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/isc-dhcp40-client/pkg-descr b/net/isc-dhcp40-client/pkg-descr deleted file mode 100644 index 7dc1bc78ea95..000000000000 --- a/net/isc-dhcp40-client/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server - * A DHCP client (this port) - * A DHCP relay agent - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp40-client/pkg-message b/net/isc-dhcp40-client/pkg-message deleted file mode 100644 index b406fd04fbd8..000000000000 --- a/net/isc-dhcp40-client/pkg-message +++ /dev/null @@ -1,10 +0,0 @@ -**** To setup dhclient, you may need to edit /etc/rc.conf to replace the - base system dhclient, such as : - - dhcp_program="%%PREFIX%%/sbin/dhclient" - dhcp_flags="-q" - - See dhclient(8), using the following command, for details about other - possible options: - - MANPATH=%%MAN1PREFIX%%/man man 8 dhclient diff --git a/net/isc-dhcp40-client/pkg-plist b/net/isc-dhcp40-client/pkg-plist deleted file mode 100644 index 9718418fbd95..000000000000 --- a/net/isc-dhcp40-client/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp40-client/Attic/pkg-plist,v 1.3 2004-06-26 08:46:05 eik Exp $ -etc/dhclient.conf.sample -@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf -@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf -sbin/dhclient -sbin/dhclient-script -@exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases -@unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases diff --git a/net/isc-dhcp40-relay/Makefile b/net/isc-dhcp40-relay/Makefile deleted file mode 100644 index e739f7a0e6db..000000000000 --- a/net/isc-dhcp40-relay/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -COMMENT= The ISC Dynamic Host Configuration Protocol relay - -# Local variables -# - -SUBSYS= relay - -# Local overrides -# - -MASTERDIR= ${.CURDIR}/../isc-dhcp3-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/isc-dhcp40-relay/pkg-descr b/net/isc-dhcp40-relay/pkg-descr deleted file mode 100644 index b764dbf45a19..000000000000 --- a/net/isc-dhcp40-relay/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server - * A DHCP client - * A DHCP relay agent (this port) - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp40-relay/pkg-message b/net/isc-dhcp40-relay/pkg-message deleted file mode 100644 index af6992fb34a5..000000000000 --- a/net/isc-dhcp40-relay/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -**** This port installs dhcp relay daemon, but don't invokes dhcrelay by - default. If you want to invoke dhcrelay at startup, put these lines - into /etc/rc.conf. - - dhcrelay_enable="YES" - dhcrelay_flags="" # command option(s) - dhcrelay_servers="" # dhcrelay server(s) - dhcrelay_ifaces="" # ethernet interface(s) - -**** For instance, rc.conf like variables are still read from - %%PREFIX%%/etc/rc.isc-dhcrelay.conf. They should be move - into /etc/rc.conf. Also, the dhcrelay_options variable - must be renamed dhcrelay_flags. diff --git a/net/isc-dhcp40-relay/pkg-plist b/net/isc-dhcp40-relay/pkg-plist deleted file mode 100644 index 4e31ff1c9fd7..000000000000 --- a/net/isc-dhcp40-relay/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp40-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $ -etc/rc.d/isc-dhcrelay.sh -sbin/dhcrelay diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile deleted file mode 100644 index 77309c5b0304..000000000000 --- a/net/isc-dhcp40-server/Makefile +++ /dev/null @@ -1,357 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 7 Mar 1996 -# Whom: se -# -# $FreeBSD$ -# - -PORTNAME= dhcp -PORTVERSION= 3.0.3 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_ISC} -MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history -PKGNAMEPREFIX= isc- -PKGNAMESUFFIX= 3-${SUBSYS} -DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL} - -MAINTAINER= Joerg.Pulz@frm2.tum.de -COMMENT?= The ISC Dynamic Host Configuration Protocol server - -USE_REINPLACE= yes -USE_RC_SUBR= yes - -SUBSYS?= server - -UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} -.if ${SUBSYS} == client -OPTIONS= INTERFACE_POLLING "interface polling support" on -.endif -.if ${SUBSYS} == server -OPTIONS= DHCP_PARANOIA "add -user, -group and -chroot options" on \ - DHCP_JAIL "add -chroot and -jail options" on \ - DHCP_SOCKETS "use sockets instead of /dev/bpf (jail-only)" off \ - DHCP_LDAP "add experimental LDAP backend support" off \ - DHCP_LDAP_SSL "support LDAP connection over SSL/TLS" on \ - OPENSSL_BASE "use the base system OpenSSL (required by TLS)" on \ - OPENSSL_PORT "use OpenSSL from ports (required by TLS)" off \ - DHCP_LQ "DHCPLEASEQUERY support used by Cisco uBR's" off -.endif - -.include <bsd.port.pre.mk> - -.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP) -# Based on patch from Brian Masney : -PATCH_SITES= http://www.newwave.net/~masneyb/:ldap \ - ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:ldap -PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch:ldap -PATCH_DIST_STRIP= -p1 - -USE_PERL5_RUN= yes -USE_OPENLDAP= yes - -.if !defined(WITHOUT_DHCP_LDAP_SSL) -USE_OPENSSL= yes -# hack to get bsd.openssl.mk included at this late state -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -.endif -.endif - -.if ${SUBSYS} == server && defined(WITH_DHCP_LQ) -# Based on patch from Dmitry Sukhodoev : -PATCH_SITES+= http://bingo.ru/~raven/FreeBSD/patches/:dlq \ - ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/:dlq -PATCHFILES+= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-dlq-patch:dlq -.endif - -# Global variables -# - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --subsys ${SUBSYS} -ALL_TARGET= all.${SUBSYS} -INSTALL_TARGET= install.${SUBSYS} -SCRIPTS_ENV+= PKG_PREFIX=${PREFIX} - -.if ${SUBSYS} == client -MAN5= dhclient.conf.5 dhclient.leases.5 -MAN8= dhclient.8 dhclient-script.8 -.elif ${SUBSYS} == server -MAN1= omshell.1 -MAN5= dhcpd.conf.5 dhcpd.leases.5 -MAN8= dhcpd.8 -.elif ${SUBSYS} == relay -MAN8= dhcrelay.8 -.else -MAN3= dhcpctl.3 omapi.3 -.endif -.if ${SUBSYS} != relay -MAN5+= dhcp-eval.5 dhcp-options.5 -.endif - -MSG_FILE= ${.CURDIR}/pkg-message -DESCR= ${.CURDIR}/pkg-descr -PKGINSTALL= ${.CURDIR}/pkg-install -PKGDEINSTALL= ${PKGINSTALL} -PKGMESSAGE= ${WRKDIR}/pkg-message -PLIST= ${.CURDIR}/pkg-plist - -# Local variables -# - -# for instance, possible versions are: -# 1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2 -# which have to become: -# 1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2.3, 1.2 -# so, the magic things are: -VERSION= -PATCHLEVEL= -.if ${PORTVERSION:R:E:M[br]*} != "" -RELEASE= ${PORTVERSION:R:R} -VERSION= ${PORTVERSION:R:E:S/b/beta/:S/r/rc/} -PATCHLEVEL= pl${PORTVERSION:E} -.elif ${PORTVERSION:E:M[br]*} != "" -RELEASE= ${PORTVERSION:R} -VERSION= ${PORTVERSION:E:S/b/beta/:S/r/rc/} -#.elif ${PORTVERSION:R:E} != "" -#RELEASE= ${PORTVERSION:R} -#PATCHLEVEL= pl${PORTVERSION:E} -.else -RELEASE= ${PORTVERSION} -.endif - -PATCH_SUBDIRS= common minires dst omapip -.if ${SUBSYS} == server || ${SUBSYS} == devel -PATCH_SUBDIRS+= dhcpctl -.endif -.if ${SUBSYS} != devel -PATCH_SUBDIRS+= ${SUBSYS} -.endif -.if ${SUBSYS} == server -PATCH_SUBDIRS+= omshell -.endif - -.if !defined(NOPORTDOCS) -PORTDOCS= LICENSE README RELNOTES -.endif -.if ${SUBSYS} == client -BIN_FILES= dhclient -LOCAL_CONF_FILES= dhclient.conf -SAMP_FILES= client/dhclient.conf -DATA_FILES= dhclient.leases -.elif ${SUBSYS} == server -BIN_FILES= dhcpd omshell -RC_FILES= isc-dhcpd -SAMP_FILES= server/dhcpd.conf -DATA_FILES= dhcpd.leases -.if defined(WITH_DHCP_LDAP) -PORTDOCS+= README.ldap -LDAP_SCRIPT= contrib/dhcpd-conf-to-ldap.pl -LDAP_SCHEMA= contrib/dhcp.schema -.endif -.elif ${SUBSYS} == relay -BIN_FILES= dhcrelay -RC_FILES= isc-dhcrelay -.endif - -SAMP_SUFX= .sample - -CONF_DIR= ${PREFIX}/etc -RC_DIR= ${PREFIX}/etc/rc.d -SCHEMA_DIR= ${PREFIX}/share/${PKGBASE} -DOCSDIR= ${PREFIX}/share/doc/${PKGBASE} -DATADIR= /var/db - -PLIST_SUB+= SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" -.if defined(WITH_DHCP_LDAP) -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " -.endif -REINPLACE_SUB= PREFIX=${PREFIX} -RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -.if ${OSVERSION} >= 502100 -RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin -.else -RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin -.endif -.if !defined(WITHOUT_DHCP_PARANOIA) -RCSCRIPTS_SUB+= PARANOIA=YES -.else -RCSCRIPTS_SUB+= PARANOIA=NO -.endif -.if !defined(WITHOUT_DHCP_JAIL) -RCSCRIPTS_SUB+= JAIL=YES -.else -RCSCRIPTS_SUB+= JAIL=NO -.endif -PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \ - DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}" - -# Post-extract -# - -post-extract: extract-omshell extract-script - -extract-omshell: - @${MKDIR} ${WRKSRC}/omshell - @${MV} ${WRKSRC}/dhcpctl/omshell.? ${WRKSRC}/omshell - @${CP} ${FILESDIR}/omshell::Makefile.dist \ - ${WRKSRC}/omshell/Makefile.dist - -extract-script: - @${CP} ${FILESDIR}/client::scripts::freebsd ${WRKSRC}/client/scripts/freebsd - -# Post-patch -# - -post-patch: patch-scripts patch-makefile-conf \ - patch-makefiles-dist patch-man-pages \ - patch-pkgmessage patch-site-conf \ - patch-rc-scripts patch-dlq - -patch-scripts: - @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/client/dhclient.conf \ - ${WRKSRC}/client/scripts/freebsd - -patch-site-conf: -.if ${SUBSYS} == client && !defined(WITHOUT_INTERFACE_POLLING) - @${ECHO_CMD} CFLAGS += -DENABLE_POLLING_MODE >> ${WRKSRC}/site.conf -.endif -.if ${SUBSYS} == server -.if !defined(WITHOUT_DHCP_PARANOIA) - @${ECHO_CMD} CFLAGS += -DPARANOIA >> ${WRKSRC}/site.conf -.endif -.if !defined(WITHOUT_DHCP_JAIL) - @${ECHO_CMD} CFLAGS += -DJAIL >> ${WRKSRC}/site.conf -.if defined(WITH_DHCP_SOCKETS) - @${ECHO_CMD} CFLAGS += -DUSE_SOCKETS >> ${WRKSRC}/site.conf -.endif -.endif -.if defined(WITH_DHCP_LDAP) - @${ECHO_CMD} CFLAGS += -I${LOCALBASE}/include >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -L${LOCALBASE}/lib >> ${WRKSRC}/site.conf -.if !defined(WITHOUT_DHCP_LDAP_SSL) - @${ECHO_CMD} CFLAGS += -DUSE_SSL -I${OPENSSLINC} >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -L${OPENSSLLIB} >> ${WRKSRC}/site.conf - @${ECHO_CMD} LIBS += -lcrypto -lssl >> ${WRKSRC}/site.conf -.endif -.endif -.endif - -patch-makefile-conf: - @${REINPLACE_CMD} -e 's|^DEBUG[ ]*=|# DEBUG ?=|g' \ - ${WRKSRC}/Makefile.conf - -patch-makefiles-dist: -.for subdir in ${PATCH_SUBDIRS} - @${REINPLACE_CMD} -e 's|^CFLAGS[ ]*=|CFLAGS +=|g' \ - ${WRKSRC}/${subdir}/Makefile.dist -.endfor - -# temporary hack - no patch file needed for this typo. -patch-man-pages: - @${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3 - -patch-rc-scripts: -.for f in ${RC_FILES} - @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh -.endfor - -patch-pkgmessage: -.if ${SUBSYS} != devel - @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${MSG_FILE} > ${PKGMESSAGE} -.if defined(WITH_DHCP_LDAP) - @${REINPLACE_CMD} -e 's|^%%LDAP%%||g' ${PKGMESSAGE} -.else - @${REINPLACE_CMD} -e '/^%%LDAP%%/d' ${PKGMESSAGE} -.endif -.endif - -patch-dlq: -.if ${SUBSYS} == server && defined(WITH_DHCP_LQ) -.if defined(WITH_DHCP_LDAP) - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq-ldap -.else - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-dlq -.endif -.endif - -# Post-install -# - -POST-INSTALL= parallel-post-install configure-package display-message -.ORDER: ${POST-INSTALL} -post-install: ${POST-INSTALL} - -parallel-post-install: \ - strip-binary-files install-startup-files \ - install-doc-files install-ldap-files install-sample-files \ - create-conf-files create-data-files - -strip-binary-files: -.for f in ${BIN_FILES} -.if exists(${PREFIX}/bin/${f}) - @${STRIP_CMD} ${PREFIX}/bin/${f} -.endif -.if exists(${PREFIX}/sbin/${f}) - @${STRIP_CMD} ${PREFIX}/sbin/${f} -.endif -.endfor - -install-startup-files: -.for f in ${RC_FILES} - @${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR} -.endfor - -install-doc-files: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif - -install-ldap-files: -.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP) - @${INSTALL_SCRIPT} ${WRKSRC}/${LDAP_SCRIPT} ${PREFIX}/bin - @${MKDIR} ${SCHEMA_DIR} - @${INSTALL_DATA} ${WRKSRC}/${LDAP_SCHEMA} ${SCHEMA_DIR} -.endif - -install-sample-files: -.for f in ${SAMP_FILES} - @${INSTALL_DATA} ${WRKSRC}/${f} ${CONF_DIR}/${f:T}${SAMP_SUFX} -.endfor - -create-conf-files: -.for f in ${LOCAL_CONF_FILES} -.if !exists(${CONF_DIR}/${f}) - @${TOUCH} ${CONF_DIR}/${f} -.endif -.endfor - -create-data-files: -.for f in ${DATA_FILES} -.if !exists(${DATADIR}/${f}) - @${TOUCH} ${DATADIR}/${f} -.endif -.endfor - -configure-package: -.if ${SUBSYS} == server - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - -display-message: -.if ${SUBSYS} != devel - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} -.endif - -.include <bsd.port.post.mk> diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo deleted file mode 100644 index c97ee828e8ca..000000000000 --- a/net/isc-dhcp40-server/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -MD5 (dhcp-3.0.3.tar.gz) = f91416a0b8ed3fd0601688cf0b7df58f -SHA256 (dhcp-3.0.3.tar.gz) = c96bcd884dde06c22a709cfb9e84f7e32f6577dcd52aa7f12186aa22b5e63afe -SIZE (dhcp-3.0.3.tar.gz) = 870240 -MD5 (dhcp-3.0.3-ldap-patch) = c0d51532696222f3258ff19e91a39ce4 -SHA256 (dhcp-3.0.3-ldap-patch) = da88f17a7c514bdfb38dc53aa2547ae43f6031b7b6f2973728474d9b8d063bf6 -SIZE (dhcp-3.0.3-ldap-patch) = 153377 -MD5 (dhcp-3.0.3-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b -SHA256 (dhcp-3.0.3-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108 -SIZE (dhcp-3.0.3-dlq-patch) = 7655 diff --git a/net/isc-dhcp40-server/files/client::scripts::freebsd b/net/isc-dhcp40-server/files/client::scripts::freebsd deleted file mode 100644 index 9c4c3d3a6f24..000000000000 --- a/net/isc-dhcp40-server/files/client::scripts::freebsd +++ /dev/null @@ -1,510 +0,0 @@ -#!/bin/sh - -############################################################################# -# -# Copyright (c) 1999, MindStep Corporation -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# -############################################################################# -# -# This script was written by Patrick Bihan-Faou, patrick@mindstep.com, -# Please contact us for bug reports, etc. -# -############################################################################# -# $MindStep_Id: dhclient-script.sh,v 1.8 1999/12/07 22:11:08 patrick Exp $ -# $MindStep_Tag: CONTRIB_19991207 $ -# from FreeBSD: src/sbin/dhclient/dhclient-script.sh,v 1.2 2002/02/01 18:46:58 alfred Exp -# $FreeBSD$ -############################################################################# - - -############################################################################# -# hook functions prototypes -# -# The "pre_state_XXX_hook" functions are called before the main -# work is done for the state XXX -# -# The "post_state_XXX_hook" functions are called after the main -# work is done for the state XXX -# -# These functions are meant to be overridden by the user's -# dhclient-enter-hooks file -############################################################################# - -pre_state_MEDIUM_hook () { } -pre_state_PREINIT_hook () { } -pre_state_ARPCHECK_hook () { } -pre_state_ARPSEND_hook () { } -pre_state_RENEW_hook () { } -pre_state_REBIND_hook () { } -pre_state_BOUND_hook () { } -pre_state_REBOOT_hook () { } -pre_state_EXPIRE_hook () { } -pre_state_FAIL_hook () { } -pre_state_TIMEOUT_hook () { } -post_state_MEDIUM_hook () { } -post_state_PREINIT_hook () { } -post_state_ARPCHECK_hook () { } -post_state_ARPSEND_hook () { } -post_state_RENEW_hook () { } -post_state_REBIND_hook () { } -post_state_BOUND_hook () { } -post_state_REBOOT_hook () { } -post_state_EXPIRE_hook () { } -post_state_FAIL_hook () { } -post_state_TIMEOUT_hook () { } - -############################################################################# -# make_resolv_conf -# -# This function is called to update the information related to the -# DNS configuration (the resolver part) -############################################################################# -make_resolv_conf () -{ - if [ "x$new_domain_name" != x ] && [ "x$new_domain_name_servers" != x ]; then - echo search $new_domain_name >/etc/resolv.conf - for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf - done - fi -} - -############################################################################# -# set_XXX -# unset_XXX -# -# These function each deal with one particular setting. -# They are OS dependent and may be overridden in the -# dhclient-enter-hooks file if needed. -# -# These functions are called with either "new" or "old" to indicate which -# set of variables to use (new_ip_address or old_ip_address...) -# -############################################################################# - -update_hostname () -{ - local current_hostname=`/bin/hostname` - - if [ "$current_hostname" = "" ] || \ - [ "$current_hostname" = "$old_host_name" ] - then - if [ "$new_host_name" != "$old_host_name" ] - then - $LOGGER "New Hostname: $new_host_name" - hostname $new_host_name - fi - fi -} - -set_ip_address () -{ - local ip - local mask - local bcast - - if [ $# -lt 1 ] - then - return 1 - fi - - eval ip="\$${1}_ip_address" - eval mask="\$${1}_subnet_mask" - eval bcast="\$${1}_broadcast_address" - - if [ "$ip" != "" ] - then - ifconfig $interface inet $ip netmask $mask broadcast $bcast $medium -# route add $ip 127.0.0.1 > /dev/null 2>&1 - fi -} - -unset_ip_address () -{ - local ip - - if [ $# -lt 1 ] - then - return 1 - fi - - eval ip="\$${1}_ip_address" - - if [ "$ip" != "" ] - then - ifconfig $interface inet -alias $ip $medium -# route delete $ip 127.0.0.1 > /dev/null 2>&1 - fi -} - -set_ip_alias () -{ - if [ "$alias_ip_address" != "" ] - then - ifconfig $interface inet alias $alias_ip_address netmask $alias_subnet_mask -# route add $alias_ip_address 127.0.0.1 - fi -} - -unset_ip_alias () -{ - if [ "$alias_ip_address" != "" ] - then - ifconfig $interface inet -alias $alias_ip_address > /dev/null 2>&1 -# route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1 - fi -} - -set_routers () -{ - local router_list - - if [ $# -lt 1 ] - then - return 1 - fi - - eval router_list="\$${1}_routers" - - for router in $router_list - do - route add default $router >/dev/null 2>&1 - done -} - -unset_routers () -{ - local router_list - - if [ $# -lt 1 ] - then - return 1 - fi - - eval router_list="\$${1}_routers" - - for router in $router_list - do - route delete default $router >/dev/null 2>&1 - done -} - -set_static_routes () -{ - local static_routes - - if [ $# -lt 1 ] - then - return 1 - fi - - eval static_routes="\$${1}_static_routes" - - set static_routes - - while [ $# -ge 2 ] - do - $LOGGER "New Static Route: $1 -> $2" - route add $1 $2 - shift; shift - done -} - -unset_static_routes () -{ - local static_routes - - if [ $# -lt 1 ] - then - return 1 - fi - - eval static_routes="\$${1}_static_routes" - - set static_routes - - while [ $# -ge 2 ] - do - route delete $1 $2 - shift; shift - done -} - -############################################################################# -# -# utility functions grouping what needs to be done in logical units. -# -############################################################################# - -set_all () -{ - set_ip_address new - set_routers new - set_static_routes new - - if [ "$new_ip_address" != "$alias_ip_address" ] - then - set_ip_alias - fi -} - -set_others () -{ - update_hostname - make_resolv_conf -} - -clear_arp_table () -{ - arp -d -a -} - -unset_all () -{ - if [ "$alias_ip_address" != "$old_ip_address" ] - then - unset_ip_alias - fi - - if [ "$old_ip_address" != "" ] - then - unset_ip_address old - unset_routers old - unset_static_routes old - clear_arp_table - fi -} - -test_new_lease () -{ - local rc - - set $new_routers - - if [ $# -ge 1 ] - then - set_ip_address new - if ping -q -c 1 $1 - then - rc=0 - else - rc=1 - fi - unset_ip_address new - else - rc=1 - fi - return $rc -} - -############################################################################# -# Main State functions. -# -# There is a state function for each state of the DHCP client -# These functions are OS specific and should be be tampered with. -############################################################################# - -in_state_MEDIUM () -{ - ifconfig $interface $medium - ifconfig $interface inet -alias 0.0.0.0 $medium >/dev/null 2>&1 - sleep 1 - exit_status=0 -} - -in_state_PREINIT () -{ - unset_ip_alias - - ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \ - broadcast 255.255.255.255 up - exit_status=0 -} - -in_state_ARPCHECK () -{ - exit_status=0 -} - -in_state_ARPSEND () -{ - exit_status=0 -} - -in_state_RENEW () -{ - if [ "$old_ip_address" != "$new_ip_address" ] - then - unset_all - set_all - fi - - set_others -} - -in_state_REBIND () { - in_state_RENEW -} - -in_state_BOUND () { - unset_all - set_all - set_others -} - -in_state_REBOOT () { - in_state_BOUND -} - -in_state_EXPIRE () -{ - unset_all - set_ip_alias - exit_status=0 -} - -in_state_FAIL () { - in_state_EXPIRE -} - -in_state_TIMEOUT () -{ - unset_all - - if test_new_lease - then - set_all - set_others - else - $LOGGER "No good lease information in TIMEOUT state" - set_ip_alias - exit_status=1 - fi -} - -############################################################################# -# Main functions: -# -# dhclient_script_init() parses the optional "enter_hooks" script which can -# override any of the state functions -# -# This function also parses the variables and notifies the detected changes. -############################################################################# -dhclient_script_init () -{ - if [ "$new_network_number" != "" ] - then - $LOGGER "New Network Number: $new_network_number" - fi - - if [ "$new_ip_address" != "" ] - then - $LOGGER "New IP Address: $new_ip_address" - fi - - if [ "$new_broadcast_address" != "" ] - then - $LOGGER "New Broadcast Address: $new_broadcast_address" - fi - - if [ "$new_subnet_mask" != "" ] - then - $LOGGER "New Subnet Mask for $interface: $new_subnet_mask" - fi - - if [ "$alias_subnet_mask" != "" ] - then - fi -} - -############################################################################# -# dhclient_main() does the appropriate work depending on the state of -# the dhcp client -############################################################################# -dhclient_script_main () -{ -# set -x - exit_status=0 - - case $reason in - MEDIUM|\ - PREINIT|\ - ARPCHECK|\ - ARPSEND|\ - RENEW|\ - REBIND|\ - BOUND|\ - REBOOT|\ - EXPIRE|\ - FAIL|\ - TIMEOUT) - pre_state_${reason}_hook - in_state_${reason} - post_state_${reason}_hook - ;; - *) - $LOGGER "dhclient-script called with invalid reason $reason" - exit_status=1 - ;; - esac -} - -############################################################################# -# Let's do the work... -############################################################################# - -if [ -x /usr/bin/logger ]; then - LOGGER="/usr/bin/logger -s -p user.notice -t dhclient" -else - LOGGER=echo -fi - -# Invoke the local dhcp client enter hooks, if they exist. -if [ -x %%PREFIX%%/etc/dhclient-enter-hooks ] -then - exit_status=0 - . %%PREFIX%%/etc/dhclient-enter-hooks - # allow the local script to abort processing of this state - # local script must set exit_status variable to nonzero. - if [ $exit_status -ne 0 ] - then - exit $exit_status - fi -fi - -dhclient_script_init -dhclient_script_main - -# Invokes the local dhcp client exit hooks, if any. -if [ -x %%PREFIX%%/etc/dhclient-exit-hooks ]; then - . %%PREFIX%%/etc/dhclient-exit-hooks -fi - -exit $exit_status - -############################################################################# -# That's all folks -############################################################################# diff --git a/net/isc-dhcp40-server/files/extra-patch-dlq b/net/isc-dhcp40-server/files/extra-patch-dlq deleted file mode 100644 index 5657af491721..000000000000 --- a/net/isc-dhcp40-server/files/extra-patch-dlq +++ /dev/null @@ -1,14 +0,0 @@ ---- server/Makefile.dist.orig Tue Jun 14 09:37:50 2005 -+++ server/Makefile.dist Tue Jun 14 09:37:50 2005 -@@ -25,9 +25,9 @@ - CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 - SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 - SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ -- omapi.c mdb.c stables.c salloc.c ddns.c -+ omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c - OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \ -- omapi.o mdb.o stables.o salloc.o ddns.o -+ omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o - PROG = dhcpd - MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - diff --git a/net/isc-dhcp40-server/files/extra-patch-dlq-ldap b/net/isc-dhcp40-server/files/extra-patch-dlq-ldap deleted file mode 100644 index 9b1ffff4c1a9..000000000000 --- a/net/isc-dhcp40-server/files/extra-patch-dlq-ldap +++ /dev/null @@ -1,14 +0,0 @@ ---- server/Makefile.dist.orig Tue Jun 14 09:39:39 2005 -+++ server/Makefile.dist Tue Jun 14 09:39:39 2005 -@@ -25,9 +25,9 @@ - CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 - SEDMANPAGES = dhcpd.man8 dhcpd.conf.man5 dhcpd.leases.man5 - SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ -- ldap.c omapi.c mdb.c stables.c salloc.c ddns.c -+ ldap.c omapi.c mdb.c stables.c salloc.c ddns.c dhcpleasequery.c - OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o \ -- ldap.o omapi.o mdb.o stables.o salloc.o ddns.o -+ ldap.o omapi.o mdb.o stables.o salloc.o ddns.o dhcpleasequery.o - PROG = dhcpd - MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 - diff --git a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample deleted file mode 100644 index 97e56f5f9b24..000000000000 --- a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample +++ /dev/null @@ -1,722 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcpd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable dhcpd: -# -# dhcpd_enable="YES" -# - -. %%RC_SUBR%% - -name=dhcpd -paranoia=%%PARANOIA%% # compiled in paranoia? -jail=%%JAIL%% # compiled in jail? - -load_rc_config $name - -# override these variables in /etc/rc.conf -dhcpd_enable=${dhcpd_enable:-"NO"} -dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot # command option(s) -dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf} # configuration file -dhcpd_ifaces=${dhcpd_ifaces:-} # ethernet interface(s) -dhcpd_withumask=${dhcpd_withumask:-022} # file creation mask - -dhcpd_chuser_enable=${dhcpd_chuser_enable:-"%%PARANOIA%%"} # runs w/o privileges? -dhcpd_withuser=${dhcpd_withuser:-${name}} # user name to run as -dhcpd_withgroup=${dhcpd_withgroup:-${name}} # group name to run as - -dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"} # runs chrooted? -dhcpd_devfs_enable=${dhcpd_devfs_enable:-"YES"} # devfs if available? -dhcpd_makedev_enable=${dhcpd_makedev_enable:-"NO"} # MAKEDEV instead of devfs? -dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}} # directory to run in -dhcpd_includedir=${dhcpd_includedir:-} # directory for included config files - -# untested -dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"} # runs imprisoned? -dhcpd_hostname=${dhcpd_hostname:-} # jail hostname -dhcpd_ipaddress=${dhcpd_ipaddress:-} # jail ip address - -safe_run () # rc command [args...] -{ - local _rc - - _rc=$1 - shift - - if [ "${_rc}" -eq 0 ]; then - debug safe_run: "$@" - "$@" || _rc=1 - else - warn safe_run: "$@" - fi - return ${_rc} -} - -precious () # entry... -{ - local _entry _rc - - _rc=0 - for _entry; do - # do nothing if /dev, /var/run or /var/db - echo ${_entry} | egrep -q '^//*(dev|var//*(run|db))?/*$' || _rc=1 - done - debug precious: "$@" rc=${_rc} - return ${_rc} -} - -lsmod () # user group file... -{ - local _entry _user _group _rc - - _user=$1 _group=$2 - shift 2 - - _rc=0 - for _entry; do - ls -ld ${_entry} 2> /dev/null | - awk -v u=${_user} -v g=${_group} '{ - exit ((u && $3 != u) || (g && $4 != g)) - }' || _rc=1 - done - debug lsmod: "$@" rc=${_rc} - return ${_rc} -} - -safe_chmog () # entry... -{ - local _entry _user _group _usergroup _rc - - _user=${dhcpd_withuser} - _group=${dhcpd_withgroup} - - _rc=0 - if [ -n "${_user}" -o -n "${_group}" ]; then - _usergroup=${_user}${_group:+:${_group}} - for _entry; do - if [ -d ${_entry} ] && mounted ${_entry}; then - continue - fi - if [ -e ${_entry} ] && - ! precious ${_entry} && - ! lsmod ${_user} ${_group} ${_entry} && - ! safe_run ${_rc} chown ${_usergroup} ${_entry}; then - warn "unable to change permissions of ${_entry}" - _rc=1 - fi - done - fi - return ${_rc} -} - -safe_mkdir () # dir... -{ - local _dir _rc - - _rc=0 - for _dir; do - if [ ! -d ${_dir} ] && - ! precious ${_dir} && - ! safe_run ${_rc} mkdir -p ${_dir}; then - err 1 "unable to create directory ${_dir}" - _rc=1 - fi - done - safe_run ${_rc} safe_chmog "$@" || _rc=1 - return ${_rc} -} - -safe_rmdir () # dir... -{ - local _dir _rc - - _rc=0 - for _dir; do - if [ -d ${_dir} ] && - ! precious ${_dir} && - ! mounted ${_dir}; then - if safe_run ${_rc} rmdir ${_dir}; then - safe_run ${_rc} safe_rmdir ${_dir%/*} || _rc=1 - else - warn "unable to remove directory ${_dir}" - _rc=1 - fi - fi - done - return ${_rc} -} - -safe_touch () # file... -{ - local _file _rc - - _rc=0 - for _file; do - if [ ! -e ${_file} ] && - ! safe_run ${_rc} touch ${_file}; then - err 1 "unable to create file ${_file}" - _rc=1 - fi - done - safe_run ${_rc} safe_chmog "$@" || _rc=1 - return ${_rc} -} - -safe_remove () # entry... -{ - local _entry _rc - - _rc=0 - for _entry; do - if [ -f ${_entry} ]; then - if ! safe_run ${_rc} rm -f ${_entry}; then - warn "unable to remove file ${_entry}" - _rc=1 - fi - elif [ -d ${_entry} ] && - ! precious ${_entry} && - ! mounted ${_entry}; then - if ! safe_run ${_rc} rm -rf ${_entry}; then - warn "unable to remove directory ${_entry}" - _rc=1 - fi - fi - done - return ${_rc} -} - -safe_copy () # src dst -{ - local _src _dst _rc - - _src=$1 _dst=$2 - - _rc=0 - if [ -f ${_src} ]; then - if ! safe_run ${_rc} safe_remove ${_dst} || - ! safe_run ${_rc} cp -p ${_src} ${_dst}; then - err 1 "unable to copy file ${_src} to ${_dst}" - _rc=1 - fi - safe_run ${_rc} safe_chmog ${_dst} || _rc=1 - elif [ -d ${_src} ] && - ! precious ${_dst} && - ! mounted ${_dst}; then - if ! safe_run ${_rc} pax -rw -pe -ts "|^${_src}||" \ - ${_src} ${_dst}; then - err 1 "unable to copy directory ${_src} to ${_dst}" - _rc=1 - fi - else - err 1 "unable to copy ${_src} to ${_dst}" \ - "-- not a file or a directory" - _rc=1 - fi - return ${_rc} -} - -mounted () # dir... -{ - local _rc - - _rc=1 - if checkyesno dhcpd_devfs_enable || - checkyesno dhcpd_jail_enable; then - mount -t devfs | awk ' - BEGIN { n = ARGC; ARGC = 2 } - { for (i = 2; i != n; i++) if ($3 == ARGV[i]) exit 1 } - ' - "$@" || _rc=0 - fi - debug mounted: "$@" rc=${_rc} - return ${_rc} -} - -safe_mount () # dir -{ - local _dir _rc - - _dir=$1 - - _rc=0 - if checkyesno dhcpd_devfs_enable && - ! mounted ${_dir} && - ! safe_run ${_rc} mount -t devfs devfs ${_dir}; then - err 1 "unable to mount ${_dir}" - _rc=1 - fi - return ${_rc} -} - -safe_umount () # dir -{ - local _dir _rc - - _dir=$1 - - _rc=0 - if checkyesno dhcpd_devfs_enable && - mounted ${_dir} && - ! safe_run ${_rc} umount ${_dir}; then - warn "unable to unmount ${_dir}" - _rc=1 - fi - return ${_rc} -} - -safe_useradd () -{ - local _user _group _home _shell _gecos - - _user=$1 _group=$2 _gecos=${3:-"& daemon"} - _home=${4:-/nonexistent} _shell=${5:-%%NOLOGIN%%} - - if [ -n "${_group}" ]; then - if pw group show ${_group} 2>/dev/null; then - echo "You already have a group \"${_group}\"," \ - "so I will use it." - elif pw groupadd ${_group} -h -; then - echo "Added group \"${_group}\"." - else - echo "Adding group \"${_group}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi - if [ -n "${_user}" ]; then - if pw user show ${_user} 2>/dev/null; then - echo "You already have a user \"${_user}\"," \ - "so I will use it." - elif pw useradd ${_user} -g ${_group} -h - \ - -d ${_home} -s ${_shell} -c "${_gecos}"; then - echo "Added user \"${_user}\"." - else - echo "Adding user \"${_user}\" failed..." - echo "Please create it, and try again." - exit 1 - fi - fi -} - -check_chuser () -{ - if checkyesno paranoia; then - if checkyesno dhcpd_chuser_enable && - [ -z "${dhcpd_withuser}" -a -z "${dhcpd_withgroup}" ]; then - err 1 "one of dhcpd_withuser and dhcpd_withgroup" \ - "must be set if dhcpd_chuser_enable is enabled" - fi - else - if checkyesno dhcpd_chuser_enable; then - warn "dhcpd_chuser_enable disabled -- not compiled in" - dhcpd_chuser_enable=NO - fi - fi -} - -check_jail () -{ - if checkyesno paranoia && checkyesno jail; then - if checkyesno dhcpd_jail_enable && - ! checkyesno dhcpd_chroot_enable; then - warn "dhcpd_chroot_enable implied by dhcpd_jail_enable" - dhcpd_chroot_enable=YES - fi - if checkyesno dhcpd_jail_enable && - [ -n "${dhcpd_hostname}" -a -z "${dhcpd_ipaddress}" ] || - [ -z "${dhcpd_hostname}" -a -n "${dhcpd_ipaddress}" ]; then - err 1 "both dhcpd_hostname and dhcpd_ipaddress" \ - "must be set if dhcpd_jail_enable is enabled" - fi - else - if checkyesno dhcpd_jail_enable; then - warn "dhcpd_jail_enable disabled -- not compiled in" - dhcpd_jail_enable=NO - fi - fi -} - -check_chroot () -{ - if checkyesno paranoia; then - if checkyesno dhcpd_chroot_enable; then - if [ -z "${dhcpd_rootdir}" ]; then - err 1 "dhcpd_rootdir must be set" \ - "if dhcpd_chroot_enable is enabled" - fi - if checkyesno dhcpd_devfs_enable && - checkyesno dhcpd_makedev_enable; then - err 1 "dhcpd_devfs_enable and dhcpd_makedev_enable" \ - "are mutually exclusive. enable only one!" - fi - if checkyesno dhcpd_devfs_enable && - ! ( type mount_devfs ) > /dev/null 2>&1; then - warn "dhcpd_devfs_enable disabled" \ - "-- not available" - dhcpd_devfs_enable=NO - fi - if checkyesno dhcpd_makedev_enable && - ! [ -x ${__dhcpd_devdir}/MAKEDEV ]; then - warn "dhcpd_makedev_enable disabled" \ - "-- not available" - dhcpd_makedev_enable=NO - fi - else - dhcpd_devfs_enable=NO - dhcpd_makedev_enable=NO - fi - else - if checkyesno dhcpd_chroot_enable; then - warn "dhcpd_chroot_enable disabled -- not compiled in" - dhcpd_chroot_enable=NO - fi - dhcpd_devfs_enable=NO - dhcpd_makedev_enable=NO - fi -} - -rcvar_chuser () -{ - if checkyesno paranoia && checkyesno dhcpd_chuser_enable; then - dhcpd_piddir=${__dhcpd_piddir}/${name} - dhcpd_leasesdir=${__dhcpd_leasesdir}/${name} - else - dhcpd_withuser= dhcpd_withgroup= - fi -} - -rcvar_jail () -{ - if ! checkyesno paranoia || ! checkyesno jail || - ! checkyesno dhcpd_jail_enable; then - dhcpd_hostname= dhcpd_ipaddress= - fi -} - -rcvar_chroot () -{ - if ! checkyesno paranoia || ! checkyesno dhcpd_chroot_enable; then - dhcpd_rootdir= - elif checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - dhcpd_devdir=${__dhcpd_devdir} - dhcpd_etcdir=${__dhcpd_etcdir} - fi -} - -rcvar_pidnleases () -{ - if ! checkyesno dhcpd_chuser_enable; then - dhcpd_piddir=${__dhcpd_piddir} - dhcpd_leasesdir=${__dhcpd_leasesdir} - fi - dhcpd_pidfile=${dhcpd_piddir}/${name}.pid - dhcpd_leasesfile=${dhcpd_leasesdir}/${name}.leases - dhcpd_conffile=${dhcpd_conf} # for convenience only - dhcpd_confdir=$(dirname ${dhcpd_conffile}) -} - -rcvar_rooted () -{ - _dhcpd_rootdir=${dhcpd_rootdir} - _dhcpd_devdir=${dhcpd_rootdir}${dhcpd_devdir} - _dhcpd_etcdir=${dhcpd_rootdir}${dhcpd_etcdir} - _dhcpd_confdir=${dhcpd_rootdir}${dhcpd_confdir} - _dhcpd_includedir=${dhcpd_rootdir}${dhcpd_includedir} - _dhcpd_piddir=${dhcpd_rootdir}${dhcpd_piddir} - _dhcpd_leasesdir=${dhcpd_rootdir}${dhcpd_leasesdir} - _dhcpd_conffile=${dhcpd_rootdir}${dhcpd_conffile} - _dhcpd_pidfile=${dhcpd_rootdir}${dhcpd_pidfile} - _dhcpd_leasesfile=${dhcpd_rootdir}${dhcpd_leasesfile} -} - -setup_compat () -{ - local dhcpd_rcconf - - # suck in old configuration file and variables - # - dhcpd_rcconf=${dhcpd_confdir}/rc.isc-dhcpd.conf - - if [ -f ${dhcpd_rcconf} ]; then - warn "${dhcpd_rcconf} is obsolete, use /etc/rc.conf and/or" \ - "/etc/rc.conf.d/${name} instead." - . ${dhcpd_rcconf} - - if [ -n "${dhcpd_options}" -a -z "${rc_flags}" ]; then - warn "dhcpd_options is obsolete," \ - "use dhcpd_flags instead." - rc_flags=${dhcpd_options} - fi - fi -} - -setup_umask () -{ - if [ -n "${dhcpd_withumask}" ]; then - umask ${dhcpd_withumask} - fi -} - -setup_chroot () -{ - local _mdev _hconf _hosts _ltime _rconf - - _mdev=MAKEDEV - _hconf=host.conf - _hosts=hosts - _ltime=localtime - _rconf=resolv.conf - - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - if ! mounted ${_dhcpd_devdir}; then - safe_mkdir ${_dhcpd_devdir}/_ - # XXX /_ hack! so, .../dev is root owned. - fi - safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_etcdir}/_ ${_dhcpd_confdir} - # XXX /_ hack! so, .../etc is root owned. - if checkyesno dhcpd_devfs_enable; then - safe_mount ${_dhcpd_devdir} - elif checkyesno dhcpd_makedev_enable; then - safe_copy ${dhcpd_devdir}/$_mdev ${_dhcpd_devdir}/$_mdev - safe_run 0 sh -c "cd ${_dhcpd_devdir} && ./$_mdev jail bpf4" - else - safe_copy ${dhcpd_devdir} ${_dhcpd_devdir} - fi - safe_copy ${dhcpd_conffile} ${_dhcpd_conffile} - safe_copy ${dhcpd_etcdir}/$_hconf ${_dhcpd_etcdir}/$_hconf - safe_copy ${dhcpd_etcdir}/$_hosts ${_dhcpd_etcdir}/$_hosts - safe_copy ${dhcpd_etcdir}/$_ltime ${_dhcpd_etcdir}/$_ltime - safe_copy ${dhcpd_etcdir}/$_rconf ${_dhcpd_etcdir}/$_rconf - # copy dhcpd_includedir if defined and available - if [ -d "${dhcpd_includedir}" ]; then - safe_mkdir ${_dhcpd_includedir} - safe_copy ${dhcpd_includedir} ${_dhcpd_includedir} - fi - fi -} - -setup_chuser () -{ - if checkyesno paranoia && { - checkyesno dhcpd_chuser_enable || checkyesno dhcpd_chroot_enable - }; then - safe_mkdir ${_dhcpd_piddir} ${_dhcpd_leasesdir} - fi -} - -setup_leases () -{ - safe_touch ${_dhcpd_leasesfile} -} - -setup_flags () -{ - if [ -n "${dhcpd_conf}" ]; then - rc_flags="${rc_flags} -cf ${dhcpd_conf}" - fi - if [ -n "${dhcpd_leasesfile}" ]; then - rc_flags="${rc_flags} -lf ${dhcpd_leasesfile}" - fi - if [ -n "${dhcpd_pidfile}" ]; then - rc_flags="${rc_flags} -pf ${dhcpd_pidfile}" - fi - if [ -n "${dhcpd_withuser}" ]; then - rc_flags="${rc_flags} -user ${dhcpd_withuser}" - fi - if [ -n "${dhcpd_withgroup}" ]; then - rc_flags="${rc_flags} -group ${dhcpd_withgroup}" - fi - if [ -n "${dhcpd_rootdir}" ]; then - rc_flags="${rc_flags} -chroot ${dhcpd_rootdir}" - fi - if [ -n "${dhcpd_hostname}" -a -n "${dhcpd_ipaddress}" ]; then - rc_flags="${rc_flags} -jail ${dhcpd_hostname} ${dhcpd_ipaddress}" - fi - rc_flags="${rc_flags} ${dhcpd_ifaces}" -} - -cleanup_chroot () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_umount ${_dhcpd_devdir} - fi -} - -dhcpd_stop () -{ - if sh $0 forcestatus; then - sh $0 forcestop - fi -} - -remove_pid () -{ - if [ -e ${_dhcpd_pidfile} ]; then - warn "${_dhcpd_pidfile} still exists! -- removing anyway" - fi - safe_remove ${_dhcpd_pidfile} -} - -remove_leases () -{ - if [ -s ${_dhcpd_leasesfile} ]; then - warn "${_dhcpd_leasesfile} not empty -- not removed --" \ - "futher warning messages expected, don't care." - else - safe_remove ${_dhcpd_leasesfile} ${_dhcpd_leasesfile}~ - fi -} - -remove_chuser () -{ - if checkyesno paranoia && { - checkyesno dhcpd_chuser_enable || checkyesno dhcpd_chroot_enable - }; then - safe_rmdir ${_dhcpd_piddir} ${_dhcpd_leasesdir} - fi -} - -remove_chroot () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_remove ${_dhcpd_conffile} ${_dhcpd_includedir} \ - ${_dhcpd_etcdir} - if checkyesno dhcpd_devfs_enable; then - safe_umount ${_dhcpd_devdir} - safe_rmdir ${_dhcpd_devdir}/_ # XXX /_ hack! - elif checkyesno dhcpd_jail_enable; then - if ! mounted ${_dhcpd_devdir}; then - safe_remove ${_dhcpd_devdir} - fi - else - safe_remove ${_dhcpd_devdir} - fi - safe_rmdir ${_dhcpd_confdir} ${_dhcpd_rootdir} # XXX /_ hack! - fi -} - -dhcpd_check () -{ - check_chuser - check_jail - check_chroot -} - -dhcpd_rcvar () -{ - rcvar_chuser - rcvar_jail - rcvar_chroot - rcvar_pidnleases - rcvar_rooted -} - -dhcpd_precmd () -{ - setup_compat - setup_umask - setup_chroot - setup_chuser - setup_leases - setup_flags -} - -dhcpd_postcmd () -{ - cleanup_chroot -} - -dhcpd_install () -{ - if checkyesno paranoia; then - safe_useradd "${dhcpd_withuser}" "${dhcpd_withgroup}" \ - "DHCP Daemon" - fi -} - -_dhcpd_uninstall () # user group root -{ - local _user _group _root - - _user=$1 _group=$2 _root=$3 - - if [ -n "${_user}" -o -n "${_group}" ]; then - dhcpd_chuser_enable=YES - dhcpd_withuser=${_user} - dhcpd_withgroup=${_group} - else - dhcpd_chuser_enable=NO - fi - if [ -n "${_root}" ]; then - dhcpd_chroot_enable=YES - dhcpd_rootdir=${_root} - else - dhcpd_chroot_enable=NO - fi - dhcpd_check - dhcpd_rcvar - dhcpd_uninstall -} - -dhcpd_uninstall () -{ - if checkyesno __dhcpd_uninstall; then - dhcpd_stop - remove_pid - remove_leases - remove_chuser - remove_chroot - else - local _user _group _root - - __dhcpd_uninstall=YES - - _user=${dhcpd_withuser} - _group=${dhcpd_withgroup} - _root=${dhcpd_rootdir} - - _dhcpd_uninstall "" "" "" - - if checkyesno paranoia; then - if [ -n "${_user}" -o -n "${_group}" ]; then - _dhcpd_uninstall "${_user}" "${_group}" "" - fi - if [ -n "${_root}" ]; then - _dhcpd_uninstall "" "" "${_root}" - fi - if [ -n "${_user}" -o -n "${_group}" ] && - [ -n "${_root}" ]; then - _dhcpd_uninstall "${_user}" "${_group}" "${_root}" - fi - fi - fi -} - -rcvar=$(set_rcvar) -load_rc_config ${name} - -__dhcpd_uninstall="NO" # internal use only -__dhcpd_devdir=/dev # devices directory -__dhcpd_etcdir=/etc # etc directory -__dhcpd_piddir=/var/run # pid file directory -__dhcpd_leasesdir=/var/db # leases file directory -#__dhcpd_rootdir=/var/db/${name} # root directory - -dhcpd_check -dhcpd_rcvar - -command=%%PREFIX%%/sbin/${name} -pidfile=${_dhcpd_pidfile} -required_files=${dhcpd_conf} -start_precmd=${name}_precmd -stop_postcmd=${name}_postcmd -install_cmd=dhcpd_install -uninstall_cmd=dhcpd_uninstall -extra_commands="install uninstall" - -run_rc_command "$1" diff --git a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample deleted file mode 100644 index 11c9b00b3133..000000000000 --- a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcrelay -# REQUIRE: DAEMON -# -# Add the following line to /etc/rc.conf to enable dhcrelay: -# -# dhcrelay_enable="YES" -# - -# override these variables in /etc/rc.conf -dhcrelay_enable=${dhcrelay_enable:-"NO"} -dhcrelay_flags=${dhcrelay_flags:-} # command option(s) -dhcrelay_servers=${dhcrelay_servers:-} # dhcrelay server(s) -dhcrelay_ifaces=${dhcrelay_ifaces:-} # ethernet interface(s) - -dhcrelay_precmd () -{ - local ifaces - - dhcrelay_rcconf=%%PREFIX%%/etc/rc.isc-dhcrelay.conf - - if [ -f ${dhcrelay_rcconf} ]; then - warn "${dhcrelay_rcconf} is obsolete, use /etc/rc.conf instead." - . ${dhcrelay_rcconf} - - if [ -n "${dhcrelay_options}" -a -z "${rc_flags}" ]; then - warn "dhcrelay_options is obsolete, use dhcrelay_flags instead." - rc_flags=${dhcrelay_options} - fi - fi - - if [ -z "${dhcrelay_servers}" ]; then - err 1 "no dhcrelay server(s) configured." - fi - - ifaces= - for iface in ${dhcrelay_ifaces}; do - ifaces="${ifaces} -i ${iface}" - done - - rc_flags="${rc_flags} ${ifaces} ${dhcrelay_servers}" -} - -. %%RC_SUBR%% - -name=dhcrelay -rcvar=$(set_rcvar) - -command=%%PREFIX%%/sbin/${name} -pidfile=/var/run/${name}.pid -start_precmd=${name}_precmd - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net/isc-dhcp40-server/files/omshell::Makefile.dist b/net/isc-dhcp40-server/files/omshell::Makefile.dist deleted file mode 100644 index 34c90a2e7f53..000000000000 --- a/net/isc-dhcp40-server/files/omshell::Makefile.dist +++ /dev/null @@ -1,80 +0,0 @@ -# Makefile.dist -# -# Copyright (c) 1996-2002 Internet Software Consortium. -# Use is subject to license terms which appear in the file named -# ISC-LICENSE that should have accompanied this file when you -# received it. If a file named ISC-LICENSE did not accompany this -# file, or you are not sure the one you have is correct, you may -# obtain an applicable copy of the license at: -# -# http://www.isc.org/isc-license-1.0.html. -# -# This file is part of the ISC DHCP distribution. The documentation -# associated with this file is listed in the file DOCUMENTATION, -# included in the top-level directory of this release. -# -# Support and other services are available for ISC products - see -# http://www.isc.org for more information. -# - -CATMANPAGES = omshell.cat1 -SEDMANPAGES = omshell.man1 -SRCS = omshell.c -OBJS = omshell.o -PROG = omshell -MAN = omshell.1 - -INCLUDES = -I$(TOP)/dhcpctl $(BINDINC) -I$(TOP)/includes -CFLAGS = $(DEBUG) $(PREDEFINES) $(INCLUDES) $(COPTS) -DHCPCTLLIBS = ../dhcpctl/libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \ - ../omapip/libomapi.a ../dst/libdst.a - -all: $(PROG) $(CATMANPAGES) - -$(PROG): $(OBJS) $(DHCPCTLLIBS) - $(CC) $(DEBUG) $(LFLAGS) -o $(PROG) $(OBJS) $(DHCPCTLLIBS) $(LIBS) - -install: all $(CATMANPAGES) - for dir in $(USRMANDIR) $(USERBINDIR); do \ - foo=""; \ - for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ - foo=$${foo}/$$bar; \ - if [ ! -d $$foo ]; then \ - mkdir $$foo; \ - chmod 755 $$foo; \ - fi; \ - done; \ - done - $(INSTALL) omshell $(DESTDIR)$(USERBINDIR) - $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell - $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \ - $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT) - -depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS) - -clean: - -rm -f $(OBJS) - -realclean: clean - -rm -f $(PROG) *~ $(CATMANPAGES) $(SEDMANPAGES) #* - -distclean: realclean - -rm -f Makefile - -links: - @for foo in $(SRCS) $(MAN); do \ - if [ ! -b $$foo ]; then \ - rm -f $$foo; \ - fi; \ - ln -s $(TOP)/omshell/$$foo $$foo; \ - done - -omshell.cat1: omshell.man1 - nroff -man omshell.man1 >omshell.cat1 - -omshell.man1: omshell.1 - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ - -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 - -# Dependencies (semi-automatically-generated) diff --git a/net/isc-dhcp40-server/files/patch-Makefile b/net/isc-dhcp40-server/files/patch-Makefile deleted file mode 100644 index 7a8df08b137b..000000000000 --- a/net/isc-dhcp40-server/files/patch-Makefile +++ /dev/null @@ -1,76 +0,0 @@ ---- Makefile.orig Fri Nov 8 00:10:07 2002 -+++ Makefile Mon Apr 28 15:04:50 2003 -@@ -38,59 +38,59 @@ - # ``http://www.nominum.com''. - # - --all: -+all all.devel all.server all.relay all.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make all); \ -+ (cd work.$$sysname; make $@); \ - fi - --install: -+install install.devel install.server install.relay install.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make install); \ -+ (cd work.$$sysname; make $@); \ - fi - --depend: -+depend depend.devel depend.server depend.relay depend.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make depend); \ -+ (cd work.$$sysname; make $@); \ - fi - --clean: -+clean clean.devel clean.server clean.relay clean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make clean); \ -+ (cd work.$$sysname; make $@); \ - fi - --realclean: -+realclean realclean.devel realclean.server realclean.relay realclean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make realclean); \ -+ (cd work.$$sysname; make $@); \ - fi - --distclean: -+distclean distclean.devel distclean.server distclean.relay distclean.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make distclean); \ -+ (cd work.$$sysname; make $@); \ - fi - --links: -+links links.devel links.server links.relay links.client: - @sysname=`./configure --print-sysname`; \ - if [ ! -d work.$$sysname ]; then \ - echo No build directory for $$sysname - please run ./configure.; \ - else \ -- (cd work.$$sysname; make links); \ -+ (cd work.$$sysname; make $@); \ - fi - diff --git a/net/isc-dhcp40-server/files/patch-Makefile.dist b/net/isc-dhcp40-server/files/patch-Makefile.dist deleted file mode 100644 index 0c09997023cc..000000000000 --- a/net/isc-dhcp40-server/files/patch-Makefile.dist +++ /dev/null @@ -1,226 +0,0 @@ ---- Makefile.dist.orig Fri Nov 8 00:10:08 2002 -+++ Makefile.dist Tue Apr 29 00:07:43 2003 -@@ -17,47 +17,200 @@ - # http://www.isc.org for more information. - # - --SUBDIRS= common $(MINIRES) dst omapip server client relay dhcpctl -+COMMON_SUBDIRS= common -+DEVEL_SUBDIRS= $(MINIRES) dst omapip dhcpctl -+SERVER_SUBDIRS= omshell server -+RELAY_SUBDIRS= relay -+CLIENT_SUBDIRS= client -+ -+DEVEL_BUILD_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS} -+SERVER_BUILD_SUBDIRS= ${SERVER_SUBDIRS} -+RELAY_BUILD_SUBDIRS= ${RELAY_SUBDIRS} -+CLIENT_BUILD_SUBDIRS= ${CLIENT_SUBDIRS} -+ -+DEVEL_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${DEVEL_SUBDIRS} -+SERVER_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${SERVER_SUBDIRS} -+RELAY_INSTALL_SUBDIRS= ${RELAY_SUBDIRS} -+CLIENT_INSTALL_SUBDIRS= ${COMMON_SUBDIRS} ${CLIENT_SUBDIRS} - --all: -- @for dir in ${SUBDIRS}; do \ -+all: all.server all.relay all.client -+ -+all.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.server: all.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.relay: all.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Making all in $$dir"; \ -+ (cd $$dir; $(MAKE) all) || exit 1; \ -+ done -+ -+all.client: all.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Making all in $$dir"; \ - (cd $$dir; $(MAKE) all) || exit 1; \ -- done -+ done -+ -+install: install.devel install.server install.relay install.client -+ -+install.devel: -+ @for dir in ${DEVEL_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done - --install: -- @for dir in ${SUBDIRS}; do \ -+install.server: -+ @for dir in ${SERVER_INSTALL_SUBDIRS}; do \ - echo "Installing in $$dir"; \ - (cd $$dir; $(MAKE) install) || exit 1; \ -- done -+ done - --depend: -- @for dir in ${SUBDIRS}; do \ -+install.relay: -+ @for dir in ${RELAY_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done -+ -+install.client: -+ @for dir in ${CLIENT_INSTALL_SUBDIRS}; do \ -+ echo "Installing in $$dir"; \ -+ (cd $$dir; $(MAKE) install) || exit 1; \ -+ done -+ -+depend: depend.server depend.relay depend.client -+ -+depend.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+depend.server: depend.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+depend.relay: depend.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ - echo "Making dependencies in $$dir"; \ - (cd $$dir; $(MAKE) depend) || exit 1; \ -- done -+ done -+ -+depend.client: depend.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Making dependencies in $$dir"; \ -+ (cd $$dir; $(MAKE) depend) || exit 1; \ -+ done -+ -+clean: clean.server clean.relay clean.client -+ -+clean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done -+ -+clean.server: clean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done -+ -+clean.relay: clean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) clean) || exit 1; \ -+ done - --clean: -- @for dir in ${SUBDIRS}; do \ -+clean.client: clean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Cleaning in $$dir"; \ - (cd $$dir; $(MAKE) clean) || exit 1; \ -- done -+ done -+ -+realclean: realclean.server realclean.relay realclean.client -+ -+realclean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done - --realclean: -- @for dir in ${SUBDIRS}; do \ -+realclean.server: realclean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ - echo "Really cleaning in $$dir"; \ - (cd $$dir; $(MAKE) realclean) || exit 1; \ -- done -+ done - --distclean: -- @for dir in ${SUBDIRS}; do \ -+realclean.relay: realclean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done -+ -+realclean.client: realclean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) realclean) || exit 1; \ -+ done -+ -+distclean: distclean.server distclean.relay distclean.client -+ -+distclean.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ - echo "Really, really cleaning in $$dir"; \ - (cd $$dir; $(MAKE) distclean) || exit 1; \ -- done -- @rm -f Makefile -+ done -+ -+distclean.server: distclean.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+distclean.relay: distclean.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+distclean.client: distclean.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ -+ echo "Really, really cleaning in $$dir"; \ -+ (cd $$dir; $(MAKE) distclean) || exit 1; \ -+ done -+ -+links: links.server links.relay links.client -+ -+links.devel: -+ @for dir in ${DEVEL_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done -+ -+links.server: links.devel -+ @for dir in ${SERVER_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done -+ -+links.relay: links.devel -+ @for dir in ${RELAY_BUILD_SUBDIRS}; do \ -+ echo "Making links in $$dir"; \ -+ (cd $$dir; $(MAKE) links) || exit 1; \ -+ done - --links: -- @for dir in ${SUBDIRS}; do \ -+links.client: links.devel -+ @for dir in ${CLIENT_BUILD_SUBDIRS}; do \ - echo "Making links in $$dir"; \ - (cd $$dir; $(MAKE) links) || exit 1; \ -- done -+ done diff --git a/net/isc-dhcp40-server/files/patch-client::clparse.c b/net/isc-dhcp40-server/files/patch-client::clparse.c deleted file mode 100644 index 4140cc6e3109..000000000000 --- a/net/isc-dhcp40-server/files/patch-client::clparse.c +++ /dev/null @@ -1,11 +0,0 @@ ---- client/clparse.c.orig Mon Feb 10 01:39:57 2003 -+++ client/clparse.c Wed Mar 3 01:35:39 2004 -@@ -785,7 +785,7 @@ - if (status != ISC_R_SUCCESS) - log_fatal ("Can't record interface %s: %s", - name, isc_result_totext (status)); -- strcpy (ip -> name, name); -+ strlcpy (ip -> name, name, IFNAMSIZ); - if (dummy_interfaces) { - interface_reference (&ip -> next, - dummy_interfaces, MDL); diff --git a/net/isc-dhcp40-server/files/patch-client::dhclient.8 b/net/isc-dhcp40-server/files/patch-client::dhclient.8 deleted file mode 100644 index 4e6096f5aa86..000000000000 --- a/net/isc-dhcp40-server/files/patch-client::dhclient.8 +++ /dev/null @@ -1,83 +0,0 @@ ---- client/dhclient.8.orig Sun Nov 17 03:25:43 2002 -+++ client/dhclient.8 Wed Mar 3 02:06:52 2004 -@@ -18,6 +18,10 @@ - .\" - .\" from Id: dhclient.8,v 1.12.2.8 2004/06/10 17:59:12 dhankins Exp - .\" -+.\" Portions copyright (c) 2000 David E. O'Brien. -+.\" All rights reserved. -+.\" $FreeBSD$ -+.\" - .TH dhclient 8 - .SH NAME - dhclient - Dynamic Host Configuration Protocol Client -@@ -28,12 +32,18 @@ - .I port - ] - [ -+.B -D -+] -+[ - .B -d - ] - [ - .B -q - ] - [ -+.B -v -+] -+[ - .B -1 - ] - [ -@@ -64,6 +74,10 @@ - relay - ] - [ -+.B -i -+interval -+] -+[ - .B -n - ] - [ -@@ -148,6 +162,15 @@ - configuration file or on the command line, and will ignore all other - interfaces. - .PP -+The -+.B -D -+flag causes -+.B dhclient -+to save the script it creates for use in conjunction with -+.B dhclient-script -+in -+.IR /tmp. -+.PP - If the DHCP client should listen and transmit on a port other than the - standard (port 68), the - .B -p -@@ -171,6 +194,12 @@ - flag, followed by the IP address to send. This is only useful for testing, - and should not be expected to work in any consistent or useful way. - .PP -+On FreeBSD, dhclient can be enabled to automatically handle the -+link status of the network card. Normally polling is done every -+five seconds. The polling interval can be set using the -+.B -i -+flag, followed by the numbers of seconds. Minimum is one second. -+.PP - The DHCP client will normally run in the foreground until it has - configured an interface, and then will revert to running in the - background. To run force dhclient to always run as a foreground -@@ -188,6 +217,10 @@ - .B -q - flag prevents any messages other than errors from being printed to the - standard error descriptor. -+.B -v -+flag turns on all messages. -+Opposite of -+.B -q . - .PP - The client normally doesn't release the current lease as it is not - required by the DHCP protocol. Some cable ISPs require their clients diff --git a/net/isc-dhcp40-server/files/patch-client::dhclient.c b/net/isc-dhcp40-server/files/patch-client::dhclient.c deleted file mode 100644 index 7345bfaf057d..000000000000 --- a/net/isc-dhcp40-server/files/patch-client::dhclient.c +++ /dev/null @@ -1,545 +0,0 @@ ---- client/dhclient.c.orig Wed Nov 24 18:39:14 2004 -+++ client/dhclient.c Tue Mar 8 14:06:59 2005 -@@ -38,6 +38,13 @@ - #include "dhcpd.h" - #include "version.h" - -+#if __FreeBSD_version > 502010 -+#include <sys/ioctl.h> -+#include <net/if_media.h> -+#include <net80211/ieee80211_ioctl.h> -+#include <net80211/ieee80211.h> -+#endif -+ - TIME default_lease_time = 43200; /* 12 hours... */ - TIME max_lease_time = 86400; /* 24 hours... */ - -@@ -72,8 +79,11 @@ - struct string_list *client_env=NULL; - int client_env_count=0; - int onetry=0; --int quiet=0; -+int quiet=1; - int nowait=0; -+#ifdef ENABLE_POLLING_MODE -+int polling_interval = 5; -+#endif - - static void usage PROTO ((void)); - -@@ -174,6 +184,9 @@ - } else if (!strcmp (argv [i], "-q")) { - quiet = 1; - quiet_interface_discovery = 1; -+ } else if (!strcmp (argv [i], "-v")) { -+ quiet = 0; -+ quiet_interface_discovery = 0; - } else if (!strcmp (argv [i], "-s")) { - if (++i == argc) - usage (); -@@ -187,6 +200,19 @@ - } else if (!strcmp (argv [i], "-n")) { - /* do not start up any interfaces */ - interfaces_requested = 1; -+#ifdef ENABLE_POLLING_MODE -+ } else if (!strcmp (argv [i], "-i")) { -+ if (++i == argc) -+ usage (); -+ polling_interval = (int)strtol (argv [i], -+ (char **)NULL, 10); -+ if (polling_interval <= 0) { -+ log_info ("Incorrect polling interval %d", -+ polling_interval); -+ log_info ("Using a default of 5 seconds"); -+ polling_interval = 5; -+ } -+#endif - } else if (!strcmp (argv [i], "-w")) { - /* do not exit if there are no broadcast interfaces. */ - persist = 1; -@@ -215,7 +241,16 @@ - if (strlen (argv [i]) > sizeof tmp -> name) - log_fatal ("%s: interface name too long (max %ld)", - argv [i], (long)strlen (argv [i])); -- strcpy (tmp -> name, argv [i]); -+ strlcpy (tmp -> name, argv [i], IFNAMSIZ); -+#if __FreeBSD_version > 502010 -+ set_ieee80211 (tmp); -+#endif -+ /* Init some interface vars, enable polling */ -+#ifdef ENABLE_POLLING_MODE -+ tmp -> forcediscover = 0; -+ tmp -> linkstate = HAVELINK; -+ tmp -> polling = 1; -+#endif /* ifdef ENABLE_POLLING_MODE */ - if (interfaces) { - interface_reference (&tmp -> next, - interfaces, MDL); -@@ -375,6 +410,16 @@ - INTERFACE_AUTOMATIC)) != - INTERFACE_REQUESTED)) - continue; -+#if __FreeBSD_version > 502010 -+ set_ieee80211 (ip); -+#endif -+#ifdef ENABLE_POLLING_MODE -+ ip -> forcediscover = 0; -+ if (ip -> client -> config -> media != NULL) -+ ip -> havemedia = 1; -+ else -+ ip -> havemedia = 0; -+#endif - script_init (ip -> client, - "PREINIT", (struct string_list *)0); - if (ip -> client -> alias) -@@ -417,8 +462,13 @@ - client -> state = S_INIT; - /* Set up a timeout to start the initialization - process. */ -+#ifdef ENABLE_POLLING_MODE -+ add_timeout (cur_time + random () % 5 + 2, -+ state_polling, client, 0, 0); -+#else - add_timeout (cur_time + random () % 5, - state_reboot, client, 0, 0); -+#endif - } - } - } -@@ -476,9 +526,9 @@ - log_info (arr); - log_info (url); - -- log_error ("Usage: dhclient [-1dqr] [-nw] [-p <port>] %s", -- "[-s server]"); -- log_error (" [-cf config-file] [-lf lease-file]%s", -+ log_error ("Usage: dhclient [-1Ddqrv] [-i polling-interval] %s", -+ "[-nw] [-p <port>] [-s server]"); -+ log_error (" [-cf config-file] [-lf lease-file] %s", - "[-pf pid-file] [-e VAR=val]"); - log_fatal (" [-sf script-file] [interface]"); - } -@@ -881,6 +931,15 @@ - /* Write out the new lease. */ - write_client_lease (client, client -> new, 0, 0); - -+ /* -+ * It's now possible that state_reboot can be called -+ * after a interface link went down and is up again. -+ * To prevent tons of equal leases saved on disk, we rewrite -+ * them. -+ */ -+ read_client_leases (); -+ rewrite_client_leases (); -+ - /* Replace the old active lease with the new one. */ - if (client -> active) - destroy_client_lease (client -> active); -@@ -895,6 +954,12 @@ - piaddr (client -> active -> address), - (long)(client -> active -> renewal - cur_time)); - client -> state = S_BOUND; -+#ifdef ENABLE_POLLING_MODE -+ /* Init some interface vars, enable polling */ -+ client -> interface -> linkstate = HAVELINK; -+ client -> interface -> forcediscover = 0; -+ client -> interface -> polling = 1; -+#endif /* ifdef ENABLE_POLLING_MODE */ - reinitialize_interfaces (); - go_daemon (); - if (client -> config -> do_forward_update) { -@@ -1359,6 +1424,11 @@ - int interval; - int increase = 1; - -+#ifdef ENABLE_POLLING_MODE -+ /* Disable polling for this interface */ -+ client -> interface -> polling = 0; -+#endif -+ - /* Figure out how long it's been since we started transmitting. */ - interval = cur_time - client -> first_sending; - -@@ -1464,6 +1534,9 @@ - struct client_lease *loop; - struct client_lease *lp; - -+ if (client -> interface -> linkstate == NOLINK) -+ return; -+ - loop = lp = client -> active; - - log_info ("No DHCPOFFERS received."); -@@ -1496,6 +1569,10 @@ - log_info ("bound: renewal in %ld %s.", - (long)(client -> active -> renewal - - cur_time), "seconds"); -+#ifdef ENABLE_POLLING_MODE -+ /* Enable polling for this interface */ -+ client -> interface -> polling = 1; -+#endif - add_timeout (client -> active -> renewal, - state_bound, client, 0, 0); - } else { -@@ -1503,6 +1580,11 @@ - log_info ("bound: immediate renewal."); - state_bound (client); - } -+ /* -+ * Set the link status back to nolink, even -+ * if we have media settings. -+ */ -+ client -> interface -> linkstate = NOLINK; - reinitialize_interfaces (); - go_daemon (); - return; -@@ -1548,6 +1630,12 @@ - } - - log_info ("No working leases in persistent database - sleeping."); -+ -+#ifdef ENABLE_POLLING_MODE -+ /* Enable polling for this interface */ -+ client -> interface -> polling = 1; -+#endif -+ - script_init (client, "FAIL", (struct string_list *)0); - if (client -> alias) - script_write_params (client, "alias_", client -> alias); -@@ -1689,6 +1777,18 @@ - client -> packet.secs = htons (65535); - } - -+ /* -+ * Only try the first ten seconds to renew a lease from a -+ * given dhcp-server adress. After that, fall back to use -+ * state_reboot with INADDR_BROADCAST. -+ */ -+ if (destination.sin_addr.s_addr != INADDR_BROADCAST && -+ (client -> state == S_RENEWING || client -> state == S_REBINDING)) { -+ if (client -> active && client -> active -> expiry > cur_time && -+ interval >= 10) -+ goto cancel; -+ } -+ - log_info ("DHCPREQUEST on %s to %s port %d", - client -> name ? client -> name : client -> interface -> name, - inet_ntoa (destination.sin_addr), -@@ -1710,6 +1810,16 @@ - from, &destination, - (struct hardware *)0); - -+ /* -+ * If sendto() for a direct request fails, fall back to use -+ * state_reboot with INADDR_BROADCAST. -+ */ -+ if (result == -1 && destination.sin_addr.s_addr != INADDR_BROADCAST && -+ (client -> state == S_RENEWING || client -> state == S_REBINDING)) { -+ if (client -> active && client -> active -> expiry > cur_time) -+ goto cancel; -+ } -+ - add_timeout (cur_time + client -> interval, - send_request, client, 0, 0); - } -@@ -2607,6 +2717,13 @@ - wstatus = 0; - } - } else { -+ if ((i = open(_PATH_DEVNULL, O_RDWR)) != -1) { -+ dup2(i, STDIN_FILENO); -+ dup2(i, STDOUT_FILENO); -+ dup2(i, STDERR_FILENO); -+ if (i > STDERR_FILENO) -+ close(i); -+ } - execve (scriptName, argv, envp); - log_error ("execve (%s, ...): %m", scriptName); - exit (0); -@@ -2793,8 +2910,10 @@ - case S_STOPPED: - break; - } -+#ifndef ENABLE_POLLING_MODE - client -> state = S_INIT; - state_reboot (client); -+#endif - } - } - } -@@ -3022,7 +3141,9 @@ - break; - - case server_awaken: -+#ifndef ENABLE_POLLING_MODE - state_reboot (client); -+#endif - break; - } - } -@@ -3160,3 +3281,265 @@ - data_string_forget (&ddns_dhcid, MDL); - return rcode; - } -+ -+/* Check to see if there's a wire plugged in */ -+int -+interface_active(struct interface_info *ip) { -+#if __FreeBSD_version > 502010 -+ struct ifmediareq ifmr; -+ int *media_list, i; -+ char *ifname; -+ int sock; -+ -+ ifname = ip -> name; -+ -+ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) -+ log_fatal ("Can't create interface_active socket"); -+ -+ (void) memset (&ifmr, 0, sizeof (ifmr)); -+ (void) strncpy (ifmr.ifm_name, ifname, sizeof (ifmr.ifm_name)); -+ -+ if (ioctl (sock, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) { -+ /* -+ * Interface doesn't support SIOCGIFMEDIA, presume okay -+ */ -+ close (sock); -+ return (HAVELINK); -+ } -+ close (sock); -+ -+ if (ifmr.ifm_count == 0) { -+ /* -+ * Assume that this means interface -+ * does not support SIOCGIFMEDIA -+ */ -+ log_fatal ("%s: no media types?", ifname); -+ return (HAVELINK); -+ } -+ -+ if (ifmr.ifm_status & IFM_AVALID) { -+ if (ip -> ieee80211) { -+ /* -+ * Wavelan devices need to be checked if they are -+ * associated. -+ */ -+ if ((IFM_TYPE(ifmr.ifm_active) == IFM_IEEE80211) && -+ (ifmr.ifm_status & IFM_ACTIVE)) { -+ return (HAVELINK); -+ } -+ } else { -+ if (ifmr.ifm_status & IFM_ACTIVE) { -+ return (HAVELINK); -+ } -+ } -+ /* -+ * We really have no link. -+ */ -+ return (NOLINK); -+ } -+ /* -+ * IFM_AVALID is not set. We cannot check -+ * the link state. Assume HAVELINK. -+ */ -+ -+#endif /* Other OSs */ -+ /* -+ * Always return a successful link if the OS -+ * is not supported. -+ */ -+ return (HAVELINK); -+} -+ -+#if __FreeBSD_version > 502010 -+void -+set_ieee80211 (struct interface_info *ip) { -+ -+ struct ieee80211req ireq; -+ u_int8_t data[32]; -+ int associated = 0; -+ int *media_list, i; -+ char *ifname; -+ int sock; -+ -+ ifname = ip -> name; -+ -+ if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) -+ log_fatal ("Can't create interface_active socket"); -+ -+ (void) memset (&ireq, 0, sizeof (ireq)); -+ (void) strncpy (ireq.i_name, ifname, sizeof (ireq.i_name)); -+ ireq.i_data = &data; -+ ireq.i_type = IEEE80211_IOC_SSID; -+ ireq.i_val = -1; -+ /* -+ * If we can't get the SSID, -+ * this isn't an 802.11 device. -+ */ -+ if (ioctl (sock, SIOCG80211, &ireq) < 0) -+ ip -> ieee80211 = 0; -+ else { -+#ifdef DEBUG -+ printf ("Device %s has 802.11\n", ifname); -+#endif -+ ip -> ieee80211 = 1; -+ } -+ close (sock); -+ } -+#endif /* __FreeBSD_version */ -+ -+#ifdef ENABLE_POLLING_MODE -+/* Go to background after some time */ -+void state_background (cpp) -+ void *cpp; -+{ -+ go_daemon (); -+} -+ -+/* Check the state of the NICs if we have link */ -+void state_polling (cpp) -+ void *cpp; -+{ -+ static int doinitcheck = 0; -+ struct interface_info *ip; -+ struct client_state *client; -+ int result; -+ -+ for (ip = interfaces; ip; ip = ip -> next) { -+ if (! ip -> polling) -+ continue; -+#ifdef DEBUG -+ printf ("%s: Polling interface state\n", ip -> name); -+ for (client = ip -> client; -+ client; client = client -> next) { -+ printf ("%s: client state of %d\n", ip -> name, ip -> client -> state); -+ printf ("%s: link = %d\n", ip -> name, ip -> linkstate); -+ } -+#endif -+ -+ result = interface_active (ip); -+ /* -+ * If dhclient.conf contains media settings, we cannot -+ * abort if the interface is not set to active mode. -+ */ -+ if (ip -> havemedia && ip -> client -> state != S_BOUND) { -+ if (result == HAVELINK) -+ ip -> forcediscover = 1; -+ result = HAVELINK; -+ } -+ -+ /* -+ * The last status of the interface tells us -+ * the we've got no link ... -+ */ -+ if (ip -> linkstate == NOLINK || ! doinitcheck) { -+ /* -+ * ... but we have now link. Let's send -+ * requests. -+ */ -+ if (result == HAVELINK) { -+#ifdef DEBUG -+ if (ip -> havemedia) -+ printf ("%s: Trying media settings on interface\n", -+ ip -> name); -+ else -+ printf ("%s: Found Link on interface\n", ip -> name); -+#endif -+ /* -+ * Set the interface to state_bound. We assume that we have -+ * a working link. If we cannot reach the server directly, -+ * INADDR_BROADCAST is used. -+ */ -+ for (client = ip -> client; -+ client; client = client -> next) { -+ cancel_timeout (state_init, client); -+ cancel_timeout (state_reboot, client); -+ cancel_timeout (state_selecting, client); -+ if (client -> active) { -+ add_timeout (cur_time + random () % 5, -+ state_bound, client, 0, 0); -+ } else { -+ add_timeout (cur_time + random () % 5, -+ state_reboot, client, 0, 0); -+ } -+ } -+ ip -> linkstate = HAVELINK; -+ } else { -+#ifdef DEBUG -+ printf ("%s: No link on interface\n", ip -> name); -+#endif -+ for (client = ip -> client; -+ client; client = client -> next) { -+ /* -+ * Without this add_timout(), dhclient does -+ * not poll on a interface if there -+ * is no cable plugged in at startup -+ * time. Because we add one additional second -+ * to the time of a normal timeout, we always -+ * skip and block a running one. This prevents -+ * that polling is done twice at the same time. -+ */ -+ if (client -> state == S_INIT) { -+ add_timeout (cur_time + (polling_interval + 1), -+ state_polling, client, 0, 0); -+ } -+ } -+ ip -> linkstate = NOLINK; -+ /* -+ * Automatically go into the background after -+ * some time. Do this only if there are no -+ * media options available for a interface. -+ */ -+ if (! ip -> havemedia && ! doinitcheck) { -+ add_timeout (cur_time + (polling_interval * 2), -+ state_background, client, 0, 0); -+ } -+ } -+ } -+ -+ /* -+ * The last status of the interface tells us -+ * the we previously had link. -+ */ -+ if (ip -> linkstate == HAVELINK && doinitcheck) { -+ if (result == NOLINK) { -+ /* -+ * We lost link on the interface, or it isn't -+ * associated anymore. -+ */ -+#ifdef DEBUG -+ printf ("%s: Lost Link on interface\n", ip -> name); -+#endif -+ /* -+ * After we lost link, cycle again through the -+ * different media settings if available. Else -+ * set NOLINK. -+ */ -+ if (ip -> havemedia) -+ ip -> forcediscover = 1; -+ else -+ ip -> linkstate = NOLINK; -+ } -+ /* -+ * If we happen to have a real link, but no -+ * active lease, force the interface into -+ * state_reboot. Do the same if media settings -+ * are available. -+ */ -+ if (ip -> forcediscover) { -+ for (client = ip -> client; -+ client; client = client -> next) { -+ if (client -> state != S_REBOOTING && -+ client -> state != S_SELECTING) { -+ add_timeout (cur_time + random () % 5, -+ state_reboot, client, 0, 0); -+ } -+ } -+ ip -> forcediscover = 0; -+ ip -> linkstate = HAVELINK; -+ } -+ /* We still have link, do nothing. */ -+ } -+ } -+ doinitcheck = 1; -+} -+#endif /* ifdef ENABLE_POLLING_MODE */ diff --git a/net/isc-dhcp40-server/files/patch-client::dhclient.conf b/net/isc-dhcp40-server/files/patch-client::dhclient.conf deleted file mode 100644 index 2d9560f43bf8..000000000000 --- a/net/isc-dhcp40-server/files/patch-client::dhclient.conf +++ /dev/null @@ -1,11 +0,0 @@ ---- client/dhclient.conf.orig Tue Jun 3 00:50:44 1997 -+++ client/dhclient.conf Wed Mar 3 02:20:41 2004 -@@ -11,7 +11,7 @@ - reboot 10; - select-timeout 5; - initial-interval 2; --script "/etc/dhclient-script"; -+script "%%PREFIX%%/sbin/dhclient-script"; - media "-link0 -link1 -link2", "link0 link1"; - reject 192.33.137.209; - diff --git a/net/isc-dhcp40-server/files/patch-common::dhcp-options.5 b/net/isc-dhcp40-server/files/patch-common::dhcp-options.5 deleted file mode 100644 index 9d936cfffeee..000000000000 --- a/net/isc-dhcp40-server/files/patch-common::dhcp-options.5 +++ /dev/null @@ -1,32 +0,0 @@ ---- common/dhcp-options.5.orig Sun Feb 23 04:27:42 2003 -+++ common/dhcp-options.5 Wed Mar 3 02:12:13 2004 -@@ -431,7 +431,10 @@ - the domain-name option to specify the domain name). See RFC 1035 for - character set restrictions. This option is only honored by - .B dhclient-script(8) --if the hostname for the client machine is not set. -+if the hostname for the client machine is not set (i.e., set to the empty -+string in -+.B rc.conf(5) -+). - .RE - .PP - .B option \fBieee802-3-encapsulation\fR \fIflag\fR\fB;\fR -@@ -654,7 +657,7 @@ - This option specifies whether the client should configure its IP - layer to allow forwarding of datagrams with non-local source routes - (see Section 3.3.5 of [4] for a discussion of this topic). A value --of false means disallow forwarding of such datagrams, and a value of true -+of 0 means disallow forwarding of such datagrams, and a value of true - means allow forwarding. - .RE - .PP -@@ -948,7 +951,7 @@ - .PP - This option specifies whether or not the client should negotiate the - use of trailers (RFC 893 [14]) when using the ARP protocol. A value --of false indicates that the client should not attempt to use trailers. A -+of 0 indicates that the client should not attempt to use trailers. A - value of true means that the client should attempt to use trailers. - .RE - .PP diff --git a/net/isc-dhcp40-server/files/patch-common::discover.c b/net/isc-dhcp40-server/files/patch-common::discover.c deleted file mode 100644 index 1cfcc2094098..000000000000 --- a/net/isc-dhcp40-server/files/patch-common::discover.c +++ /dev/null @@ -1,238 +0,0 @@ ---- common/discover.c.orig Fri Jul 25 21:44:15 2003 -+++ common/discover.c Fri Mar 5 23:33:04 2004 -@@ -47,6 +47,7 @@ - #endif /* not lint */ - - #include "dhcpd.h" -+#include <ifaddrs.h> - #include <sys/ioctl.h> - - struct interface_info *interfaces, *dummy_interfaces, *fallback_interface; -@@ -135,10 +136,7 @@ - { - struct interface_info *tmp, *ip; - struct interface_info *last, *next; -- char buf [2048]; -- struct ifconf ic; -- struct ifreq ifr; -- int i; -+ struct ifaddrs *ifap, *ifa; - int sock; - int address_count = 0; - struct subnet *subnet; -@@ -157,61 +155,6 @@ - if ((sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) - log_fatal ("Can't create addrlist socket"); - -- /* Get the interface configuration information... */ -- --#ifdef SIOCGIFCONF_ZERO_PROBE -- /* linux will only tell us how long a buffer it wants if we give it -- * a null buffer first. So, do a dry run to figure out the length. -- * -- * XXX this code is duplicated from below because trying to fold -- * the logic into the if statement and goto resulted in excesssive -- * obfuscation. The intent is that unless you run Linux you shouldn't -- * have to deal with this. */ -- -- ic.ifc_len = 0; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)NULL; --#else -- /* otherwise, we just feed it a starting size, and it'll tell us if -- * it needs more */ -- -- ic.ifc_len = sizeof buf; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; --#endif -- -- gifconf_again: -- i = ioctl(sock, SIOCGIFCONF, &ic); -- -- if (i < 0) -- log_fatal ("ioctl: SIOCGIFCONF: %m"); -- --#ifdef SIOCGIFCONF_ZERO_PROBE -- /* Workaround for SIOCGIFCONF bug on some Linux versions. */ -- if (ic.ifc_ifcu.ifcu_buf == 0 && ic.ifc_len == 0) { -- ic.ifc_len = sizeof buf; -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; -- goto gifconf_again; -- } --#endif -- -- /* If the SIOCGIFCONF resulted in more data than would fit in -- a buffer, allocate a bigger buffer. */ -- if ((ic.ifc_ifcu.ifcu_buf == buf --#ifdef SIOCGIFCONF_ZERO_PROBE -- || ic.ifc_ifcu.ifcu_buf == 0 --#endif -- ) && ic.ifc_len > sizeof buf) { -- ic.ifc_ifcu.ifcu_buf = dmalloc ((size_t)ic.ifc_len, MDL); -- if (!ic.ifc_ifcu.ifcu_buf) -- log_fatal ("Can't allocate SIOCGIFCONF buffer."); -- goto gifconf_again; --#ifdef SIOCGIFCONF_ZERO_PROBE -- } else if (ic.ifc_ifcu.ifcu_buf == 0) { -- ic.ifc_ifcu.ifcu_buf = (caddr_t)buf; -- ic.ifc_len = sizeof buf; -- goto gifconf_again; --#endif -- } -- - - /* If we already have a list of interfaces, and we're running as - a DHCP server, the interfaces were requested. */ -@@ -224,51 +167,38 @@ - else - ir = INTERFACE_REQUESTED; - -+ if (getifaddrs(&ifap) != 0) -+ log_fatal ("getifaddrs failed"); -+ - /* Cycle through the list of interfaces looking for IP addresses. */ -- for (i = 0; i < ic.ifc_len;) { -- struct ifreq *ifp = (struct ifreq *)((caddr_t)ic.ifc_req + i); --#ifdef HAVE_SA_LEN -- if (ifp -> ifr_addr.sa_len > sizeof (struct sockaddr)) -- i += (sizeof ifp -> ifr_name) + ifp -> ifr_addr.sa_len; -- else --#endif -- i += sizeof *ifp; -+ for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) { - - #ifdef ALIAS_NAMES_PERMUTED -- if ((s = strrchr (ifp -> ifr_name, ':'))) { -+ if ((s = strrchr (ifa -> ifa_name, ':'))) { - *s = 0; - } - #endif - - #ifdef SKIP_DUMMY_INTERFACES -- if (!strncmp (ifp -> ifr_name, "dummy", 5)) -+ if (!strncmp (ifa -> ifa_name, "dummy", 5)) - continue; - #endif - -- -- /* See if this is the sort of interface we want to -- deal with. */ -- strcpy (ifr.ifr_name, ifp -> ifr_name); -- if (ioctl (sock, SIOCGIFFLAGS, &ifr) < 0) -- log_fatal ("Can't get interface flags for %s: %m", -- ifr.ifr_name); -- - /* See if we've seen an interface that matches this one. */ - for (tmp = interfaces; tmp; tmp = tmp -> next) -- if (!strcmp (tmp -> name, ifp -> ifr_name)) -+ if (!strcmp (tmp -> name, ifa -> ifa_name)) - break; - -- /* Skip non broadcast interfaces (plus loopback and -- point-to-point in case an OS incorrectly marks them -- as broadcast). Also skip down interfaces unless we're -+ /* See if this is the sort of interface we want to -+ deal with. Skip loopback, point-to-point and down -+ interfaces, except don't skip down interfaces if we're - trying to get a list of configurable interfaces. */ -- if (((!(ifr.ifr_flags & IFF_BROADCAST) || -- ifr.ifr_flags & IFF_LOOPBACK || -- ifr.ifr_flags & IFF_POINTOPOINT) && !tmp) || -- (!(ifr.ifr_flags & IFF_UP) && -+ if ((ifa->ifa_flags & IFF_LOOPBACK) || -+ (ifa->ifa_flags & IFF_POINTOPOINT) || -+ (!(ifa->ifa_flags & IFF_UP) && - state != DISCOVER_UNCONFIGURED)) - continue; -- -+ - /* If there isn't already an interface by this name, - allocate one. */ - if (!tmp) { -@@ -276,9 +206,9 @@ - status = interface_allocate (&tmp, MDL); - if (status != ISC_R_SUCCESS) - log_fatal ("Error allocating interface %s: %s", -- ifp -> ifr_name, -+ ifa -> ifa_name, - isc_result_totext (status)); -- strcpy (tmp -> name, ifp -> ifr_name); -+ strcpy (tmp -> name, ifa -> ifa_name); - interface_snorf (tmp, ir); - interface_dereference (&tmp, MDL); - tmp = interfaces; /* XXX */ -@@ -290,9 +220,9 @@ - /* If we have the capability, extract link information - and record it in a linked list. */ - #ifdef HAVE_AF_LINK -- if (ifp -> ifr_addr.sa_family == AF_LINK) { -+ if (ifa -> ifa_addr->sa_family == AF_LINK) { - struct sockaddr_dl *foo = ((struct sockaddr_dl *) -- (&ifp -> ifr_addr)); -+ (ifa -> ifa_addr)); - #if defined (HAVE_SIN_LEN) - tmp -> hw_address.hlen = foo -> sdl_alen; - #else -@@ -305,12 +235,11 @@ - } else - #endif /* AF_LINK */ - -- if (ifp -> ifr_addr.sa_family == AF_INET) { -+ if (ifa -> ifa_addr->sa_family == AF_INET) { - struct iaddr addr; - - /* Get a pointer to the address... */ -- memcpy (&foo, &ifp -> ifr_addr, -- sizeof ifp -> ifr_addr); -+ bcopy(ifa->ifa_addr, &foo, sizeof(foo)); - - /* We don't want the loopback interface. */ - if (foo.sin_addr.s_addr == htonl (INADDR_LOOPBACK) && -@@ -323,16 +252,15 @@ - found, keep a pointer to ifreq structure in - which we found it. */ - if (!tmp -> ifp) { --#ifdef HAVE_SA_LEN -- unsigned len = ((sizeof ifp -> ifr_name) + -- ifp -> ifr_addr.sa_len); --#else -- unsigned len = sizeof *ifp; --#endif -+ -+ int len = (IFNAMSIZ + -+ ifa -> ifa_addr->sa_len); - tif = (struct ifreq *)dmalloc (len, MDL); - if (!tif) - log_fatal ("no space for ifp."); -- memcpy (tif, ifp, len); -+ strlcpy(tif->ifr_name, ifa->ifa_name, IFNAMSIZ); -+ memcpy(&tif->ifr_addr, ifa->ifa_addr, -+ ifa->ifa_addr->sa_len); - tmp -> ifp = tif; - tmp -> primary_address = foo.sin_addr; - } -@@ -346,9 +274,6 @@ - } - } - -- /* If we allocated a buffer, free it. */ -- if (ic.ifc_ifcu.ifcu_buf != buf) -- dfree (ic.ifc_ifcu.ifcu_buf, MDL); - - #if defined (LINUX_SLASHPROC_DISCOVERY) - /* On Linux, interfaces that don't have IP addresses don't -@@ -529,6 +454,7 @@ - be able to configure, we can quit now. */ - if (state == DISCOVER_UNCONFIGURED) { - close (sock); -+ freeifaddrs(ifap); - return; - } - -@@ -674,6 +600,7 @@ - } - - close (sock); -+ freeifaddrs(ifap); - - if (state == DISCOVER_SERVER && wifcount == 0) { - log_info ("%s", ""); diff --git a/net/isc-dhcp40-server/files/patch-common::dispatch.c b/net/isc-dhcp40-server/files/patch-common::dispatch.c deleted file mode 100644 index 0aa709cf0860..000000000000 --- a/net/isc-dhcp40-server/files/patch-common::dispatch.c +++ /dev/null @@ -1,29 +0,0 @@ ---- common/dispatch.c.orig Sun Nov 17 03:26:57 2002 -+++ common/dispatch.c Wed Mar 3 16:20:15 2004 -@@ -95,11 +95,26 @@ - void dispatch () - { - struct timeval tv, *tvp; -+#ifdef ENABLE_POLLING_MODE -+ struct timeval *tvp_new; -+#endif - isc_result_t status; -+ TIME cur_time; - -+ tvp = NULL; -+#ifdef ENABLE_POLLING_MODE -+ tvp_new = NULL; -+#endif - /* Wait for a packet or a timeout... XXX */ - do { - tvp = process_outstanding_timeouts (&tv); -+#ifdef ENABLE_POLLING_MODE -+ GET_TIME (&cur_time); -+ add_timeout(cur_time + polling_interval, state_polling, 0, 0, 0); -+ tvp_new = process_outstanding_timeouts(&tv); -+ if (tvp != NULL && (tvp -> tv_sec > tvp_new -> tv_sec)) -+ tvp = tvp_new; -+#endif /* ENABLE_POLLING_MODE */ - status = omapi_one_dispatch (0, tvp); - } while (status == ISC_R_TIMEDOUT || status == ISC_R_SUCCESS); - log_fatal ("omapi_one_dispatch failed: %s -- exiting.", diff --git a/net/isc-dhcp40-server/files/patch-common::parse.c b/net/isc-dhcp40-server/files/patch-common::parse.c deleted file mode 100644 index 637d69e7f41b..000000000000 --- a/net/isc-dhcp40-server/files/patch-common::parse.c +++ /dev/null @@ -1,22 +0,0 @@ ---- common/parse.c.orig 2 Sep 2003 11:01:23 -0000 -+++ common/parse.c 22 Feb 2004 10:44:52 -0000 -@@ -414,6 +414,7 @@ - { - const char *val; - enum dhcp_token token; -+ int32_t num; - - token = next_token (&val, (unsigned *)0, cfile); - if (token != NUMBER) { -@@ -421,9 +422,9 @@ - skip_to_semi (cfile); - return; - } -- convert_num (cfile, (unsigned char *)timep, val, 10, 32); -+ convert_num (cfile, (unsigned char *)&num, val, 10, 32); - /* Unswap the number - convert_num returns stuff in NBO. */ -- *timep = ntohl (*timep); /* XXX */ -+ *timep = ntohl (num); - - parse_semi (cfile); - } diff --git a/net/isc-dhcp40-server/files/patch-configure b/net/isc-dhcp40-server/files/patch-configure deleted file mode 100644 index 5aff6909acce..000000000000 --- a/net/isc-dhcp40-server/files/patch-configure +++ /dev/null @@ -1,41 +0,0 @@ ---- configure.orig Sat Apr 20 23:44:13 2002 -+++ configure Mon Apr 28 23:02:10 2003 -@@ -13,6 +13,9 @@ - elif [ x$1 = x--dirs ]; then - dirs=$2 - shift -+ elif [ x$1 = x--subsys ]; then -+ subsys=$2 -+ shift - elif [ x$1 = x--no-links ]; then - nolinks=YES - elif [ x$1 = x--copts ]; then -@@ -233,7 +236,14 @@ - fi - - if [ x"$dirs" = x ]; then -- dirs=". client server relay common omapip dhcpctl minires dst" -+ dirs=". common minires dst omapip dhcpctl" -+ if [ x$subsys = x ]; then -+ dirs="$dirs server omshell client relay" -+ elif [ x$subsys = xserver ]; then -+ dirs="$dirs server omshell" -+ elif [ x$subsys = xclient -o x$subsys = xrelay ]; then -+ dirs="$dirs $subsys" -+ fi - fi - - for foo in $dirs; do -@@ -253,7 +263,11 @@ - - # Make the link tree in which to actually build. - if [ x$nolinks = x ]; then -- make links -+ if [ x$subsys = x ]; then -+ make links -+ else -+ make links.$subsys -+ fi - fi - - exit 0 diff --git a/net/isc-dhcp40-server/files/patch-dhcpctl::Makefile.dist b/net/isc-dhcp40-server/files/patch-dhcpctl::Makefile.dist deleted file mode 100644 index f840cfba6278..000000000000 --- a/net/isc-dhcp40-server/files/patch-dhcpctl::Makefile.dist +++ /dev/null @@ -1,79 +0,0 @@ ---- dhcpctl/Makefile.dist.orig Thu Mar 3 17:55:23 2005 -+++ dhcpctl/Makefile.dist Mon Jul 25 08:33:33 2005 -@@ -22,11 +22,11 @@ - # http://www.isc.org/ - # - --CATMANPAGES = dhcpctl.cat3 omshell.cat1 --SEDMANPAGES = dhcpctl.man3 omshell.man1 -+CATMANPAGES = dhcpctl.cat3 -+SEDMANPAGES = dhcpctl.man3 - SRC = dhcpctl.c callback.c remote.c - OBJ = dhcpctl.o callback.o remote.o --MAN = dhcpctl.3 omshell.1 -+MAN = dhcpctl.3 - HDRS = dhcpctl.h - - INCLUDES = $(BINDINC) -I$(TOP)/includes -@@ -34,10 +34,7 @@ - DHCPCTLLIBS = libdhcpctl.a ../common/libdhcp.a $(BINDLIB) \ - ../omapip/libomapi.a ../dst/libdst.a - --all: libdhcpctl.a omshell cltest $(CATMANPAGES) -- --omshell: omshell.o $(DHCPCTLLIBS) -- $(CC) $(DEBUG) $(LFLAGS) -o omshell omshell.o $(DHCPCTLLIBS) $(LIBS) -+all: libdhcpctl.a cltest $(CATMANPAGES) - - cltest: cltest.o $(DHCPCTLLIBS) - $(CC) $(DEBUG) $(LFLAGS) -o cltest cltest.o $(DHCPCTLLIBS) $(LIBS) -@@ -48,8 +45,7 @@ - $(RANLIB) libdhcpctl.a - - install: all $(CATMANPAGES) -- for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR) $(USRMANDIR) \ -- $(USERBINDIR); do \ -+ for dir in $(LIBDIR) $(LIBMANDIR) $(INCDIR); do \ - foo=""; \ - for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ - foo=$${foo}/$$bar; \ -@@ -69,16 +65,12 @@ - $(MANINSTALL) $(MANFROM) $${prefix}.$(MANCAT)$${suffix} $(MANTO) \ - $(DESTDIR)$(LIBMANDIR)/$${prefix}$(LIBMANEXT); \ - done -- $(INSTALL) omshell $(DESTDIR)$(USERBINDIR) -- $(CHMOD) 755 $(DESTDIR)$(USERBINDIR)/omshell -- $(MANINSTALL) $(MANFROM) omshell.$(MANCAT)1 $(MANTO) \ -- $(DESTDIR)$(USRMANDIR)/omshell$(USRMANEXT) - - depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC) - - clean: -- -rm -f $(OBJ) omshell.o omshell cltest.o cltest -+ -rm -f $(OBJ) cltest.o cltest - - realclean: clean - -rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES) -@@ -87,7 +79,7 @@ - -rm -f Makefile - - links: -- @for foo in $(SRC) $(MAN) omshell.c cltest.c $(HDRS); do \ -+ @for foo in $(SRC) $(MAN) cltest.c $(HDRS); do \ - if [ ! -b $$foo ]; then \ - rm -f $$foo; \ - fi; \ -@@ -100,12 +92,5 @@ - dhcpctl.man3: dhcpctl.3 - sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ - -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3 -- --omshell.cat1: omshell.man1 -- nroff -man omshell.man1 >omshell.cat1 -- --omshell.man1: omshell.1 -- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ -- -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1 - - # Dependencies (semi-automatically-generated) diff --git a/net/isc-dhcp40-server/files/patch-dhcpd.conf b/net/isc-dhcp40-server/files/patch-dhcpd.conf deleted file mode 100644 index 030e89874d8d..000000000000 --- a/net/isc-dhcp40-server/files/patch-dhcpd.conf +++ /dev/null @@ -1,12 +0,0 @@ ---- server/dhcpd.conf.orig Thu Jan 25 03:33:11 2001 -+++ server/dhcpd.conf Wed Jan 30 22:06:52 2002 -@@ -14,6 +14,9 @@ - # network, the authoritative directive should be uncommented. - #authoritative; - -+# ad-hoc DNS update scheme - set to "none" to disable dynamic DNS updates. -+ddns-update-style ad-hoc; -+ - # Use this to send dhcp log messages to a different log file (you also - # have to hack syslog.conf to complete the redirection). - log-facility local7; diff --git a/net/isc-dhcp40-server/files/patch-dst::Makefile.dist b/net/isc-dhcp40-server/files/patch-dst::Makefile.dist deleted file mode 100644 index ad45436b1629..000000000000 --- a/net/isc-dhcp40-server/files/patch-dst::Makefile.dist +++ /dev/null @@ -1,29 +0,0 @@ ---- dst/Makefile.dist.orig Sun Nov 17 03:27:43 2002 -+++ dst/Makefile.dist Fri Mar 5 23:40:45 2004 -@@ -26,12 +26,24 @@ - - all: libdst.a - --install: -- - libdst.a: $(OBJ) - rm -f dst.a - ar cruv libdst.a $(OBJ) - $(RANLIB) libdst.a -+ -+install: all -+ for dir in $(LIBDIR);\ -+ do \ -+ foo=""; \ -+ for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \ -+ foo=$${foo}/$$bar; \ -+ if [ ! -d $$foo ]; then \ -+ mkdir $$foo; \ -+ chmod 755 $$foo; \ -+ fi; \ -+ done; \ -+ done -+ $(INSTALL) libdst.a $(DESTDIR)$(LIBDIR) - - depend: - $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRC) diff --git a/net/isc-dhcp40-server/files/patch-includes::cf::freebsd.h b/net/isc-dhcp40-server/files/patch-includes::cf::freebsd.h deleted file mode 100644 index 9a3f4c636b09..000000000000 --- a/net/isc-dhcp40-server/files/patch-includes::cf::freebsd.h +++ /dev/null @@ -1,62 +0,0 @@ ---- includes/cf/freebsd.h.orig Wed Mar 3 02:32:39 2004 -+++ includes/cf/freebsd.h Wed Mar 3 02:31:56 2004 -@@ -42,7 +42,7 @@ - */ - - #include <syslog.h> --#include <sys/types.h> -+#include <sys/param.h> - #include <string.h> - #include <paths.h> - #include <errno.h> -@@ -101,6 +101,10 @@ - #define SOCKLEN_T int - #endif - -+#ifdef RESCUE -+#define _PATH_DHCLIENT_SCRIPT "/rescue/dhclient-script" -+#endif -+ - #if defined (USE_DEFAULT_NETWORK) - # define USE_BPF - #endif -@@ -111,6 +115,9 @@ - #endif /* HAVE_DEV_RANDOM */ - - const char *cmds[] = { -+#ifndef RESCUE -+ /* rescue environment can't rely on these ... */ -+ /* Actually, /sbin/dhclient shouldn't use these, either. */ - "/bin/ps -axlw 2>&1", - "/usr/sbin/arp -an 2>&1", - "/usr/bin/netstat -an 2>&1", -@@ -121,10 +128,12 @@ - "/usr/sbin/iostat 2>&1", - "/usr/bin/vmstat 2>&1", - "/usr/bin/w 2>&1", -+#endif - NULL - }; - - const char *dirs[] = { -+#ifndef RESCUE - "/tmp", - "/usr/tmp", - ".", -@@ -134,13 +143,16 @@ - "/var/mail", - "/home", - "/usr/home", -+#endif - NULL - }; - - const char *files[] = { -+#ifndef RESCUE - "/var/log/messages", - "/var/log/wtmp", - "/var/log/lastlog", -+#endif - NULL - }; - #endif /* NEED_PRAND_CONF */ diff --git a/net/isc-dhcp40-server/files/patch-includes::dhcpd.h b/net/isc-dhcp40-server/files/patch-includes::dhcpd.h deleted file mode 100644 index 1933e0b4037a..000000000000 --- a/net/isc-dhcp40-server/files/patch-includes::dhcpd.h +++ /dev/null @@ -1,56 +0,0 @@ ---- includes/dhcpd.h.orig Mon Feb 10 02:22:46 2003 -+++ includes/dhcpd.h Wed Mar 3 16:20:09 2004 -@@ -99,6 +99,9 @@ - (((x) >> OPTION_HASH_EXP) & \ - (OPTION_HASH_PTWO - 1))) % OPTION_HASH_SIZE; - -+#define NOLINK 0 -+#define HAVELINK 1 -+ - enum dhcp_shutdown_state { - shutdown_listeners, - shutdown_omapi_connections, -@@ -783,6 +786,11 @@ - unsigned remote_id_len; /* Length of Remote ID. */ - - char name [IFNAMSIZ]; /* Its name... */ -+ int ieee80211; /* True if media is ieee802.11 */ -+ int havemedia; /* True if we have a media table */ -+ int linkstate; /* True if we have link */ -+ int polling; /* True if polling is enabled */ -+ int forcediscover; /* True if a discover is needed */ - int index; /* Its index. */ - int rfdesc; /* Its read file descriptor. */ - int wfdesc; /* Its write file descriptor, if -@@ -1845,6 +1853,9 @@ - extern const char *path_dhclient_pid; - extern char *path_dhclient_script; - extern int interfaces_requested; -+#ifdef ENABLE_POLLING_MODE -+extern int polling_interval; -+#endif - - extern struct client_config top_level_config; - -@@ -1858,12 +1869,21 @@ - void send_decline PROTO ((void *)); - - void state_reboot PROTO ((void *)); -+#ifdef ENABLE_POLLING_MODE -+void state_background PROTO ((void *)); -+void state_polling PROTO ((void *)); -+#endif - void state_init PROTO ((void *)); - void state_selecting PROTO ((void *)); - void state_requesting PROTO ((void *)); - void state_bound PROTO ((void *)); - void state_stop PROTO ((void *)); - void state_panic PROTO ((void *)); -+ -+#if __FreeBSD_version > 502010 -+void set_ieee80211 PROTO ((struct interface_info *)); -+#endif -+int interface_active PROTO ((struct interface_info *)); - - void bind_lease PROTO ((struct client_state *)); - diff --git a/net/isc-dhcp40-server/files/patch-server::dhcpd.c b/net/isc-dhcp40-server/files/patch-server::dhcpd.c deleted file mode 100644 index e2e6e24e814e..000000000000 --- a/net/isc-dhcp40-server/files/patch-server::dhcpd.c +++ /dev/null @@ -1,288 +0,0 @@ ---- server/dhcpd.c.orig Thu Jun 10 19:59:52 2004 -+++ server/dhcpd.c Fri Jun 25 15:49:09 2004 -@@ -47,6 +47,22 @@ - #include "version.h" - #include <omapip/omapip_p.h> - -+#if defined (PARANOIA) -+#include <sys/types.h> -+#include <unistd.h> -+#include <pwd.h> -+/* get around the ISC declaration of group */ -+#define group real_group -+#include <grp.h> -+#undef group -+#endif /* PARANOIA */ -+#if defined (JAIL) -+#include <sys/param.h> -+#include <sys/jail.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#endif /* JAIL */ -+ - static void usage PROTO ((void)); - - TIME cur_time; -@@ -195,6 +211,35 @@ - omapi_object_dereference (&listener, MDL); - } - -+#if defined (PARANOIA) -+/* to be used in one of two possible scenarios */ -+static void setup_chroot (char *chroot_dir) -+{ -+ if (geteuid ()) -+ log_fatal ("you must be root to use chroot"); -+ if (chroot (chroot_dir)) -+ log_fatal ("chroot(\"%s\"): %m", chroot_dir); -+ if (chdir ("/")) -+ /* probably permission denied */ -+ log_fatal ("chdir(\"/\"): %m"); -+} -+#endif /* PARANOIA */ -+ -+#if defined (JAIL) -+static void setup_jail (char *chroot_dir, char *hostname, u_int32_t ip_number) -+{ -+ struct jail j; -+ -+ j.version = 0; -+ j.path = chroot_dir; -+ j.hostname = hostname; -+ j.ip_number = ip_number; -+ -+ if (jail (&j) < 0) -+ log_fatal ("jail(%s, %s): %m", chroot_dir, hostname); -+} -+#endif /* JAIL */ -+ - int main (argc, argv, envp) - int argc; - char **argv, **envp; -@@ -227,6 +272,25 @@ - char *traceinfile = (char *)0; - char *traceoutfile = (char *)0; - #endif -+#if defined (PARANOIA) -+ char *set_user = 0; -+ char *set_group = 0; -+ uid_t set_uid = 0; -+ gid_t set_gid = 0; -+ int early_chroot = 0; -+ int no_dhcpd_user = 0; -+ int no_dhcpd_group = 0; -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ char *set_chroot = 0; -+ int no_dhcpd_chroot = 0; -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ char *set_jail = 0; -+ u_int32_t jail_ip_address = 0; /* Good as long as it's IPv4 ... */ -+ int no_dhcpd_jail = 0; -+ char *s2; -+#endif /* JAIL */ - - /* Make sure we have stdin, stdout and stderr. */ - status = open ("/dev/null", O_RDWR); -@@ -289,6 +353,39 @@ - if (++i == argc) - usage (); - server = argv [i]; -+#if defined (PARANOIA) -+ } else if (!strcmp (argv [i], "-user")) { -+ if (++i == argc) -+ usage (); -+ set_user = argv [i]; -+ no_dhcpd_user = 1; -+ } else if (!strcmp (argv [i], "-group")) { -+ if (++i == argc) -+ usage (); -+ set_group = argv [i]; -+ no_dhcpd_group = 1; -+ } else if (!strcmp (argv [i], "-early_chroot")) { -+ early_chroot = 1; -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ } else if (!strcmp (argv [i], "-chroot")) { -+ if (++i == argc) -+ usage (); -+ set_chroot = argv [i]; -+ no_dhcpd_chroot = 1; -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ } else if (!strcmp (argv [i], "-jail")) { -+ if (++i == argc) -+ usage (); -+ set_jail = argv [i]; -+ if (++i == argc) -+ usage (); -+ if (ascii2addr (AF_INET, argv[i], &jail_ip_address) < 0) -+ log_fatal ("invalid ip address: %s", argv[i]); -+ jail_ip_address = ntohl (jail_ip_address); -+ no_dhcpd_jail = 1; -+#endif /* JAIL */ - } else if (!strcmp (argv [i], "-cf")) { - if (++i == argc) - usage (); -@@ -366,6 +463,28 @@ - if (!no_dhcpd_pid && (s = getenv ("PATH_DHCPD_PID"))) { - path_dhcpd_pid = s; - } -+#if defined (PARANOIA) -+ if (!no_dhcpd_user && (s = getenv ("DHCPD_USER"))) { -+ set_user = s; -+ } -+ if (!no_dhcpd_group && (s = getenv ("DHCPD_GROUP"))) { -+ set_group = s; -+ } -+#endif /* PARANOIA */ -+#if defined (PARANOIA) || defined (JAIL) -+ if (!no_dhcpd_chroot && (s = getenv ("PATH_DHCPD_CHROOT"))) { -+ set_chroot = s; -+ } -+#endif /* PARANOIA || JAIL */ -+#if defined (JAIL) -+ if (!no_dhcpd_jail && (s = getenv ("DHCPD_JAIL_HOSTNAME")) && -+ (s2 = getenv ("DHCPD_JAIL_IPADDRESS"))) { -+ set_jail = s; -+ if (ascii2addr (AF_INET, s2, &jail_ip_address) < 0) -+ log_fatal ("invalid ip address: %s", s2); -+ jail_ip_address = ntohl (jail_ip_address); -+ } -+#endif /* JAIL */ - - if (!quiet) { - log_info ("%s %s", message, DHCP_VERSION); -@@ -388,6 +507,57 @@ - trace_seed_stop, MDL); - #endif - -+#if defined (PARANOIA) -+ /* get user and group info if those options were given */ -+ if (set_user) { -+ struct passwd *tmp_pwd; -+ -+ if (geteuid ()) -+ log_fatal ("you must be root to set user"); -+ -+ if (!(tmp_pwd = getpwnam (set_user))) -+ log_fatal ("no such user: %s", set_user); -+ -+ set_uid = tmp_pwd->pw_uid; -+ -+ /* use the user's group as the default gid */ -+ if (!set_group) -+ set_gid = tmp_pwd->pw_gid; -+ } -+ -+ if (set_group) { -+/* get around the ISC declaration of group */ -+#define group real_group -+ struct group *tmp_grp; -+ -+ if (geteuid ()) -+ log_fatal ("you must be root to set group"); -+ -+ if (!(tmp_grp = getgrnam (set_group))) -+ log_fatal ("no such group: %s", set_group); -+ -+ set_gid = tmp_grp->gr_gid; -+#undef group -+ } -+#endif /* PARANOIA */ -+#if defined (JAIL) -+ if (set_jail) { -+ /* Initialize icmp support... */ -+ if (!cftest && !lftest) -+ icmp_startup (1, lease_pinged); -+ if(!set_chroot) -+ set_chroot = "/"; -+ setup_jail (set_chroot, set_jail, jail_ip_address); -+ } -+#endif /* JAIL */ -+#if defined (PARANOIA) && defined (JAIL) -+ else -+#endif /* PARANOIA && JAIL */ -+#if defined (PARANOIA) -+ if (early_chroot && set_chroot) -+ setup_chroot (set_chroot); -+#endif /* PARANOIA */ -+ - /* Default to the DHCP/BOOTP port. */ - if (!local_port) - { -@@ -462,6 +632,9 @@ - #endif - - /* Initialize icmp support... */ -+#if defined (JAIL) -+ if (!set_jail) -+#endif /* JAIL */ - if (!cftest && !lftest) - icmp_startup (1, lease_pinged); - -@@ -491,6 +664,14 @@ - - postconf_initialization (quiet); - -+#if defined (PARANOIA) -+#if defined (JAIL) -+ if (!set_jail) -+#endif /* JAIL */ -+ if (!early_chroot && set_chroot) -+ setup_chroot (set_chroot); -+#endif /* PARANOIA */ -+ - /* test option should cause an early exit */ - if (cftest && !lftest) - exit(0); -@@ -533,7 +714,22 @@ - else if (pid) - exit (0); - } -+ -+#if defined (PARANOIA) -+ /* change uid to the specified one */ -+ if (set_gid) { -+ if (setgroups (0, (void *)0)) -+ log_fatal ("setgroups: %m"); -+ if (setgid (set_gid)) -+ log_fatal ("setgid(%d): %m", (int) set_gid); -+ } - -+ if (set_uid) { -+ if (setuid (set_uid)) -+ log_fatal ("setuid(%d): %m", (int) set_uid); -+ } -+#endif /* PARANOIA */ -+ - /* Read previous pid file. */ - if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) { - status = read (i, pbuf, (sizeof pbuf) - 1); -@@ -877,8 +1073,24 @@ - log_info (copyright); - log_info (arr); - -- log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s", -+ log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s%s%s%s", - "\n [-cf config-file] [-lf lease-file]", -+ -+#if defined (PARANOIA) -+ /* meld into the following string */ -+ "\n [-user user] [-group group]", -+ "\n [-chroot dir] [-early_chroot]", -+#else /* PARANOIA */ -+ "", "", -+#endif /* PARANOIA */ -+ -+#if defined (JAIL) -+ /* then also these ones */ -+ "\n [-jail name ip]", -+#else /* JAIL */ -+ "", -+#endif /* JAIL */ -+ - #if defined (TRACING) - "\n [-tf trace-output-file]", - "\n [-play trace-input-file]", diff --git a/net/isc-dhcp40-server/files/patch-site.conf b/net/isc-dhcp40-server/files/patch-site.conf deleted file mode 100644 index 1149e0c7925c..000000000000 --- a/net/isc-dhcp40-server/files/patch-site.conf +++ /dev/null @@ -1,42 +0,0 @@ ---- site.conf.orig Wed Jul 7 17:20:10 1999 -+++ site.conf Wed Mar 3 14:00:14 2004 -@@ -1,2 +1,39 @@ - # Put local site configuration stuff here to override the default - # settings in Makefile.conf -+ -+PREFIX ?= /usr/local -+ -+USERBINDIR = $(PREFIX)/bin -+BINDIR = $(PREFIX)/sbin -+CLIENTBINDIR = $(PREFIX)/sbin -+ADMMANDIR = $(PREFIX)/man/man8 -+ADMMANEXT = .8 -+FFMANDIR = $(PREFIX)/man/man5 -+FFMANEXT = .5 -+LIBMANDIR = $(PREFIX)/man/man3 -+LIBMANEXT = .3 -+USRMANDIR = $(PREFIX)/man/man1 -+USRMANEXT = .1 -+MANCAT = man -+# INSTALL = ${INSTALL_DATA} -+# MANINSTALL = ${INSTALL_MAN} -+ETC = $(PREFIX)/etc -+LIBDIR = ${PREFIX}/lib -+INCDIR = ${PREFIX}/include -+CLIENT_PATH = \"PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/sbin:${PREFIX}/bin\" -+ -+DEBUG ?= #none -+ -+CFLAGS += -D_PATH_DHCPD_CONF=\"$(ETC)/dhcpd.conf\" -+CFLAGS += -D_PATH_DHCPD_DB=\"$(VARDB)/dhcpd.leases\" -+CFLAGS += -D_PATH_DHCPD_PID=\"$(VARRUN)/dhcpd.pid\" -+ -+CFLAGS += -D_PATH_DHCRELAY_PID=\"$(VARRUN)/dhcrelay.pid\" -+ -+CFLAGS += -D_PATH_DHCLIENT_CONF=\"$(ETC)/dhclient.conf\" -+CFLAGS += -D_PATH_DHCLIENT_SCRIPT=\"$(CLIENTBINDIR)/dhclient-script\" -+CFLAGS += -D_PATH_DHCLIENT_DB=\"$(VARDB)/dhclient.leases\" -+CFLAGS += -D_PATH_DHCLIENT_PID=\"$(VARRUN)/dhclient.pid\" -+ -+CFLAGS += -Dwarn=dhcp_warn -+CFLAGS += -DNOMINUM diff --git a/net/isc-dhcp40-server/pkg-descr b/net/isc-dhcp40-server/pkg-descr deleted file mode 100644 index 86bbb3cc62f0..000000000000 --- a/net/isc-dhcp40-server/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -The ISC Dynamic Host Configuration Protocol Distribution provides a -freely redistributable reference implementation of all aspects of the -DHCP protocol, through a suite of DHCP tools: - - * A DHCP server (this port) - * A DHCP client - * A DHCP relay agent - -Version 3 of the ISC DHCP Distribution includes the following features -that are new since version 2.0: - - * DHCP Failover Protocol support - * OMAPI, an API for accessing and modifying the DHCP server and client state - * Conditional behaviour - * Storing arbitrary information on leases - * Address pools with access control - * Client classing - * Address allocation restriction by class - * Relay agent information option support - * Dynamic DNS updates - * Many bug fixes, performance enhancements, and minor new DHCP protocol - features. - -WWW: http://www.isc.org/products/DHCP/ diff --git a/net/isc-dhcp40-server/pkg-install b/net/isc-dhcp40-server/pkg-install deleted file mode 100644 index 8bafd2bed768..000000000000 --- a/net/isc-dhcp40-server/pkg-install +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -[ $# != 2 ] && exit 1 -[ -z "${PKG_PREFIX}" ] && exit 1 -[ -n "${BATCH}" ] && exit 0 - -case $2 in -POST-INSTALL) - ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall - ;; -DEINSTALL) - ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall - ;; -POST-DEINSTALL|PRE-INSTALL) - ;; -*) - echo "usage: $0 <PKG_NAME> {PRE-INSTALL|POST-INSTALL|DEINSTALL|POST-DEINSTALL}" >&2 - exit 1 - ;; -esac diff --git a/net/isc-dhcp40-server/pkg-message b/net/isc-dhcp40-server/pkg-message deleted file mode 100644 index 754d49ae331f..000000000000 --- a/net/isc-dhcp40-server/pkg-message +++ /dev/null @@ -1,53 +0,0 @@ -**** To setup dhcpd, you may have to copy %%PREFIX%%/etc/dhcpd.conf.sample - to %%PREFIX%%/etc/dhcpd.conf for editing. - -**** This port installs dhcp daemon, but don't invokes dhcpd by default. If - you want to invoke dhcpd at startup, put these lines into /etc/rc.conf. - - dhcpd_enable="YES" # dhcpd enabled? - dhcpd_flags="-q" # command option(s) - dhcpd_conf="%%PREFIX%%/etc/dhcpd.conf" # configuration file - dhcpd_ifaces="" # ethernet interface(s) - dhcpd_withumask="022" # file creation mask - -**** If compiled with paranoia support (the default), the following lines - are also supported: - - dhcpd_chuser_enable="YES" # runs w/o privileges? - dhcpd_withuser="dhcpd" # user name to run as - dhcpd_withgroup="dhcpd" # group name to run as - dhcpd_chroot_enable="YES" # runs chrooted? - dhcpd_devfs_enable="YES" # use devfs if available? - dhcpd_makedev_enable="YES" # use MAKEDEV instead? - dhcpd_rootdir="/var/db/dhcpd" # directory to run in - dhcpd_includedir="<some_dir>" # directory with config- - files to include - dhcpd_flags="-early_chroot" # needs full root - - WARNING: -early_chroot requires a jail(8) like environment to work. - - WARNING: dhcpd_devfs_enable and dhcpd_makedev_enable are mutually - exclusive - dhcpd_makedev_enable make NO sense on FreeBSD 5.x and up! - -**** If compiled with jail support (the default), the following lines are - also supported (-early_chroot and dhcpd_chroot_enable=YES are implied): - - dhcpd_jail_enable="YES" # runs imprisoned? - dhcpd_hostname="<hostname>" # jail hostname - dhcpd_ipaddress="<ip address>" # jail ip address - - WARNING: dhcpd_rootdir needs to point to a full jail(8) environment. - -**** WARNING: never edit the chrooted or jailed dhcpd.conf file but - %%PREFIX%%/etc/dhcpd.conf instead which is always copied where - needed upon startup. - -**** WARNING: %%PREFIX%%/etc/rc.isc-dhcpd.conf is obsolete. rc.conf like - variables are still read there but should be moved /etc/rc.conf or - /etc/rc.conf.d/dhcpd instead. Also, the dhcpd_options variable must - be renamed dhcpd_flags if any. -%%LDAP%% -%%LDAP%%**** You have requested support for the LDAP configuration backend. -%%LDAP%% The OpenLDAP schema file is installed as %%SCHEMA_DIR%%/dhcp.schema. -%%LDAP%% See %%DOCSDIR%%/README.ldap for further LDAP configuration details. diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist deleted file mode 100644 index 3daff57c0e42..000000000000 --- a/net/isc-dhcp40-server/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -@comment $FreeBSD$ -bin/omshell -%%LDAP%%bin/dhcpd-conf-to-ldap.pl -etc/dhcpd.conf.sample -etc/rc.d/isc-dhcpd.sh -sbin/dhcpd -%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema -%%LDAP%%@dirrm %%SCHEMA_DIR%% diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile deleted file mode 100644 index a70bb4f7ad1c..000000000000 --- a/net/kdenetwork4/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: kdenetwork2 -# Date created: 2 November 2001 -# Whom: will@cvs.kde.org -# -# $FreeBSD$ -# - -PORTNAME= kdenetwork -PORTVERSION= ${KDE_VERSION} -CATEGORIES?= net kde -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src -DIST_SUBDIR= KDE - -MAINTAINER?= kde@FreeBSD.org -COMMENT= Network-related programs and modules for KDE - -LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn \ - slp:${PORTSDIR}/net/openslp -RUN_DEPENDS= ${QT_PREFIX}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls - -CONFLICTS= kopete-[0-9]* kvirc-[0-9]* - -USE_KDELIBS_VER=3 -PREFIX= ${KDE_PREFIX} - -USE_PERL5= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_OPENSSL= yes -USE_REINPLACE= yes - -USE_AUTOTOOLS= libtool:15 -INSTALLS_SHLIB= yes -LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -DO_NOT_COMPILE+=lanbrowsing -_NO_KDE_FINAL= yes - -CONFIGURE_ARGS+=--with-ssl-dir=/ - -.if defined(DO_NOT_COMPILE) -CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}" -.endif # defined(DO_NOT_COMPILE) - -.include "${.CURDIR}/../../x11/kde3/Makefile.kde" -.include <bsd.port.pre.mk> - -pre-configure: - @${REINPLACE_CMD} \ - -E -e '/^SUBDIRS/s/lisa//g' \ - ${WRKSRC}/doc/Makefile.in - -post-configure: -.if ${OSVERSION} < 500028 - @${REINPLACE_CMD} -e 's|$$(depcomp)||g' \ - ${WRKSRC}/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile -.endif - -.include <bsd.port.post.mk> diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo deleted file mode 100644 index 6ee3a74bc18a..000000000000 --- a/net/kdenetwork4/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (KDE/kdenetwork-3.5.1.tar.bz2) = 02ced8c14c80f28635056488949d56d7 -SHA256 (KDE/kdenetwork-3.5.1.tar.bz2) = 4067db7d60927c309cfd268609d5a638c67786da6c573bb32a5af18c3939c725 -SIZE (KDE/kdenetwork-3.5.1.tar.bz2) = 7464777 diff --git a/net/kdenetwork4/files/patch-configure b/net/kdenetwork4/files/patch-configure deleted file mode 100644 index 00bec73d8263..000000000000 --- a/net/kdenetwork4/files/patch-configure +++ /dev/null @@ -1,23 +0,0 @@ ---- configure Mon May 31 16:06:53 2004 -+++ configure Sun Jun 6 20:29:06 2004 -@@ -37996,20 +37996,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - -- kde_cv_utmp_file=no -- -- for ac_file in \ -- \ -- /var/run/utmp \ -- /var/adm/utmp \ -- /etc/utmp \ -- ; \ -- do -- if test -r "$ac_file"; then -- kde_cv_utmp_file=$ac_file -- break -- fi -- done -+ kde_cv_utmp_file=/var/run/utmp - - fi diff --git a/net/kdenetwork4/pkg-descr b/net/kdenetwork4/pkg-descr deleted file mode 100644 index 930132bfb9a4..000000000000 --- a/net/kdenetwork4/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -KDE provides an integrated X11 based environment, much like CDE. -This particular port installs the networking components of KDE, -which includes applications for networking things like kppp, -ksirc (irc-client), KDE's instant messenger kopete, and so forth. - -WWW: http://www.kde.org/ diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist deleted file mode 100644 index d6427c565dac..000000000000 --- a/net/kdenetwork4/pkg-plist +++ /dev/null @@ -1,2070 +0,0 @@ -bin/dsirc -bin/feedbrowser -bin/kdict -bin/kget -bin/knewstickerstub -bin/kopete -bin/kopete_latexconvert.sh -bin/kppp -bin/kppplogview -bin/krdc -bin/krfb -bin/krfb_httpd -bin/ksirc -bin/ktalkd -bin/ktalkdlg -bin/mail.local -bin/rssclient -bin/rssservice -include/kopete/kabcpersistence.h -include/kopete/kopete_export.h -include/kopete/kopeteaccount.h -include/kopete/kopeteaccountmanager.h -include/kopete/kopeteaway.h -include/kopete/kopeteawayaction.h -include/kopete/kopeteawaydialog.h -include/kopete/kopeteblacklister.h -include/kopete/kopetechatsession.h -include/kopete/kopetechatsessionmanager.h -include/kopete/kopetecommandhandler.h -include/kopete/kopetecontact.h -include/kopete/kopetecontactlist.h -include/kopete/kopetecontactlistelement.h -include/kopete/kopetecontactproperty.h -include/kopete/kopeteeventpresentation.h -include/kopete/kopeteglobal.h -include/kopete/kopetegroup.h -include/kopete/kopetemessage.h -include/kopete/kopetemessageevent.h -include/kopete/kopetemessagehandler.h -include/kopete/kopetemessagehandlerchain.h -include/kopete/kopetemetacontact.h -include/kopete/kopetemimetypehandler.h -include/kopete/kopetenotifydataobject.h -include/kopete/kopeteonlinestatus.h -include/kopete/kopeteonlinestatusmanager.h -include/kopete/kopetepassword.h -include/kopete/kopetepasswordedaccount.h -include/kopete/kopeteplugin.h -include/kopete/kopeteprotocol.h -include/kopete/kopetesimplemessagehandler.h -include/kopete/kopetetask.h -include/kopete/kopetetransfermanager.h -include/kopete/kopeteuiglobal.h -include/kopete/kopeteversion.h -include/kopete/kopetexsl.h -include/kopete/managedconnectionaccount.h -include/kopete/ui/accountselector.h -include/kopete/ui/addcontactpage.h -include/kopete/ui/addressbookselectordialog.h -include/kopete/ui/addressbookselectorwidget.h -include/kopete/ui/editaccountwidget.h -include/kopete/ui/fileconfirmbase.h -include/kopete/ui/kopeteawaydialogbase.h -include/kopete/ui/kopetecontactaction.h -include/kopete/ui/kopetefileconfirmdialog.h -include/kopete/ui/kopetelistview.h -include/kopete/ui/kopetelistviewitem.h -include/kopete/ui/kopetelistviewsearchline.h -include/kopete/ui/kopetepassworddialog.h -include/kopete/ui/kopetepasswordwidget.h -include/kopete/ui/kopetepasswordwidgetbase.h -include/kopete/ui/kopetestdaction.h -include/kopete/ui/kopeteview.h -include/kopete/ui/kopeteviewplugin.h -include/kopete/ui/userinfodialog.h -include/rss/article.h -include/rss/document.h -include/rss/global.h -include/rss/image.h -include/rss/librss.h -include/rss/loader.h -include/rss/textinput.h -lib/kconf_update_bin/kopete-account-kconf_update -lib/kconf_update_bin/kopete-nameTracking-kconf_update -lib/kconf_update_bin/kopete-pluginloader2-kconf_update -lib/kde3/fileshare_propsdlgplugin.a -lib/kde3/fileshare_propsdlgplugin.la -lib/kde3/fileshare_propsdlgplugin.so -lib/kde3/kcm_fileshare.a -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so -lib/kde3/kcm_kopete_accountconfig.a -lib/kde3/kcm_kopete_accountconfig.la -lib/kde3/kcm_kopete_accountconfig.so -lib/kde3/kcm_kopete_addbookmarks.a -lib/kde3/kcm_kopete_addbookmarks.la -lib/kde3/kcm_kopete_addbookmarks.so -lib/kde3/kcm_kopete_alias.a -lib/kde3/kcm_kopete_alias.la -lib/kde3/kcm_kopete_alias.so -lib/kde3/kcm_kopete_appearanceconfig.a -lib/kde3/kcm_kopete_appearanceconfig.la -lib/kde3/kcm_kopete_appearanceconfig.so -lib/kde3/kcm_kopete_autoreplace.a -lib/kde3/kcm_kopete_autoreplace.la -lib/kde3/kcm_kopete_autoreplace.so -lib/kde3/kcm_kopete_avdeviceconfig.a -lib/kde3/kcm_kopete_avdeviceconfig.la -lib/kde3/kcm_kopete_avdeviceconfig.so -lib/kde3/kcm_kopete_behaviorconfig.a -lib/kde3/kcm_kopete_behaviorconfig.la -lib/kde3/kcm_kopete_behaviorconfig.so -lib/kde3/kcm_kopete_cryptography.a -lib/kde3/kcm_kopete_cryptography.la -lib/kde3/kcm_kopete_cryptography.so -lib/kde3/kcm_kopete_highlight.a -lib/kde3/kcm_kopete_highlight.la -lib/kde3/kcm_kopete_highlight.so -lib/kde3/kcm_kopete_history.a -lib/kde3/kcm_kopete_history.la -lib/kde3/kcm_kopete_history.so -lib/kde3/kcm_kopete_identityconfig.a -lib/kde3/kcm_kopete_identityconfig.la -lib/kde3/kcm_kopete_identityconfig.so -lib/kde3/kcm_kopete_latex.a -lib/kde3/kcm_kopete_latex.la -lib/kde3/kcm_kopete_latex.so -lib/kde3/kcm_kopete_msn.a -lib/kde3/kcm_kopete_msn.la -lib/kde3/kcm_kopete_msn.so -lib/kde3/kcm_kopete_netmeeting.a -lib/kde3/kcm_kopete_netmeeting.la -lib/kde3/kcm_kopete_netmeeting.so -lib/kde3/kcm_kopete_nowlistening.a -lib/kde3/kcm_kopete_nowlistening.la -lib/kde3/kcm_kopete_nowlistening.so -lib/kde3/kcm_kopete_texteffect.a -lib/kde3/kcm_kopete_texteffect.la -lib/kde3/kcm_kopete_texteffect.so -lib/kde3/kcm_kopete_translator.a -lib/kde3/kcm_kopete_translator.la -lib/kde3/kcm_kopete_translator.so -lib/kde3/kcm_kopete_webpresence.a -lib/kde3/kcm_kopete_webpresence.la -lib/kde3/kcm_kopete_webpresence.so -lib/kde3/kcm_krfb.a -lib/kde3/kcm_krfb.la -lib/kde3/kcm_krfb.so -lib/kde3/kcm_ktalkd.a -lib/kde3/kcm_ktalkd.la -lib/kde3/kcm_ktalkd.so -lib/kde3/kded_dnssdwatcher.a -lib/kde3/kded_dnssdwatcher.la -lib/kde3/kded_dnssdwatcher.so -lib/kde3/kded_kinetd.a -lib/kde3/kded_kinetd.la -lib/kde3/kded_kinetd.so -lib/kde3/kdict.a -lib/kde3/kdict.la -lib/kde3/kdict.so -lib/kde3/kdict_panelapplet.a -lib/kde3/kdict_panelapplet.la -lib/kde3/kdict_panelapplet.so -lib/kde3/kfile_torrent.a -lib/kde3/kfile_torrent.la -lib/kde3/kfile_torrent.so -lib/kde3/khtml_kget.a -lib/kde3/khtml_kget.la -lib/kde3/khtml_kget.so -lib/kde3/kio_jabberdisco.a -lib/kde3/kio_jabberdisco.la -lib/kde3/kio_jabberdisco.so -lib/kde3/kio_zeroconf.a -lib/kde3/kio_zeroconf.la -lib/kde3/kio_zeroconf.so -lib/kde3/knewsticker_panelapplet.a -lib/kde3/knewsticker_panelapplet.la -lib/kde3/knewsticker_panelapplet.so -lib/kde3/kopete_addbookmarks.a -lib/kde3/kopete_addbookmarks.la -lib/kde3/kopete_addbookmarks.so -lib/kde3/kopete_aim.a -lib/kde3/kopete_aim.la -lib/kde3/kopete_aim.so -lib/kde3/kopete_alias.a -lib/kde3/kopete_alias.la -lib/kde3/kopete_alias.so -lib/kde3/kopete_autoreplace.a -lib/kde3/kopete_autoreplace.la -lib/kde3/kopete_autoreplace.so -lib/kde3/kopete_chatwindow.a -lib/kde3/kopete_chatwindow.la -lib/kde3/kopete_chatwindow.so -lib/kde3/kopete_connectionstatus.a -lib/kde3/kopete_connectionstatus.la -lib/kde3/kopete_connectionstatus.so -lib/kde3/kopete_contactnotes.a -lib/kde3/kopete_contactnotes.la -lib/kde3/kopete_contactnotes.so -lib/kde3/kopete_cryptography.a -lib/kde3/kopete_cryptography.la -lib/kde3/kopete_cryptography.so -lib/kde3/kopete_emailwindow.a -lib/kde3/kopete_emailwindow.la -lib/kde3/kopete_emailwindow.so -lib/kde3/kopete_gadu.a -lib/kde3/kopete_gadu.la -lib/kde3/kopete_gadu.so -lib/kde3/kopete_groupwise.a -lib/kde3/kopete_groupwise.la -lib/kde3/kopete_groupwise.so -lib/kde3/kopete_highlight.a -lib/kde3/kopete_highlight.la -lib/kde3/kopete_highlight.so -lib/kde3/kopete_history.a -lib/kde3/kopete_history.la -lib/kde3/kopete_history.so -lib/kde3/kopete_icq.a -lib/kde3/kopete_icq.la -lib/kde3/kopete_icq.so -lib/kde3/kopete_irc.a -lib/kde3/kopete_irc.la -lib/kde3/kopete_irc.so -lib/kde3/kopete_jabber.a -lib/kde3/kopete_jabber.la -lib/kde3/kopete_jabber.so -lib/kde3/kopete_latex.a -lib/kde3/kopete_latex.la -lib/kde3/kopete_latex.so -lib/kde3/kopete_msn.a -lib/kde3/kopete_msn.la -lib/kde3/kopete_msn.so -lib/kde3/kopete_netmeeting.a -lib/kde3/kopete_netmeeting.la -lib/kde3/kopete_netmeeting.so -lib/kde3/kopete_nowlistening.a -lib/kde3/kopete_nowlistening.la -lib/kde3/kopete_nowlistening.so -lib/kde3/kopete_sms.a -lib/kde3/kopete_sms.la -lib/kde3/kopete_sms.so -lib/kde3/kopete_statistics.a -lib/kde3/kopete_statistics.la -lib/kde3/kopete_statistics.so -lib/kde3/kopete_testbed.a -lib/kde3/kopete_testbed.la -lib/kde3/kopete_testbed.so -lib/kde3/kopete_texteffect.a -lib/kde3/kopete_texteffect.la -lib/kde3/kopete_texteffect.so -lib/kde3/kopete_translator.a -lib/kde3/kopete_translator.la -lib/kde3/kopete_translator.so -lib/kde3/kopete_webpresence.a -lib/kde3/kopete_webpresence.la -lib/kde3/kopete_webpresence.so -lib/kde3/kopete_yahoo.a -lib/kde3/kopete_yahoo.la -lib/kde3/kopete_yahoo.so -lib/kde3/kpf_panelapplet.a -lib/kde3/kpf_panelapplet.la -lib/kde3/kpf_panelapplet.so -lib/kde3/kpfpropertiesdialog.a -lib/kde3/kpfpropertiesdialog.la -lib/kde3/kpfpropertiesdialog.so -lib/kde3/ksirc.a -lib/kde3/ksirc.la -lib/kde3/ksirc.so -lib/kde3/libkcm_kcmsambaconf.a -lib/kde3/libkcm_kcmsambaconf.la -lib/kde3/libkcm_kcmsambaconf.so -lib/kde3/libkntsrcfilepropsdlg.a -lib/kde3/libkntsrcfilepropsdlg.la -lib/kde3/libkntsrcfilepropsdlg.so -lib/kde3/libkrichtexteditpart.a -lib/kde3/libkrichtexteditpart.la -lib/kde3/libkrichtexteditpart.so -lib/libkdeinit_kdict.a -lib/libkdeinit_kdict.la -lib/libkdeinit_kdict.so -lib/libkdeinit_ksirc.a -lib/libkdeinit_ksirc.la -lib/libkdeinit_ksirc.so -lib/libkopete.a -lib/libkopete.la -lib/libkopete.so -lib/libkopete.so.1 -lib/libkopete_msn_shared.a -lib/libkopete_msn_shared.la -lib/libkopete_msn_shared.so -lib/libkopete_msn_shared.so.0 -lib/libkopete_oscar.a -lib/libkopete_oscar.la -lib/libkopete_oscar.so -lib/libkopete_oscar.so.2 -lib/libkopete_videodevice.a -lib/libkopete_videodevice.la -lib/libkopete_videodevice.so -lib/libkopete_videodevice.so.0 -lib/librss.a -lib/librss.la -lib/librss.so -lib/librss.so.1 -share/applications/kde/Kppp.desktop -share/applications/kde/fileshare.desktop -share/applications/kde/kcmkrfb.desktop -share/applications/kde/kcmktalkd.desktop -share/applications/kde/kcmsambaconf.desktop -share/applications/kde/kdict.desktop -share/applications/kde/kget.desktop -share/applications/kde/knewsticker-standalone.desktop -share/applications/kde/kopete.desktop -share/applications/kde/kppplogview.desktop -share/applications/kde/krdc.desktop -share/applications/kde/krfb.desktop -share/applications/kde/ksirc.desktop -share/applnk/.hidden/knewstickerstub.desktop -share/apps/kconf_update/knewsticker.upd -share/apps/kconf_update/knt-0.1-0.2.pl -share/apps/kconf_update/kopete-account-0.10.pl -share/apps/kconf_update/kopete-account-kconf_update.sh -share/apps/kconf_update/kopete-account-kconf_update.upd -share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh -share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd -share/apps/kconf_update/kopete-jabberproxytype-kconf_update.sh -share/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd -share/apps/kconf_update/kopete-nameTracking.upd -share/apps/kconf_update/kopete-pluginloader.pl -share/apps/kconf_update/kopete-pluginloader.upd -share/apps/kconf_update/kopete-pluginloader2.sh -share/apps/kconf_update/kopete-pluginloader2.upd -share/apps/kdict/icons/crystalsvg/16x16/actions/define_clip.png -share/apps/kdict/icons/crystalsvg/16x16/actions/query_erase.png -share/apps/kdict/icons/crystalsvg/22x22/actions/define_clip.png -share/apps/kdict/icons/crystalsvg/32x32/actions/define_clip.png -share/apps/kdict/kdictui.rc -share/apps/kget/eventsrc -share/apps/kget/icons/crystalsvg/22x22/actions/bar0.png -share/apps/kget/icons/crystalsvg/22x22/actions/bar1.png -share/apps/kget/icons/crystalsvg/22x22/actions/bar2.png -share/apps/kget/icons/crystalsvg/22x22/actions/bar3.png -share/apps/kget/icons/crystalsvg/22x22/actions/bar4.png -share/apps/kget/icons/crystalsvg/22x22/actions/bar5.png -share/apps/kget/icons/crystalsvg/22x22/actions/bar6.png -share/apps/kget/icons/crystalsvg/22x22/actions/kget_dock.png -share/apps/kget/icons/crystalsvg/22x22/actions/kget_dock_download.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_clipboard.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_delay.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_disconnect.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_dock.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_drop_target.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_expert.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_logwindow.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_normal.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_off.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_offline_mode_on.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_pause.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_queue.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_restart.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_resume.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_shutdown.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_timer.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_uselastdir.png -share/apps/kget/kgetui.rc -share/apps/kget/pics/connect0.png -share/apps/kget/pics/connect1.png -share/apps/kget/pics/connect2.png -share/apps/kget/pics/connect3.png -share/apps/kget/pics/connect4.png -share/apps/kget/pics/connect5.png -share/apps/kget/pics/connect6.png -share/apps/kget/pics/connect7.png -share/apps/kget/pics/md_delayed.png -share/apps/kget/pics/md_finished.png -share/apps/kget/pics/md_queued.png -share/apps/kget/pics/md_scheduled.png -share/apps/kget/pics/retrying.png -share/apps/kget/pics/target.png -share/apps/kget/pics/try0.png -share/apps/kget/pics/try1.png -share/apps/kget/pics/try2.png -share/apps/kget/pics/try3.png -share/apps/kget/pics/try4.png -share/apps/kget/pics/try5.png -share/apps/kget/pics/try6.png -share/apps/kget/pics/try7.png -share/apps/khtml/kpartplugins/kget_plug_in.desktop -share/apps/khtml/kpartplugins/kget_plug_in.rc -share/apps/kicker/applets/kdictapplet.desktop -share/apps/kicker/applets/knewsticker.desktop -share/apps/kicker/applets/kpfapplet.desktop -share/apps/kinetd/eventsrc -share/apps/knewsticker/eventsrc -share/apps/konqueror/servicemenus/kget_download.desktop -share/apps/konqueror/servicemenus/smb2rdc.desktop -share/apps/kopete/eventsrc -share/apps/kopete/icons/crystalsvg/128x128/apps/aim_protocol.png -share/apps/kopete/icons/crystalsvg/128x128/apps/icq_protocol.png -share/apps/kopete/icons/crystalsvg/128x128/apps/kopete_avdevice.png -share/apps/kopete/icons/crystalsvg/128x128/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/128x128/apps/sms_protocol.png -share/apps/kopete/icons/crystalsvg/128x128/apps/testbed_protocol.png -share/apps/kopete/icons/crystalsvg/128x128/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/actions/account_offline_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/aim_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/aim_connecting.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/aim_offline.png -share/apps/kopete/icons/crystalsvg/16x16/actions/aim_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_away_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_busy_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_food_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_invisible_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_phone_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_xa_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/emoticon.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy_d.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_con.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_connecting.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_description_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_ignored.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_invi.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_invi_d.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_offline.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_offline_d.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/gg_online_d.png -share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_busy.png -share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_connecting.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_invisible.png -share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_connecting.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_dnd.png -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_ffc.png -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_invisible.png -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_na.png -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_occupied.png -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_offline.png -share/apps/kopete/icons/crystalsvg/16x16/actions/icq_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/irc_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/irc_channel.png -share/apps/kopete/icons/crystalsvg/16x16/actions/irc_connecting.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/irc_normal.png -share/apps/kopete/icons/crystalsvg/16x16/actions/irc_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/irc_op.png -share/apps/kopete/icons/crystalsvg/16x16/actions/irc_server.png -share/apps/kopete/icons/crystalsvg/16x16/actions/irc_voice.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_chatty.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_connecting.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_group.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_invisible.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_na.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_offline.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_original.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_raw.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_off.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_on.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_xa.png -share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key1.png -share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key2.png -share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key3.png -share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteaway.png -share/apps/kopete/icons/crystalsvg/16x16/actions/logging.png -share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_offline.png -share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_unknown.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_blocked.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_brb.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_busy.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_connecting.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_invisible.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_lunch.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_na.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_newmsg.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_offline.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/msn_phone.png -share/apps/kopete/icons/crystalsvg/16x16/actions/newmsg.png -share/apps/kopete/icons/crystalsvg/16x16/actions/status_unknown.png -share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_busy.png -share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_connecting.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_idle.png -share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_invisible.png -share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_mobile.png -share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_tea.png -share/apps/kopete/icons/crystalsvg/16x16/apps/aim_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/gadu_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/groupwise_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/icq_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/irc_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/jabber_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/sms_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/testbed_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/22x22/actions/account_offline_overlay.png -share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteaway.png -share/apps/kopete/icons/crystalsvg/22x22/actions/logging.png -share/apps/kopete/icons/crystalsvg/22x22/apps/groupwise_protocol.png -share/apps/kopete/icons/crystalsvg/22x22/apps/kopete_avdevice.png -share/apps/kopete/icons/crystalsvg/32x32/actions/account_offline_overlay.png -share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteaway.png -share/apps/kopete/icons/crystalsvg/32x32/actions/logging.png -share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_away.png -share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_offline.png -share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_online.png -share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_unknown.png -share/apps/kopete/icons/crystalsvg/32x32/actions/newmessage.mng -share/apps/kopete/icons/crystalsvg/32x32/actions/newmsg.png -share/apps/kopete/icons/crystalsvg/32x32/apps/aim_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/autoreplace.png -share/apps/kopete/icons/crystalsvg/32x32/apps/gadu_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/groupwise_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/highlight.png -share/apps/kopete/icons/crystalsvg/32x32/apps/icq_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/irc_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/jabber_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/kopete_avdevice.png -share/apps/kopete/icons/crystalsvg/32x32/apps/latex.png -share/apps/kopete/icons/crystalsvg/32x32/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/sms_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/testbed_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/texteffect.png -share/apps/kopete/icons/crystalsvg/32x32/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteaway.png -share/apps/kopete/icons/crystalsvg/48x48/actions/logging.png -share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_away.png -share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_offline.png -share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_online.png -share/apps/kopete/icons/crystalsvg/48x48/apps/aim_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/groupwise_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/icq_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/jabber_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/sms_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/testbed_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/actions/logging.png -share/apps/kopete/icons/crystalsvg/64x64/apps/aim_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/groupwise_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/icq_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/kopete_avdevice.png -share/apps/kopete/icons/crystalsvg/64x64/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/sms_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/testbed_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz -share/apps/kopete/icons/hicolor/16x16/actions/aim_away.png -share/apps/kopete/icons/hicolor/16x16/actions/aim_connecting.mng -share/apps/kopete/icons/hicolor/16x16/actions/aim_offline.png -share/apps/kopete/icons/hicolor/16x16/actions/aim_online.png -share/apps/kopete/icons/hicolor/16x16/actions/emoticon.png -share/apps/kopete/icons/hicolor/16x16/actions/icq_away.png -share/apps/kopete/icons/hicolor/16x16/actions/icq_connecting.mng -share/apps/kopete/icons/hicolor/16x16/actions/icq_dnd.png -share/apps/kopete/icons/hicolor/16x16/actions/icq_ffc.png -share/apps/kopete/icons/hicolor/16x16/actions/icq_invisible.png -share/apps/kopete/icons/hicolor/16x16/actions/icq_na.png -share/apps/kopete/icons/hicolor/16x16/actions/icq_occupied.png -share/apps/kopete/icons/hicolor/16x16/actions/icq_offline.png -share/apps/kopete/icons/hicolor/16x16/actions/icq_online.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_away.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_chatty.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_connecting.mng -share/apps/kopete/icons/hicolor/16x16/actions/jabber_group.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_invisible.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_na.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_offline.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_online.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_original.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_raw.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_off.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_on.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_xa.png -share/apps/kopete/icons/hicolor/16x16/actions/kopeteavailable.png -share/apps/kopete/icons/hicolor/16x16/actions/kopeteaway.png -share/apps/kopete/icons/hicolor/16x16/actions/newmsg.png -share/apps/kopete/icons/hicolor/16x16/actions/status_unknown.png -share/apps/kopete/icons/hicolor/16x16/apps/aim_protocol.png -share/apps/kopete/icons/hicolor/16x16/apps/icq_protocol.png -share/apps/kopete/icons/hicolor/16x16/apps/jabber_protocol.png -share/apps/kopete/icons/hicolor/22x22/actions/kopeteavailable.png -share/apps/kopete/icons/hicolor/22x22/actions/kopeteaway.png -share/apps/kopete/icons/hicolor/32x32/actions/kopeteavailable.png -share/apps/kopete/icons/hicolor/32x32/actions/kopeteaway.png -share/apps/kopete/icons/hicolor/32x32/actions/newmessage.mng -share/apps/kopete/icons/hicolor/32x32/apps/aim_protocol.png -share/apps/kopete/icons/hicolor/32x32/apps/icq_protocol.png -share/apps/kopete/icons/hicolor/32x32/apps/jabber_protocol.png -share/apps/kopete/icons/hicolor/48x48/actions/kopeteavailable.png -share/apps/kopete/icons/hicolor/48x48/actions/kopeteaway.png -share/apps/kopete/icons/hicolor/48x48/apps/jabber_protocol.png -share/apps/kopete/ircchatui.rc -share/apps/kopete/ircnetworks.xml -share/apps/kopete/kopetechatwindow.rc -share/apps/kopete/kopetecommandui.rc -share/apps/kopete/kopeteemailwindow.rc -share/apps/kopete/kopeteui.rc -share/apps/kopete/nowlisteningchatui.rc -share/apps/kopete/nowlisteningui.rc -share/apps/kopete/pics/statistics/black.png -share/apps/kopete/pics/statistics/blue.png -share/apps/kopete/pics/statistics/gray.png -share/apps/kopete/pics/statistics/navy.png -share/apps/kopete/styles/Adium.xsl -share/apps/kopete/styles/Enclosed.xsl -share/apps/kopete/styles/Gaim.xsl -share/apps/kopete/styles/Keramik.xsl -share/apps/kopete/styles/Konsole.xsl -share/apps/kopete/styles/Kopete-old.xsl -share/apps/kopete/styles/Kopete.xsl -share/apps/kopete/styles/MSN.xsl -share/apps/kopete/styles/Minimal.xsl -share/apps/kopete/styles/XChat.xsl -share/apps/kopete/styles/data/Adium/adium.js -share/apps/kopete/styles/data/Kopete/action.png -share/apps/kopete/styles/data/Kopete/important.png -share/apps/kopete/styles/data/Kopete/system.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/br.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/br.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/blue/me.png -share/apps/kopete/styles/data/iChat-Trans/blue/them.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/br.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/br.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/clear/me.png -share/apps/kopete/styles/data/iChat-Trans/clear/them.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/br.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/br.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/graphite/me.png -share/apps/kopete/styles/data/iChat-Trans/graphite/them.png -share/apps/kopete/styles/data/iChat-Trans/green/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/green/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/green/From/br.png -share/apps/kopete/styles/data/iChat-Trans/green/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/green/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/green/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/green/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/green/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/green/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/green/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/green/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/green/To/br.png -share/apps/kopete/styles/data/iChat-Trans/green/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/green/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/green/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/green/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/green/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/green/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/green/me.png -share/apps/kopete/styles/data/iChat-Trans/green/them.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/br.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/br.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/orange/me.png -share/apps/kopete/styles/data/iChat-Trans/orange/them.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/br.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/br.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/pink/me.png -share/apps/kopete/styles/data/iChat-Trans/pink/them.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/br.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/br.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/purple/me.png -share/apps/kopete/styles/data/iChat-Trans/purple/them.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/br.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/br.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/yellow/me.png -share/apps/kopete/styles/data/iChat-Trans/yellow/them.png -share/apps/kopete/styles/data/iChat/blue/From/bl.png -share/apps/kopete/styles/data/iChat/blue/From/bm.png -share/apps/kopete/styles/data/iChat/blue/From/br.png -share/apps/kopete/styles/data/iChat/blue/From/ml.png -share/apps/kopete/styles/data/iChat/blue/From/mm.png -share/apps/kopete/styles/data/iChat/blue/From/mr.png -share/apps/kopete/styles/data/iChat/blue/From/tl.png -share/apps/kopete/styles/data/iChat/blue/From/tm.png -share/apps/kopete/styles/data/iChat/blue/From/tr.png -share/apps/kopete/styles/data/iChat/blue/To/bl.png -share/apps/kopete/styles/data/iChat/blue/To/bm.png -share/apps/kopete/styles/data/iChat/blue/To/br.png -share/apps/kopete/styles/data/iChat/blue/To/ml.png -share/apps/kopete/styles/data/iChat/blue/To/mm.png -share/apps/kopete/styles/data/iChat/blue/To/mr.png -share/apps/kopete/styles/data/iChat/blue/To/tl.png -share/apps/kopete/styles/data/iChat/blue/To/tm.png -share/apps/kopete/styles/data/iChat/blue/To/tr.png -share/apps/kopete/styles/data/iChat/blue/me.png -share/apps/kopete/styles/data/iChat/blue/them.png -share/apps/kopete/styles/data/iChat/clear/From/bl.png -share/apps/kopete/styles/data/iChat/clear/From/bm.png -share/apps/kopete/styles/data/iChat/clear/From/br.png -share/apps/kopete/styles/data/iChat/clear/From/ml.png -share/apps/kopete/styles/data/iChat/clear/From/mm.png -share/apps/kopete/styles/data/iChat/clear/From/mr.png -share/apps/kopete/styles/data/iChat/clear/From/tl.png -share/apps/kopete/styles/data/iChat/clear/From/tm.png -share/apps/kopete/styles/data/iChat/clear/From/tr.png -share/apps/kopete/styles/data/iChat/clear/To/bl.png -share/apps/kopete/styles/data/iChat/clear/To/bm.png -share/apps/kopete/styles/data/iChat/clear/To/br.png -share/apps/kopete/styles/data/iChat/clear/To/ml.png -share/apps/kopete/styles/data/iChat/clear/To/mm.png -share/apps/kopete/styles/data/iChat/clear/To/mr.png -share/apps/kopete/styles/data/iChat/clear/To/tl.png -share/apps/kopete/styles/data/iChat/clear/To/tm.png -share/apps/kopete/styles/data/iChat/clear/To/tr.png -share/apps/kopete/styles/data/iChat/clear/me.png -share/apps/kopete/styles/data/iChat/clear/them.png -share/apps/kopete/styles/data/iChat/graphite/From/bl.png -share/apps/kopete/styles/data/iChat/graphite/From/bm.png -share/apps/kopete/styles/data/iChat/graphite/From/br.png -share/apps/kopete/styles/data/iChat/graphite/From/ml.png -share/apps/kopete/styles/data/iChat/graphite/From/mm.png -share/apps/kopete/styles/data/iChat/graphite/From/mr.png -share/apps/kopete/styles/data/iChat/graphite/From/tl.png -share/apps/kopete/styles/data/iChat/graphite/From/tm.png -share/apps/kopete/styles/data/iChat/graphite/From/tr.png -share/apps/kopete/styles/data/iChat/graphite/To/bl.png -share/apps/kopete/styles/data/iChat/graphite/To/bm.png -share/apps/kopete/styles/data/iChat/graphite/To/br.png -share/apps/kopete/styles/data/iChat/graphite/To/ml.png -share/apps/kopete/styles/data/iChat/graphite/To/mm.png -share/apps/kopete/styles/data/iChat/graphite/To/mr.png -share/apps/kopete/styles/data/iChat/graphite/To/tl.png -share/apps/kopete/styles/data/iChat/graphite/To/tm.png -share/apps/kopete/styles/data/iChat/graphite/To/tr.png -share/apps/kopete/styles/data/iChat/graphite/me.png -share/apps/kopete/styles/data/iChat/graphite/them.png -share/apps/kopete/styles/data/iChat/green/From/bl.png -share/apps/kopete/styles/data/iChat/green/From/bm.png -share/apps/kopete/styles/data/iChat/green/From/br.png -share/apps/kopete/styles/data/iChat/green/From/ml.png -share/apps/kopete/styles/data/iChat/green/From/mm.png -share/apps/kopete/styles/data/iChat/green/From/mr.png -share/apps/kopete/styles/data/iChat/green/From/tl.png -share/apps/kopete/styles/data/iChat/green/From/tm.png -share/apps/kopete/styles/data/iChat/green/From/tr.png -share/apps/kopete/styles/data/iChat/green/To/bl.png -share/apps/kopete/styles/data/iChat/green/To/bm.png -share/apps/kopete/styles/data/iChat/green/To/br.png -share/apps/kopete/styles/data/iChat/green/To/ml.png -share/apps/kopete/styles/data/iChat/green/To/mm.png -share/apps/kopete/styles/data/iChat/green/To/mr.png -share/apps/kopete/styles/data/iChat/green/To/tl.png -share/apps/kopete/styles/data/iChat/green/To/tm.png -share/apps/kopete/styles/data/iChat/green/To/tr.png -share/apps/kopete/styles/data/iChat/green/me.png -share/apps/kopete/styles/data/iChat/green/them.png -share/apps/kopete/styles/data/iChat/orange/From/bl.png -share/apps/kopete/styles/data/iChat/orange/From/bm.png -share/apps/kopete/styles/data/iChat/orange/From/br.png -share/apps/kopete/styles/data/iChat/orange/From/ml.png -share/apps/kopete/styles/data/iChat/orange/From/mm.png -share/apps/kopete/styles/data/iChat/orange/From/mr.png -share/apps/kopete/styles/data/iChat/orange/From/tl.png -share/apps/kopete/styles/data/iChat/orange/From/tm.png -share/apps/kopete/styles/data/iChat/orange/From/tr.png -share/apps/kopete/styles/data/iChat/orange/To/bl.png -share/apps/kopete/styles/data/iChat/orange/To/bm.png -share/apps/kopete/styles/data/iChat/orange/To/br.png -share/apps/kopete/styles/data/iChat/orange/To/ml.png -share/apps/kopete/styles/data/iChat/orange/To/mm.png -share/apps/kopete/styles/data/iChat/orange/To/mr.png -share/apps/kopete/styles/data/iChat/orange/To/tl.png -share/apps/kopete/styles/data/iChat/orange/To/tm.png -share/apps/kopete/styles/data/iChat/orange/To/tr.png -share/apps/kopete/styles/data/iChat/orange/me.png -share/apps/kopete/styles/data/iChat/orange/them.png -share/apps/kopete/styles/data/iChat/pink/From/bl.png -share/apps/kopete/styles/data/iChat/pink/From/bm.png -share/apps/kopete/styles/data/iChat/pink/From/br.png -share/apps/kopete/styles/data/iChat/pink/From/ml.png -share/apps/kopete/styles/data/iChat/pink/From/mm.png -share/apps/kopete/styles/data/iChat/pink/From/mr.png -share/apps/kopete/styles/data/iChat/pink/From/tl.png -share/apps/kopete/styles/data/iChat/pink/From/tm.png -share/apps/kopete/styles/data/iChat/pink/From/tr.png -share/apps/kopete/styles/data/iChat/pink/To/bl.png -share/apps/kopete/styles/data/iChat/pink/To/bm.png -share/apps/kopete/styles/data/iChat/pink/To/br.png -share/apps/kopete/styles/data/iChat/pink/To/ml.png -share/apps/kopete/styles/data/iChat/pink/To/mm.png -share/apps/kopete/styles/data/iChat/pink/To/mr.png -share/apps/kopete/styles/data/iChat/pink/To/tl.png -share/apps/kopete/styles/data/iChat/pink/To/tm.png -share/apps/kopete/styles/data/iChat/pink/To/tr.png -share/apps/kopete/styles/data/iChat/pink/me.png -share/apps/kopete/styles/data/iChat/pink/them.png -share/apps/kopete/styles/data/iChat/purple/From/bl.png -share/apps/kopete/styles/data/iChat/purple/From/bm.png -share/apps/kopete/styles/data/iChat/purple/From/br.png -share/apps/kopete/styles/data/iChat/purple/From/ml.png -share/apps/kopete/styles/data/iChat/purple/From/mm.png -share/apps/kopete/styles/data/iChat/purple/From/mr.png -share/apps/kopete/styles/data/iChat/purple/From/tl.png -share/apps/kopete/styles/data/iChat/purple/From/tm.png -share/apps/kopete/styles/data/iChat/purple/From/tr.png -share/apps/kopete/styles/data/iChat/purple/To/bl.png -share/apps/kopete/styles/data/iChat/purple/To/bm.png -share/apps/kopete/styles/data/iChat/purple/To/br.png -share/apps/kopete/styles/data/iChat/purple/To/ml.png -share/apps/kopete/styles/data/iChat/purple/To/mm.png -share/apps/kopete/styles/data/iChat/purple/To/mr.png -share/apps/kopete/styles/data/iChat/purple/To/tl.png -share/apps/kopete/styles/data/iChat/purple/To/tm.png -share/apps/kopete/styles/data/iChat/purple/To/tr.png -share/apps/kopete/styles/data/iChat/purple/me.png -share/apps/kopete/styles/data/iChat/purple/them.png -share/apps/kopete/styles/data/iChat/yellow/From/bl.png -share/apps/kopete/styles/data/iChat/yellow/From/bm.png -share/apps/kopete/styles/data/iChat/yellow/From/br.png -share/apps/kopete/styles/data/iChat/yellow/From/ml.png -share/apps/kopete/styles/data/iChat/yellow/From/mm.png -share/apps/kopete/styles/data/iChat/yellow/From/mr.png -share/apps/kopete/styles/data/iChat/yellow/From/tl.png -share/apps/kopete/styles/data/iChat/yellow/From/tm.png -share/apps/kopete/styles/data/iChat/yellow/From/tr.png -share/apps/kopete/styles/data/iChat/yellow/To/bl.png -share/apps/kopete/styles/data/iChat/yellow/To/bm.png -share/apps/kopete/styles/data/iChat/yellow/To/br.png -share/apps/kopete/styles/data/iChat/yellow/To/ml.png -share/apps/kopete/styles/data/iChat/yellow/To/mm.png -share/apps/kopete/styles/data/iChat/yellow/To/mr.png -share/apps/kopete/styles/data/iChat/yellow/To/tl.png -share/apps/kopete/styles/data/iChat/yellow/To/tm.png -share/apps/kopete/styles/data/iChat/yellow/To/tr.png -share/apps/kopete/styles/data/iChat/yellow/me.png -share/apps/kopete/styles/data/iChat/yellow/them.png -share/apps/kopete/styles/iChat.xsl -share/apps/kopete/webpresence/webpresence_html.xsl -share/apps/kopete/webpresence/webpresence_html_images.xsl -share/apps/kopete/webpresence/webpresence_xhtml.xsl -share/apps/kopete/webpresence/webpresence_xhtml_images.xsl -share/apps/kopete_contactnotes/contactnotesui.rc -share/apps/kopete_cryptography/cryptographychatui.rc -share/apps/kopete_cryptography/cryptographyui.rc -share/apps/kopete_groupwise/gwchatui.rc -share/apps/kopete_history/historychatui.rc -share/apps/kopete_history/historyui.rc -share/apps/kopete_latex/latexchatui.rc -share/apps/kopete_msn/msnchatui.rc -share/apps/kopete_netmeeting/netmeetingchatui.rc -share/apps/kopete_statistics/statisticsui.rc -share/apps/kopete_translator/translatorchatui.rc -share/apps/kopete_translator/translatorui.rc -share/apps/kopete_yahoo/yahoochatui.rc -share/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc -share/apps/kppp/Provider/Austria/.directory -share/apps/kppp/Provider/Austria/Simon%032Media -share/apps/kppp/Provider/Belarus/.directory -share/apps/kppp/Provider/Belarus/AtlantTelecom -share/apps/kppp/Provider/Czech_Republic/.directory -share/apps/kppp/Provider/Czech_Republic/AICOM -share/apps/kppp/Provider/Czech_Republic/ARsystem -share/apps/kppp/Provider/Czech_Republic/ASYS -share/apps/kppp/Provider/Czech_Republic/ApexNet -share/apps/kppp/Provider/Czech_Republic/BohemiaNet -share/apps/kppp/Provider/Czech_Republic/Brailcom -share/apps/kppp/Provider/Czech_Republic/CITYNET -share/apps/kppp/Provider/Czech_Republic/Contactel -share/apps/kppp/Provider/Czech_Republic/ES-servis -share/apps/kppp/Provider/Czech_Republic/Econnect -share/apps/kppp/Provider/Czech_Republic/Falco_computer -share/apps/kppp/Provider/Czech_Republic/Fortech -share/apps/kppp/Provider/Czech_Republic/HP-NET -share/apps/kppp/Provider/Czech_Republic/INTERNET_OnLine -share/apps/kppp/Provider/Czech_Republic/INTERNEXT -share/apps/kppp/Provider/Czech_Republic/IQNET -share/apps/kppp/Provider/Czech_Republic/KPNQuest -share/apps/kppp/Provider/Czech_Republic/M-soft -share/apps/kppp/Provider/Czech_Republic/Nextra -share/apps/kppp/Provider/Czech_Republic/ProfiNet -share/apps/kppp/Provider/Czech_Republic/SeverNET -share/apps/kppp/Provider/Czech_Republic/Video_OnLine -share/apps/kppp/Provider/Czech_Republic/Volny -share/apps/kppp/Provider/Denmark/.directory -share/apps/kppp/Provider/Denmark/Get2Net -share/apps/kppp/Provider/France/.directory -share/apps/kppp/Provider/France/ClubInternetFull -share/apps/kppp/Provider/Germany/.directory -share/apps/kppp/Provider/Germany/CityWeb -share/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041 -share/apps/kppp/Provider/Germany/MUC%046DE -share/apps/kppp/Provider/Germany/Netsurf -share/apps/kppp/Provider/Irland/.directory -share/apps/kppp/Provider/Irland/Eircom -share/apps/kppp/Provider/Irland/IOL -share/apps/kppp/Provider/Irland/UTV -share/apps/kppp/Provider/Irland/UVT -share/apps/kppp/Provider/Netherlands/.directory -share/apps/kppp/Provider/Netherlands/12Move -share/apps/kppp/Provider/Netherlands/Bart -share/apps/kppp/Provider/Netherlands/Betuwenet%032BFree -share/apps/kppp/Provider/Netherlands/Betuwenet%032BQuality -share/apps/kppp/Provider/Netherlands/Cistron -share/apps/kppp/Provider/Netherlands/Concepts%032ICT -share/apps/kppp/Provider/Netherlands/Cubic%032Circle -share/apps/kppp/Provider/Netherlands/Dataweb -share/apps/kppp/Provider/Netherlands/Daxis%032Internet -share/apps/kppp/Provider/Netherlands/Demon%032Internet -share/apps/kppp/Provider/Netherlands/Energis-Ision -share/apps/kppp/Provider/Netherlands/Euronet%032anytime -share/apps/kppp/Provider/Netherlands/Euronet%032professional -share/apps/kppp/Provider/Netherlands/FlakkeeNet -share/apps/kppp/Provider/Netherlands/FreeAcces -share/apps/kppp/Provider/Netherlands/Freeler%032basis -share/apps/kppp/Provider/Netherlands/Freeler%032compleet -share/apps/kppp/Provider/Netherlands/Freeler%032voordelig -share/apps/kppp/Provider/Netherlands/HCC%032NET -share/apps/kppp/Provider/Netherlands/Hacom -share/apps/kppp/Provider/Netherlands/HetNet%032Basis%032Surfen -share/apps/kppp/Provider/Netherlands/HetNet%032Frequent%032Surfen -share/apps/kppp/Provider/Netherlands/HetNet%032Regelmatig%032Surfen -share/apps/kppp/Provider/Netherlands/IAE -share/apps/kppp/Provider/Netherlands/ILimburg -share/apps/kppp/Provider/Netherlands/InterNLnet -share/apps/kppp/Provider/Netherlands/Interbox -share/apps/kppp/Provider/Netherlands/Internet%032Acces%032Facilities -share/apps/kppp/Provider/Netherlands/Internet%032Online -share/apps/kppp/Provider/Netherlands/Interstroom -share/apps/kppp/Provider/Netherlands/IntroWeb%032Hengelo%032e.o. -share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0323-cijferig%032kengetal -share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0324-cijferig%032kengetal -share/apps/kppp/Provider/Netherlands/Kabelfoon -share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0323%032cijferig%032kengetal -share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0324%032cijferig%032kengetal -share/apps/kppp/Provider/Netherlands/Luna -share/apps/kppp/Provider/Netherlands/Macom -share/apps/kppp/Provider/Netherlands/Nederland.net -share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Premium -share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Standaard -share/apps/kppp/Provider/Netherlands/Plant%032Acces -share/apps/kppp/Provider/Netherlands/Popin -share/apps/kppp/Provider/Netherlands/PublishNet -share/apps/kppp/Provider/Netherlands/Raketnet -share/apps/kppp/Provider/Netherlands/Solcon -share/apps/kppp/Provider/Netherlands/Support%032Net -share/apps/kppp/Provider/Netherlands/Telebyte -share/apps/kppp/Provider/Netherlands/Tiscali%032Compleet -share/apps/kppp/Provider/Netherlands/Tiscali%032Gratis -share/apps/kppp/Provider/Netherlands/UwNet -share/apps/kppp/Provider/Netherlands/Via%032Networks -share/apps/kppp/Provider/Netherlands/Wannadoo%032budget -share/apps/kppp/Provider/Netherlands/Wannadoo%032budget%320plus -share/apps/kppp/Provider/Netherlands/Wannadoo%032smartpack -share/apps/kppp/Provider/Netherlands/Wirehub -share/apps/kppp/Provider/Netherlands/XS4All -share/apps/kppp/Provider/Netherlands/Zeelandnet -share/apps/kppp/Provider/Netherlands/Zon%0322 -share/apps/kppp/Provider/Netherlands/Zon%032Gratis -share/apps/kppp/Provider/Netherlands/Zon%032Inclusief -share/apps/kppp/Provider/NewZealand/.directory -share/apps/kppp/Provider/NewZealand/OrconInternet -share/apps/kppp/Provider/NewZealand/Paradise -share/apps/kppp/Provider/NewZealand/Voyager -share/apps/kppp/Provider/NewZealand/XTRA -share/apps/kppp/Provider/NewZealand/ihug -share/apps/kppp/Provider/Norway/.directory -share/apps/kppp/Provider/Norway/BGNett -share/apps/kppp/Provider/Norway/Institutt%032for%032informatikk -share/apps/kppp/Provider/Portugal/.directory -share/apps/kppp/Provider/Portugal/Clix -share/apps/kppp/Provider/Portugal/Netc -share/apps/kppp/Provider/Portugal/OniNet -share/apps/kppp/Provider/Slovenia/AmisNet -share/apps/kppp/Provider/Slovenia/Arnes -share/apps/kppp/Provider/Slovenia/Kiss -share/apps/kppp/Provider/Slovenia/MojNet -share/apps/kppp/Provider/Slovenia/SiOL -share/apps/kppp/Provider/Slovenia/Volja -share/apps/kppp/Provider/Sweden/.directory -share/apps/kppp/Provider/Sweden/Tiscali -share/apps/kppp/Provider/Sweden/Utfors -share/apps/kppp/Provider/Switzerland/.directory -share/apps/kppp/Provider/Switzerland/Bluewin -share/apps/kppp/Provider/Taiwan/.directory -share/apps/kppp/Provider/Taiwan/EraNet -share/apps/kppp/Provider/Taiwan/HiNet -share/apps/kppp/Provider/Taiwan/SeedNet -share/apps/kppp/Provider/Ukraine/.directory -share/apps/kppp/Provider/Ukraine/Adamant -share/apps/kppp/Provider/Ukraine/IPTelecom -share/apps/kppp/Provider/Ukraine/NuVse -share/apps/kppp/Provider/United_Kingdom/.directory -share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666 -share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666 -share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666 -share/apps/kppp/Provider/United_Kingdom/FreeServe -share/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032ISDN -share/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032Modem -share/apps/kppp/Provider/United_Kingdom/UKPOST%032ISDN -share/apps/kppp/Provider/United_Kingdom/UKPOST%032Modem -share/apps/kppp/Provider/Yugoslavia/041Net -share/apps/kppp/Provider/Yugoslavia/BeoTelNet -share/apps/kppp/Provider/Yugoslavia/CG.Bar.yu -share/apps/kppp/Provider/Yugoslavia/CG.Berane.yu -share/apps/kppp/Provider/Yugoslavia/CG.BijeloPolje.CG.yu -share/apps/kppp/Provider/Yugoslavia/CG.Budva.yu -share/apps/kppp/Provider/Yugoslavia/CG.Cetinje.yu -share/apps/kppp/Provider/Yugoslavia/CG.HercegNovi.yu -share/apps/kppp/Provider/Yugoslavia/CG.Kotor.yu -share/apps/kppp/Provider/Yugoslavia/CG.Niksic.yu -share/apps/kppp/Provider/Yugoslavia/CG.Pljevlja.yu -share/apps/kppp/Provider/Yugoslavia/CG.Podgorica.yu -share/apps/kppp/Provider/Yugoslavia/CG.Tivat.yu -share/apps/kppp/Provider/Yugoslavia/CG.Ulcinj.yu -share/apps/kppp/Provider/Yugoslavia/CG.yu -share/apps/kppp/Provider/Yugoslavia/DrenikNet -share/apps/kppp/Provider/Yugoslavia/EUnet@Full -share/apps/kppp/Provider/Yugoslavia/EUnet@Lite -share/apps/kppp/Provider/Yugoslavia/EUnetBeograd -share/apps/kppp/Provider/Yugoslavia/EUnetCacak -share/apps/kppp/Provider/Yugoslavia/EUnetKragujevac -share/apps/kppp/Provider/Yugoslavia/EUnetNis -share/apps/kppp/Provider/Yugoslavia/EUnetNoviSad -share/apps/kppp/Provider/Yugoslavia/EUnetPristina -share/apps/kppp/Provider/Yugoslavia/EUnetSombor -share/apps/kppp/Provider/Yugoslavia/EUnetSubotica -share/apps/kppp/Provider/Yugoslavia/InfoSKY -share/apps/kppp/Provider/Yugoslavia/PTT -share/apps/kppp/Provider/Yugoslavia/SCnet -share/apps/kppp/Provider/Yugoslavia/Sezampro -share/apps/kppp/Provider/Yugoslavia/SuOnline -share/apps/kppp/Provider/Yugoslavia/TippNet -share/apps/kppp/Provider/Yugoslavia/VeratNet -share/apps/kppp/Provider/Yugoslavia/YUBCnet -share/apps/kppp/Rules/Argentina/Argentina_0610.rst -share/apps/kppp/Rules/Argentina/Argentina_Local.rst -share/apps/kppp/Rules/Australia/Local.rst -share/apps/kppp/Rules/Australia/Optus_Residential.rst -share/apps/kppp/Rules/Australia/STD_Zone_1_-_25-50_kms.rst -share/apps/kppp/Rules/Australia/STD_Zone_2_-_50-85_kms.rst -share/apps/kppp/Rules/Australia/STD_Zone_3_-_85-165_kms.rst -share/apps/kppp/Rules/Australia/STD_Zone_4_-_165+_kms.rst -share/apps/kppp/Rules/Austria/Business_1/Local.rst -share/apps/kppp/Rules/Austria/Business_1/Long_Distance.rst -share/apps/kppp/Rules/Austria/Business_1/Online.rst -share/apps/kppp/Rules/Austria/Business_2/Local.rst -share/apps/kppp/Rules/Austria/Business_2/Long_Distance.rst -share/apps/kppp/Rules/Austria/Business_2/Online.rst -share/apps/kppp/Rules/Austria/Minimum/Local.rst -share/apps/kppp/Rules/Austria/Minimum/Long_Distance.rst -share/apps/kppp/Rules/Austria/Minimum/Online.rst -share/apps/kppp/Rules/Austria/Standard/Local.rst -share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst -share/apps/kppp/Rules/Austria/Standard/Online.rst -share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst -share/apps/kppp/Rules/Bangladesh/ATT00007.rst -share/apps/kppp/Rules/Bangladesh/ATT00010.rst -share/apps/kppp/Rules/Belgium/Belgium_internet_euro.rst -share/apps/kppp/Rules/Belgium/Belgium_internet_frank.rst -share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst -share/apps/kppp/Rules/Belgium/Belgium_zonal.rst -share/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_home_-_bez_impulsa.rst -share/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_student_-_bez_impulsa.rst -share/apps/kppp/Rules/Bosnia_and_Herzegovina/SmartNet_PERSONAL_bez_impulsa.rst -share/apps/kppp/Rules/Bosnia_and_Herzegovina/samo_impulsi.rst -share/apps/kppp/Rules/Brasil/Brasil.rst -share/apps/kppp/Rules/Brasil/Brasil_Ligbr.rst -share/apps/kppp/Rules/Brasil/Rio_de_Janeiro.rst -share/apps/kppp/Rules/Brasil/SaoPaulo.rst -share/apps/kppp/Rules/Croatia/CARNet.rst -share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Business_Internet.rst -share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Home_Internet.rst -share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst -share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst -share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_universal.rst -share/apps/kppp/Rules/Denmark/12Move_Analog.rst -share/apps/kppp/Rules/Denmark/12Move_ISDN.rst -share/apps/kppp/Rules/Denmark/Cybercity_Friabonnement.rst -share/apps/kppp/Rules/Denmark/Get2net_Betaling.rst -share/apps/kppp/Rules/Denmark/Get2net_Gratis.rst -share/apps/kppp/Rules/Denmark/Mobilix_Wanadoo.rst -share/apps/kppp/Rules/Denmark/Teledanmark_Basis.rst -share/apps/kppp/Rules/Denmark/Teledanmark_Favoritinternet.rst -share/apps/kppp/Rules/Denmark/Worldonline-Analog.rst -share/apps/kppp/Rules/Denmark/Worldonline-ISDN.rst -share/apps/kppp/Rules/Estonia/Eesti_Telefon.rst -share/apps/kppp/Rules/Finland/VLP.rst -share/apps/kppp/Rules/France/Cegetel_Local.rst -share/apps/kppp/Rules/France/Cegetel_National.rst -share/apps/kppp/Rules/France/France_Telecom_Internet.rst -share/apps/kppp/Rules/France/France_Telecom_Local.rst -share/apps/kppp/Rules/France/France_Telecom_National.rst -share/apps/kppp/Rules/France/Le_9_Local.rst -share/apps/kppp/Rules/France/Le_9_National.rst -share/apps/kppp/Rules/France/OneTel.rst -share/apps/kppp/Rules/France/Tele2_Local.rst -share/apps/kppp/Rules/France/Tele2_National.rst -share/apps/kppp/Rules/France/Wanadoo_Free.rst -share/apps/kppp/Rules/Germany/1und1_InternetZugang.rst -share/apps/kppp/Rules/Germany/2.5min.rst -share/apps/kppp/Rules/Germany/2.5s.rst -share/apps/kppp/Rules/Germany/AddCom_by_Call.rst -share/apps/kppp/Rules/Germany/Addcom.rst -share/apps/kppp/Rules/Germany/Arcor_Internet_by_Call_easy.rst -share/apps/kppp/Rules/Germany/CallOkaynet.rst -share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst -share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst -share/apps/kppp/Rules/Germany/Callisa_City.rst -share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst -share/apps/kppp/Rules/Germany/Cityweb.rst -share/apps/kppp/Rules/Germany/CompuservePro.rst -share/apps/kppp/Rules/Germany/E-Plus-Online_Jedermann.rst -share/apps/kppp/Rules/Germany/Easynet_easy-call.rst -share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst -share/apps/kppp/Rules/Germany/Freenet_Sorglos.rst -share/apps/kppp/Rules/Germany/Freenet_StandardTarif.rst -share/apps/kppp/Rules/Germany/Freenet_Super_CbC.rst -share/apps/kppp/Rules/Germany/Freenet_special_call_by_call.rst -share/apps/kppp/Rules/Germany/MSN.rst -share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst -share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst -share/apps/kppp/Rules/Germany/Netcom_Kassel.rst -share/apps/kppp/Rules/Germany/Nikoma.rst -share/apps/kppp/Rules/Germany/Nikoma_Internet_by_Call.rst -share/apps/kppp/Rules/Germany/Nikoma_Study_and_Surf.rst -share/apps/kppp/Rules/Germany/Planet-Interkom_Internet_by_call.rst -share/apps/kppp/Rules/Germany/Puretec.rst -share/apps/kppp/Rules/Germany/Telekom_City_Select_5_30.rst -share/apps/kppp/Rules/Germany/VR-Web.rst -share/apps/kppp/Rules/Germany/expressnet.rst -share/apps/kppp/Rules/Germany/knUUt-by-Call.rst -share/apps/kppp/Rules/Germany/talkline_by_call.rst -share/apps/kppp/Rules/Germany/vossnet_fun.rst -share/apps/kppp/Rules/Germany/vossnet_fun_light.rst -share/apps/kppp/Rules/Germany/vossnet_kompl.rst -share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone1_in_euro.rst -share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone2_in_euro.rst -share/apps/kppp/Rules/Greece/Hellas_EPAK_local_in_euro.rst -share/apps/kppp/Rules/Greece/Hellas_analog_local_in_euro.rst -share/apps/kppp/Rules/Greece/Hellas_digital_local_in_euro.rst -share/apps/kppp/Rules/Hong_Kong/Hong_Kong_Telecom.rst -share/apps/kppp/Rules/Hungary/Local.rst -share/apps/kppp/Rules/Hungary/LocalTop_MATAV.rst -share/apps/kppp/Rules/Hungary/Local_MATAV.rst -share/apps/kppp/Rules/Hungary/PapaTel.rst -share/apps/kppp/Rules/Iceland/Iceland_general.rst -share/apps/kppp/Rules/India/BSNL_Local.rst -share/apps/kppp/Rules/India/BSNL_Long_101_To_200.rst -share/apps/kppp/Rules/India/BSNL_Medium_51_To_100.rst -share/apps/kppp/Rules/India/Vsnl_local.rst -share/apps/kppp/Rules/Indonesia/Lokal_1_Metropolitan.rst -share/apps/kppp/Rules/Indonesia/Lokal_2_Metropolitan.rst -share/apps/kppp/Rules/Indonesia/Lokal_non_metropolitan.rst -share/apps/kppp/Rules/Ireland/Eircom_Internet.rst -share/apps/kppp/Rules/Ireland/Eircom_Local.rst -share/apps/kppp/Rules/Ireland/Eircom_National.rst -share/apps/kppp/Rules/Ireland/Eircom_Special.rst -share/apps/kppp/Rules/Israel/Bezeq_Interurban.rst -share/apps/kppp/Rules/Israel/Bezeq_Local.rst -share/apps/kppp/Rules/Italy/Atlanet.rst -share/apps/kppp/Rules/Italy/Cheapnet.rst -share/apps/kppp/Rules/Italy/Infostrada_Internet_SpZero.rst -share/apps/kppp/Rules/Italy/Infostrada_Libero1055_Base.rst -share/apps/kppp/Rules/Italy/Infostrada_Libero1055_SpZero.rst -share/apps/kppp/Rules/Italy/Infostrada_Loc_Reg_Naz_SpZero.rst -share/apps/kppp/Rules/Italy/Infostrada_Locali_Base.rst -share/apps/kppp/Rules/Italy/Infostrada_Reg_Naz_Base.rst -share/apps/kppp/Rules/Italy/Tele2_Altri_ISP.rst -share/apps/kppp/Rules/Italy/Tele2_Internet_Tele2.rst -share/apps/kppp/Rules/Italy/Telecom_Interurbane_Fino15Km.rst -share/apps/kppp/Rules/Italy/Telecom_Interurbane_Oltre15Km.rst -share/apps/kppp/Rules/Italy/Telecom_Locali.rst -share/apps/kppp/Rules/Italy/Teleconomy24_Internet.rst -share/apps/kppp/Rules/Italy/Teleconomy24_Nazionali.rst -share/apps/kppp/Rules/Italy/Teleconomy_NoStop_Internet.rst -share/apps/kppp/Rules/Italy/Wind_24ore_Internet_AltriISP.rst -share/apps/kppp/Rules/Italy/Wind_24ore_Internet_InWind.rst -share/apps/kppp/Rules/Italy/Wind_24ore_Interurbane.rst -share/apps/kppp/Rules/Italy/Wind_24ore_Urbane.rst -share/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Internet_InWind.rst -share/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Urbane_Interurbane.rst -share/apps/kppp/Rules/Italy/Wind_Family_Internet_AltriISP.rst -share/apps/kppp/Rules/Italy/Wind_Family_Internet_InWind.rst -share/apps/kppp/Rules/Italy/Wind_Family_Interurbane.rst -share/apps/kppp/Rules/Italy/Wind_Family_Urbane.rst -share/apps/kppp/Rules/Italy/Wind_Flat_Internet_AltriISP.rst -share/apps/kppp/Rules/Italy/Wind_Flat_Internet_InWind.rst -share/apps/kppp/Rules/Italy/Wind_Urbana_1088_Light.rst -share/apps/kppp/Rules/Jamaica/CWJ_InterParish.rst -share/apps/kppp/Rules/Jamaica/CWJ_Local.rst -share/apps/kppp/Rules/Japan/NTT_Local.rst -share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst -share/apps/kppp/Rules/Luxembourg/Local.rst -share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_interurban.rst -share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst -share/apps/kppp/Rules/Macedonia/Macedonia_MTnet.rst -share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst -share/apps/kppp/Rules/Malaysia/malaysia.rst -share/apps/kppp/Rules/Netherlands/12Move.rst -share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst -share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst -share/apps/kppp/Rules/Netherlands/BelBasis_Regio.rst -share/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst -share/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst -share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst -share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst -share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst -share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst -share/apps/kppp/Rules/Netherlands/Cistron -share/apps/kppp/Rules/Netherlands/Freeler_Basis.rst -share/apps/kppp/Rules/Netherlands/Freeler_Voordelig.rst -share/apps/kppp/Rules/Netherlands/HetNet_Regelmatig_Surfen.rst -share/apps/kppp/Rules/Netherlands/InterNLnet.rst -share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Buiten_Regio.rst -share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Regio.rst -share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Buiten_Regio.rst -share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Regio.rst -share/apps/kppp/Rules/Netherlands/Planet_Internet.rst -share/apps/kppp/Rules/Netherlands/Priority_Telecom_Nationaal.rst -share/apps/kppp/Rules/Netherlands/Priority_Telecom_Regionaal.rst -share/apps/kppp/Rules/Netherlands/Tele2_Extra_Buiten_Regio.rst -share/apps/kppp/Rules/Netherlands/Tele2_Extra_Regio.rst -share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Buiten_Regio.rst -share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Regio.rst -share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Buiten_Regio.rst -share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Regio.rst -share/apps/kppp/Rules/Netherlands/Wannadoo_Budget_Plus -share/apps/kppp/Rules/Norway/Local_Area.rst -share/apps/kppp/Rules/Norway/Long_Distance.rst -share/apps/kppp/Rules/Norway/Netcom.rst -share/apps/kppp/Rules/Poland/Internetia.rst -share/apps/kppp/Rules/Poland/Netia_100km_Niebieska.rst -share/apps/kppp/Rules/Poland/Netia_100km_Zielona.rst -share/apps/kppp/Rules/Poland/Netia_Lokalne_Niebieska.rst -share/apps/kppp/Rules/Poland/Netia_Lokalne_Zielona.rst -share/apps/kppp/Rules/Poland/TPSA.rst -share/apps/kppp/Rules/Poland/TP_100km.rst -share/apps/kppp/Rules/Poland/TP_Lokalne.rst -share/apps/kppp/Rules/Portugal/PT_Local.rst -share/apps/kppp/Rules/Portugal/PT_Local_Ilhas.rst -share/apps/kppp/Rules/Portugal/PT_Regional.rst -share/apps/kppp/Rules/Portugal/PT_Regional_Ilhas.rst -share/apps/kppp/Rules/Portugal/PT_YesNET.rst -share/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst -share/apps/kppp/Rules/Romania/Easynet.rst -share/apps/kppp/Rules/Romania/RomTelecom_GSM.rst -share/apps/kppp/Rules/Romania/Romtelecom_Acces_Special_Internet.rst -share/apps/kppp/Rules/Romania/Romtelecom_Interjudetean.rst -share/apps/kppp/Rules/Romania/Romtelecom_Local.rst -share/apps/kppp/Rules/Romania/Zapp-Mobile.rst -share/apps/kppp/Rules/Russia/TEMPLATE.ru -share/apps/kppp/Rules/Russia/mtu-intel_standart.rst -share/apps/kppp/Rules/Singapore/SingTel_Local.rst -share/apps/kppp/Rules/Slovakia/Internetovy_tarif_019XY.rst -share/apps/kppp/Rules/Slovakia/ST_medzimesto.rst -share/apps/kppp/Rules/Slovakia/ST_mesto.rst -share/apps/kppp/Rules/Slovenia/omrezje_0880.rst -share/apps/kppp/Rules/Slovenia/omrezje_0889.rst -share/apps/kppp/Rules/Slovenia/stacionarno_omrezje.rst -share/apps/kppp/Rules/South_Africa/South_Africa_local.rst -share/apps/kppp/Rules/South_Africa/South_Africa_long_distance.rst -share/apps/kppp/Rules/South_Afrika/South_Afrika.rst -share/apps/kppp/Rules/South_Afrika/South_Afrika_Justin.rst -share/apps/kppp/Rules/Spain/Infovia.rst -share/apps/kppp/Rules/Spain/Infovia_IVA.rst -share/apps/kppp/Rules/Spain/Telefonica_Interprovincial.rst -share/apps/kppp/Rules/Spain/Telefonica_Interprovincial_IVA.rst -share/apps/kppp/Rules/Spain/Telefonica_Local.rst -share/apps/kppp/Rules/Spain/Telefonica_Metropolitana.rst -share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst -share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst -share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst -share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst -share/apps/kppp/Rules/Sweden/ACN.rst -share/apps/kppp/Rules/Sweden/Abonnera_com.rst -share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst -share/apps/kppp/Rules/Sweden/Crossnet-Affinity.rst -share/apps/kppp/Rules/Sweden/Glocalnet.rst -share/apps/kppp/Rules/Sweden/Gts.rst -share/apps/kppp/Rules/Sweden/Home_se.rst -share/apps/kppp/Rules/Sweden/Nemtel.rst -share/apps/kppp/Rules/Sweden/Plusenergi.rst -share/apps/kppp/Rules/Sweden/RSLCom.rst -share/apps/kppp/Rules/Sweden/Rix_Telecom.rst -share/apps/kppp/Rules/Sweden/Supertel.rst -share/apps/kppp/Rules/Sweden/Svensk_Telekom.rst -share/apps/kppp/Rules/Sweden/Tele1_Europe.rst -share/apps/kppp/Rules/Sweden/Tele2.rst -share/apps/kppp/Rules/Sweden/Tele8.rst -share/apps/kppp/Rules/Sweden/Teleman.rst -share/apps/kppp/Rules/Sweden/Telenordia.rst -share/apps/kppp/Rules/Sweden/Telerian.rst -share/apps/kppp/Rules/Sweden/Telia.rst -share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst -share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst -share/apps/kppp/Rules/Sweden/Telitel.rst -share/apps/kppp/Rules/Sweden/Tiscali.rst -share/apps/kppp/Rules/Sweden/Transnet.rst -share/apps/kppp/Rules/Sweden/Universal_Telecom.rst -share/apps/kppp/Rules/Sweden/Utfors.rst -share/apps/kppp/Rules/Sweden/Vattenfall.rst -share/apps/kppp/Rules/Switzerland/Sunrise_Freetime.rst -share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst -share/apps/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst -share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst -share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst -share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst -share/apps/kppp/Rules/TEMPLATE -share/apps/kppp/Rules/Turkey/Turk_Telekom_Internet.rst -share/apps/kppp/Rules/Ukraine/IPTelecom_hourly.rst -share/apps/kppp/Rules/Ukraine/NuVse_hourly.rst -share/apps/kppp/Rules/Ukraine/TEMPLATE.uk -share/apps/kppp/Rules/Ukraine/Utel_Unet.rst -share/apps/kppp/Rules/United_Kingdom/BirminghamCable_Local.rst -share/apps/kppp/Rules/United_Kingdom/BirminghamCable_National.rst -share/apps/kppp/Rules/United_Kingdom/BirminghamCable_SameTelco.rst -share/apps/kppp/Rules/United_Kingdom/BritishTelecom_Local.rst -share/apps/kppp/Rules/United_Kingdom/BritishTelecom_National.rst -share/apps/kppp/Rules/United_Kingdom/BritishTelecom_Regional.rst -share/apps/kppp/Rules/United_Kingdom/British_OneTel.rst -share/apps/kppp/Rules/United_Kingdom/Connaught_Telecom.rst -share/apps/kppp/Rules/Uruguay/Adinet_cIVA.rst -share/apps/kppp/Rules/Yugoslavia/041_1xx_xxx.rst -share/apps/kppp/Rules/Yugoslavia/041_2xx_xxx.rst -share/apps/kppp/Rules/Yugoslavia/041_3xx_xxx.rst -share/apps/kppp/Rules/Yugoslavia/041_4xx_xxx.rst -share/apps/kppp/Rules/Yugoslavia/041_5xx_xxx.rst -share/apps/kppp/Rules/Yugoslavia/041_9xx_xxx.rst -share/apps/kppp/Rules/Yugoslavia/III_zona-preko_200km.rst -share/apps/kppp/Rules/Yugoslavia/II_zona-do_200km.rst -share/apps/kppp/Rules/Yugoslavia/I_zona-ista_mreza.rst -share/apps/kppp/Rules/Yugoslavia/Lokalni_poziv.rst -share/apps/kppp/Rules/checkrules -share/apps/kppp/pics/dock_both.png -share/apps/kppp/pics/dock_left.png -share/apps/kppp/pics/dock_none.png -share/apps/kppp/pics/dock_right.png -share/apps/kppp/pics/folder.png -share/apps/kppp/pics/modemboth.png -share/apps/kppp/pics/modemleft.png -share/apps/kppp/pics/modemnone.png -share/apps/kppp/pics/modemright.png -share/apps/kppp/pics/phone.png -share/apps/krdc/pics/close.png -share/apps/krdc/pics/iconify.png -share/apps/krdc/pics/pindown.png -share/apps/krdc/pics/pinup.png -share/apps/krdc/pics/pointcursor.png -share/apps/krdc/pics/pointcursormask.png -share/apps/krfb/eventsrc -share/apps/krfb/pics/connection-side-image.png -share/apps/krfb/pics/eyes-closed24.png -share/apps/krfb/pics/eyes-open24.png -share/apps/ksirc/autodcc.pl -share/apps/ksirc/eventsrc -share/apps/ksirc/filters.pl -share/apps/ksirc/icons/crystalsvg/22x22/actions/info.png -share/apps/ksirc/icons/crystalsvg/22x22/actions/ksirc_dock.png -share/apps/ksirc/icons/hicolor/16x16/apps/ksirc.png -share/apps/ksirc/icons/hicolor/22x22/apps/ksirc.png -share/apps/ksirc/icons/hicolor/32x32/apps/ksirc.png -share/apps/ksirc/icons/hicolor/48x48/apps/ksirc.png -share/apps/ksirc/icons/hicolor/64x64/apps/ksirc.png -share/apps/ksirc/ksirc.pl -share/apps/ksirc/pics/X.png -share/apps/ksirc/pics/action.png -share/apps/ksirc/pics/arrow.png -share/apps/ksirc/pics/blueball.png -share/apps/ksirc/pics/bluepin.png -share/apps/ksirc/pics/bminus.png -share/apps/ksirc/pics/bplus.png -share/apps/ksirc/pics/channel.xpm -share/apps/ksirc/pics/channels.xpm -share/apps/ksirc/pics/ctcpping.png -share/apps/ksirc/pics/dcc.png -share/apps/ksirc/pics/dccget.png -share/apps/ksirc/pics/dccsend.png -share/apps/ksirc/pics/elipsis.png -share/apps/ksirc/pics/emoticons/biggrin.png -share/apps/ksirc/pics/emoticons/clown.png -share/apps/ksirc/pics/emoticons/cry.png -share/apps/ksirc/pics/emoticons/devil.png -share/apps/ksirc/pics/emoticons/frown.png -share/apps/ksirc/pics/emoticons/heart.png -share/apps/ksirc/pics/emoticons/loveit.png -share/apps/ksirc/pics/emoticons/puh.png -share/apps/ksirc/pics/emoticons/puh2.png -share/apps/ksirc/pics/emoticons/redface.png -share/apps/ksirc/pics/emoticons/sadley.png -share/apps/ksirc/pics/emoticons/slime.png -share/apps/ksirc/pics/emoticons/smile.png -share/apps/ksirc/pics/emoticons/wink.png -share/apps/ksirc/pics/emoticons/yummie.png -share/apps/ksirc/pics/error.png -share/apps/ksirc/pics/greenpin.png -share/apps/ksirc/pics/info.png -share/apps/ksirc/pics/info1.png -share/apps/ksirc/pics/join.png -share/apps/ksirc/pics/kick.png -share/apps/ksirc/pics/ksirc.png -share/apps/ksirc/pics/ksirc_a.xpm -share/apps/ksirc/pics/ksirc_b.xpm -share/apps/ksirc/pics/madsmiley.png -share/apps/ksirc/pics/mdi.png -share/apps/ksirc/pics/mini-run.png -share/apps/ksirc/pics/minus.png -share/apps/ksirc/pics/mode.png -share/apps/ksirc/pics/notice.png -share/apps/ksirc/pics/ominus.png -share/apps/ksirc/pics/oplus.png -share/apps/ksirc/pics/part.png -share/apps/ksirc/pics/plus.png -share/apps/ksirc/pics/quit.png -share/apps/ksirc/pics/sadsmiley.png -share/apps/ksirc/pics/sdi.png -share/apps/ksirc/pics/server.xpm -share/apps/ksirc/pics/servinfo.png -share/apps/ksirc/pics/smiley.png -share/apps/ksirc/pics/star.png -share/apps/ksirc/pics/topic.png -share/apps/ksirc/relnotes -share/apps/ksirc/servers.ini -share/apps/ksirc/servers.txt -share/apps/ksirc/sirc.help.gz -share/apps/remoteview/zeroconf.desktop -share/apps/zeroconf/_ftp._tcp -share/apps/zeroconf/_http._tcp -share/apps/zeroconf/_ldap._tcp -share/apps/zeroconf/_nfs._tcp -share/apps/zeroconf/_rfb._tcp -share/apps/zeroconf/_ssh._tcp -share/apps/zeroconf/_webdav._tcp -share/config.kcfg/historyconfig.kcfg -share/config.kcfg/kopete.kcfg -share/config.kcfg/kopeteidentityconfigpreferences.kcfg -share/config.kcfg/latexconfig.kcfg -share/config.kcfg/nowlisteningconfig.kcfg -share/config/ksircrc -share/config/ktalkdrc -share/doc/HTML/en/kcontrol/kcmtalkd/common -share/doc/HTML/en/kcontrol/kcmtalkd/index.cache.bz2 -share/doc/HTML/en/kcontrol/kcmtalkd/index.docbook -share/doc/HTML/en/kcontrol/lanbrowser/common -share/doc/HTML/en/kcontrol/lanbrowser/index.cache.bz2 -share/doc/HTML/en/kcontrol/lanbrowser/index.docbook -share/doc/HTML/en/kdict/applet.png -share/doc/HTML/en/kdict/common -share/doc/HTML/en/kdict/conf.png -share/doc/HTML/en/kdict/index.cache.bz2 -share/doc/HTML/en/kdict/index.docbook -share/doc/HTML/en/kdict/mainwin.png -share/doc/HTML/en/kdict/seteditor.png -share/doc/HTML/en/kget/common -share/doc/HTML/en/kget/fileopen.png -share/doc/HTML/en/kget/index.cache.bz2 -share/doc/HTML/en/kget/index.docbook -share/doc/HTML/en/kget/kget1.png -share/doc/HTML/en/kget/kget2.png -share/doc/HTML/en/kget/kget3.png -share/doc/HTML/en/kget/kget4.png -share/doc/HTML/en/kget/kget5.png -share/doc/HTML/en/knewsticker/TODO -share/doc/HTML/en/knewsticker/about-icon.png -share/doc/HTML/en/knewsticker/checknews-icon.png -share/doc/HTML/en/knewsticker/common -share/doc/HTML/en/knewsticker/contextmenu.png -share/doc/HTML/en/knewsticker/help-icon.png -share/doc/HTML/en/knewsticker/index.cache.bz2 -share/doc/HTML/en/knewsticker/index.docbook -share/doc/HTML/en/knewsticker/kcmnewsticker-filters.png -share/doc/HTML/en/knewsticker/kcmnewsticker-general.png -share/doc/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png -share/doc/HTML/en/knewsticker/kcmnewsticker-newssources.png -share/doc/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png -share/doc/HTML/en/knewsticker/kcontrol-icon.png -share/doc/HTML/en/knewsticker/knewsticker-childpanel.png -share/doc/HTML/en/knewsticker/knewsticker-icon.png -share/doc/HTML/en/knewsticker/knewsticker-kicker.png -share/doc/HTML/en/knewsticker/knewsticker-ownwindow.png -share/doc/HTML/en/knewsticker/newarticle-icon.png -share/doc/HTML/en/knewsticker/newssite-icon.png -share/doc/HTML/en/knewsticker/oldarticle-icon.png -share/doc/HTML/en/knewsticker/preferences-icon.png -share/doc/HTML/en/kopete/common -share/doc/HTML/en/kopete/index.cache.bz2 -share/doc/HTML/en/kopete/index.docbook -share/doc/HTML/en/kopete/menus.docbook -share/doc/HTML/en/kpf/common -share/doc/HTML/en/kpf/index.cache.bz2 -share/doc/HTML/en/kpf/index.docbook -share/doc/HTML/en/kppp/accounting.docbook -share/doc/HTML/en/kppp/callback.docbook -share/doc/HTML/en/kppp/chap.docbook -share/doc/HTML/en/kppp/common -share/doc/HTML/en/kppp/costsgraphs.fig -share/doc/HTML/en/kppp/costsgraphs.png -share/doc/HTML/en/kppp/dialog-setup.docbook -share/doc/HTML/en/kppp/getting-online.docbook -share/doc/HTML/en/kppp/global-settings.docbook -share/doc/HTML/en/kppp/hayes.docbook -share/doc/HTML/en/kppp/index.cache.bz2 -share/doc/HTML/en/kppp/index.docbook -share/doc/HTML/en/kppp/kppp-account-accounting-tab.png -share/doc/HTML/en/kppp/kppp-account-dial-tab.png -share/doc/HTML/en/kppp/kppp-account-dns-tab.png -share/doc/HTML/en/kppp/kppp-account-execute-tab.png -share/doc/HTML/en/kppp/kppp-account-gateway-tab.png -share/doc/HTML/en/kppp/kppp-account-ip-tab.png -share/doc/HTML/en/kppp/kppp-account-login-script-tab.png -share/doc/HTML/en/kppp/kppp-config.png -share/doc/HTML/en/kppp/kppp-device-tab.png -share/doc/HTML/en/kppp/kppp-dialler-tab.png -share/doc/HTML/en/kppp/kppp-faq.docbook -share/doc/HTML/en/kppp/kppp-graph-tab.png -share/doc/HTML/en/kppp/kppp-misc-tab.png -share/doc/HTML/en/kppp/kppp-modem-tab.png -share/doc/HTML/en/kppp/kppp-wizard.png -share/doc/HTML/en/kppp/kppp.faq.question -share/doc/HTML/en/kppp/security.docbook -share/doc/HTML/en/kppp/tricks.docbook -share/doc/HTML/en/kppp/ttyS-cua.txt -share/doc/HTML/en/kppp/wizard.docbook -share/doc/HTML/en/krdc/authentication.eps -share/doc/HTML/en/krdc/authentication.png -share/doc/HTML/en/krdc/close.png -share/doc/HTML/en/krdc/common -share/doc/HTML/en/krdc/index.cache.bz2 -share/doc/HTML/en/krdc/index.docbook -share/doc/HTML/en/krdc/krdc_window.eps -share/doc/HTML/en/krdc/krdc_window.png -share/doc/HTML/en/krdc/preferences_profilestab.eps -share/doc/HTML/en/krdc/preferences_profilestab.png -share/doc/HTML/en/krdc/preferences_rdpdefaultstab.eps -share/doc/HTML/en/krdc/preferences_rdpdefaultstab.png -share/doc/HTML/en/krdc/preferences_vncdefaultstab.eps -share/doc/HTML/en/krdc/preferences_vncdefaultstab.png -share/doc/HTML/en/krdc/snapshot.eps -share/doc/HTML/en/krdc/snapshot.png -share/doc/HTML/en/krdc/snapshot_connectionspeed.eps -share/doc/HTML/en/krdc/snapshot_connectionspeed.png -share/doc/HTML/en/krdc/snapshot_nobrowse.eps -share/doc/HTML/en/krdc/snapshot_nobrowse.png -share/doc/HTML/en/krdc/snapshot_vncentry.eps -share/doc/HTML/en/krdc/snapshot_vncentry.png -share/doc/HTML/en/krdc/window_fullscreen.png -share/doc/HTML/en/krdc/window_nofullscreen.png -share/doc/HTML/en/krfb/common -share/doc/HTML/en/krfb/configuration_access.eps -share/doc/HTML/en/krfb/configuration_access.png -share/doc/HTML/en/krfb/configuration_network.eps -share/doc/HTML/en/krfb/configuration_network.png -share/doc/HTML/en/krfb/configuration_session.eps -share/doc/HTML/en/krfb/configuration_session.png -share/doc/HTML/en/krfb/connection.eps -share/doc/HTML/en/krfb/connection.png -share/doc/HTML/en/krfb/email_invitation.eps -share/doc/HTML/en/krfb/email_invitation.png -share/doc/HTML/en/krfb/index.cache.bz2 -share/doc/HTML/en/krfb/index.docbook -share/doc/HTML/en/krfb/invitation_management.eps -share/doc/HTML/en/krfb/invitation_management.png -share/doc/HTML/en/krfb/personal_invitation.eps -share/doc/HTML/en/krfb/personal_invitation.png -share/doc/HTML/en/krfb/screenshot.eps -share/doc/HTML/en/krfb/screenshot.png -share/doc/HTML/en/ksirc/common -share/doc/HTML/en/ksirc/index.cache.bz2 -share/doc/HTML/en/ksirc/index.docbook -share/doc/HTML/en/ktalkd/common -share/doc/HTML/en/ktalkd/index.cache.bz2 -share/doc/HTML/en/ktalkd/index.docbook -share/doc/HTML/en/kwifimanager/common -share/doc/HTML/en/kwifimanager/index.cache.bz2 -share/doc/HTML/en/kwifimanager/index.docbook -share/icons/crystalsvg/128x128/apps/ktalkd.png -share/icons/crystalsvg/16x16/apps/kget.png -share/icons/crystalsvg/16x16/apps/kpf.png -share/icons/crystalsvg/16x16/apps/krfb.png -share/icons/crystalsvg/16x16/apps/ktalkd.png -share/icons/crystalsvg/16x16/mimetypes/kget_list.png -share/icons/crystalsvg/16x16/mimetypes/kopete_emoticons.png -share/icons/crystalsvg/22x22/actions/khtml_kget.png -share/icons/crystalsvg/22x22/apps/kget.png -share/icons/crystalsvg/22x22/apps/kopete_all_away.png -share/icons/crystalsvg/22x22/apps/kopete_offline.png -share/icons/crystalsvg/22x22/apps/kopete_some_away.png -share/icons/crystalsvg/22x22/apps/kopete_some_online.png -share/icons/crystalsvg/22x22/apps/ktalkd.png -share/icons/crystalsvg/22x22/mimetypes/kget_list.png -share/icons/crystalsvg/22x22/mimetypes/kopete_emoticons.png -share/icons/crystalsvg/32x32/apps/kget.png -share/icons/crystalsvg/32x32/apps/kpf.png -share/icons/crystalsvg/32x32/apps/krdc.png -share/icons/crystalsvg/32x32/apps/krfb.png -share/icons/crystalsvg/32x32/apps/ktalkd.png -share/icons/crystalsvg/32x32/mimetypes/kget_list.png -share/icons/crystalsvg/48x48/apps/kget.png -share/icons/crystalsvg/48x48/apps/kpf.png -share/icons/crystalsvg/48x48/apps/krdc.png -share/icons/crystalsvg/48x48/apps/krfb.png -share/icons/crystalsvg/48x48/apps/ktalkd.png -share/icons/crystalsvg/48x48/mimetypes/kget_list.png -share/icons/hicolor/128x128/apps/kdict.png -share/icons/hicolor/128x128/apps/kopete.png -share/icons/hicolor/128x128/apps/kppp.png -share/icons/hicolor/16x16/apps/kcmsambaconf.png -share/icons/hicolor/16x16/apps/kdict.png -share/icons/hicolor/16x16/apps/knewsticker.png -share/icons/hicolor/16x16/apps/kopete.png -share/icons/hicolor/16x16/apps/kppp.png -share/icons/hicolor/16x16/apps/ksirc.png -share/icons/hicolor/22x22/apps/kopete.png -share/icons/hicolor/22x22/apps/kppp.png -share/icons/hicolor/22x22/apps/ksirc.png -share/icons/hicolor/32x32/apps/kdict.png -share/icons/hicolor/32x32/apps/knewsticker.png -share/icons/hicolor/32x32/apps/kopete.png -share/icons/hicolor/32x32/apps/kppp.png -share/icons/hicolor/32x32/apps/ksirc.png -share/icons/hicolor/48x48/apps/kdict.png -share/icons/hicolor/48x48/apps/knewsticker.png -share/icons/hicolor/48x48/apps/kopete.png -share/icons/hicolor/48x48/apps/kppp.png -share/icons/hicolor/48x48/apps/ksirc.png -share/icons/hicolor/64x64/apps/kdict.png -share/icons/hicolor/64x64/apps/kopete.png -share/icons/hicolor/64x64/apps/kppp.png -share/icons/hicolor/64x64/apps/ksirc.png -share/icons/hicolor/scalable/apps/kdict.svgz -share/icons/hicolor/scalable/apps/kopete2.svgz -share/icons/locolor/16x16/apps/krfb.png -share/icons/locolor/32x32/apps/krfb.png -share/mimelnk/application/x-icq.desktop -share/mimelnk/application/x-kgetlist.desktop -share/mimelnk/application/x-kopete-emoticons.desktop -share/services/aim.protocol -share/services/chatwindow.desktop -share/services/emailwindow.desktop -share/services/fileshare_propsdlgplugin.desktop -share/services/invitation.protocol -share/services/irc.protocol -share/services/jabberdisco.protocol -share/services/kconfiguredialog/kopete_addbookmarks_config.desktop -share/services/kconfiguredialog/kopete_alias_config.desktop -share/services/kconfiguredialog/kopete_autoreplace_config.desktop -share/services/kconfiguredialog/kopete_cryptography_config.desktop -share/services/kconfiguredialog/kopete_highlight_config.desktop -share/services/kconfiguredialog/kopete_history_config.desktop -share/services/kconfiguredialog/kopete_latex_config.desktop -share/services/kconfiguredialog/kopete_msn_config.desktop -share/services/kconfiguredialog/kopete_netmeeting_config.desktop -share/services/kconfiguredialog/kopete_nowlistening_config.desktop -share/services/kconfiguredialog/kopete_texteffect_config.desktop -share/services/kconfiguredialog/kopete_translator_config.desktop -share/services/kconfiguredialog/kopete_webpresence_config.desktop -share/services/kded/dnssdwatcher.desktop -share/services/kded/kinetd.desktop -share/services/kfile_torrent.desktop -share/services/kinetd_krfb.desktop -share/services/kinetd_krfb_httpd.desktop -share/services/kntsrcfilepropsdlg.desktop -share/services/kopete_accountconfig.desktop -share/services/kopete_addbookmarks.desktop -share/services/kopete_aim.desktop -share/services/kopete_alias.desktop -share/services/kopete_appearanceconfig.desktop -share/services/kopete_autoreplace.desktop -share/services/kopete_avdeviceconfig.desktop -share/services/kopete_behaviorconfig.desktop -share/services/kopete_connectionstatus.desktop -share/services/kopete_contactnotes.desktop -share/services/kopete_cryptography.desktop -share/services/kopete_gadu.desktop -share/services/kopete_groupwise.desktop -share/services/kopete_highlight.desktop -share/services/kopete_history.desktop -share/services/kopete_icq.desktop -share/services/kopete_identityconfig.desktop -share/services/kopete_irc.desktop -share/services/kopete_jabber.desktop -share/services/kopete_latex.desktop -share/services/kopete_msn.desktop -share/services/kopete_netmeeting.desktop -share/services/kopete_nowlistening.desktop -share/services/kopete_sms.desktop -share/services/kopete_statistics.desktop -share/services/kopete_testbed.desktop -share/services/kopete_texteffect.desktop -share/services/kopete_translator.desktop -share/services/kopete_webpresence.desktop -share/services/kopete_yahoo.desktop -share/services/kpfpropertiesdialogplugin.desktop -share/services/rdp.protocol -share/services/rssservice.desktop -share/services/vnc.protocol -share/services/zeroconf.protocol -share/servicetypes/kinetdmodule.desktop -share/servicetypes/kopeteplugin.desktop -share/servicetypes/kopeteprotocol.desktop -share/servicetypes/kopeteui.desktop -share/sounds/KGet_Added.ogg -share/sounds/KGet_Finished.ogg -share/sounds/KGet_Finished_All.ogg -share/sounds/KGet_Started.ogg -share/sounds/Kopete_Event.ogg -share/sounds/Kopete_Received.ogg -share/sounds/Kopete_Sent.ogg -share/sounds/Kopete_User_is_Online.ogg -share/sounds/ktalkd.wav -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/html -@dirrm share/services/kconfiguredialog -@dirrm share/doc/HTML/en/kwifimanager -@dirrm share/doc/HTML/en/ktalkd -@dirrm share/doc/HTML/en/ksirc -@dirrm share/doc/HTML/en/krfb -@dirrm share/doc/HTML/en/krdc -@dirrm share/doc/HTML/en/kppp -@dirrm share/doc/HTML/en/kpf -@dirrm share/doc/HTML/en/kopete -@dirrm share/doc/HTML/en/knewsticker -@dirrm share/doc/HTML/en/kget -@dirrm share/doc/HTML/en/kdict -@dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html -@dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete -@dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/html -@dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete -@dirrm share/doc/HTML/en/kdenetwork-apidocs -@dirrm share/doc/HTML/en/kcontrol/lanbrowser -@dirrm share/doc/HTML/en/kcontrol/kcmtalkd -@dirrm share/apps/remoteview -@dirrm share/apps/ksirc/pics/emoticons -@dirrm share/apps/ksirc/pics -@dirrm share/apps/ksirc/icons/hicolor/64x64/apps -@dirrm share/apps/ksirc/icons/hicolor/64x64 -@dirrm share/apps/ksirc/icons/hicolor/48x48/apps -@dirrm share/apps/ksirc/icons/hicolor/48x48 -@dirrm share/apps/ksirc/icons/hicolor/32x32/apps -@dirrm share/apps/ksirc/icons/hicolor/32x32 -@dirrm share/apps/ksirc/icons/hicolor/22x22/apps -@dirrm share/apps/ksirc/icons/hicolor/22x22 -@dirrm share/apps/ksirc/icons/hicolor/16x16/apps -@dirrm share/apps/ksirc/icons/hicolor/16x16 -@dirrm share/apps/ksirc/icons/hicolor -@dirrm share/apps/ksirc/icons/crystalsvg/22x22/actions -@dirrm share/apps/ksirc/icons/crystalsvg/22x22 -@dirrm share/apps/ksirc/icons/crystalsvg -@dirrm share/apps/ksirc/icons -@dirrm share/apps/ksirc -@dirrm share/apps/krfb/pics -@dirrm share/apps/krfb -@dirrm share/apps/krdc/pics -@dirrm share/apps/krdc -@dirrm share/apps/kppp/pics -@dirrm share/apps/kppp/Rules/Yugoslavia -@dirrm share/apps/kppp/Rules/Uruguay -@dirrm share/apps/kppp/Rules/United_Kingdom -@dirrm share/apps/kppp/Rules/Ukraine -@dirrm share/apps/kppp/Rules/Turkey -@dirrm share/apps/kppp/Rules/Switzerland -@dirrm share/apps/kppp/Rules/Sweden -@dirrm share/apps/kppp/Rules/Spain -@dirrm share/apps/kppp/Rules/South_Afrika -@dirrm share/apps/kppp/Rules/South_Africa -@dirrm share/apps/kppp/Rules/Slovenia -@dirrm share/apps/kppp/Rules/Slovakia -@dirrm share/apps/kppp/Rules/Singapore -@dirrm share/apps/kppp/Rules/Russia -@dirrm share/apps/kppp/Rules/Romania -@dirrm share/apps/kppp/Rules/Portugal -@dirrm share/apps/kppp/Rules/Poland -@dirrm share/apps/kppp/Rules/Norway -@dirrm share/apps/kppp/Rules/Netherlands -@dirrm share/apps/kppp/Rules/Malaysia -@dirrm share/apps/kppp/Rules/Macedonia -@dirrm share/apps/kppp/Rules/Luxembourg -@dirrm share/apps/kppp/Rules/Kazakhstan -@dirrm share/apps/kppp/Rules/Japan -@dirrm share/apps/kppp/Rules/Jamaica -@dirrm share/apps/kppp/Rules/Italy -@dirrm share/apps/kppp/Rules/Israel -@dirrm share/apps/kppp/Rules/Ireland -@dirrm share/apps/kppp/Rules/Indonesia -@dirrm share/apps/kppp/Rules/India -@dirrm share/apps/kppp/Rules/Iceland -@dirrm share/apps/kppp/Rules/Hungary -@dirrm share/apps/kppp/Rules/Hong_Kong -@dirrm share/apps/kppp/Rules/Greece -@dirrm share/apps/kppp/Rules/Germany -@dirrm share/apps/kppp/Rules/France -@dirrm share/apps/kppp/Rules/Finland -@dirrm share/apps/kppp/Rules/Estonia -@dirrm share/apps/kppp/Rules/Denmark -@dirrm share/apps/kppp/Rules/Czechia -@dirrm share/apps/kppp/Rules/Croatia -@dirrm share/apps/kppp/Rules/Brasil -@dirrm share/apps/kppp/Rules/Bosnia_and_Herzegovina -@dirrm share/apps/kppp/Rules/Belgium -@dirrm share/apps/kppp/Rules/Bangladesh -@dirrm share/apps/kppp/Rules/Austria/Standard -@dirrm share/apps/kppp/Rules/Austria/Minimum -@dirrm share/apps/kppp/Rules/Austria/Business_2 -@dirrm share/apps/kppp/Rules/Austria/Business_1 -@dirrm share/apps/kppp/Rules/Austria -@dirrm share/apps/kppp/Rules/Australia -@dirrm share/apps/kppp/Rules/Argentina -@dirrm share/apps/kppp/Rules -@dirrm share/apps/kppp/Provider/Yugoslavia -@dirrm share/apps/kppp/Provider/United_Kingdom -@dirrm share/apps/kppp/Provider/Ukraine -@dirrm share/apps/kppp/Provider/Taiwan -@dirrm share/apps/kppp/Provider/Switzerland -@dirrm share/apps/kppp/Provider/Sweden -@dirrm share/apps/kppp/Provider/Slovenia -@dirrm share/apps/kppp/Provider/Portugal -@dirrm share/apps/kppp/Provider/Norway -@dirrm share/apps/kppp/Provider/NewZealand -@dirrm share/apps/kppp/Provider/Netherlands -@dirrm share/apps/kppp/Provider/Irland -@dirrm share/apps/kppp/Provider/Germany -@dirrm share/apps/kppp/Provider/France -@dirrm share/apps/kppp/Provider/Denmark -@dirrm share/apps/kppp/Provider/Czech_Republic -@dirrm share/apps/kppp/Provider/Belarus -@dirrm share/apps/kppp/Provider/Austria -@dirrm share/apps/kppp/Provider -@dirrm share/apps/kppp -@dirrm share/apps/kopeterichtexteditpart -@dirrm share/apps/kopete_yahoo -@dirrm share/apps/kopete_translator -@dirrm share/apps/kopete_statistics -@dirrm share/apps/kopete_netmeeting -@dirrm share/apps/kopete_msn -@dirrm share/apps/kopete_latex -@dirrm share/apps/kopete_history -@dirrm share/apps/kopete_groupwise -@dirrm share/apps/kopete_cryptography -@dirrm share/apps/kopete_contactnotes -@dirrm share/apps/kopete/webpresence -@dirrm share/apps/kopete/styles/data/iChat/yellow/To -@dirrm share/apps/kopete/styles/data/iChat/yellow/From -@dirrm share/apps/kopete/styles/data/iChat/yellow -@dirrm share/apps/kopete/styles/data/iChat/purple/To -@dirrm share/apps/kopete/styles/data/iChat/purple/From -@dirrm share/apps/kopete/styles/data/iChat/purple -@dirrm share/apps/kopete/styles/data/iChat/pink/To -@dirrm share/apps/kopete/styles/data/iChat/pink/From -@dirrm share/apps/kopete/styles/data/iChat/pink -@dirrm share/apps/kopete/styles/data/iChat/orange/To -@dirrm share/apps/kopete/styles/data/iChat/orange/From -@dirrm share/apps/kopete/styles/data/iChat/orange -@dirrm share/apps/kopete/styles/data/iChat/green/To -@dirrm share/apps/kopete/styles/data/iChat/green/From -@dirrm share/apps/kopete/styles/data/iChat/green -@dirrm share/apps/kopete/styles/data/iChat/graphite/To -@dirrm share/apps/kopete/styles/data/iChat/graphite/From -@dirrm share/apps/kopete/styles/data/iChat/graphite -@dirrm share/apps/kopete/styles/data/iChat/clear/To -@dirrm share/apps/kopete/styles/data/iChat/clear/From -@dirrm share/apps/kopete/styles/data/iChat/clear -@dirrm share/apps/kopete/styles/data/iChat/blue/To -@dirrm share/apps/kopete/styles/data/iChat/blue/From -@dirrm share/apps/kopete/styles/data/iChat/blue -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/green -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue -@dirrm share/apps/kopete/styles/data/iChat-Trans -@dirrm share/apps/kopete/styles/data/iChat -@dirrm share/apps/kopete/styles/data/Kopete -@dirrm share/apps/kopete/styles/data/Adium -@dirrm share/apps/kopete/styles/data -@dirrm share/apps/kopete/styles -@dirrm share/apps/kopete/pics/statistics -@dirrm share/apps/kopete/pics -@dirrm share/apps/kopete/icons/hicolor/48x48/apps -@dirrm share/apps/kopete/icons/hicolor/48x48/actions -@dirrm share/apps/kopete/icons/hicolor/48x48 -@dirrm share/apps/kopete/icons/hicolor/32x32/apps -@dirrm share/apps/kopete/icons/hicolor/32x32/actions -@dirrm share/apps/kopete/icons/hicolor/32x32 -@dirrm share/apps/kopete/icons/hicolor/22x22/actions -@dirrm share/apps/kopete/icons/hicolor/22x22 -@dirrm share/apps/kopete/icons/hicolor/16x16/apps -@dirrm share/apps/kopete/icons/hicolor/16x16/actions -@dirrm share/apps/kopete/icons/hicolor/16x16 -@dirrm share/apps/kopete/icons/hicolor -@dirrm share/apps/kopete/icons/crystalsvg/scalable/actions -@dirrm share/apps/kopete/icons/crystalsvg/scalable -@dirrm share/apps/kopete/icons/crystalsvg/64x64/apps -@dirrm share/apps/kopete/icons/crystalsvg/64x64/actions -@dirrm share/apps/kopete/icons/crystalsvg/64x64 -@dirrm share/apps/kopete/icons/crystalsvg/48x48/apps -@dirrm share/apps/kopete/icons/crystalsvg/48x48/actions -@dirrm share/apps/kopete/icons/crystalsvg/48x48 -@dirrm share/apps/kopete/icons/crystalsvg/32x32/apps -@dirrm share/apps/kopete/icons/crystalsvg/32x32/actions -@dirrm share/apps/kopete/icons/crystalsvg/32x32 -@dirrm share/apps/kopete/icons/crystalsvg/22x22/apps -@dirrm share/apps/kopete/icons/crystalsvg/22x22/actions -@dirrm share/apps/kopete/icons/crystalsvg/22x22 -@dirrm share/apps/kopete/icons/crystalsvg/16x16/apps -@dirrm share/apps/kopete/icons/crystalsvg/16x16/actions -@dirrm share/apps/kopete/icons/crystalsvg/16x16 -@dirrm share/apps/kopete/icons/crystalsvg/128x128/apps -@dirrm share/apps/kopete/icons/crystalsvg/128x128 -@dirrm share/apps/kopete/icons/crystalsvg -@dirrm share/apps/kopete/icons -@dirrm share/apps/kopete -@dirrm share/apps/knewsticker -@dirrm share/apps/kinetd -@dirrm share/apps/khtml/kpartplugins -@dirrm share/apps/kget/pics -@dirrm share/apps/kget/icons/crystalsvg/22x22/actions -@dirrm share/apps/kget/icons/crystalsvg/22x22 -@dirrm share/apps/kget/icons/crystalsvg -@dirrm share/apps/kget/icons -@dirrm share/apps/kget -@dirrm share/apps/kdict/icons/crystalsvg/32x32/actions -@dirrm share/apps/kdict/icons/crystalsvg/32x32 -@dirrm share/apps/kdict/icons/crystalsvg/22x22/actions -@dirrm share/apps/kdict/icons/crystalsvg/22x22 -@dirrm share/apps/kdict/icons/crystalsvg/16x16/actions -@dirrm share/apps/kdict/icons/crystalsvg/16x16 -@dirrm share/apps/kdict/icons/crystalsvg -@dirrm share/apps/kdict/icons -@dirrm share/apps/kdict -@dirrm lib/kconf_update_bin -@dirrm include/rss -@dirrm include/kopete/ui -@dirrm include/kopete diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile deleted file mode 100644 index 97deff7875bc..000000000000 --- a/net/knemo-kde4/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# New ports collection makefile for: knemo -# Date created: Sat Jan 22 00:20:26 CET 2005 -# Whom: Markus Brueffer <markus@FreeBSD.org> -# -# $FreeBSD$ - -PORTNAME= knemo -PORTVERSION= 0.3.1 -PORTREVISION= 4 -CATEGORIES= net kde -MASTER_SITES= http://www.eris23.de/knemo/ - -MAINTAINER= markus@FreeBSD.org -COMMENT= Network monitor for KDE - -EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure - -USE_BZIP2= yes -USE_KDELIBS_VER=3 -USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 -USE_REINPLACE= yes - -post-patch: - @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} - -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net/knemo-kde4/distinfo b/net/knemo-kde4/distinfo deleted file mode 100644 index 2ce1cdb21878..000000000000 --- a/net/knemo-kde4/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (knemo-0.3.1.tar.bz2) = 774b7b085e7b2d492bf811d7f89cee6e -SHA256 (knemo-0.3.1.tar.bz2) = 66874172760eeab4d68ea9533db96f408ce3d9af6a5c07d45906092d0b4bdbef -SIZE (knemo-0.3.1.tar.bz2) = 549018 diff --git a/net/knemo-kde4/files/patch-kcm-configdialog.cpp b/net/knemo-kde4/files/patch-kcm-configdialog.cpp deleted file mode 100644 index d8285d4fe55f..000000000000 --- a/net/knemo-kde4/files/patch-kcm-configdialog.cpp +++ /dev/null @@ -1,78 +0,0 @@ ---- kcm/configdialog.cpp.orig Wed Sep 15 18:24:37 2004 -+++ kcm/configdialog.cpp Wed Jan 19 15:23:57 2005 -@@ -17,6 +17,16 @@ - Boston, MA 02111-1307, USA. - */ - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <net/if.h> -+#include <net/if_mib.h> -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <net/route.h> -+#endif -+ - #include <qfile.h> - #include <qdict.h> - #include <qlabel.h> -@@ -355,6 +365,39 @@ - void ConfigDialog::defaults() - { - // Default interfaces -+#ifdef Q_OS_FREEBSD -+ /* Determine number of interfaces */ -+ u_int n = 0; -+ size_t nlen = 0; -+ nlen = sizeof(n); -+ -+ if ( sysctlbyname("net.link.generic.system.ifcount", &n, &nlen, NULL, 0) != -1 ) -+ { -+ mSettingsDict.clear(); -+ mDlg->listBoxInterfaces->clear(); -+ -+ ifmibdata ifmd; -+ size_t len = 0; -+ len = sizeof(ifmd); -+ static int name[] = { CTL_NET, -+ PF_LINK, -+ NETLINK_GENERIC, -+ IFMIB_IFDATA, -+ 0, -+ IFDATA_GENERAL }; -+ -+ for (int i = 1; i <= n; ++i) -+ { -+ name[4] = i; -+ /* Get data for iface-number i */ -+ if ( sysctl(name, 6, (void*)&ifmd, (size_t*)&len, (void*)NULL, (size_t)0) == -1 ) -+ continue; -+ -+ QString interface = QString::fromLatin1(ifmd.ifmd_name); -+ -+ if ( ifmd.ifmd_flags & IFF_LOOPBACK) -+ continue; -+#else - QFile proc( "/proc/net/dev" ); - if ( proc.open( IO_ReadOnly ) ) - { -@@ -372,6 +415,7 @@ - if ( interface == "lo" ) - continue; - -+#endif - InterfaceSettings* settings = new InterfaceSettings(); - settings->customCommands = false; - settings->hideWhenNotAvailable = false; -@@ -391,8 +435,10 @@ - mDlg->checkBoxNotExisting->setChecked( false ); - mDlg->checkBoxCustom->setChecked( false ); - } -+#ifndef __FreeBSD__ - } - proc.close(); -+#endif - } - - // Default tool tips diff --git a/net/knemo-kde4/files/patch-knemod-data.h b/net/knemo-kde4/files/patch-knemod-data.h deleted file mode 100644 index c45f8b191029..000000000000 --- a/net/knemo-kde4/files/patch-knemod-data.h +++ /dev/null @@ -1,35 +0,0 @@ ---- knemod/data.h.orig Sat Jan 22 00:10:05 2005 -+++ knemod/data.h Fri Jan 21 17:38:50 2005 -@@ -22,6 +22,7 @@ - - #include <qpair.h> - #include <qcolor.h> -+#include <qdict.h> - #include <qstring.h> - #include <qvaluevector.h> - -@@ -41,6 +42,11 @@ - int toolTipContent; - }; - -+struct AddrData { -+ QString subnetMask; -+ QString broadcastAddress; -+}; -+ - struct InterfaceData - { - InterfaceData::InterfaceData() -@@ -64,11 +70,9 @@ - unsigned long prevTxBytes; - unsigned long incomingBytes; - unsigned long outgoingBytes; -- QString ipAddress; -- QString subnetMask; -+ QDict<AddrData> addrData; - QString hwAddress; - QString ptpAddress; -- QString broadcastAddress; - QString defaultGateway; - QString rxString; - QString txString; diff --git a/net/knemo-kde4/files/patch-knemod-interfacestatusdialog.cpp b/net/knemo-kde4/files/patch-knemod-interfacestatusdialog.cpp deleted file mode 100644 index 822857eff083..000000000000 --- a/net/knemo-kde4/files/patch-knemod-interfacestatusdialog.cpp +++ /dev/null @@ -1,50 +0,0 @@ ---- knemod/interfacestatusdialog.cpp.orig Sat Jan 22 00:11:02 2005 -+++ knemod/interfacestatusdialog.cpp Sat Jan 22 00:15:24 2005 -@@ -24,6 +24,7 @@ - #include <qtabwidget.h> - - #include <kdebug.h> -+#include <kcombobox.h> - #include <kconfig.h> - #include <klocale.h> - #include <kglobal.h> -@@ -69,6 +70,10 @@ - mTimer = new QTimer(); - connect( mTimer, SIGNAL( timeout() ), this, SLOT( updateDialog() ) ); - mTimer->start( 1000 ); -+ -+#ifdef Q_OS_FREEBSD -+ connect( comboBoxIP, SIGNAL( activated(int) ), this, SLOT( updateDialog() ) ); -+#endif - } - - InterfaceStatusDialog::~InterfaceStatusDialog() -@@ -152,12 +157,28 @@ - if ( data.available ) - { - // ip tab -+#ifdef Q_OS_FREEBSD -+ if ( data.addrData.count() != comboBoxIP->count() ) -+ comboBoxIP->clear(); -+ -+ QDictIterator<AddrData> it( data.addrData ); -+ for( ; it.current(); ++it ) -+ if (!comboBoxIP->contains(it.currentKey())) -+ comboBoxIP->insertItem( it.currentKey() ); -+ -+ textLabelSubnet->setText(data.addrData[ comboBoxIP->currentText() ]->subnetMask); -+#else - textLabelIP->setText( data.ipAddress ); - textLabelSubnet->setText( data.subnetMask ); -+#endif - if ( mInterface->getType() == Interface::ETHERNET ) - { - variableLabel1->setText( i18n( "Broadcast Address:" ) ); -+#ifdef Q_OS_FREEBSD -+ variableText1->setText( data.addrData[ comboBoxIP->currentText() ]->broadcastAddress); -+#else - variableText1->setText( data.broadcastAddress ); -+#endif - variableLabel2->setText( i18n( "Default Gateway:" ) ); - variableText2->setText( data.defaultGateway ); - variableLabel3->setText( i18n( "HW-Address:" ) ); diff --git a/net/knemo-kde4/files/patch-knemod-interfacestatusdlg.ui b/net/knemo-kde4/files/patch-knemod-interfacestatusdlg.ui deleted file mode 100644 index d506e3f44a0f..000000000000 --- a/net/knemo-kde4/files/patch-knemod-interfacestatusdlg.ui +++ /dev/null @@ -1,271 +0,0 @@ ---- knemod/interfacestatusdlg.ui.orig Fri Jan 21 16:57:24 2005 -+++ knemod/interfacestatusdlg.ui Fri Jan 21 20:02:50 2005 -@@ -9,7 +9,7 @@ - <x>0</x> - <y>0</y> - <width>272</width> -- <height>258</height> -+ <height>237</height> - </rect> - </property> - <property name="caption"> -@@ -145,7 +145,7 @@ - </property> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout3</cstring> -+ <cstring>layout7</cstring> - </property> - <hbox> - <property name="name"> -@@ -171,18 +171,18 @@ - </property> - <property name="sizeHint"> - <size> -- <width>20</width> -+ <width>40</width> - <height>20</height> - </size> - </property> - </spacer> -- <widget class="KActiveLabel"> -+ <widget class="KComboBox"> - <property name="name"> -- <cstring>textLabelIP</cstring> -+ <cstring>comboBoxIP</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -- <hsizetype>1</hsizetype> -+ <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> -@@ -193,7 +193,7 @@ - </widget> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout4</cstring> -+ <cstring>layout8</cstring> - </property> - <hbox> - <property name="name"> -@@ -207,41 +207,30 @@ - <string>Subnet Mask:</string> - </property> - </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer13_2</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>71</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- <widget class="KActiveLabel"> -+ <widget class="QLabel"> - <property name="name"> - <cstring>textLabelSubnet</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -- <hsizetype>1</hsizetype> -- <vsizetype>0</vsizetype> -+ <hsizetype>7</hsizetype> -+ <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> -+ <property name="text"> -+ <string></string> -+ </property> -+ <property name="alignment"> -+ <set>AlignVCenter|AlignRight</set> -+ </property> - </widget> - </hbox> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout5</cstring> -+ <cstring>layout9</cstring> - </property> - <hbox> - <property name="name"> -@@ -255,41 +244,22 @@ - <string>Broadcast Address:</string> - </property> - </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer13_3</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>71</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- <widget class="KActiveLabel"> -+ <widget class="QLabel"> - <property name="name"> - <cstring>variableText1</cstring> - </property> -- <property name="sizePolicy"> -- <sizepolicy> -- <hsizetype>1</hsizetype> -- <vsizetype>0</vsizetype> -- <horstretch>0</horstretch> -- <verstretch>0</verstretch> -- </sizepolicy> -+ <property name="text"> -+ <string></string> -+ </property> -+ <property name="alignment"> -+ <set>AlignVCenter|AlignRight</set> - </property> - </widget> - </hbox> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout6</cstring> -+ <cstring>layout10</cstring> - </property> - <hbox> - <property name="name"> -@@ -303,41 +273,30 @@ - <string>Default Gateway:</string> - </property> - </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer13_4</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>71</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- <widget class="KActiveLabel"> -+ <widget class="QLabel"> - <property name="name"> - <cstring>variableText2</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -- <hsizetype>1</hsizetype> -- <vsizetype>0</vsizetype> -+ <hsizetype>7</hsizetype> -+ <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> -+ <property name="text"> -+ <string></string> -+ </property> -+ <property name="alignment"> -+ <set>AlignVCenter|AlignRight</set> -+ </property> - </widget> - </hbox> - </widget> - <widget class="QLayoutWidget"> - <property name="name"> -- <cstring>layout7</cstring> -+ <cstring>layout11</cstring> - </property> - <hbox> - <property name="name"> -@@ -351,35 +310,24 @@ - <string>HW-Address:</string> - </property> - </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer13_5</cstring> -- </property> -- <property name="orientation"> -- <enum>Horizontal</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>71</width> -- <height>21</height> -- </size> -- </property> -- </spacer> -- <widget class="KActiveLabel"> -+ <widget class="QLabel"> - <property name="name"> - <cstring>variableText3</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> -- <hsizetype>1</hsizetype> -- <vsizetype>0</vsizetype> -+ <hsizetype>7</hsizetype> -+ <vsizetype>5</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> -+ <property name="text"> -+ <string></string> -+ </property> -+ <property name="alignment"> -+ <set>AlignVCenter|AlignRight</set> -+ </property> - </widget> - </hbox> - </widget> -@@ -728,8 +676,6 @@ - </widget> - </vbox> - </widget> --<customwidgets> --</customwidgets> - <connections> - <connection> - <sender>buttonClose</sender> -@@ -740,10 +686,6 @@ - </connections> - <layoutdefaults spacing="6" margin="11"/> - <includehints> -- <includehint>kactivelabel.h</includehint> -- <includehint>kactivelabel.h</includehint> -- <includehint>kactivelabel.h</includehint> -- <includehint>kactivelabel.h</includehint> -- <includehint>kactivelabel.h</includehint> -+ <includehint>kcombobox.h</includehint> - </includehints> - </UI> diff --git a/net/knemo-kde4/files/patch-knemod-interfacetooltip.cpp b/net/knemo-kde4/files/patch-knemod-interfacetooltip.cpp deleted file mode 100644 index 10235e4477c3..000000000000 --- a/net/knemo-kde4/files/patch-knemod-interfacetooltip.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- knemod/interfacetooltip.cpp.orig Fri Jan 21 17:51:13 2005 -+++ knemod/interfacetooltip.cpp Fri Jan 21 17:59:47 2005 -@@ -99,6 +99,23 @@ - - if ( data.available ) - { -+#ifdef Q_OS_FREEBSD -+ QDictIterator<AddrData> it( data.addrData ); -+ for( ; it.current(); ++it ) -+ { -+ if ( toolTipContent & IP_ADDRESS ) -+ text += "<tr><td>" + mToolTips[4].first + "</td><td>" + it.currentKey() + "</td></tr>"; -+ if ( toolTipContent & SUBNET_MASK ) -+ text += "<tr><td>" + mToolTips[5].first + "</td><td>" + it.current()->subnetMask + "</td></tr>"; -+ if ( mInterface->getType() == Interface::ETHERNET ) -+ { -+ if ( toolTipContent & BCAST_ADDRESS ) -+ text += "<tr><td>" + mToolTips[18].first + "</td><td>" + it.current()->broadcastAddress + "</td></tr>"; -+ } -+ } -+ if ( mInterface->getType() == Interface::ETHERNET ) -+ { -+#else - if ( toolTipContent & IP_ADDRESS ) - text += "<tr><td>" + mToolTips[4].first + "</td><td>" + data.ipAddress + "</td></tr>"; - if ( toolTipContent & SUBNET_MASK ) -@@ -107,6 +124,7 @@ - { - if ( toolTipContent & BCAST_ADDRESS ) - text += "<tr><td>" + mToolTips[18].first + "</td><td>" + data.broadcastAddress + "</td></tr>"; -+#endif - if ( toolTipContent & GATEWAY ) - text += "<tr><td>" + mToolTips[19].first + "</td><td>" + data.defaultGateway + "</td></tr>"; - if ( toolTipContent & HW_ADDRESS ) diff --git a/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp b/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp deleted file mode 100644 index 4a743c105842..000000000000 --- a/net/knemo-kde4/files/patch-knemod-interfaceupdater.cpp +++ /dev/null @@ -1,291 +0,0 @@ ---- knemod/interfaceupdater.cpp.orig Fri Aug 20 20:26:41 2004 -+++ knemod/interfaceupdater.cpp Sat Jan 22 13:34:49 2005 -@@ -17,6 +17,24 @@ - Boston, MA 02111-1307, USA. - */ - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/sysctl.h> -+#include <sys/time.h> -+#include <sys/ioctl.h> -+#include <net/ethernet.h> -+#include <net/if_media.h> -+#include <net/if_types.h> -+#include <net/if.h> -+#include <net/if_dl.h> -+#include <net/if_mib.h> -+#include <netdb.h> -+#include <ifaddrs.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+#endif -+ - #include <qmap.h> - #include <qtimer.h> - #include <qregexp.h> -@@ -48,6 +66,7 @@ - mTimer->stop(); - delete mTimer; - -+#ifndef Q_OS_FREEBSD - if ( mRouteProcess ) - { - mRouteProcess->kill(); -@@ -63,10 +82,12 @@ - mIwconfigProcess->kill(); - delete mIwconfigProcess; - } -+#endif - } - - void InterfaceUpdater::checkConfig() - { -+#ifndef Q_OS_FREEBSD - if ( !mIfconfigProcess ) - { - mIfconfigStdout = QString::null; -@@ -108,6 +129,7 @@ - } - } - #endif -+#endif // Q_OS_FREEBSD - - #ifdef PATH_ROUTE - if ( !mRouteProcess ) -@@ -116,7 +138,11 @@ - mRouteProcess = new KProcess(); - mRouteProcess->setEnvironment( "LANG", "C" ); - mRouteProcess->setEnvironment( "LC_ALL", "C" ); -+#ifdef Q_OS_FREEBSD -+ *mRouteProcess << PATH_ROUTE << "-n" << "get" << "default"; -+#else - *mRouteProcess << PATH_ROUTE << "-n"; -+#endif - connect( mRouteProcess, SIGNAL( receivedStdout( KProcess*, char*, int ) ), - this, SLOT( routeProcessStdout( KProcess*, char*, int ) ) ); - connect( mRouteProcess, SIGNAL( receivedStderr( KProcess*, char*, int ) ), -@@ -131,6 +157,140 @@ - } - } - #endif -+ -+#ifdef Q_OS_FREEBSD -+ // Check interfaces and update accordingly -+ -+ Interface* interface = 0; -+ InterfaceData* data = 0; -+ -+ struct if_data* ifd; -+ struct ifaddrs *ifap; -+ char buf[NI_MAXHOST]; -+ -+ // Reset all devices first -+ QDictIterator<Interface> ifIt( mInterfaceDict ); -+ for ( ; ifIt.current(); ++ifIt ) -+ { -+ interface = ifIt.current(); -+ interface->getData().existing = false; -+ interface->getData().available = false; -+ interface->getData().addrData.clear(); -+ } -+ -+ // Get IP address and related information -+ if ( getifaddrs(&ifap) == 0 ) { -+ for ( ifaddrs *ifa = ifap; ifa; ifa = ifa->ifa_next ) { -+ switch ( ifa->ifa_addr->sa_family ) { -+ case AF_INET6: -+ case AF_INET: -+ interface = mInterfaceDict[QString::fromLatin1(ifa->ifa_name)]; -+ if ( interface ) { -+ data = &interface->getData(); -+ -+ bzero(buf, NI_MAXHOST); -+ getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len, buf, sizeof(buf), 0, 0, NI_NUMERICHOST); -+ AddrData *addrData = new AddrData; -+ data->addrData.insert( QString::fromLatin1(buf), addrData); -+ -+ if ( ifa->ifa_netmask != NULL ) { -+ if (ifa->ifa_addr->sa_family == AF_INET6 ) { -+ bzero(buf, NI_MAXHOST); -+ getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, sizeof(buf), 0, 0, NI_NUMERICHOST); -+ addrData->subnetMask = QString::fromLatin1( buf ); -+ } else { -+ struct sockaddr_in *sin = (struct sockaddr_in *)ifa->ifa_netmask; -+ addrData->subnetMask = QString::fromLatin1( inet_ntoa(sin->sin_addr) ); -+ } -+ } -+ -+ if ( ifa->ifa_broadaddr != NULL ) { -+ bzero(buf, NI_MAXHOST); -+ getnameinfo(ifa->ifa_broadaddr, ifa->ifa_broadaddr->sa_len, buf, sizeof(buf), 0, 0, NI_NUMERICHOST); -+ addrData->broadcastAddress = QString::fromLatin1(buf); -+ } -+ -+ if ( ifa->ifa_dstaddr != NULL ) { -+ bzero(buf, NI_MAXHOST); -+ getnameinfo(ifa->ifa_dstaddr, ifa->ifa_dstaddr->sa_len, buf, sizeof(buf), 0, 0, NI_NUMERICHOST); -+ data->ptpAddress = QString::fromLatin1(buf); -+ } -+ -+ data->existing = true; -+ interface->setType((ifa->ifa_flags & IFF_POINTOPOINT ) ? Interface::PPP : Interface::ETHERNET ); -+ -+ // Get media status -+ int s; -+ if ((s = socket(ifa->ifa_addr->sa_family, SOCK_DGRAM, 0)) >= 0) { -+ struct ifmediareq ifmr; -+ (void) memset(&ifmr, 0, sizeof(ifmr)); -+ (void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name)); -+ -+ if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) >= 0) { -+ if (ifmr.ifm_status & IFM_AVALID) -+ /* -+ * The interface is marked available, if the interface is up -+ * and if it is has carrier (LAN) or is associated (WLAN) -+ */ -+ data->available = (ifa->ifa_flags & IFF_UP) && (ifmr.ifm_status & IFM_ACTIVE); -+ } -+ else -+ data->available = (ifa->ifa_flags & IFF_UP); -+ -+ close(s); -+ } -+ } -+ break; -+ -+ case AF_LINK: -+ interface = mInterfaceDict[QString::fromLatin1(ifa->ifa_name)]; -+ if ( interface ) { -+ data = &interface->getData(); -+ -+ // get MAC address -+ struct sockaddr_dl* sdl = (struct sockaddr_dl*)ifa->ifa_addr; -+ if (sdl->sdl_type == IFT_ETHER && sdl->sdl_alen == ETHER_ADDR_LEN) -+ data->hwAddress = QString::fromLatin1(ether_ntoa((struct ether_addr*)LLADDR(sdl))); -+ else -+ data->hwAddress = ""; -+ -+ // Get traffic statistics -+ if (ifa->ifa_data != NULL) { -+ ifd = (if_data *)ifa->ifa_data; -+ -+ data->rxPackets = ifd->ifi_ipackets; -+ data->txPackets = ifd->ifi_opackets; -+ -+ if ( data->prevRxBytes == 0L ) -+ data->prevRxBytes = ifd->ifi_ibytes; -+ else -+ data->prevRxBytes = data->rxBytes; -+ -+ data->rxBytes = ifd->ifi_ibytes; -+ data->incomingBytes = data->rxBytes - data->prevRxBytes; -+ data->rxString = KIO::convertSize( data->rxBytes ); -+ -+ if ( data->prevTxBytes == 0L ) -+ data->prevTxBytes = ifd->ifi_obytes; -+ else -+ data->prevTxBytes = data->txBytes; -+ -+ data->txBytes = ifd->ifi_obytes; -+ data->outgoingBytes = data->txBytes - data->prevTxBytes; -+ data->txString = KIO::convertSize( data->txBytes ); -+ } -+ } -+ break; -+ } -+ } -+ freeifaddrs(ifap); -+ } -+ -+ // Update the display -+ for ( ifIt.toFirst(); ifIt.current(); ++ifIt ) -+ ifIt.current()->activateMonitor(); -+ -+#endif // Q_OS_FREEBSD - } - - void InterfaceUpdater::routeProcessExited( KProcess* process ) -@@ -180,6 +340,7 @@ - - void InterfaceUpdater::parseIfconfigOutput() - { -+#ifndef Q_OS_FREEBSD - /* mIfconfigStdout contains the complete output of 'ifconfig' which we - * are going to parse here. - */ -@@ -235,10 +396,12 @@ - } - interface->activateMonitor(); - } -+#endif - } - - void InterfaceUpdater::updateInterfaceData( QString& config, InterfaceData& data, int type ) - { -+#ifndef Q_OS_FREEBSD - QRegExp regExp( ".*RX.*:(\\d+).*:\\d+.*:\\d+.*:\\d+" ); - if ( regExp.search( config ) > -1 ) - data.rxPackets = regExp.cap( 1 ).toULong(); -@@ -318,10 +481,12 @@ - if ( regExp.search( config ) > -1 ) - data.ptpAddress = regExp.cap( 2 ); - } -+#endif - } - - void InterfaceUpdater::parseIwconfigOutput() - { -+#ifndef Q_OS_FREEBSD - /* mIwconfigStdout contains the complete output of 'iwconfig' which we - * are going to parse here. - */ -@@ -364,10 +529,12 @@ - updateWirelessData( configs[key], interface->getWirelessData() ); - } - } -+#endif - } - - void InterfaceUpdater::updateWirelessData( QString& config, WirelessData& data ) - { -+#ifndef Q_OS_FREEBSD - QRegExp regExp( "ESSID:\"?([^\"]*)\"?" ); - if ( regExp.search( config ) > -1 ) - data.essid = regExp.cap( 1 ); -@@ -401,6 +568,7 @@ - regExp.setPattern( "Link Quality:([\\d/]*)" ); - if ( regExp.search( config ) > -1 ) - data.linkQuality = regExp.cap( 1 ); -+#endif - } - - void InterfaceUpdater::parseRouteOutput() -@@ -409,16 +577,25 @@ - * are going to parse here. - */ - QMap<QString, QStringList> configs; -- QStringList routeList = QStringList::split( "\n", mRouteStdout ); -+ QStringList gateway, routeList = QStringList::split( "\n", mRouteStdout ); - QStringList::Iterator it; - for ( it = routeList.begin(); it != routeList.end(); ++it ) - { - QStringList routeParameter = QStringList::split( " ", *it ); -+#ifdef Q_OS_FREEBSD -+ if ( routeParameter.count() != 2 ) -+ continue; -+ if ( routeParameter[0] == "gateway:" ) -+ gateway = routeParameter; -+ if ( routeParameter[0] == "interface:" ) -+ configs[routeParameter[1]] = gateway; -+#else - if ( routeParameter.count() < 8 ) // no routing entry - continue; - if ( routeParameter[0] != "0.0.0.0" ) // no default route - continue; - configs[routeParameter[7]] = routeParameter; -+#endif - } - - /* We loop over the interfaces the user wishs to monitor. diff --git a/net/knemo-kde4/pkg-descr b/net/knemo-kde4/pkg-descr deleted file mode 100644 index 0fa8cdc5e1f4..000000000000 --- a/net/knemo-kde4/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -KNemo - the KDE Network Monitor - -KNemo offers a network monitor similar to the one found in Windows. -For every network interface it displays an icon in the systray. - -WWW: http://www.kde-apps.org/content/show.php?content=12956 diff --git a/net/knemo-kde4/pkg-message b/net/knemo-kde4/pkg-message deleted file mode 100644 index e0a417e2f008..000000000000 --- a/net/knemo-kde4/pkg-message +++ /dev/null @@ -1,4 +0,0 @@ ------------------------------------------------------------------------------ - IMPORTANT: KNemo is not an executable but an KDED service. Therefore - it has to be started using Control Center/KDE Components/Service Manager. ------------------------------------------------------------------------------ diff --git a/net/knemo-kde4/pkg-plist b/net/knemo-kde4/pkg-plist deleted file mode 100644 index dd19f2ab8781..000000000000 --- a/net/knemo-kde4/pkg-plist +++ /dev/null @@ -1,64 +0,0 @@ -lib/kde3/kcm_knemo.a -lib/kde3/kcm_knemo.la -lib/kde3/kcm_knemo.so -lib/kde3/kded_knemod.a -lib/kde3/kded_knemod.la -lib/kde3/kded_knemod.so -share/applnk/Settings/Network/kcm_knemo.desktop -share/apps/knemo/eventsrc -share/icons/crystalsvg/16x16/apps/knemo.png -share/icons/crystalsvg/22x22/actions/network_connected.png -share/icons/crystalsvg/22x22/actions/network_connected_lan.png -share/icons/crystalsvg/22x22/actions/network_connected_ppp.png -share/icons/crystalsvg/22x22/actions/network_connected_wlan.png -share/icons/crystalsvg/22x22/actions/network_disconnected.png -share/icons/crystalsvg/22x22/actions/network_disconnected_lan.png -share/icons/crystalsvg/22x22/actions/network_disconnected_ppp.png -share/icons/crystalsvg/22x22/actions/network_disconnected_wlan.png -share/icons/crystalsvg/22x22/actions/network_incoming.png -share/icons/crystalsvg/22x22/actions/network_incoming_lan.png -share/icons/crystalsvg/22x22/actions/network_incoming_ppp.png -share/icons/crystalsvg/22x22/actions/network_incoming_wlan.png -share/icons/crystalsvg/22x22/actions/network_outgoing.png -share/icons/crystalsvg/22x22/actions/network_outgoing_lan.png -share/icons/crystalsvg/22x22/actions/network_outgoing_ppp.png -share/icons/crystalsvg/22x22/actions/network_outgoing_wlan.png -share/icons/crystalsvg/22x22/actions/network_traffic.png -share/icons/crystalsvg/22x22/actions/network_traffic_lan.png -share/icons/crystalsvg/22x22/actions/network_traffic_ppp.png -share/icons/crystalsvg/22x22/actions/network_traffic_wlan.png -share/icons/crystalsvg/32x32/apps/knemo.png -share/locale/bg/LC_MESSAGES/kcm_knemo.mo -share/locale/bg/LC_MESSAGES/knemod.mo -share/locale/cs/LC_MESSAGES/kcm_knemo.mo -share/locale/cs/LC_MESSAGES/knemod.mo -share/locale/de/LC_MESSAGES/kcm_knemo.mo -share/locale/de/LC_MESSAGES/knemod.mo -share/locale/es/LC_MESSAGES/kcm_knemo.mo -share/locale/es/LC_MESSAGES/knemod.mo -share/locale/fr/LC_MESSAGES/kcm_knemo.mo -share/locale/fr/LC_MESSAGES/knemod.mo -share/locale/it/LC_MESSAGES/kcm_knemo.mo -share/locale/it/LC_MESSAGES/knemod.mo -share/locale/nl/LC_MESSAGES/kcm_knemo.mo -share/locale/nl/LC_MESSAGES/knemod.mo -share/locale/pt_BR/LC_MESSAGES/kcm_knemo.mo -share/locale/pt_BR/LC_MESSAGES/knemod.mo -share/locale/ru/LC_MESSAGES/kcm_knemo.mo -share/locale/ru/LC_MESSAGES/knemod.mo -share/services/kded/knemod.desktop -@dirrmtry share/services/kded -@dirrmtry share/services -@dirrmtry share/icons/crystalsvg/32x32/apps -@dirrmtry share/icons/crystalsvg/32x32 -@dirrmtry share/icons/crystalsvg/22x22/actions -@dirrmtry share/icons/crystalsvg/22x22 -@dirrmtry share/icons/crystalsvg/16x16/apps -@dirrmtry share/icons/crystalsvg/16x16 -@dirrmtry share/icons/crystalsvg -@dirrmtry share/icons -@dirrm share/apps/knemo -@dirrmtry share/apps -@dirrmtry share/applnk/Settings/Network -@dirrmtry share/applnk/Settings -@dirrmtry share/applnk diff --git a/net/mcl/Makefile b/net/mcl/Makefile deleted file mode 100644 index 32dd98b20e1c..000000000000 --- a/net/mcl/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# New ports collection makefile for: mcl -# Date created: 29 October 2003 -# Whom: past@noc.ntua.gr -# -# $FreeBSD$ -# - -PORTNAME= mcl -PORTVERSION= 2.99.1 -PORTREVISION= 1 -CATEGORIES= mbone net -MASTER_SITES= http://www.inrialpes.fr/planete/people/roca/mcl/bin/ -DISTNAME= mcl_v2.99.1 -EXTRACT_SUFX= .tgz - -MAINTAINER= past@ebs.gr -COMMENT= Implementation of the ALC and NORM Reliable Multicast Protocols - -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} \ - gdome-config:${PORTSDIR}/textproc/gdome2 \ - glib-gettextize:${PORTSDIR}/devel/glib20 - -USE_REINPLACE= yes -INSTALLS_SHLIB= yes -USE_GMAKE= yes -MAN1= fcast.1 fcastn.1 mclrecv2.1 mclsend2.1 -MAN2= mcl_abort.2 mcl_close.2 mcl_ctl.2 mcl_open.2 mcl_recv.2 \ - mcl_send.2 mcl_wait_event.2 - -pre-patch: - @cd ${WRKSRC} && \ - ${MKDIR} bin/freebsd - -post-patch: - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/src/alc/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/check/alc/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/fcast/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/flute/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/mclftp/Makefile - @${REINPLACE_CMD} -Ee 's#-pthread|-lc_r#${PTHREAD_LIBS}#g' \ - ${WRKSRC}/robcast/Makefile - -pre-install: - @${REINPLACE_CMD} -Ee 's#../alc/#alc/#g' \ - ${WRKSRC}/src/common/mcl_lib_api.h - @${REINPLACE_CMD} -Ee 's#../norm/#norm/#g' \ - ${WRKSRC}/src/common/mcl_lib_api.h - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/fcast ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/flute ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_client ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/bin/freebsd/robcast_server ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/bin/freebsd/libmclalc.a ${PREFIX}/lib - @${INSTALL_DATA} ${WRKSRC}/src/common/mcl_lib_api.h ${PREFIX}/include - @${INSTALL_DATA} -d ${PREFIX}/include/alc - @${INSTALL_DATA} ${WRKSRC}/src/alc/mcl_lib_api_alc.h \ - ${PREFIX}/include/alc - @${INSTALL_MAN} ${WRKSRC}/man/fcast.man.1 ${PREFIX}/man/man1/fcast.1 - @${INSTALL_MAN} ${WRKSRC}/man/fcastn.man.1 ${PREFIX}/man/man1/fcastn.1 - @${INSTALL_MAN} ${WRKSRC}/man/mclrecv2.man.1 \ - ${PREFIX}/man/man1/mclrecv2.1 - @${INSTALL_MAN} ${WRKSRC}/man/mclsend2.man.1 \ - ${PREFIX}/man/man1/mclsend2.1 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_abort.man.2 \ - ${PREFIX}/man/man2/mcl_abort.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_close.man.2 \ - ${PREFIX}/man/man2/mcl_close.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_ctl.man.2 ${PREFIX}/man/man2/mcl_ctl.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_open.man.2 \ - ${PREFIX}/man/man2/mcl_open.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_recv.man.2 \ - ${PREFIX}/man/man2/mcl_recv.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_send.man.2 \ - ${PREFIX}/man/man2/mcl_send.2 - @${INSTALL_MAN} ${WRKSRC}/man/mcl_wait_event.man.2 \ - ${PREFIX}/man/man2/mcl_wait_event.2 - -.include <bsd.port.mk> diff --git a/net/mcl/distinfo b/net/mcl/distinfo deleted file mode 100644 index c2499bb901b5..000000000000 --- a/net/mcl/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (mcl_v2.99.1.tgz) = d4a5c0c384d45dfa6c2a3dcbdcb3a81e -SHA256 (mcl_v2.99.1.tgz) = 141966bf922c2995a29eeb73a536ee3f83438835b0f29f99afb626048decdc35 -SIZE (mcl_v2.99.1.tgz) = 368784 diff --git a/net/mcl/files/patch-Makefile b/net/mcl/files/patch-Makefile deleted file mode 100644 index 8c38fb03e633..000000000000 --- a/net/mcl/files/patch-Makefile +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.orig Sun Dec 7 18:35:07 2003 -+++ Makefile Sun Dec 7 18:35:20 2003 -@@ -5,8 +5,8 @@ - # We need the GNU make tool, on some systems it is called - # gmake, on others make is an alias to gmake. Choose one... - # --MAKE = make --#MAKE = gmake -+#MAKE = make -+MAKE = gmake - - - # A phony target is one that is not really the name of a file. diff --git a/net/mcl/files/patch-Makefile.common b/net/mcl/files/patch-Makefile.common deleted file mode 100644 index 4cb001289885..000000000000 --- a/net/mcl/files/patch-Makefile.common +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.common.orig Sun Dec 7 18:36:25 2003 -+++ Makefile.common Sun Dec 7 18:38:10 2003 -@@ -24,11 +24,15 @@ - ifeq (${SYSTEM},SunOS) - OS = solaris - endif -+ifeq (${SYSTEM},FreeBSD) -+ OS = freebsd -+endif - # - # and the old way (e.g. if the above lines do not work!) - # - #OS = linux - #OS = solaris -+#OS = freebsd - - - # Do you want/need extended memory debugging? -@@ -59,6 +63,14 @@ - # - CC = /opt/SUNWspro/bin/CC - LD = /opt/SUNWspro/bin/CC -+endif -+ifeq (${OS},freebsd) -+ OSFLAGS = -DFREEBSD -I${LOCALBASE}/g++ -I${LOCALBASE}/c++/3.3 -+ # Which compiler? -+ # NB: use -Wall for compilation warnings with gcc -+ # -+ CC = g++ -Wall -+ LD = g++ -Wall - endif - - diff --git a/net/mcl/files/patch-alc-Makefile b/net/mcl/files/patch-alc-Makefile deleted file mode 100644 index b38cb525c35f..000000000000 --- a/net/mcl/files/patch-alc-Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- src/alc/Makefile.orig Tue Jul 22 19:42:18 2003 -+++ src/alc/Makefile Wed Oct 15 17:21:25 2003 -@@ -36,6 +36,13 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lpthread - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ BINDIR = ../../bin/freebsd -+ LDPC_BINDIR = ../../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - ###### Other Variables ###### - diff --git a/net/mcl/files/patch-check-alc-Makefile b/net/mcl/files/patch-check-alc-Makefile deleted file mode 100644 index 65fa32515984..000000000000 --- a/net/mcl/files/patch-check-alc-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- check/alc/Makefile.orig Wed Oct 15 18:02:27 2003 -+++ check/alc/Makefile Wed Oct 15 17:24:04 2003 -@@ -35,6 +35,18 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -mt -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - endif - -+ifeq (${OS},freebsd) -+ # Linux version -+ # -+ BINDIR = ../../bin/freebsd -+ LDPC_BINDIR = ../../../ldpc/bin/freebsd -+ # Edit the following two lines as appropriate, according to the FEC -+ # codec in use: if LDPC is used, then add the libbdpc.a library. -+ # -+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a -+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+endif -+ - - ###### Other variables ###### - diff --git a/net/mcl/files/patch-display.c b/net/mcl/files/patch-display.c deleted file mode 100644 index 44ff013dd66f..000000000000 --- a/net/mcl/files/patch-display.c +++ /dev/null @@ -1,14 +0,0 @@ ---- flute/display.c.orig Wed Jan 7 12:08:23 2004 -+++ flute/display.c Wed Jan 7 12:07:24 2004 -@@ -65,7 +65,11 @@ - signal (SIGTERM, sig_catcher); - sigaction (SIGTERM, (struct sigaction *) 0, &sa); - sa.sa_flags |= SA_RESTART; -+#if defined(FREEBSD) -+ sa.sa_flags &= ~SA_NOCLDSTOP; -+#else - sa.sa_flags &= ~SA_INTERRUPT; -+#endif - sigaction (SIGTERM, &sa, (struct sigaction *) 0); - sigaction (SIGINT, &sa, (struct sigaction *) 0); - tcsetattr(0, TCSANOW, &new_settings); diff --git a/net/mcl/files/patch-fcast-Makefile b/net/mcl/files/patch-fcast-Makefile deleted file mode 100644 index dce7b64a9811..000000000000 --- a/net/mcl/files/patch-fcast-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- fcast/Makefile.orig Tue Jul 22 19:43:25 2003 -+++ fcast/Makefile Wed Oct 15 17:20:46 2003 -@@ -39,6 +39,14 @@ - - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - ###### Other variables ###### - -@@ -76,8 +84,8 @@ - # codec in use: if LDPC is used, then add the libbdpc.a library. - # If only RSE is used and if you don't have the LDPC archive, then - # remove the libbdpc.a library. --#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc: TARGET_FCAST = ${BINDIR}/fcast - #alc: all - diff --git a/net/mcl/files/patch-fcast.h b/net/mcl/files/patch-fcast.h deleted file mode 100644 index bd50c0f41eb7..000000000000 --- a/net/mcl/files/patch-fcast.h +++ /dev/null @@ -1,20 +0,0 @@ ---- fcast/fcast.h.orig Tue Jul 22 19:37:39 2003 -+++ fcast/fcast.h Wed Oct 15 16:59:13 2003 -@@ -62,12 +62,16 @@ - #include "frecv.h" - - -+ - #if defined(LINUX) /* On Linux systems, signal handlers must be of __sighandler_t type */ - #define sighandler_t __sighandler_t - - #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32) -- - #define sighandler_t void (*)(int) -+ -+#elif defined(FREEBSD) -+#define sighandler_t sig_t -+ - #endif - - diff --git a/net/mcl/files/patch-flute-Makefile b/net/mcl/files/patch-flute-Makefile deleted file mode 100644 index 159fef2f7960..000000000000 --- a/net/mcl/files/patch-flute-Makefile +++ /dev/null @@ -1,52 +0,0 @@ ---- flute/Makefile.orig Wed Nov 26 17:18:21 2003 -+++ flute/Makefile Wed Jan 7 12:38:28 2004 -@@ -36,6 +36,18 @@ - - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version: -+ # CC requires: -mt -lpthread for multithreaded applications -+ # NB: mpatrol not installed ! -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread -lglib-2.0 -lgdome -lxml2 -L${LOCALBASE}/lib -+ # added -I/usr/local/include for libgdome header files -+ ADD_INCLUDES = -I${LOCALBASE}/include/ -I${LOCALBASE}/include/glib-2.0/ -I${LOCALBASE}/include/libgdome/ -+endif -+ - - ###### Other variables ###### - -@@ -73,24 +85,24 @@ - # codec in use: if LDPC is used, then add the libbdpc.a library. - # If only RSE is used and if you don't have the LDPC archive, then - # remove the libbdpc.a library. --#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc: TARGET_FLUTE = ${BINDIR}/flute - #alc: all - - alc_pure: RM_PROTOCOL = ALC - # Edit the following two lines as appropriate, according to the FEC - # codec in use: if LDPC is used, then add the libbdpc.a library. --#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc_pure: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc_pure: TARGET_FLUTE = ${BINDIR}/flute - alc_pure: pure - - alc_quantify: RM_PROTOCOL = ALC - # Edit the following two lines as appropriate, according to the FEC - # codec in use: if LDPC is used, then add the libbdpc.a library. --#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a --alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a -+#alc_quantify: MCL_LIBRARY = ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - alc_quantify: TARGET_FLUTE = ${BINDIR}/flute - alc_quantify: quantify - diff --git a/net/mcl/files/patch-flute.h b/net/mcl/files/patch-flute.h deleted file mode 100644 index c38ad033f34c..000000000000 --- a/net/mcl/files/patch-flute.h +++ /dev/null @@ -1,13 +0,0 @@ ---- flute/flute.h.orig Wed Jan 7 11:13:20 2004 -+++ flute/flute.h Wed Jan 7 11:15:28 2004 -@@ -69,6 +69,10 @@ - #elif defined(SOLARIS) || defined(IRIX) || defined(WIN32) - - #define sighandler_t void (*)(int) -+ -+#elif defined(FREEBSD) -+#define sighandler_t sig_t -+ - #endif - - diff --git a/net/mcl/files/patch-mcl_debug.cpp b/net/mcl/files/patch-mcl_debug.cpp deleted file mode 100644 index 982503f326c9..000000000000 --- a/net/mcl/files/patch-mcl_debug.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/common/mcl_debug.cpp.orig Tue Jul 22 19:37:39 2003 -+++ src/common/mcl_debug.cpp Wed Oct 15 17:55:58 2003 -@@ -73,7 +73,7 @@ - PRINT_OUT((mcl_stdout, "\tDUMP %d first bytes...\n\t", i * sizeof(int))) - for (ptr = (int*)buf; i > 0; i--, ptr++) { - /* convert to big endian format to be sure of byte order */ -- PRINT_OUT((mcl_stdout, "%08x ", htonl(*ptr))) -+ PRINT_OUT((mcl_stdout, "%08lx ", htonl(*ptr))) - if (++j == 8) { - j = 0; - PRINT_OUT((mcl_stdout, "\n\t")) diff --git a/net/mcl/files/patch-mcl_includes.h b/net/mcl/files/patch-mcl_includes.h deleted file mode 100644 index d68a50637331..000000000000 --- a/net/mcl/files/patch-mcl_includes.h +++ /dev/null @@ -1,36 +0,0 @@ ---- src/alc/mcl_includes.h.orig Tue Jul 22 19:37:39 2003 -+++ src/alc/mcl_includes.h Tue Oct 14 15:23:54 2003 -@@ -40,11 +40,13 @@ - #include <sys/types.h> - #include <math.h> - -+#ifndef FREEBSD - #if defined(DEBUG) && defined(MPATROL) && !defined(WIN32) - #include <mpatrol.h> - #else - #include <malloc.h> - #endif -+#endif - #include <new> // required by _set_new_handler on linux - - -@@ -58,14 +60,18 @@ - #else /* UNIX Systems */ - - #include <unistd.h> -+ -+#ifndef FREEBSD - #include <values.h> /* for MAXINT */ -+#endif -+ - #include <strings.h> - #include <sys/time.h> - #include <sys/wait.h> - #include <pthread.h> - #include <sys/uio.h> - --#ifdef SOLARIS -+#if defined(SOLARIS) || defined(FREEBSD) - #include <netinet/in_systm.h> - #endif /* SOLARIS */ - diff --git a/net/mcl/files/patch-mcl_lib.cpp b/net/mcl/files/patch-mcl_lib.cpp deleted file mode 100644 index d40dbe58584c..000000000000 --- a/net/mcl/files/patch-mcl_lib.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- src/alc/mcl_lib.cpp.orig Wed Nov 26 15:38:14 2003 -+++ src/alc/mcl_lib.cpp Tue Dec 16 23:58:46 2003 -@@ -1384,8 +1384,10 @@ - if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) { - TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n")) - return (recvfrom(id, (char*)buf, len, 0, saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) /* linux => uint, solaris => int */ -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - saddr_len)); - } -@@ -1520,8 +1522,11 @@ - if (id >= MCLCB_MAX_ID || (mclcb = mclcbs[id]) == NULL) { - TRACE((mcl_stdout, " mcl_recvfrom: not an MCL id, switch to standard recvfrom\n")) - return (recvfrom(id, (char*)buf, len, 0, saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) /* linux => uint, solaris => int */ -+#elif defined(FREEBSD) -+ (socklen_t*) -+ - #endif - saddr_len)); - } diff --git a/net/mcl/files/patch-mcl_network.cpp b/net/mcl/files/patch-mcl_network.cpp deleted file mode 100644 index 6e5a8cfaebfe..000000000000 --- a/net/mcl/files/patch-mcl_network.cpp +++ /dev/null @@ -1,48 +0,0 @@ ---- src/alc/mcl_network.cpp.orig Tue Jul 22 19:37:39 2003 -+++ src/alc/mcl_network.cpp Tue Oct 14 15:47:45 2003 -@@ -414,8 +414,10 @@ - pkt->pkt_len = recvfrom(mg->ses_sock, - pkt->get_buf(), pkt->get_buf_len(), - 0, &saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &saddr_len); - #ifdef WIN32 -@@ -483,8 +485,10 @@ - pkt->pkt_len = recvfrom(mg->priv_sock, - pkt->get_buf(), pkt->get_buf_len(), - 0, &saddr, --#ifdef LINUX -+#if defined(LINUX) - (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &saddr_len); - #ifdef WIN32 -@@ -663,8 +667,10 @@ - err = setsockopt(fd, SOL_SOCKET, buf, (char*)&val, sizeof(val)); - else - err = getsockopt(fd, SOL_SOCKET, buf, (char*)&val, --#ifdef LINUX -- (size_t*) /* linux => uint, solaris => int */ -+#if defined(LINUX) -+ (size_t*) -+#elif defined(FREEBSD) -+ (socklen_t*) - #endif - &len); - if (err < 0) { -@@ -938,7 +944,7 @@ - - if (mcl_is_valid_sock(mg->priv_sock) && - getsockname(mg->priv_sock, (struct sockaddr *)&tmp_addr, --#ifdef LINUX -+#if defined(LINUX) || defined(FREEBSD) - (socklen_t*) - #endif - &tmp_len) < 0) { diff --git a/net/mcl/files/patch-mcl_osdep.h b/net/mcl/files/patch-mcl_osdep.h deleted file mode 100644 index 1effff377a98..000000000000 --- a/net/mcl/files/patch-mcl_osdep.h +++ /dev/null @@ -1,32 +0,0 @@ ---- src/common/mcl_osdep.h.orig Sun Dec 7 18:58:22 2003 -+++ src/common/mcl_osdep.h Sun Dec 7 19:00:39 2003 -@@ -44,7 +44,7 @@ - * bit field order is compiler/OS dependant - * With linux, see the above LINUX_XXX defines... - */ --#if defined(LINUX_I386) || defined(WIN32) -+#if defined(LINUX_I386) || defined(WIN32) || defined (FREEBSD) - #define _BIT_FIELDS_LTOH - #undef _BIT_FIELDS_HTOL - -@@ -58,7 +58,7 @@ - /* - * sighandler - */ --#if defined(LINUX) -+#if defined(LINUX) || defined (FREEBSD) - /* On Linux systems, signal handlers must be of __sighandler_t type */ - #define sighandler_t __sighandler_t - -@@ -77,9 +77,9 @@ - #define u_int16_t ushort_t /* or uint16_t */ - #define u_int32_t uint_t /* or uint32_t */ - --#elif defined (WIN32) -+#elif defined (WIN32) || defined (FREEBSD) - --/* u_xxx absent from WIN32! */ -+/* u_xxx absent from WIN32 and ulong absent from FreeBSD! */ - #define u_int8_t unsigned char /* or uint8_t */ - #define u_int16_t unsigned short /* or uint16_t */ - #define u_int32_t unsigned int /* or uint32_t */ diff --git a/net/mcl/files/patch-mcl_profile.h b/net/mcl/files/patch-mcl_profile.h deleted file mode 100644 index 24408a4ddbfe..000000000000 --- a/net/mcl/files/patch-mcl_profile.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/alc/mcl_profile.h.orig Tue Dec 16 23:47:58 2003 -+++ src/alc/mcl_profile.h Tue Dec 16 23:48:09 2003 -@@ -130,7 +130,7 @@ - /* - * Do you want to use LDPC large block Forward Error Correction (FEC) ? - */ --#define LDPC_FEC -+//#define LDPC_FEC - - #if defined(RSE_FEC) || defined(LDPC_FEC) - #define FEC diff --git a/net/mcl/files/patch-mclftp-Makefile b/net/mcl/files/patch-mclftp-Makefile deleted file mode 100644 index 0ddac0210fa9..000000000000 --- a/net/mcl/files/patch-mclftp-Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- mclftp/Makefile.orig Wed Dec 17 00:13:34 2003 -+++ mclftp/Makefile Wed Dec 17 00:15:56 2003 -@@ -36,6 +36,14 @@ - LIBRARIES = -lc -lm -lsocket -lnsl /usr/ucblib/libucb.a -lposix4 -lpthread - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # MCL library requires -pthread -+ # -+ BINDIR = ../bin/freebsd -+ LIBRARIES = -lm -pthread -+endif -+ - - - ###### Other variables ###### diff --git a/net/mcl/files/patch-robcast-Makefile b/net/mcl/files/patch-robcast-Makefile deleted file mode 100644 index f6f4a21f0e42..000000000000 --- a/net/mcl/files/patch-robcast-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- robcast/Makefile.orig Wed Oct 15 18:03:36 2003 -+++ robcast/Makefile Wed Oct 15 17:33:36 2003 -@@ -29,6 +29,16 @@ - LIBRARIES = -lc -lm -lsocket -lnsl -L/usr/ucblib -lucb -lposix4 -lpthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a - endif - -+ifeq (${OS},freebsd) -+ # FreeBSD version -+ # MCL library requires -pthread -+ # -+ BINDIR = ../bin/freebsd -+ LDPC_BINDIR = ../../ldpc/bin/freebsd -+ LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a -+ #LIBRARIES = -lm -pthread ${BINDIR}/libmclalc.a ${LDPC_BINDIR}/libldpc.a -+endif -+ - - ###### Other variables ###### - diff --git a/net/mcl/files/patch-test_abort.c b/net/mcl/files/patch-test_abort.c deleted file mode 100644 index ad1116943ab0..000000000000 --- a/net/mcl/files/patch-test_abort.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_abort.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_abort.c Wed Oct 15 17:10:42 2003 -@@ -26,6 +26,10 @@ - #include <stdio.h> - #include <stdlib.h> /* for exit */ - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #include <io.h> diff --git a/net/mcl/files/patch-test_demux_label1_rx.c b/net/mcl/files/patch-test_demux_label1_rx.c deleted file mode 100644 index d172c016a3b0..000000000000 --- a/net/mcl/files/patch-test_demux_label1_rx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_demux_label1_rx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_demux_label1_rx.c Wed Oct 15 17:13:17 2003 -@@ -26,6 +26,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_demux_label1_tx.c b/net/mcl/files/patch-test_demux_label1_tx.c deleted file mode 100644 index 57e1efe5f915..000000000000 --- a/net/mcl/files/patch-test_demux_label1_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_demux_label1_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_demux_label1_tx.c Wed Oct 15 17:12:56 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_dyn_tsi.c b/net/mcl/files/patch-test_dyn_tsi.c deleted file mode 100644 index bf09722b074f..000000000000 --- a/net/mcl/files/patch-test_dyn_tsi.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_dyn_tsi.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_dyn_tsi.c Wed Oct 15 17:13:37 2003 -@@ -30,6 +30,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_multi_sessions1.c b/net/mcl/files/patch-test_multi_sessions1.c deleted file mode 100644 index 0b0af22dd2b1..000000000000 --- a/net/mcl/files/patch-test_multi_sessions1.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_multi_sessions1.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_multi_sessions1.c Wed Oct 15 17:11:53 2003 -@@ -24,6 +24,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_multi_sessions2.c b/net/mcl/files/patch-test_multi_sessions2.c deleted file mode 100644 index 0033a72b5a86..000000000000 --- a/net/mcl/files/patch-test_multi_sessions2.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_multi_sessions2.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_multi_sessions2.c Wed Oct 15 17:12:13 2003 -@@ -25,6 +25,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #include <io.h> diff --git a/net/mcl/files/patch-test_no_tx.c b/net/mcl/files/patch-test_no_tx.c deleted file mode 100644 index e6f1e0b90d83..000000000000 --- a/net/mcl/files/patch-test_no_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_no_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_no_tx.c Wed Oct 15 17:10:20 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_rebootable_client.c b/net/mcl/files/patch-test_rebootable_client.c deleted file mode 100644 index 9ee9725b77a9..000000000000 --- a/net/mcl/files/patch-test_rebootable_client.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_rebootable_client.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_rebootable_client.c Wed Oct 15 17:18:38 2003 -@@ -35,6 +35,10 @@ - #include <stdio.h> - #include <string.h> - -+#ifdef FREEBSD -+#include <sys/time.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_seq_of_tx_sessions.c b/net/mcl/files/patch-test_seq_of_tx_sessions.c deleted file mode 100644 index 31d967ca431e..000000000000 --- a/net/mcl/files/patch-test_seq_of_tx_sessions.c +++ /dev/null @@ -1,14 +0,0 @@ ---- check/alc/test_seq_of_tx_sessions.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_seq_of_tx_sessions.c Wed Oct 15 17:11:13 2003 -@@ -25,6 +25,11 @@ - */ - - #include <stdio.h> -+ -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_several_fec_codecs.c b/net/mcl/files/patch-test_several_fec_codecs.c deleted file mode 100644 index 34da7be64644..000000000000 --- a/net/mcl/files/patch-test_several_fec_codecs.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_several_fec_codecs.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_several_fec_codecs.c Wed Oct 15 17:05:40 2003 -@@ -28,6 +28,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_vtm_rx.c b/net/mcl/files/patch-test_vtm_rx.c deleted file mode 100644 index a0cf05b33306..000000000000 --- a/net/mcl/files/patch-test_vtm_rx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_vtm_rx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_vtm_rx.c Wed Oct 15 17:14:28 2003 -@@ -27,6 +27,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_vtm_tx.c b/net/mcl/files/patch-test_vtm_tx.c deleted file mode 100644 index 8d26b0f60d2d..000000000000 --- a/net/mcl/files/patch-test_vtm_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_vtm_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_vtm_tx.c Wed Oct 15 17:14:02 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/files/patch-test_wait_rx_receiver.c b/net/mcl/files/patch-test_wait_rx_receiver.c deleted file mode 100644 index c03c4a4be206..000000000000 --- a/net/mcl/files/patch-test_wait_rx_receiver.c +++ /dev/null @@ -1,12 +0,0 @@ ---- check/alc/test_wait_rx_receiver.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_rx_receiver.c Wed Oct 15 17:09:56 2003 -@@ -27,6 +27,9 @@ - #include <stdio.h> - - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif - - #ifdef WIN32 - #include <winsock2.h> diff --git a/net/mcl/files/patch-test_wait_rx_sender.c b/net/mcl/files/patch-test_wait_rx_sender.c deleted file mode 100644 index 694af55beed3..000000000000 --- a/net/mcl/files/patch-test_wait_rx_sender.c +++ /dev/null @@ -1,12 +0,0 @@ ---- check/alc/test_wait_rx_sender.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_rx_sender.c Wed Oct 15 17:09:33 2003 -@@ -27,6 +27,9 @@ - #include <stdio.h> - - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif - - #ifdef WIN32 - #include <winsock2.h> diff --git a/net/mcl/files/patch-test_wait_tx.c b/net/mcl/files/patch-test_wait_tx.c deleted file mode 100644 index b0b816cc8cd8..000000000000 --- a/net/mcl/files/patch-test_wait_tx.c +++ /dev/null @@ -1,13 +0,0 @@ ---- check/alc/test_wait_tx.c.orig Tue Jul 22 19:37:39 2003 -+++ check/alc/test_wait_tx.c Wed Oct 15 17:09:00 2003 -@@ -25,6 +25,10 @@ - - #include <stdio.h> - -+#ifdef FREEBSD -+#include <sys/types.h> -+#endif -+ - #ifdef WIN32 - #include <winsock2.h> - #else diff --git a/net/mcl/pkg-descr b/net/mcl/pkg-descr deleted file mode 100644 index 27a280bad227..000000000000 --- a/net/mcl/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -This is a port of MCLv3, an open source implementation of the ALC and -NORM Reliable Multicast Protocols. - -The MCLv3 project is an Open-Source GNU/GPL, multi-platform -implementation of the two major reliable multicast protocols being -standardized by the RMT IETF working group: ALC/LCT and NORM. It is -composed of a C/C++ library and several applications built on top of it -and provides an easy-to-use and integrated solution for reliable and -highly scalable multicast delivery of data. - -WWW: http://www.inrialpes.fr/planete/people/roca/mcl/mcl.html - -- Panagiotis Astithas -past@noc.ntua.gr diff --git a/net/mcl/pkg-plist b/net/mcl/pkg-plist deleted file mode 100644 index 2e3b802a574e..000000000000 --- a/net/mcl/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/fcast -bin/flute -bin/robcast_client -bin/robcast_server -lib/libmclalc.a -include/mcl_lib_api.h -include/alc/mcl_lib_api_alc.h -@dirrm include/alc diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile deleted file mode 100644 index 991b1ad608d3..000000000000 --- a/net/mpd5/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: mpd -# Date created: 20 Sep 2005 -# Whom: Archie Cobbs -# -# $FreeBSD$ -# - -PORTNAME= mpd4 -PORTVERSION= 4.0b4 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= glebius -DIST_SUBDIR= mpd4 - -MAINTAINER= glebius@freebsd.org -COMMENT= Multi-link PPP daemon based on netgraph(4) [development version] - -LIB_DEPENDS= pdel.0:${PORTSDIR}/devel/libpdel - -MTREE_FILE= ${FILESDIR}/mpd4.mtree -MAN8= mpd4.8 -MANCOMPRESSED= maybe - -USE_OPENSSL= yes - -post-install: - @${INSTALL_SCRIPT} -m 751 ${FILESDIR}/mpd4.sh ${PREFIX}/etc/rc.d/mpd4.sh.sample - -.include <bsd.port.mk> diff --git a/net/mpd5/distinfo b/net/mpd5/distinfo deleted file mode 100644 index b75129016fef..000000000000 --- a/net/mpd5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -SIZE (mpd4/mpd4-4.0b4.tar.gz) = 338472 -MD5 (mpd4/mpd4-4.0b4.tar.gz) = 033c0a1620eab8ba8706a9f08e902dec -SHA256 (mpd4/mpd4-4.0b4.tar.gz) = 19303efa25f0f5a069ac734433ae355c97fec776a5209deeff0a5cdb3c45d87f diff --git a/net/mpd5/files/mpd4.mtree b/net/mpd5/files/mpd4.mtree deleted file mode 100644 index 530d666792dd..000000000000 --- a/net/mpd5/files/mpd4.mtree +++ /dev/null @@ -1,28 +0,0 @@ -# $FreeBSD$ - -/set type=dir uname=root gname=wheel mode=0755 -. - etc - rc.d - .. - .. - sbin - .. - etc - mpd4 - .. - .. - man - cat8 uname=man - .. - man8 - .. - .. - share - doc - mpd4 - .. - .. - .. -.. - diff --git a/net/mpd5/files/mpd4.sh b/net/mpd5/files/mpd4.sh deleted file mode 100644 index b267a10d13c5..000000000000 --- a/net/mpd5/files/mpd4.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -DAEMON=/usr/local/sbin/mpd4 -PIDFILE=/var/run/mpd4.pid - -case "$1" in -start) - if [ -f "${DAEMON}" -a -x "${DAEMON}" ]; then - if [ -f "${PIDFILE}" ]; then - echo ' mpd4 PID file found - not starting' - else - "${DAEMON}" -b -p "${PIDFILE}" - echo -n ' mpd4' - fi - else - echo ' "${DAEMON}" executable not found - mpd4 not starting' - fi - ;; -stop) - if [ -f "${PIDFILE}" ]; then - read -r pid junk < "${PIDFILE}" - kill ${pid} - else - echo ' mpd4 PID file not found - not killing' - fi - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -*) - echo "usage: ${0##*/} {start|stop|restart}" >&2 - ;; -esac - diff --git a/net/mpd5/pkg-descr b/net/mpd5/pkg-descr deleted file mode 100644 index 655837db7ad1..000000000000 --- a/net/mpd5/pkg-descr +++ /dev/null @@ -1,25 +0,0 @@ -Mpd is a netgraph(4) based implementation of the multi-link PPP -protocol for FreeBSD. It is designed to be both fast and flexible. -It handles configuration and negotiation in user land, while routing -all data packets strictly in the kernel. It supports several of -the numerous PPP sub-protocols and extensions, such as: - - Multi-link PPP capability - PAP, CHAP, and MS-CHAP authentication - EAP authentication - PPP compression and encryption - Point-to-Point Tunnelling Protocol (PPTP) - PPP over Ethernet (PPPoE) - RADIUS (authentication and accounting) - -Mpd also includes many additional features: - - Dial-on-demand with idle timeout - Multiple active connections running simultaneously - Dynamic demand based link management (also known as ``rubber bandwidth'') - Powerful chat scripting language for asynchronous serial ports - Pre-tested chat scripts for several common modems and ISDN TAs - Clean device-type independent design - Comprehensive logging - -WWW: http://www.sourceforge.net/projects/mpd diff --git a/net/mpd5/pkg-plist b/net/mpd5/pkg-plist deleted file mode 100644 index 168d5695535f..000000000000 --- a/net/mpd5/pkg-plist +++ /dev/null @@ -1,72 +0,0 @@ -etc/mpd4/mpd.conf.sample -etc/mpd4/mpd.links.sample -etc/mpd4/mpd.secret.sample -etc/mpd4/mpd.script.sample -etc/rc.d/mpd4.sh.sample -sbin/mpd4 -share/doc/mpd4/README -share/doc/mpd4/mpd.ps -share/doc/mpd4/mpd.html -share/doc/mpd4/mpd1.html -share/doc/mpd4/mpd10.html -share/doc/mpd4/mpd11.html -share/doc/mpd4/mpd12.html -share/doc/mpd4/mpd13.html -share/doc/mpd4/mpd14.html -share/doc/mpd4/mpd15.html -share/doc/mpd4/mpd16.html -share/doc/mpd4/mpd17.html -share/doc/mpd4/mpd18.html -share/doc/mpd4/mpd19.html -share/doc/mpd4/mpd2.html -share/doc/mpd4/mpd20.html -share/doc/mpd4/mpd21.html -share/doc/mpd4/mpd22.html -share/doc/mpd4/mpd23.html -share/doc/mpd4/mpd24.html -share/doc/mpd4/mpd25.html -share/doc/mpd4/mpd26.html -share/doc/mpd4/mpd27.html -share/doc/mpd4/mpd28.html -share/doc/mpd4/mpd29.html -share/doc/mpd4/mpd3.html -share/doc/mpd4/mpd30.html -share/doc/mpd4/mpd31.html -share/doc/mpd4/mpd32.html -share/doc/mpd4/mpd33.html -share/doc/mpd4/mpd34.html -share/doc/mpd4/mpd35.html -share/doc/mpd4/mpd36.html -share/doc/mpd4/mpd37.html -share/doc/mpd4/mpd38.html -share/doc/mpd4/mpd39.html -share/doc/mpd4/mpd4.html -share/doc/mpd4/mpd40.html -share/doc/mpd4/mpd41.html -share/doc/mpd4/mpd42.html -share/doc/mpd4/mpd43.html -share/doc/mpd4/mpd44.html -share/doc/mpd4/mpd45.html -share/doc/mpd4/mpd46.html -share/doc/mpd4/mpd47.html -share/doc/mpd4/mpd48.html -share/doc/mpd4/mpd49.html -share/doc/mpd4/mpd5.html -share/doc/mpd4/mpd50.html -share/doc/mpd4/mpd51.html -share/doc/mpd4/mpd52.html -share/doc/mpd4/mpd53.html -share/doc/mpd4/mpd54.html -share/doc/mpd4/mpd55.html -share/doc/mpd4/mpd56.html -share/doc/mpd4/mpd57.html -share/doc/mpd4/mpd58.html -share/doc/mpd4/mpd59.html -share/doc/mpd4/mpd6.html -share/doc/mpd4/mpd60.html -share/doc/mpd4/mpd7.html -share/doc/mpd4/mpd8.html -share/doc/mpd4/mpd9.html -share/doc/mpd4/mpd_toc.html -@dirrm etc/mpd4 -@dirrm share/doc/mpd4 diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile deleted file mode 100644 index 722a8e819daa..000000000000 --- a/net/mpich2/Makefile +++ /dev/null @@ -1,213 +0,0 @@ -# New ports collection makefile for: mpich (portable mpi standard imp.) -# Date created: 2 May 1998 -# Whom: dbader@ece.unm.edu -# -# $FreeBSD$ -# - -PORTNAME= mpich -PORTVERSION= 1.2.6 -PORTREVISION= 1 -CATEGORIES= net parallel -MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/ -DIST_SUBDIR= mpich - -PATCH_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/patch/${PORTVERSION}/ -PATCHFILES= 10039 10243 10246 - -MAINTAINER= dbader@ece.unm.edu -COMMENT= Message Passing Interface (MPI) Library - -CONFIGURE_ARGS= -prefix=${PREFIX}/mpich - -OPTIONS= X11 "Enable MPE graphics" on \ - TK "Build with TK support" on \ - JAVA "Build with Java support" off \ - SSH "Enable SSH client support" on - -.include <bsd.port.pre.mk> - -.if defined(WITHOUT_X11) -WITHOUT_TK= yes -CONFIGURE_ARGS+=--disable-mpe_graphics -PLIST_SUB+= X11="@comment " -.else -USE_XLIB= yes -CONFIGURE_ARGS+=--enable-mpe_graphics -PLIST_SUB+= X11="" -.endif - -.if defined(WITHOUT_TK) -CONFIGURE_ARGS+=-mpe_opts="--without-tcldir --without-tkdir --without-wishloc" -PLIST_SUB+= TK="@comment " -.else -RUN_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS+= wish8.4:${PORTSDIR}/x11-toolkits/tk84 -CONFIGURE_ARGS+=-mpe_opts="--with-wishloc=wish8.4" -PLIST_SUB+= TK="" -.endif - -.if defined(WITHOUT_JAVA) || defined(PACKAGE_BUILDING) -CONFIGURE_ARGS+= --without-java -PLIST_SUB+= JAVA="@comment " -.else -USE_JAVA= yes -JAVA_VERSION= 1.4+ -RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper -BUILD_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper -PLIST_SUB+= JAVA="" -.endif - -HAS_CONFIGURE= yes - -ALL_TARGET= - -MANPREFIX= ${PREFIX}/mpich - -MAN1= MPI.1 cleanipcs.1 mpiCC.1 mpicc.1 mpif77.1 mpif90.1 mpiman.1 \ - mpireconfig.1 mpirun.1 Jumpshots.1 chp4_servs.1 tstmachines.1 -MAN3= MPI_File_get_position.3 MPI_File_preallocate.3 \ - MPI_2DOUBLE_PRECISION.3 MPI_2INT.3 MPI_2INTEGER.3 MPI_2REAL.3 \ - MPI_ANY_SOURCE.3 MPI_ANY_TAG.3 MPI_Abort.3 MPI_Address.3 MPI_Aint.3 \ - MPI_Allgatherv.3 MPI_Allreduce.3 MPI_Alltoall.3 MPI_Alltoallv.3 \ - MPI_ERR_REQUEST.3 MPIO_Wait.3 MPI_Attr_get.3 MPI_Attr_put.3 MPI_BAND.3 \ - MPI_BOR.3 MPI_BOTTOM.3 MPI_BSEND_OVERHEAD.3 MPI_BXOR.3 MPI_BYTE.3 \ - MPI_Barrier.3 MPI_Bcast.3 MPI_Bsend_init.3 MPI_Buffer_attach.3 \ - MPI_Buffer_detach.3 MPI_CART.3 MPI_CHAR.3 MPI_COMM_SELF.3 \ - MPI_COMM_WORLD.3 MPI_COMPLEX.3 MPI_CONGRUENT.3 MPI_Cancel.3 \ - MPI_Cart_coords.3 MPI_Cart_create.3 MPI_Cart_get.3 MPI_Cart_map.3 \ - MPI_Cart_rank.3 MPI_Cart_shift.3 MPI_Cart_sub.3 MPI_Comm_compare.3 \ - MPI_Comm_create.3 MPI_Comm_dup.3 MPI_Comm_free.3 MPI_Comm_group.3 \ - MPI_Comm_get_name.3 MPI_Comm_rank.3 MPI_Comm_remote_size.3 \ - MPI_Comm_size.3 MPI_Comm_split.3 MPI_Comm_set_name.3 \ - MPI_Comm_test_inter.3 MPI_Copy_function.3 MPI_DATATYPE_NULL.3 \ - MPI_DOUBLE.3 MPI_DOUBLE_COMPLEX.3 MPI_DOUBLE_INT.3 \ - MPI_DOUBLE_PRECISION.3 MPI_DUP_FN.3 MPI_Delete_function.3 \ - MPI_Dims_create.3 MPI_ERROR.3 MPI_ERRORS_ARE_FATAL.3 \ - MPI_ERRORS_RETURN.3 MPI_ERR_ARG.3 MPI_IO.3 MPI_ERR_BUFFER.3 \ - MPI_ERR_BUFFER_EXISTS.3 MPI_ERR_COMM.3 MPI_ERR_COMM_INTER.3 \ - MPI_ERR_COMM_INTRA.3 MPI_ERR_COMM_NULL.3 MPI_ERR_COUNT.3 \ - MPI_ERR_DIMS.3 MPI_ERR_ERRORCODE.3 MPI_ERR_GROUP.3 MPI_ERR_INIT.3 \ - MPI_ERR_INTERN.3 MPI_ERR_IN_STATUS.3 MPI_ERR_LASTCODE.3 \ - MPI_ERR_LIMIT.3 MPI_ERR_NOMATCH.3 MPI_ERR_OP.3 MPI_ERR_NULL.3 \ - MPI_ERR_PERM_KEY.3 MPI_ERR_PERM_OP.3 MPI_ERR_PERM_TYPE.3 \ - MPI_ERR_PRE_INIT.3 MPI_ERR_RANK.3 MPI_ERR_ROOT.3 MPI_ERR_TAG.3 \ - MPI_ERR_TOPOLOGY.3 MPI_ERR_TRUNCATE.3 MPI_ERR_TYPE.3 MPI_ERR_UNKNOWN.3 \ - MPI_Errhandler_free.3 MPI_Errhandler_get.3 MPI_Errhandler_set.3 \ - MPI_FLOAT.3 MPI_GRAPH.3 MPI_Error_class.3 MPI_FLOAT_INT.3 \ - MPI_Finalize.3 MPI_Gather.3 MPI_File_delete.3 MPI_File_f2c.3 \ - MPI_File_get_amode.3 MPI_File_get_atomicity.3 \ - MPI_File_get_byte_offset.3 MPI_File_get_group.3 \ - MPI_File_set_errhandler.3 MPI_File_get_info.3 MPI_File_iread.3 \ - MPI_File_set_size.3 MPI_File_get_size.3 MPI_File_read.3 \ - MPI_File_get_view.3 MPI_File_iread_at.3 MPI_File_iread_shared.3 \ - MPI_File_iwrite.3 MPI_File_iwrite_at.3 MPI_File_iwrite_shared.3 \ - MPI_File_open.3 MPI_File_read_all.3 MPI_File_read_at_all_begin.3 \ - MPI_File_read_all_begin.3 MPI_File_read_all_end.3 MPI_File_read_at.3 \ - MPI_File_read_at_all.3 MPI_File_read_ordered.3 MPI_Info_get_nthkey.3 \ - MPI_File_read_ordered_begin.3 MPI_File_read_ordered_end.3 \ - MPI_File_read_shared.3 MPI_File_seek.3 MPI_File_set_atomicity.3 \ - MPI_File_set_info.3 MPI_File_write.3 MPI_File_sync.3 \ - MPI_File_write_all.3 MPI_File_write_all_begin.3 \ - MPI_File_write_all_end.3 MPI_HOST.3 MPI_File_write_at.3 \ - MPI_File_write_at_all.3 MPI_File_write_at_all_end.3 \ - MPI_Type_create_subarray.3 MPI_File_write_ordered.3 \ - MPI_File_write_ordered_end.3 MPI_File_write_shared.3 MPI_Info_c2f.3 \ - MPI_Info_create.3 MPI_GROUP_EMPTY.3 MPI_GROUP_NULL.3 MPI_Gatherv.3 \ - MPI_Get_count.3 MPI_Get_elements.3 MPI_Get_processor_name.3 \ - MPI_Get_version.3 MPI_Graph_create.3 MPI_Graph_get.3 MPI_Graph_map.3 \ - MPI_Graph_neighbors.3 MPI_Graphdims_get.3 MPI_Group_compare.3 \ - MPI_Group_difference.3 MPI_Group_excl.3 MPI_Group_free.3 \ - MPI_Group_incl.3 MPI_Group_intersection.3 MPI_Group_range_excl.3 \ - MPI_Group_range_incl.3 MPI_Group_rank.3 MPI_Group_size.3 \ - MPI_Group_translate_ranks.3 MPI_Group_union.3 MPI_Handler_function.3 \ - MPI_IDENT.3 MPI_INT.3 MPI_INTEGER.3 MPI_INTEGER1.3 MPI_INTEGER2.3 \ - MPI_INTEGER4.3 MPI_Ibsend.3 MPI_Info_delete.3 MPI_Info_dup.3 \ - MPIO_Request_c2f.3 MPI_Info_f2c.3 MPI_Info_free.3 MPI_LB.3 \ - MPI_Info_get_nkeys.3 MPI_Info_get_valuelen.3 MPI_File_get_errhandler.3 \ - MPI_Info_set.3 MPI_Init.3 MPI_Initialized.3 MPI_Int2handle.3 \ - MPI_Intercomm_create.3 MPI_Intercomm_merge.3 MPI_Iprobe.3 MPI_Irecv.3 \ - MPI_Irsend.3 MPI_Isend.3 MPI_Issend.3 MPI_KEYVAL_INVALID.3 \ - MPI_Keyval_create.3 MPI_Keyval_free.3 MPI_LAND.3 MPI_LOGICAL.3 \ - MPI_LONG.3 MPI_LONG_DOUBLE.3 MPI_LONG_INT.3 MPI_LONG_LONG_INT.3 \ - MPI_LOR.3 MPI_LXOR.3 MPI_MAX.3 MPI_MAXLOC.3 MPI_MAX_ERROR_STRING.3 \ - MPI_MAX_PROCESSOR_NAME.3 MPI_MIN.3 MPI_MINLOC.3 MPI_NULL_COPY_FN.3 \ - MPI_NULL_DELETE_FN.3 MPI_OP_NULL.3 MPI_Op_create.3 MPI_PACKED.3 \ - MPI_PROC_NULL.3 MPI_PROD.3 MPI_Pack.3 MPI_Pack_size.3 MPI_Pcontrol.3 \ - MPI_Probe.3 MPI_REAL.3 MPI_REAL8.3 MPI_REQUEST_NULL.3 MPI_Recv.3 \ - MPI_Recv_init.3 MPI_Reduce.3 MPI_Rsend.3 MPI_Request_c2f.3 \ - MPI_Rsend_init.3 MPI_SHORT.3 MPI_SHORT_INT.3 MPI_SIMILAR.3 \ - MPI_SOURCE.3 MPI_SUCCESS.3 MPI_SUM.3 MPI_Scan.3 MPI_Scatter.3 \ - MPI_Scatterv.3 MPI_Send.3 MPI_Send_init.3 MPI_Sendrecv.3 \ - MPI_Sendrecv_replace.3 MPI_Ssend.3 MPI_Ssend_init.3 MPI_Start.3 \ - MPI_Status_c2f.3 MPI_Status_set_cancelled.3 MPI_Status_set_elements.3 \ - MPI_TAG.3 MPI_TAG_UB.3 MPI_Test.3 MPI_Test_cancelled.3 MPI_Testall.3 \ - MPI_Testany.3 MPI_Testsome.3 MPI_Topo_test.3 MPI_Type_contiguous.3 \ - MPI_Type_create_indexed_block.3 MPI_Init_thread.3 MPI_UB.3 \ - MPI_Unpack.3 MPI_Type_free.3 MPI_Type_get_envelope.3 \ - MPI_Type_hindexed.3 MPI_Type_hvector.3 MPI_Type_lb.3 MPI_Type_size.3 \ - MPI_Type_struct.3 MPI_Type_ub.3 MPI_Type_vector.3 MPI_UNDEFINED.3 \ - MPI_UNDEFINED_RANK.3 MPI_UNEQUAL.3 MPI_UNSIGNED.3 MPI_UNSIGNED_CHAR.3 \ - MPI_UNSIGNED_LONG.3 MPI_UNSIGNED_SHORT.3 MPI_User_function.3 \ - MPI_WTIME_IS_GLOBAL.3 MPI_Wait.3 MPI_Waitall.3 MPI_Waitany.3 \ - MPI_Waitsome.3 MPI_Wtick.3 MPI_Wtime.3 MPIO_Test.3 Constants.3 \ - MPI_2COMPLEX.3 MPI_2DOUBLE_COMPLEX.3 MPI_Allgather.3 MPI_Attr_delete.3 \ - MPI_Bsend.3 MPI_COMM_NULL.3 MPI_Cartdim_get.3 MPI_Comm_remote_group.3 \ - MPI_ERRHANDLER_NULL.3 MPI_ERR_BAD_ARGS.3 MPI_ERR_EXHAUSTED.3 \ - MPI_ERR_OTHER.3 MPI_Errhandler_create.3 MPI_Error_string.3 \ - MPI_Finalized.3 MPI_Graph_neighbors_count.3 MPI_Info_get.3 \ - MPI_Type_create_darray.3 MPI_LONG_DOUBLE_INT.3 MPI_Op_free.3 \ - MPI_REAL4.3 MPI_Reduce_scatter.3 MPI_Request_free.3 MPI_Startall.3 \ - MPI_Type_commit.3 MPI_Type_extent.3 MPI_Type_get_contents.3 \ - MPI_Type_indexed.3 MPI_File_c2f.3 MPI_File_close.3 \ - MPI_File_get_position_shared.3 MPI_File_get_type_extent.3 \ - MPI_File_read_at_all_end.3 MPI_File_seek_shared.3 MPI_File_set_view.3 \ - MPI_File_write_ordered_begin.3 MPIO_Request_f2c.3 \ - MPI_File_write_at_all_begin.3 -MAN4= CLOG_Init.4 CLOG_commtype.4 CLOG_cput.4 CLOG_csync.4 \ - CLOG_get_new_event.4 CLOG_get_new_state.4 CLOG_init_buffers.4 \ - CLOG_mergelogs.4 CLOG_mergend.4 CLOG_msgtype.4 CLOG_procbuf.4 MPE.4 \ - CLOG_newbuff.4 CLOG_reclen.4 CLOG_reinit_buff.4 CLOG_treesetup.4 \ - MPE_Add_RGB_color.4 MPE_CaptureFile.4 MPE_Close_graphics.4 \ - MPE_Comm_global_rank.4 MPE_Counter_create.4 MPE_Counter_free.4 \ - MPE_Counter_nxtval.4 MPE_Decomp1d.4 MPE_Describe_state.4 \ - MPE_Draw_circle.4 MPE_Draw_line.4 MPE_Draw_logic.4 MPE_Draw_point.4 \ - MPE_Draw_points.4 MPE_Draw_string.4 MPE_Fill_circle.4 \ - MPE_Fill_rectangle.4 MPE_Finish_log.4 MPE_GetTags.4 \ - MPE_IO_Stdout_to_file.4 MPE_Iget_mouse_press.4 MPE_Init_log.4 \ - MPE_Initialized_logging.4 MPE_Line_thickness.4 MPE_Log_event.4 \ - MPE_Log_get_event_number.4 MPE_Log_receive.4 MPE_Log_send.4 \ - MPE_Num_colors.4 MPE_Open_graphics.4 MPE_Print_datatype_pack_action.4 \ - MPE_Seq_begin.4 MPE_Update.4 MPE_ReturnTags.4 MPE_Seq_end.4 \ - MPE_Start_log.4 MPE_Stop_log.4 MPE_TagsEnd.4 CLOG_Finalize.4 \ - CLOG_Output.4 CLOG_nodebuffer2disk.4 CLOG_rectype.4 \ - MPE_Describe_event.4 MPE_Get_mouse_press.4 MPE_Make_color_array.4 \ - MPE_Print_datatype_unpack_action.4 - -# Use ssh instead of rsh -.if !defined(WITHOUT_SSH) -.if ${OSVERSION} >= 400016 && exists(/usr/bin/ssh) -CONFIGURE_ENV+= RSHCOMMAND="/usr/bin/ssh" -.elif defined(WITH_SSH) || exists(${LOCALBASE}/bin/ssh) -RUN_DEPENDS+= ${LOCALBASE}/bin/ssh:${PORTSDIR}/security/ssh -CONFIGURE_ENV+= RSHCOMMAND="${LOCALBASE}/bin/ssh" -.endif -.endif - -post-install: - ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/mpich/bin ${PREFIX}/mpich/lib - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/mpich/doc ${PREFIX}/mpich/include \ - ${PREFIX}/mpich/share - ${LN} -sf ${PREFIX}/mpich/bin/mpicxx ${PREFIX}/mpich/bin/mpiCC - @${RMDIR} ${PREFIX}/mpich/lib/shared ${PREFIX}/mpich/examples/MPI-2-C++ -.if ! defined(WITHOUT_JAVA) && ! defined(PACKAGE_BUILDING) - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/mpich/logfiles -.endif - -.if defined(MAINTAINER_MODE) -test: build - (cd ${WRKSRC}/examples/test ; \ - ${MAKE} testing) -.endif - -.include <bsd.port.post.mk> diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo deleted file mode 100644 index 9a31905f46d6..000000000000 --- a/net/mpich2/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -MD5 (mpich/mpich-1.2.6.tar.gz) = dbf6ea0b5717bbf88851e5bd36aed644 -SHA256 (mpich/mpich-1.2.6.tar.gz) = ad82592411a771253734a92d86918f7ae8e6d02ab0f41c69e49bc0d5b2374599 -SIZE (mpich/mpich-1.2.6.tar.gz) = 15248688 -MD5 (mpich/10039) = 04309cd7e59974ca7dd41c9529309384 -SHA256 (mpich/10039) = d852b5a6e493f701aa55ae6e5bec3f2992b189085ea97fe1a9d5f039b26a395b -SIZE (mpich/10039) = 913 -MD5 (mpich/10243) = 0cfe2279c645bfb2c7a32295169560a1 -SHA256 (mpich/10243) = 1c45602fc85aa0be342fe5185ace8041aac7e09cbd8e5f245e3738202ff205fe -SIZE (mpich/10243) = 212 -MD5 (mpich/10246) = 0dab4539aba34898e1b36ef6bc99f9ed -SHA256 (mpich/10246) = 98f3401032862b67ade18af9bc2ee6e7bdecec5f206bcaf2a71f34c5bb723e53 -SIZE (mpich/10246) = 471 diff --git a/net/mpich2/files/patch-ab b/net/mpich2/files/patch-ab deleted file mode 100644 index 67d06a0ffd25..000000000000 --- a/net/mpich2/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- mpid/server/configure.orig Tue Sep 12 07:57:09 2000 -+++ mpid/server/configure Tue Sep 12 08:01:11 2000 -@@ -1589,8 +1589,8 @@ - ac_find_inc_dir=$dir - break - fi -- if test -r $dir/include/ssl.h ; then -- ac_find_inc_dir=$dir/include -+ if test -r $dir/include/openssl/ssl.h ; then -+ ac_find_inc_dir=$dir/include/openssl - break - fi - done diff --git a/net/mpich2/files/patch-mpid::ch2::chtick.c b/net/mpich2/files/patch-mpid::ch2::chtick.c deleted file mode 100644 index a12aee39f11f..000000000000 --- a/net/mpich2/files/patch-mpid::ch2::chtick.c +++ /dev/null @@ -1,10 +0,0 @@ ---- mpid/ch2/chtick.c-orig Wed Apr 4 09:16:05 2001 -+++ mpid/ch2/chtick.c Sat Aug 25 08:49:10 2001 -@@ -14,6 +14,7 @@ - !defined(MPID_CH_Wtime) - #define USING_POSIX_CLOCK - #include <time.h> -+#include <sys/time.h> - #endif - /* - This returns a value that is correct but not the best value that diff --git a/net/mpich2/pkg-descr b/net/mpich2/pkg-descr deleted file mode 100644 index fac61bdd06fb..000000000000 --- a/net/mpich2/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -MPICH is a portable implementation of the MPI (Message Passing -Interface) standard. The goal of MPI, simply stated, is to develop a -widely used standard for writing message-passing programs. As such the -interface should establish a practical, portable, efficient, and -flexible standard for message passing. Included are a full set of -documents and parallel programming examples. - -WWW: http://www.mcs.anl.gov/mpi/mpich/ diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist deleted file mode 100644 index ba82ed95fcad..000000000000 --- a/net/mpich2/pkg-plist +++ /dev/null @@ -1,622 +0,0 @@ -%%JAVA%%mpich/bin/clog2TOslog2 -mpich/bin/clog2alog -%%JAVA%%mpich/bin/clog2print -%%JAVA%%mpich/bin/clogTOslog2 -mpich/bin/clog_print -%%JAVA%%mpich/bin/clogprint -%%JAVA%%mpich/bin/jumpshot -%%JAVA%%mpich/bin/logconvertor -mpich/bin/mpicc -mpich/bin/mpichversion -mpich/bin/mpicxx -@exec ln -sf %D/%F %B/mpiCC -@unexec rm -f %D/mpich/bin/mpiCC -mpich/bin/mpif77 -mpich/bin/mpif90 -mpich/bin/mpiman -mpich/bin/mpireconfig -mpich/bin/mpireconfig.dat -mpich/bin/mpirun -mpich/bin/mpirun.args -mpich/bin/mpirun.ch_p4 -mpich/bin/mpirun.ch_p4.args -mpich/bin/mpirun.p4shmem -mpich/bin/mpirun.pg -mpich/bin/mpirun.rand -mpich/bin/mpirun_dbg.dbx -mpich/bin/mpirun_dbg.ddd -mpich/bin/mpirun_dbg.gdb -mpich/bin/mpirun_dbg.ladebug -mpich/bin/mpirun_dbg.totalview -mpich/bin/mpirun_dbg.xxgdb -%%JAVA%%mpich/bin/rlogTOslog2 -%%JAVA%%mpich/bin/rlog_check_timeorder -%%JAVA%%mpich/bin/rlog_print -%%JAVA%%mpich/bin/rlogprint -mpich/bin/serv_p4 -%%JAVA%%mpich/bin/slog2navigator -%%JAVA%%mpich/bin/slog2print -mpich/bin/tarch -mpich/bin/tdevice -%%JAVA%%mpich/bin/traceTOslog2.in -%%JAVA%%mpich/bin/traceprint.in -mpich/doc/mpeman.pdf -mpich/doc/mpeman.ps.gz -mpich/doc/mpichman-chp4.pdf -mpich/doc/mpichman-chp4.ps.gz -mpich/doc/mpichman-chp4mpd.pdf -mpich/doc/mpichman-chp4mpd.ps.gz -mpich/doc/mpichman-chshmem.pdf -mpich/doc/mpichman-chshmem.ps.gz -mpich/doc/mpichman-globus2.pdf -mpich/doc/mpichman-globus2.ps.gz -mpich/doc/mpiman.ps -mpich/doc/romio-users.ps.gz -%%JAVA%%mpich/doc/jumpshot-4/usersguide.pdf -%%JAVA%%mpich/doc/jumpshot-4/html/Backward24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Convert24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Delete24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Down24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Edit24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Find24.png -%%JAVA%%mpich/doc/jumpshot-4/html/FindBack24.png -%%JAVA%%mpich/doc/jumpshot-4/html/FindFore24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Forward24.png -%%JAVA%%mpich/doc/jumpshot-4/html/HandCloseUpLeft25.png -%%JAVA%%mpich/doc/jumpshot-4/html/HandOpenUpLeft25.png -%%JAVA%%mpich/doc/jumpshot-4/html/Help24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Home24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Information24.png -%%JAVA%%mpich/doc/jumpshot-4/html/New24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Open24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Paste24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Preferences24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Print24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Properties24.png -%%JAVA%%mpich/doc/jumpshot-4/html/up.png -%%JAVA%%mpich/doc/jumpshot-4/html/Refresh24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Stop24.png -%%JAVA%%mpich/doc/jumpshot-4/html/TreeCollapse24.png -%%JAVA%%mpich/doc/jumpshot-4/html/TreeExpand24.png -%%JAVA%%mpich/doc/jumpshot-4/html/Up24.png -%%JAVA%%mpich/doc/jumpshot-4/html/WARNINGS -%%JAVA%%mpich/doc/jumpshot-4/html/WinRedo.png -%%JAVA%%mpich/doc/jumpshot-4/html/WinUndo.png -%%JAVA%%mpich/doc/jumpshot-4/html/ZoomIn24.png -%%JAVA%%mpich/doc/jumpshot-4/html/ZoomMinusUpLeft25.png -%%JAVA%%mpich/doc/jumpshot-4/html/ZoomOut24.png -%%JAVA%%mpich/doc/jumpshot-4/html/ZoomPlusUpLeft25.png -%%JAVA%%mpich/doc/jumpshot-4/html/adj_row_count.png -%%JAVA%%mpich/doc/jumpshot-4/html/adj_row_height.png -%%JAVA%%mpich/doc/jumpshot-4/html/contents.png -%%JAVA%%mpich/doc/jumpshot-4/html/convertor_init.png -%%JAVA%%mpich/doc/jumpshot-4/html/convertor_parameters.png -%%JAVA%%mpich/doc/jumpshot-4/html/convertor_progress.png -%%JAVA%%mpich/doc/jumpshot-4/html/histogram_arrow.png -%%JAVA%%mpich/doc/jumpshot-4/html/histogram_arrow_infobox.png -%%JAVA%%mpich/doc/jumpshot-4/html/histogram_mpi_overhead.png -%%JAVA%%mpich/doc/jumpshot-4/html/histogram_state_all_cumu_excl.png -%%JAVA%%mpich/doc/jumpshot-4/html/histogram_state_infobox.png -%%JAVA%%mpich/doc/jumpshot-4/html/histogram_state_over_incl.png -%%JAVA%%mpich/doc/jumpshot-4/html/index.html -%%JAVA%%mpich/doc/jumpshot-4/html/internals.pl -%%JAVA%%mpich/doc/jumpshot-4/html/labels.pl -%%JAVA%%mpich/doc/jumpshot-4/html/legend_checkbox_menu.png -%%JAVA%%mpich/doc/jumpshot-4/html/legend_color_chooser.png -%%JAVA%%mpich/doc/jumpshot-4/html/legend_name.png -%%JAVA%%mpich/doc/jumpshot-4/html/legend_popup.png -%%JAVA%%mpich/doc/jumpshot-4/html/legend_s.png -%%JAVA%%mpich/doc/jumpshot-4/html/legend_sort_menu.png -%%JAVA%%mpich/doc/jumpshot-4/html/legend_topo.png -%%JAVA%%mpich/doc/jumpshot-4/html/legend_v.png -%%JAVA%%mpich/doc/jumpshot-4/html/main.png -%%JAVA%%mpich/doc/jumpshot-4/html/mouse_hand_mode.png -%%JAVA%%mpich/doc/jumpshot-4/html/mouse_zoom_mode.png -%%JAVA%%mpich/doc/jumpshot-4/html/next.png -%%JAVA%%mpich/doc/jumpshot-4/html/next_g.png -%%JAVA%%mpich/doc/jumpshot-4/html/node1.html -%%JAVA%%mpich/doc/jumpshot-4/html/node10.html -%%JAVA%%mpich/doc/jumpshot-4/html/node11.html -%%JAVA%%mpich/doc/jumpshot-4/html/node12.html -%%JAVA%%mpich/doc/jumpshot-4/html/node13.html -%%JAVA%%mpich/doc/jumpshot-4/html/node14.html -%%JAVA%%mpich/doc/jumpshot-4/html/node15.html -%%JAVA%%mpich/doc/jumpshot-4/html/node16.html -%%JAVA%%mpich/doc/jumpshot-4/html/node17.html -%%JAVA%%mpich/doc/jumpshot-4/html/node18.html -%%JAVA%%mpich/doc/jumpshot-4/html/node19.html -%%JAVA%%mpich/doc/jumpshot-4/html/node2.html -%%JAVA%%mpich/doc/jumpshot-4/html/node20.html -%%JAVA%%mpich/doc/jumpshot-4/html/node21.html -%%JAVA%%mpich/doc/jumpshot-4/html/node22.html -%%JAVA%%mpich/doc/jumpshot-4/html/node23.html -%%JAVA%%mpich/doc/jumpshot-4/html/node24.html -%%JAVA%%mpich/doc/jumpshot-4/html/node25.html -%%JAVA%%mpich/doc/jumpshot-4/html/node26.html -%%JAVA%%mpich/doc/jumpshot-4/html/node27.html -%%JAVA%%mpich/doc/jumpshot-4/html/node28.html -%%JAVA%%mpich/doc/jumpshot-4/html/node29.html -%%JAVA%%mpich/doc/jumpshot-4/html/node3.html -%%JAVA%%mpich/doc/jumpshot-4/html/node30.html -%%JAVA%%mpich/doc/jumpshot-4/html/node31.html -%%JAVA%%mpich/doc/jumpshot-4/html/node32.html -%%JAVA%%mpich/doc/jumpshot-4/html/node33.html -%%JAVA%%mpich/doc/jumpshot-4/html/node34.html -%%JAVA%%mpich/doc/jumpshot-4/html/node4.html -%%JAVA%%mpich/doc/jumpshot-4/html/node5.html -%%JAVA%%mpich/doc/jumpshot-4/html/node6.html -%%JAVA%%mpich/doc/jumpshot-4/html/node7.html -%%JAVA%%mpich/doc/jumpshot-4/html/node8.html -%%JAVA%%mpich/doc/jumpshot-4/html/node9.html -%%JAVA%%mpich/doc/jumpshot-4/html/preference_pview_state.png -%%JAVA%%mpich/doc/jumpshot-4/html/prev.png -%%JAVA%%mpich/doc/jumpshot-4/html/prev_g.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_infobox_duration.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_infobox_preview_state.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_infobox_real_primitive.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_popup.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_infobox_time.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_mpi_overhead.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_nesting_detail.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_nesting_legend_innermost.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_nesting_legend_middle.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_nesting_legend_outermost.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_nesting_preview_all.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_popup_finer.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_preview_detail_0.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_preview_detail_0_excl.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_preview_detail_1.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_preview_detail_1_excl.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_preview_detail_2.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_preview_detail_3.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_preview_detail_4.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_search_preview.png -%%JAVA%%mpich/doc/jumpshot-4/html/timeline_search_preview_zoomed.png -%%JAVA%%mpich/doc/jumpshot-4/html/up_g.png -%%JAVA%%mpich/doc/jumpshot-4/html/usersguide.css -%%JAVA%%mpich/doc/jumpshot-4/html/usersguide.html -%%JAVA%%mpich/doc/jumpshot-4/html/yaxis_label_panel_expanded.png -%%JAVA%%mpich/doc/jumpshot-4/html/yaxis_label_panel_simple.png -mpich/etc/mpichconf.h.dat -mpich/etc/mpichlib.conf -mpich/etc/mpichversion.c -mpich/etc/mpif77.conf -mpich/etc/mpif90.conf -mpich/examples/Makefile -mpich/examples/Makefile.in -mpich/examples/README -mpich/examples/cpi.c -mpich/examples/cpilog.c -mpich/examples/cpip.c -mpich/examples/hello++.cc -mpich/examples/mpirun -mpich/examples/pi3.f -mpich/examples/pi3f90.f90 -mpich/examples/pi3p.f -mpich/examples/simpleio.c -mpich/include/basex11.h -mpich/include/mpe.h -mpich/include/mpe_graphics.h -mpich/include/mpe_log.h -mpich/include/mpeexten.h -mpich/include/mpef.h -mpich/include/mpetools.h -mpich/include/mpi.h -mpich/include/mpi2c++/comm.h -mpich/include/mpi2c++/comm_inln.h -mpich/include/mpi2c++/constants.h -mpich/include/mpi2c++/datatype.h -mpich/include/mpi2c++/datatype_inln.h -mpich/include/mpi2c++/errhandler.h -mpich/include/mpi2c++/errhandler_inln.h -mpich/include/mpi2c++/exception.h -mpich/include/mpi2c++/functions.h -mpich/include/mpi2c++/functions_inln.h -mpich/include/mpi2c++/group.h -mpich/include/mpi2c++/group_inln.h -mpich/include/mpi2c++/intercomm.h -mpich/include/mpi2c++/intercomm_inln.h -mpich/include/mpi2c++/intracomm.h -mpich/include/mpi2c++/intracomm_inln.h -mpich/include/mpi2c++/mpi++.h -mpich/include/mpi2c++/mpi2c++_config.h -mpich/include/mpi2c++/mpi2c++_list.h -mpich/include/mpi2c++/mpi2c++_map.h -mpich/include/mpi2c++/op.h -mpich/include/mpi2c++/op_inln.h -mpich/include/mpi2c++/pcomm.h -mpich/include/mpi2c++/pdatatype.h -mpich/include/mpi2c++/perrhandler.h -mpich/include/mpi2c++/pexception.h -mpich/include/mpi2c++/pgroup.h -mpich/include/mpi2c++/pgroup_inln.h -mpich/include/mpi2c++/pintercomm.h -mpich/include/mpi2c++/pintracomm.h -mpich/include/mpi2c++/pmpi++.h -mpich/include/mpi2c++/pop.h -mpich/include/mpi2c++/pop_inln.h -mpich/include/mpi2c++/prequest.h -mpich/include/mpi2c++/prequest_inln.h -mpich/include/mpi2c++/pstatus.h -mpich/include/mpi2c++/pstatus_inln.h -mpich/include/mpi2c++/ptopology.h -mpich/include/mpi2c++/request.h -mpich/include/mpi2c++/request_inln.h -mpich/include/mpi2c++/status.h -mpich/include/mpi2c++/status_inln.h -mpich/include/mpi2c++/topology.h -mpich/include/mpi2c++/topology_inln.h -mpich/include/mpi_errno.h -mpich/include/mpi_fortdefs.h -mpich/include/mpidefs.h -mpich/include/mpif.h -mpich/include/mpio.h -mpich/include/mpiof.h -mpich/include/protofix.h -%%X11%%mpich/lib/libampe.a -mpich/lib/libfmpich.a -mpich/lib/liblmpe.a -mpich/lib/libmpe.a -%%X11%%mpich/lib/libmpe_nompi.a -mpich/lib/libmpich.a -mpich/lib/libmpichfsup.a -mpich/lib/libpmpich++.a -mpich/lib/libpmpich.a -mpich/lib/libtmpe.a -mpich/lib/mpe_prof.o -%%JAVA%%mpich/lib/clog2TOdrawable.jar -%%JAVA%%mpich/lib/clog2TOslog2.jar -%%JAVA%%mpich/lib/clog2print.jar -%%JAVA%%mpich/lib/clogTOdrawable.jar -%%JAVA%%mpich/lib/clogTOslog2.jar -%%JAVA%%mpich/lib/clogprint.jar -%%JAVA%%mpich/lib/jumpshot.jar -%%JAVA%%mpich/lib/jumpshot_launcher.jar -%%JAVA%%mpich/lib/libTraceInput.la -%%JAVA%%mpich/lib/libTraceInput.so -%%JAVA%%mpich/lib/logconvertor.jar -%%JAVA%%mpich/lib/slog2navigator.jar -%%JAVA%%mpich/lib/slog2printrecur.jar -%%JAVA%%mpich/lib/slog2printserial.jar -%%JAVA%%mpich/lib/traceTOslog2.jar -%%JAVA%%mpich/lib/traceprint.jar -%%JAVA%%mpich/logfiles/barrier.rlog -%%JAVA%%mpich/logfiles/fpilog.clog -%%JAVA%%mpich/logfiles/fpilog.slog2 -mpich/man/mandesc -mpich/sbin/chkserv -mpich/sbin/chp4_servs -mpich/sbin/cleanipcs -mpich/sbin/mpiuninstall -@unexec rm %D/mpich/sbin/mpiuninstall.old >/dev/null 2>&1 || true -mpich/sbin/tstmachines -mpich/share/Makefile.sample -mpich/share/examples/Makefile -mpich/share/examples/Makefile.in -mpich/share/examples/cpi.c -mpich/share/examples/cpilog.c -mpich/share/examples/cxgraphics.c -mpich/share/examples/fpi.f -mpich/share/examples/fxgraphics.f -mpich/share/examples/mpirun -mpich/share/examples/srtest.c -mpich/share/machines.freebsd -mpich/share/machines.sample -mpich/www/index.html -mpich/www/www1/Jumpshots.html -mpich/www/www1/MPI.html -mpich/www/www1/chp4_servs.html -mpich/www/www1/cleanipcs.html -mpich/www/www1/index.html -mpich/www/www1/mpiCC.html -mpich/www/www1/mpicc.html -mpich/www/www1/mpif77.html -mpich/www/www1/mpif90.html -mpich/www/www1/mpiman.html -mpich/www/www1/mpireconfig.html -mpich/www/www1/mpirun.html -mpich/www/www1/tstmachines.html -mpich/www/www3/Constants.html -mpich/www/www3/MPIO_Request_c2f.html -mpich/www/www3/MPIO_Request_f2c.html -mpich/www/www3/MPIO_Test.html -mpich/www/www3/MPIO_Wait.html -mpich/www/www3/MPI_Abort.html -mpich/www/www3/MPI_Address.html -mpich/www/www3/MPI_Allgather.html -mpich/www/www3/MPI_Allgatherv.html -mpich/www/www3/MPI_Allreduce.html -mpich/www/www3/MPI_Alltoall.html -mpich/www/www3/MPI_Alltoallv.html -mpich/www/www3/MPI_Attr_delete.html -mpich/www/www3/MPI_Attr_get.html -mpich/www/www3/MPI_Attr_put.html -mpich/www/www3/MPI_Barrier.html -mpich/www/www3/MPI_Bcast.html -mpich/www/www3/MPI_Bsend.html -mpich/www/www3/MPI_Bsend_init.html -mpich/www/www3/MPI_Buffer_attach.html -mpich/www/www3/MPI_Buffer_detach.html -mpich/www/www3/MPI_CHAR.html -mpich/www/www3/MPI_Cancel.html -mpich/www/www3/MPI_Cart_coords.html -mpich/www/www3/MPI_Cart_create.html -mpich/www/www3/MPI_Cart_get.html -mpich/www/www3/MPI_Cart_map.html -mpich/www/www3/MPI_Cart_rank.html -mpich/www/www3/MPI_Cart_shift.html -mpich/www/www3/MPI_Cart_sub.html -mpich/www/www3/MPI_Cartdim_get.html -mpich/www/www3/MPI_Comm_compare.html -mpich/www/www3/MPI_Comm_create.html -mpich/www/www3/MPI_Comm_dup.html -mpich/www/www3/MPI_Comm_free.html -mpich/www/www3/MPI_Comm_get_name.html -mpich/www/www3/MPI_Comm_group.html -mpich/www/www3/MPI_Comm_rank.html -mpich/www/www3/MPI_Comm_remote_group.html -mpich/www/www3/MPI_Comm_remote_size.html -mpich/www/www3/MPI_Comm_set_name.html -mpich/www/www3/MPI_Comm_size.html -mpich/www/www3/MPI_Comm_split.html -mpich/www/www3/MPI_Comm_test_inter.html -mpich/www/www3/MPI_DUP_FN.html -mpich/www/www3/MPI_Dims_create.html -mpich/www/www3/MPI_Errhandler_create.html -mpich/www/www3/MPI_Errhandler_free.html -mpich/www/www3/MPI_Errhandler_get.html -mpich/www/www3/MPI_Errhandler_set.html -mpich/www/www3/MPI_Error_class.html -mpich/www/www3/MPI_Error_string.html -mpich/www/www3/MPI_File_c2f.html -mpich/www/www3/MPI_File_close.html -mpich/www/www3/MPI_File_delete.html -mpich/www/www3/MPI_File_f2c.html -mpich/www/www3/MPI_File_get_amode.html -mpich/www/www3/MPI_File_get_atomicity.html -mpich/www/www3/MPI_File_get_byte_offset.html -mpich/www/www3/MPI_File_get_errhandler.html -mpich/www/www3/MPI_File_get_group.html -mpich/www/www3/MPI_File_get_info.html -mpich/www/www3/MPI_File_get_position.html -mpich/www/www3/MPI_File_get_position_shared.html -mpich/www/www3/MPI_File_get_size.html -mpich/www/www3/MPI_File_get_type_extent.html -mpich/www/www3/MPI_File_get_view.html -mpich/www/www3/MPI_File_iread.html -mpich/www/www3/MPI_File_iread_at.html -mpich/www/www3/MPI_File_iread_shared.html -mpich/www/www3/MPI_File_iwrite.html -mpich/www/www3/MPI_File_iwrite_at.html -mpich/www/www3/MPI_File_iwrite_shared.html -mpich/www/www3/MPI_File_open.html -mpich/www/www3/MPI_File_preallocate.html -mpich/www/www3/MPI_File_read.html -mpich/www/www3/MPI_File_read_all.html -mpich/www/www3/MPI_File_read_all_begin.html -mpich/www/www3/MPI_File_read_all_end.html -mpich/www/www3/MPI_File_read_at.html -mpich/www/www3/MPI_File_read_at_all.html -mpich/www/www3/MPI_File_read_at_all_begin.html -mpich/www/www3/MPI_File_read_at_all_end.html -mpich/www/www3/MPI_File_read_ordered.html -mpich/www/www3/MPI_File_read_ordered_begin.html -mpich/www/www3/MPI_File_read_ordered_end.html -mpich/www/www3/MPI_File_read_shared.html -mpich/www/www3/MPI_File_seek.html -mpich/www/www3/MPI_File_seek_shared.html -mpich/www/www3/MPI_File_set_atomicity.html -mpich/www/www3/MPI_File_set_errhandler.html -mpich/www/www3/MPI_File_set_info.html -mpich/www/www3/MPI_File_set_size.html -mpich/www/www3/MPI_File_set_view.html -mpich/www/www3/MPI_File_sync.html -mpich/www/www3/MPI_File_write.html -mpich/www/www3/MPI_File_write_all.html -mpich/www/www3/MPI_File_write_all_begin.html -mpich/www/www3/MPI_File_write_all_end.html -mpich/www/www3/MPI_File_write_at.html -mpich/www/www3/MPI_File_write_at_all.html -mpich/www/www3/MPI_File_write_at_all_begin.html -mpich/www/www3/MPI_File_write_at_all_end.html -mpich/www/www3/MPI_File_write_ordered.html -mpich/www/www3/MPI_File_write_ordered_begin.html -mpich/www/www3/MPI_File_write_ordered_end.html -mpich/www/www3/MPI_File_write_shared.html -mpich/www/www3/MPI_Finalize.html -mpich/www/www3/MPI_Finalized.html -mpich/www/www3/MPI_Gather.html -mpich/www/www3/MPI_Gatherv.html -mpich/www/www3/MPI_Get_count.html -mpich/www/www3/MPI_Get_elements.html -mpich/www/www3/MPI_Get_processor_name.html -mpich/www/www3/MPI_Get_version.html -mpich/www/www3/MPI_Graph_create.html -mpich/www/www3/MPI_Graph_get.html -mpich/www/www3/MPI_Graph_map.html -mpich/www/www3/MPI_Graph_neighbors.html -mpich/www/www3/MPI_Graph_neighbors_count.html -mpich/www/www3/MPI_Graphdims_get.html -mpich/www/www3/MPI_Group_compare.html -mpich/www/www3/MPI_Group_difference.html -mpich/www/www3/MPI_Group_excl.html -mpich/www/www3/MPI_Group_free.html -mpich/www/www3/MPI_Group_incl.html -mpich/www/www3/MPI_Group_intersection.html -mpich/www/www3/MPI_Group_range_excl.html -mpich/www/www3/MPI_Group_range_incl.html -mpich/www/www3/MPI_Group_rank.html -mpich/www/www3/MPI_Group_size.html -mpich/www/www3/MPI_Group_translate_ranks.html -mpich/www/www3/MPI_Group_union.html -mpich/www/www3/MPI_Ibsend.html -mpich/www/www3/MPI_Info_c2f.html -mpich/www/www3/MPI_Info_create.html -mpich/www/www3/MPI_Info_delete.html -mpich/www/www3/MPI_Info_dup.html -mpich/www/www3/MPI_Info_f2c.html -mpich/www/www3/MPI_Info_free.html -mpich/www/www3/MPI_Info_get.html -mpich/www/www3/MPI_Info_get_nkeys.html -mpich/www/www3/MPI_Info_get_nthkey.html -mpich/www/www3/MPI_Info_get_valuelen.html -mpich/www/www3/MPI_Info_set.html -mpich/www/www3/MPI_Init.html -mpich/www/www3/MPI_Init_thread.html -mpich/www/www3/MPI_Initialized.html -mpich/www/www3/MPI_Int2handle.html -mpich/www/www3/MPI_Intercomm_create.html -mpich/www/www3/MPI_Intercomm_merge.html -mpich/www/www3/MPI_Iprobe.html -mpich/www/www3/MPI_Irecv.html -mpich/www/www3/MPI_Irsend.html -mpich/www/www3/MPI_Isend.html -mpich/www/www3/MPI_Issend.html -mpich/www/www3/MPI_Keyval_create.html -mpich/www/www3/MPI_Keyval_free.html -mpich/www/www3/MPI_NULL_COPY_FN.html -mpich/www/www3/MPI_NULL_DELETE_FN.html -mpich/www/www3/MPI_Op_create.html -mpich/www/www3/MPI_Op_free.html -mpich/www/www3/MPI_Pack.html -mpich/www/www3/MPI_Pack_size.html -mpich/www/www3/MPI_Pcontrol.html -mpich/www/www3/MPI_Probe.html -mpich/www/www3/MPI_Recv.html -mpich/www/www3/MPI_Recv_init.html -mpich/www/www3/MPI_Reduce.html -mpich/www/www3/MPI_Reduce_scatter.html -mpich/www/www3/MPI_Request_c2f.html -mpich/www/www3/MPI_Request_free.html -mpich/www/www3/MPI_Rsend.html -mpich/www/www3/MPI_Rsend_init.html -mpich/www/www3/MPI_Scan.html -mpich/www/www3/MPI_Scatter.html -mpich/www/www3/MPI_Scatterv.html -mpich/www/www3/MPI_Send.html -mpich/www/www3/MPI_Send_init.html -mpich/www/www3/MPI_Sendrecv.html -mpich/www/www3/MPI_Sendrecv_replace.html -mpich/www/www3/MPI_Ssend.html -mpich/www/www3/MPI_Ssend_init.html -mpich/www/www3/MPI_Start.html -mpich/www/www3/MPI_Startall.html -mpich/www/www3/MPI_Status_c2f.html -mpich/www/www3/MPI_Status_set_cancelled.html -mpich/www/www3/MPI_Status_set_elements.html -mpich/www/www3/MPI_Test.html -mpich/www/www3/MPI_Test_cancelled.html -mpich/www/www3/MPI_Testall.html -mpich/www/www3/MPI_Testany.html -mpich/www/www3/MPI_Testsome.html -mpich/www/www3/MPI_Topo_test.html -mpich/www/www3/MPI_Type_commit.html -mpich/www/www3/MPI_Type_contiguous.html -mpich/www/www3/MPI_Type_create_darray.html -mpich/www/www3/MPI_Type_create_indexed_block.html -mpich/www/www3/MPI_Type_create_subarray.html -mpich/www/www3/MPI_Type_extent.html -mpich/www/www3/MPI_Type_free.html -mpich/www/www3/MPI_Type_get_contents.html -mpich/www/www3/MPI_Type_get_envelope.html -mpich/www/www3/MPI_Type_hindexed.html -mpich/www/www3/MPI_Type_hvector.html -mpich/www/www3/MPI_Type_indexed.html -mpich/www/www3/MPI_Type_lb.html -mpich/www/www3/MPI_Type_size.html -mpich/www/www3/MPI_Type_struct.html -mpich/www/www3/MPI_Type_ub.html -mpich/www/www3/MPI_Type_vector.html -mpich/www/www3/MPI_Unpack.html -mpich/www/www3/MPI_Wait.html -mpich/www/www3/MPI_Waitall.html -mpich/www/www3/MPI_Waitany.html -mpich/www/www3/MPI_Waitsome.html -mpich/www/www3/MPI_Wtick.html -mpich/www/www3/MPI_Wtime.html -mpich/www/www3/index.html -mpich/www/www4/CLOG_Finalize.html -mpich/www/www4/CLOG_Init.html -mpich/www/www4/CLOG_Output.html -mpich/www/www4/CLOG_commtype.html -mpich/www/www4/CLOG_cput.html -mpich/www/www4/CLOG_csync.html -mpich/www/www4/CLOG_get_new_event.html -mpich/www/www4/CLOG_get_new_state.html -mpich/www/www4/CLOG_init_buffers.html -mpich/www/www4/CLOG_mergelogs.html -mpich/www/www4/CLOG_mergend.html -mpich/www/www4/CLOG_msgtype.html -mpich/www/www4/CLOG_newbuff.html -mpich/www/www4/CLOG_nodebuffer2disk.html -mpich/www/www4/CLOG_procbuf.html -mpich/www/www4/CLOG_reclen.html -mpich/www/www4/CLOG_rectype.html -mpich/www/www4/CLOG_reinit_buff.html -mpich/www/www4/CLOG_treesetup.html -mpich/www/www4/MPE.html -mpich/www/www4/MPE_Add_RGB_color.html -mpich/www/www4/MPE_CaptureFile.html -mpich/www/www4/MPE_Close_graphics.html -mpich/www/www4/MPE_Comm_global_rank.html -mpich/www/www4/MPE_Counter_create.html -mpich/www/www4/MPE_Counter_free.html -mpich/www/www4/MPE_Counter_nxtval.html -mpich/www/www4/MPE_Decomp1d.html -mpich/www/www4/MPE_Describe_event.html -mpich/www/www4/MPE_Describe_state.html -mpich/www/www4/MPE_Draw_circle.html -mpich/www/www4/MPE_Draw_line.html -mpich/www/www4/MPE_Draw_logic.html -mpich/www/www4/MPE_Draw_point.html -mpich/www/www4/MPE_Draw_points.html -mpich/www/www4/MPE_Draw_string.html -mpich/www/www4/MPE_Fill_circle.html -mpich/www/www4/MPE_Fill_rectangle.html -mpich/www/www4/MPE_Finish_log.html -mpich/www/www4/MPE_GetTags.html -mpich/www/www4/MPE_Get_mouse_press.html -mpich/www/www4/MPE_IO_Stdout_to_file.html -mpich/www/www4/MPE_Iget_mouse_press.html -mpich/www/www4/MPE_Init_log.html -mpich/www/www4/MPE_Initialized_logging.html -mpich/www/www4/MPE_Line_thickness.html -mpich/www/www4/MPE_Log_event.html -mpich/www/www4/MPE_Log_get_event_number.html -mpich/www/www4/MPE_Log_receive.html -mpich/www/www4/MPE_Log_send.html -mpich/www/www4/MPE_Make_color_array.html -mpich/www/www4/MPE_Num_colors.html -mpich/www/www4/MPE_Open_graphics.html -mpich/www/www4/MPE_Print_datatype_pack_action.html -mpich/www/www4/MPE_Print_datatype_unpack_action.html -mpich/www/www4/MPE_ReturnTags.html -mpich/www/www4/MPE_Seq_begin.html -mpich/www/www4/MPE_Seq_end.html -mpich/www/www4/MPE_Start_log.html -mpich/www/www4/MPE_Stop_log.html -mpich/www/www4/MPE_TagsEnd.html -mpich/www/www4/MPE_Update.html -mpich/www/www4/index.html -%%JAVA%%@dirrm mpich/doc/jumpshot-4/html/ -%%JAVA%%@dirrm mpich/doc/jumpshot-4/ -@dirrm mpich/www/www4 -@dirrm mpich/www/www3 -@dirrm mpich/www/www1 -@dirrm mpich/www -@dirrm mpich/share/examples -@dirrm mpich/share -@dirrm mpich/sbin -@dirrm mpich/man/man4 -@dirrm mpich/man/man3 -@dirrm mpich/man/man1 -@dirrm mpich/man -%%JAVA%%@dirrm mpich/logfiles -@dirrm mpich/lib -@dirrm mpich/include/mpi2c++ -@dirrm mpich/include -@dirrm mpich/examples -@dirrm mpich/etc -@dirrm mpich/doc -@dirrm mpich/bin -@dirrm mpich diff --git a/net/ns2/Makefile b/net/ns2/Makefile deleted file mode 100644 index 27681f226eb1..000000000000 --- a/net/ns2/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# New ports collection makefile for: ns-2 -# Date created: 26 April 1999 -# Whom: obonilla -# -# $FreeBSD$ -# - -PORTNAME= ns -PORTVERSION= 2.29 -CATEGORIES= net -MASTER_SITES= http://www.isi.edu/nsnam/dist/ -DISTNAME= ns-src-${PORTVERSION} - -MAINTAINER= laszlof@vonostingroup.com -COMMENT= Discrete event simulator for networking research - -BUILD_DEPENDS= ${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl -RUN_DEPENDS= ${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84 - -MAN1= ns.1 -MANCOMPRESSED= no - -WRKSRC= ${WRKDIR}/ns-${PORTVERSION} - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 --with-tclcl=${LOCALBASE} -MAKE_ARGS+= "LDFLAGS=${LDFLAGS}" - -ALL_TARGET= - -.include <bsd.port.pre.mk> - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1 - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR} - -.include <bsd.port.post.mk> diff --git a/net/ns2/distinfo b/net/ns2/distinfo deleted file mode 100644 index 52c4930afe06..000000000000 --- a/net/ns2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (ns-src-2.29.tar.gz) = 4942fbdbc0179cdf2774778857c49ff0 -SHA256 (ns-src-2.29.tar.gz) = cd78c0eafb4f6f170c3ff9a3e3eace5ff43d1f2abbcb5b18cac67bfe3624bcad -SIZE (ns-src-2.29.tar.gz) = 55291146 diff --git a/net/ns2/pkg-descr b/net/ns2/pkg-descr deleted file mode 100644 index 8fa42f66b1cd..000000000000 --- a/net/ns2/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -NS is a discrete event simulator targeted at networking research. -NS provides substantial support for simulation of TCP, routing, -and multicast protocols. - -WWW: http://www.isi.edu/nsnam/ns/ diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist deleted file mode 100644 index 0e884a07c452..000000000000 --- a/net/ns2/pkg-plist +++ /dev/null @@ -1,122 +0,0 @@ -bin/ns -%%EXAMPLESDIR%%/agent-gen-script.tcl -%%EXAMPLESDIR%%/agent-gen.tcl -%%EXAMPLESDIR%%/callback_demo.tcl -%%EXAMPLESDIR%%/diffusion-prob-run.tcl -%%EXAMPLESDIR%%/diffusion-rate-run.tcl -%%EXAMPLESDIR%%/dumbbell.tcl -%%EXAMPLESDIR%%/example.tcl -%%EXAMPLESDIR%%/flooding-run.tcl -%%EXAMPLESDIR%%/flooding.tcl -%%EXAMPLESDIR%%/fq-cbr.tcl -%%EXAMPLESDIR%%/fq.tcl -%%EXAMPLESDIR%%/grid2.tcl -%%EXAMPLESDIR%%/gridkeeper.tcl -%%EXAMPLESDIR%%/hier-rtg-10.tcl -%%EXAMPLESDIR%%/hier-rtg-100.tcl -%%EXAMPLESDIR%%/hts100-0.tcl -%%EXAMPLESDIR%%/lantest.tcl -%%EXAMPLESDIR%%/large-scale-web-traffic-old.tcl -%%EXAMPLESDIR%%/large-scale-web-traffic.tcl -%%EXAMPLESDIR%%/large-sim.tcl -%%EXAMPLESDIR%%/mac-test.tcl -%%EXAMPLESDIR%%/many_tcp.tcl -%%EXAMPLESDIR%%/manytcp_trmodel.tcl -%%EXAMPLESDIR%%/mcast.tcl -%%EXAMPLESDIR%%/miptest.tcl -%%EXAMPLESDIR%%/nam-example-em.tcl -%%EXAMPLESDIR%%/nam-example.tcl -%%EXAMPLESDIR%%/nam-large-flowid.tcl -%%EXAMPLESDIR%%/nam-separate-trace.tcl -%%EXAMPLESDIR%%/nam-simplexlink.tcl -%%EXAMPLESDIR%%/omni-run.tcl -%%EXAMPLESDIR%%/pkts.tcl -%%EXAMPLESDIR%%/ranvar.tcl -%%EXAMPLESDIR%%/rbp_demo.tcl -%%EXAMPLESDIR%%/rc.tcl -%%EXAMPLESDIR%%/redlight.tcl -%%EXAMPLESDIR%%/rng-test.tcl -%%EXAMPLESDIR%%/rng-test2.tcl -%%EXAMPLESDIR%%/route-gen.tcl -%%EXAMPLESDIR%%/sat-aloha.tcl -%%EXAMPLESDIR%%/sat-iridium-links.tcl -%%EXAMPLESDIR%%/sat-iridium-nodes.tcl -%%EXAMPLESDIR%%/sat-iridium.tcl -%%EXAMPLESDIR%%/sat-mixed.tcl -%%EXAMPLESDIR%%/sat-repeater.tcl -%%EXAMPLESDIR%%/sat-teledesic-links.tcl -%%EXAMPLESDIR%%/sat-teledesic-nodes.tcl -%%EXAMPLESDIR%%/sat-teledesic.tcl -%%EXAMPLESDIR%%/sat-wired.tcl -%%EXAMPLESDIR%%/shuttle-mcast.tcl -%%EXAMPLESDIR%%/shuttle.tcl -%%EXAMPLESDIR%%/simple-dyn.tcl -%%EXAMPLESDIR%%/simple-eqp.tcl -%%EXAMPLESDIR%%/simple-eqp1.tcl -%%EXAMPLESDIR%%/simple-fsm-tcp.tcl -%%EXAMPLESDIR%%/simple-heap.tcl -%%EXAMPLESDIR%%/simple-plm.tcl -%%EXAMPLESDIR%%/simple-rtg.tcl -%%EXAMPLESDIR%%/simple-rtp.tcl -%%EXAMPLESDIR%%/simple-tcp.tcl -%%EXAMPLESDIR%%/simple-webcache-comp.tcl -%%EXAMPLESDIR%%/simple-webcache-trace.tcl -%%EXAMPLESDIR%%/simple-webcache.tcl -%%EXAMPLESDIR%%/simple-wireless.tcl -%%EXAMPLESDIR%%/simple.tcl -%%EXAMPLESDIR%%/src_test.tcl -%%EXAMPLESDIR%%/srm-adapt-rep-session.tcl -%%EXAMPLESDIR%%/srm-adapt-rep.tcl -%%EXAMPLESDIR%%/srm-adapt-req-session.tcl -%%EXAMPLESDIR%%/srm-adapt-req.tcl -%%EXAMPLESDIR%%/srm-chain-session.tcl -%%EXAMPLESDIR%%/srm-chain.tcl -%%EXAMPLESDIR%%/srm-demo.tcl -%%EXAMPLESDIR%%/srm-session.tcl -%%EXAMPLESDIR%%/srm-star-session.tcl -%%EXAMPLESDIR%%/srm-star.tcl -%%EXAMPLESDIR%%/srm.tcl -%%EXAMPLESDIR%%/ss.tcl -%%EXAMPLESDIR%%/swp.tcl -%%EXAMPLESDIR%%/t1000.tcl -%%EXAMPLESDIR%%/tcp-et.tcl -%%EXAMPLESDIR%%/tcp-int.tcl -%%EXAMPLESDIR%%/tcpapp.tcl -%%EXAMPLESDIR%%/tcpecn.tcl -%%EXAMPLESDIR%%/tcpsrm.tcl -%%EXAMPLESDIR%%/test-drr.tcl -%%EXAMPLESDIR%%/test-emulator.tcl -%%EXAMPLESDIR%%/test-rcvr.tcl -%%EXAMPLESDIR%%/test-rlm.tcl -%%EXAMPLESDIR%%/test-suite-intserv.tcl -%%EXAMPLESDIR%%/test-suite.tcl -%%EXAMPLESDIR%%/test-tbf.tcl -%%EXAMPLESDIR%%/tg.tcl -%%EXAMPLESDIR%%/topo-gen-script.tcl -%%EXAMPLESDIR%%/topo-gen.tcl -%%EXAMPLESDIR%%/topo-view.tcl -%%EXAMPLESDIR%%/trace-driven.tcl -%%EXAMPLESDIR%%/udpdata.tcl -%%EXAMPLESDIR%%/varybell.tcl -%%EXAMPLESDIR%%/virtual-classifier.tcl -%%EXAMPLESDIR%%/vlantest-flat.tcl -%%EXAMPLESDIR%%/vlantest-hier.tcl -%%EXAMPLESDIR%%/vlantest-mcst.tcl -%%EXAMPLESDIR%%/web-traffic-embobj.tcl -%%EXAMPLESDIR%%/web-traffic.tcl -%%EXAMPLESDIR%%/wired-cum-wireless-sim.tcl -%%EXAMPLESDIR%%/wireless-demo-csci694.tcl -%%EXAMPLESDIR%%/wireless-dsdv-newnode.tcl -%%EXAMPLESDIR%%/wireless-flooding.tcl -%%EXAMPLESDIR%%/wireless-landmark.tcl -%%EXAMPLESDIR%%/wireless-mip-test.tcl -%%EXAMPLESDIR%%/wireless-mitf.tcl -%%EXAMPLESDIR%%/wireless-newnode-energy.tcl -%%EXAMPLESDIR%%/wireless-pkt-demo.tcl -%%EXAMPLESDIR%%/wireless-shadowing-test.tcl -%%EXAMPLESDIR%%/wireless-shadowing-vis-test.tcl -%%EXAMPLESDIR%%/wireless-simple-mac.tcl -%%EXAMPLESDIR%%/wireless-test.tcl -%%EXAMPLESDIR%%/wireless.tcl -%%EXAMPLESDIR%%/worm.tcl -@dirrm %%EXAMPLESDIR%% diff --git a/net/opal/Makefile b/net/opal/Makefile deleted file mode 100644 index 205f557afca5..000000000000 --- a/net/opal/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: openh323 -# Date created: Thu Feb 17 15:00:48 GMT 2000 -# Whom: Roger Hardiman <roger@freebsd.org> -# -# $FreeBSD$ -# - -PORTNAME= openh323 -PORTVERSION= 1.17.3 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://www.voxgratia.org/releases/ -DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src- -EXTRACT_SUFX= tar.gz - -MAINTAINER= steve@energistic.com -COMMENT= A H323 Video Conferencing library - -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - pt_r.1:${PORTSDIR}/devel/pwlib - -WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g} - -USE_BISON= yes -USE_GMAKE= yes -USE_OPENLDAP= yes -USE_AUTOTOOLS= autoconf:259 -GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes - -ALL_TARGET= optshared -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES" -MAKE_ENV= BUILDTIME="YES" -NO_FILTER_SHLIBS= yes - -.include <bsd.port.pre.mk> - -.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64") -CFLAGS+= -fPIC -.endif - -.include <bsd.port.post.mk> diff --git a/net/opal/distinfo b/net/opal/distinfo deleted file mode 100644 index 59d1d8ae9281..000000000000 --- a/net/opal/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (openh323-v1_17_3-src-tar.gz) = 6797f1c04aaeb3b6a43aebd70b5e8b5d -SHA256 (openh323-v1_17_3-src-tar.gz) = 625bb7b6ba19638a037e7f231523bdeff0eccc4ae71abaed7700b3bc8dd47e67 -SIZE (openh323-v1_17_3-src-tar.gz) = 3745141 diff --git a/net/opal/files/patch-makefile.in b/net/opal/files/patch-makefile.in deleted file mode 100644 index 536bf181d711..000000000000 --- a/net/opal/files/patch-makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig Thu Feb 2 13:29:46 2006 -+++ Makefile.in Thu Feb 2 13:33:57 2006 -@@ -351,8 +351,8 @@ - ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE) \ - ) - (cd $(DESTDIR)$(LIBDIR); \ -- rm -f libopenh323.@SHAREDLIBEXT@ ; \ -- ln -sf $(OH323_FILE) libopenh323.@SHAREDLIBEXT@ \ -+ rm -f libopenh323.so ; \ -+ ln -sf $(OH323_FILE) libopenh323.so \ - ) - ( for dir in $(DESTDIR)$(LIBDIR) \ - $(DESTDIR)$(PREFIX)/include/openh323 \ diff --git a/net/opal/files/patch-openh323u.mak.in b/net/opal/files/patch-openh323u.mak.in deleted file mode 100644 index e68b8c4420b9..000000000000 --- a/net/opal/files/patch-openh323u.mak.in +++ /dev/null @@ -1,47 +0,0 @@ ---- openh323u.mak.in.orig Tue Mar 7 15:45:47 2006 -+++ openh323u.mak.in Tue Mar 7 15:50:52 2006 -@@ -163,7 +163,15 @@ - # - - PWLIBDIR = @PWLIBDIR@ -+ -+ifdef BUILDTIME - OPENH323DIR = @OPENH323DIR@ -+endif -+ -+ifndef OPENH323DIR -+OPENH323DIR = /usr/local/share/openh323 -+endif -+ - STDCCFLAGS += @STDCCFLAGS@ - LDFLAGS += @LDFLAGS@ - LDLIBS += @LDLIBS@ -@@ -197,12 +205,19 @@ - #OH323_SUPPRESS_H235 = 1 - - OH323_SRCDIR = $(OPENH323DIR)/src -+ - ifdef PREFIX - OH323_INCDIR = $(PREFIX)/include/openh323 -+OH323_LIBDIR = $(PREFIX)/lib - else - OH323_INCDIR = $(OPENH323DIR)/include - endif # PREFIX - -+ifdef BUILDTIME -+OH323_INCDIR = ${OPENH323DIR}/include -+OH323_LIBDIR = $(OPENH323DIR)/lib -+endif #BUILDTIME -+ - ifndef OH323_LIBDIR - OH323_LIBDIR = $(OPENH323DIR)/lib - endif # OH323_LIBDIR -@@ -216,7 +231,7 @@ - OH323_SUFFIX = $(OBJ_SUFFIX) - endif # NOTRACE - --OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE) -+OH323_BASE = h323_$(OH323_SUFFIX)$(LIB_TYPE) - OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX) - - LDFLAGS += -L$(OH323_LIBDIR) diff --git a/net/opal/pkg-descr b/net/opal/pkg-descr deleted file mode 100644 index 5ea7add9f222..000000000000 --- a/net/opal/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -OpenH323 is a multi-platform H323 Video Conferencing library. - -This is used to make H323 Video Conferencing applications -like GnomeMeeting and ohphone. (both in the FreeBSD ports tree) - -The library includes a sample program called simph323. - -The OpenH323 library makes use of PWLib. http://www.equival.com -PWLib is a multi-platform code library that can be used to write -applications that will compile and run on the BSD Unixes, Windows, Linux -and a few other Unix variants. It was developed by Equivalence Ltd Pty. - -WWW: http://www.openh323.org/ diff --git a/net/opal/pkg-plist b/net/opal/pkg-plist deleted file mode 100644 index 6eea50b90190..000000000000 --- a/net/opal/pkg-plist +++ /dev/null @@ -1,90 +0,0 @@ -lib/libh323_r.so -lib/libh323_r.so.1 -lib/libh323_r.so.1.17 -lib/libh323_r.so.1.17.3 -lib/libopenh323.so -include/openh323/QTIoctl.h -include/openh323/channels.h -include/openh323/codecs.h -include/openh323/cu30codec.h -include/openh323/dynacodec.h -include/openh323/ffh263codec.h -include/openh323/gccpdu.h -include/openh323/gkclient.h -include/openh323/gkserver.h -include/openh323/guid.h -include/openh323/h225.h -include/openh323/h225ras.h -include/openh323/h235.h -include/openh323/h235auth.h -include/openh323/h245.h -include/openh323/h248.h -include/openh323/h261codec.h -include/openh323/h263codec.h -include/openh323/h323.h -include/openh323/h323annexg.h -include/openh323/h323caps.h -include/openh323/h323con.h -include/openh323/h323ep.h -include/openh323/h323neg.h -include/openh323/h323pdu.h -include/openh323/h323pluginmgr.h -include/openh323/h323rtp.h -include/openh323/h323t120.h -include/openh323/h323t38.h -include/openh323/h323trans.h -include/openh323/h4501.h -include/openh323/h45010.h -include/openh323/h45011.h -include/openh323/h4502.h -include/openh323/h4503.h -include/openh323/h4504.h -include/openh323/h4505.h -include/openh323/h4506.h -include/openh323/h4507.h -include/openh323/h4508.h -include/openh323/h4509.h -include/openh323/h450pdu.h -include/openh323/h460.h -include/openh323/h501.h -include/openh323/h501pdu.h -include/openh323/hid.h -include/openh323/ixjDefs.h -include/openh323/ixjidb.h -include/openh323/ixjlid.h -include/openh323/jitter.h -include/openh323/lid.h -include/openh323/mcspdu.h -include/openh323/mediafmt.h -include/openh323/opalosp.h -include/openh323/opalplugin.h -include/openh323/opalusbdevice.h -include/openh323/opalvxml.h -include/openh323/opalwavfile.h -include/openh323/openh323buildopts.h -include/openh323/peclient.h -include/openh323/q931.h -include/openh323/rfc2190avcodec.h -include/openh323/rfc2833.h -include/openh323/rtp.h -include/openh323/rtp2wav.h -include/openh323/svcctrl.h -include/openh323/t120proto.h -include/openh323/t38.h -include/openh323/t38proto.h -include/openh323/transports.h -include/openh323/vblasterlid.h -include/openh323/vpblid.h -include/openh323/x224.h -include/openh323/x880.h -@dirrm include/openh323 -%%DATADIR%%/openh323u.mak -@dirrm %%DATADIR%% -lib/pwlib/codecs/audio/g726_audio_pwplugin.so -lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so -lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so -lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so -lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so -lib/pwlib/codecs/audio/speex_audio_pwplugin.so -@dirrm lib/pwlib/codecs/audio -@dirrm lib/pwlib/codecs diff --git a/net/opal3/Makefile b/net/opal3/Makefile deleted file mode 100644 index 205f557afca5..000000000000 --- a/net/opal3/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: openh323 -# Date created: Thu Feb 17 15:00:48 GMT 2000 -# Whom: Roger Hardiman <roger@freebsd.org> -# -# $FreeBSD$ -# - -PORTNAME= openh323 -PORTVERSION= 1.17.3 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://www.voxgratia.org/releases/ -DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src- -EXTRACT_SUFX= tar.gz - -MAINTAINER= steve@energistic.com -COMMENT= A H323 Video Conferencing library - -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - pt_r.1:${PORTSDIR}/devel/pwlib - -WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g} - -USE_BISON= yes -USE_GMAKE= yes -USE_OPENLDAP= yes -USE_AUTOTOOLS= autoconf:259 -GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes - -ALL_TARGET= optshared -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" BUILDTIME="YES" -MAKE_ENV= BUILDTIME="YES" -NO_FILTER_SHLIBS= yes - -.include <bsd.port.pre.mk> - -.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64") -CFLAGS+= -fPIC -.endif - -.include <bsd.port.post.mk> diff --git a/net/opal3/distinfo b/net/opal3/distinfo deleted file mode 100644 index 59d1d8ae9281..000000000000 --- a/net/opal3/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (openh323-v1_17_3-src-tar.gz) = 6797f1c04aaeb3b6a43aebd70b5e8b5d -SHA256 (openh323-v1_17_3-src-tar.gz) = 625bb7b6ba19638a037e7f231523bdeff0eccc4ae71abaed7700b3bc8dd47e67 -SIZE (openh323-v1_17_3-src-tar.gz) = 3745141 diff --git a/net/opal3/files/patch-makefile.in b/net/opal3/files/patch-makefile.in deleted file mode 100644 index 536bf181d711..000000000000 --- a/net/opal3/files/patch-makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig Thu Feb 2 13:29:46 2006 -+++ Makefile.in Thu Feb 2 13:33:57 2006 -@@ -351,8 +351,8 @@ - ln -sf $(OH323_FILE).@MAJOR_VERSION@.@MINOR_VERSION@.@BUILD_NUMBER@ $(OH323_FILE) \ - ) - (cd $(DESTDIR)$(LIBDIR); \ -- rm -f libopenh323.@SHAREDLIBEXT@ ; \ -- ln -sf $(OH323_FILE) libopenh323.@SHAREDLIBEXT@ \ -+ rm -f libopenh323.so ; \ -+ ln -sf $(OH323_FILE) libopenh323.so \ - ) - ( for dir in $(DESTDIR)$(LIBDIR) \ - $(DESTDIR)$(PREFIX)/include/openh323 \ diff --git a/net/opal3/files/patch-openh323u.mak.in b/net/opal3/files/patch-openh323u.mak.in deleted file mode 100644 index e68b8c4420b9..000000000000 --- a/net/opal3/files/patch-openh323u.mak.in +++ /dev/null @@ -1,47 +0,0 @@ ---- openh323u.mak.in.orig Tue Mar 7 15:45:47 2006 -+++ openh323u.mak.in Tue Mar 7 15:50:52 2006 -@@ -163,7 +163,15 @@ - # - - PWLIBDIR = @PWLIBDIR@ -+ -+ifdef BUILDTIME - OPENH323DIR = @OPENH323DIR@ -+endif -+ -+ifndef OPENH323DIR -+OPENH323DIR = /usr/local/share/openh323 -+endif -+ - STDCCFLAGS += @STDCCFLAGS@ - LDFLAGS += @LDFLAGS@ - LDLIBS += @LDLIBS@ -@@ -197,12 +205,19 @@ - #OH323_SUPPRESS_H235 = 1 - - OH323_SRCDIR = $(OPENH323DIR)/src -+ - ifdef PREFIX - OH323_INCDIR = $(PREFIX)/include/openh323 -+OH323_LIBDIR = $(PREFIX)/lib - else - OH323_INCDIR = $(OPENH323DIR)/include - endif # PREFIX - -+ifdef BUILDTIME -+OH323_INCDIR = ${OPENH323DIR}/include -+OH323_LIBDIR = $(OPENH323DIR)/lib -+endif #BUILDTIME -+ - ifndef OH323_LIBDIR - OH323_LIBDIR = $(OPENH323DIR)/lib - endif # OH323_LIBDIR -@@ -216,7 +231,7 @@ - OH323_SUFFIX = $(OBJ_SUFFIX) - endif # NOTRACE - --OH323_BASE = h323_$(PLATFORM_TYPE)_$(OH323_SUFFIX)$(LIB_TYPE) -+OH323_BASE = h323_$(OH323_SUFFIX)$(LIB_TYPE) - OH323_FILE = lib$(OH323_BASE).$(LIB_SUFFIX) - - LDFLAGS += -L$(OH323_LIBDIR) diff --git a/net/opal3/pkg-descr b/net/opal3/pkg-descr deleted file mode 100644 index 5ea7add9f222..000000000000 --- a/net/opal3/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -OpenH323 is a multi-platform H323 Video Conferencing library. - -This is used to make H323 Video Conferencing applications -like GnomeMeeting and ohphone. (both in the FreeBSD ports tree) - -The library includes a sample program called simph323. - -The OpenH323 library makes use of PWLib. http://www.equival.com -PWLib is a multi-platform code library that can be used to write -applications that will compile and run on the BSD Unixes, Windows, Linux -and a few other Unix variants. It was developed by Equivalence Ltd Pty. - -WWW: http://www.openh323.org/ diff --git a/net/opal3/pkg-plist b/net/opal3/pkg-plist deleted file mode 100644 index 6eea50b90190..000000000000 --- a/net/opal3/pkg-plist +++ /dev/null @@ -1,90 +0,0 @@ -lib/libh323_r.so -lib/libh323_r.so.1 -lib/libh323_r.so.1.17 -lib/libh323_r.so.1.17.3 -lib/libopenh323.so -include/openh323/QTIoctl.h -include/openh323/channels.h -include/openh323/codecs.h -include/openh323/cu30codec.h -include/openh323/dynacodec.h -include/openh323/ffh263codec.h -include/openh323/gccpdu.h -include/openh323/gkclient.h -include/openh323/gkserver.h -include/openh323/guid.h -include/openh323/h225.h -include/openh323/h225ras.h -include/openh323/h235.h -include/openh323/h235auth.h -include/openh323/h245.h -include/openh323/h248.h -include/openh323/h261codec.h -include/openh323/h263codec.h -include/openh323/h323.h -include/openh323/h323annexg.h -include/openh323/h323caps.h -include/openh323/h323con.h -include/openh323/h323ep.h -include/openh323/h323neg.h -include/openh323/h323pdu.h -include/openh323/h323pluginmgr.h -include/openh323/h323rtp.h -include/openh323/h323t120.h -include/openh323/h323t38.h -include/openh323/h323trans.h -include/openh323/h4501.h -include/openh323/h45010.h -include/openh323/h45011.h -include/openh323/h4502.h -include/openh323/h4503.h -include/openh323/h4504.h -include/openh323/h4505.h -include/openh323/h4506.h -include/openh323/h4507.h -include/openh323/h4508.h -include/openh323/h4509.h -include/openh323/h450pdu.h -include/openh323/h460.h -include/openh323/h501.h -include/openh323/h501pdu.h -include/openh323/hid.h -include/openh323/ixjDefs.h -include/openh323/ixjidb.h -include/openh323/ixjlid.h -include/openh323/jitter.h -include/openh323/lid.h -include/openh323/mcspdu.h -include/openh323/mediafmt.h -include/openh323/opalosp.h -include/openh323/opalplugin.h -include/openh323/opalusbdevice.h -include/openh323/opalvxml.h -include/openh323/opalwavfile.h -include/openh323/openh323buildopts.h -include/openh323/peclient.h -include/openh323/q931.h -include/openh323/rfc2190avcodec.h -include/openh323/rfc2833.h -include/openh323/rtp.h -include/openh323/rtp2wav.h -include/openh323/svcctrl.h -include/openh323/t120proto.h -include/openh323/t38.h -include/openh323/t38proto.h -include/openh323/transports.h -include/openh323/vblasterlid.h -include/openh323/vpblid.h -include/openh323/x224.h -include/openh323/x880.h -@dirrm include/openh323 -%%DATADIR%%/openh323u.mak -@dirrm %%DATADIR%% -lib/pwlib/codecs/audio/g726_audio_pwplugin.so -lib/pwlib/codecs/audio/gsm0610_audio_pwplugin.so -lib/pwlib/codecs/audio/ilbc_audio_pwplugin.so -lib/pwlib/codecs/audio/ima_adpcm_audio_pwplugin.so -lib/pwlib/codecs/audio/lpc10_audio_pwplugin.so -lib/pwlib/codecs/audio/speex_audio_pwplugin.so -@dirrm lib/pwlib/codecs/audio -@dirrm lib/pwlib/codecs diff --git a/net/openldap24-client/Makefile b/net/openldap24-client/Makefile deleted file mode 100644 index 7c7cf46a5c9e..000000000000 --- a/net/openldap24-client/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: openldap23-client -# Date created: 02 May 2005 -# Whom: Vsevolod Stakhov <vsevolod@highsecure.ru> -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -client - -COMMENT= Open source LDAP client implementation - -CLIENT_ONLY= yes -WITHOUT_SASL= yes - -MASTERDIR= ${.CURDIR}/../openldap23-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/openldap24-sasl-client/Makefile b/net/openldap24-sasl-client/Makefile deleted file mode 100644 index 9e084695240b..000000000000 --- a/net/openldap24-sasl-client/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: openldap23-sasl-client -# Date created: 02 May 2005 -# Whom: Vsevolod Stakhov <vsevolod@highsecure.ru> -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -sasl-client - -COMMENT= Open source LDAP client implementation with SASL2 support - -CLIENT_ONLY= yes -WITH_SASL= yes - -MASTERDIR= ${.CURDIR}/../openldap23-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile deleted file mode 100644 index 514ac5e8fd2b..000000000000 --- a/net/openldap24-server/Makefile +++ /dev/null @@ -1,428 +0,0 @@ -# New ports collection makefile for: openldap23-server -# Date created: 02 May 2005 -# Whom: Vsevolod Stakhov <vsevolod@highsecure.ru> -# -# $FreeBSD$ -# - -PORTNAME= openldap -DISTVERSION= 2.3.19 -PORTREVISION= ${OPENLDAP_PORTREVISION} -CATEGORIES= net databases -MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ - http://public.planetmirror.com/pub/openldap/%SUBDIR%/ \ - ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \ - ftp://ftp.matrix.com.br/pub/openldap/%SUBDIR%/ \ - ftp://ftp.ucr.ac.cr/pub/Unix/openldap/%SUBDIR%/ \ - ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \ - ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \ - ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \ - ftp://ftp.holywar.net/pub/OpenLDAP/%SUBDIR%/ \ - ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \ - ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/%SUBDIR%/ \ - ftp://ftp.rediris.es/mirror/OpenLDAP/%SUBDIR%/ \ - ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \ - ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/ -MASTER_SITE_SUBDIR= openldap-release -PKGNAMESUFFIX?= -server -EXTRACT_SUFX= .tgz - -MAINTAINER= vsevolod@FreeBSD.org -COMMENT?= Open source LDAP server implementation - -UNIQUENAME?= ${PKGNAMEPREFIX}openldap23 -LATEST_LINK?= ${UNIQUENAME}${PKGNAMESUFFIX} - -WANT_OPENLDAP_VER?= 23 -.if ${WANT_OPENLDAP_VER} != 23 -BROKEN= "incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}" -.endif - -PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 - -.if !defined(CLIENT_ONLY) -OPTIONS= SASL "With (Cyrus) SASL2 support" on \ - PERL "With Perl backend" off \ - SHELL "With Shell backend" on \ - ODBC "With SQL backend" off \ - SLP "With SLPv2 (RFC 2608) support" off \ - SLAPI "With Netscape SLAPI plugin API" off \ - TCP_WRAPPERS "With tcp wrapper support" on \ - BDB "With BerkeleyDB support" on \ - DYNGROUP "With Dynamic Group overlay" off \ - PROXYCACHE "With Proxy Cache overlay" off \ - ACI "With per-object ACIs (experimental)" off \ - UNIQUE "With attribute Uniqueness overlay" off \ - PPOLICY "With Password Policy overlay" off \ - SYNCPROV "With Syncprov overlay" off \ - RWM "With Rewrite/Remap overlay" off \ - DYNAMIC_BACKENDS "Build dynamic backends" on \ - RCORDER "Add rc order for slapd(1)" off -.endif - -.include <bsd.port.pre.mk> - -.if defined(CLIENT_ONLY) -OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT} -OPENLDAP_PKGFILESUFX= .client - -.if ${PKGNAMESUFFIX} == "-sasl-client" -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[!3].* -.elif ${PKGNAMESUFFIX} == "-client" -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!3].* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* -.else -BROKEN= "Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX}" -.endif - -PORTDOCS= CHANGES drafts rfc - -.if defined(USE_OPENLDAP) -IGNORE= : You have \`USE_OPENLDAP' defined either in your environment or in make(1) arguments -.endif -.else -OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER} -OPENLDAP_PKGFILESUFX= - -.if defined(WITH_SASL) && !defined(WITHOUT_SASL) -RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.2:${PORTSDIR}/net/openldap23-sasl-client -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* -.else -RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.3.so.2:${PORTSDIR}/net/openldap23-client -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* -.endif - -.endif - -USE_OPENSSL= yes -USE_REINPLACE= yes -USE_AUTOTOOLS= libtool:15 - -DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX} -PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} -PKGINSTALL= ${WRKDIR}/pkg-install -PKGMESSAGE= ${WRKDIR}/pkg-message -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall - -SCHEMATA= corba core cosine dyngroup \ - inetorgperson java misc \ - nis openldap ppolicy - -LDAP_RUN_DIR?= /var/run/openldap -LOCALSTATEDIR?= /var/db -DATABASEDIR?= ${LOCALSTATEDIR}/openldap-data -SLURPDIR?= ${LOCALSTATEDIR}/openldap-slurp - -PLIST_SUB+= LDAP_RUN_DIR=${LDAP_RUN_DIR} \ - DATABASEDIR=${DATABASEDIR} \ - SLURPDIR=${SLURPDIR} \ - -SED_SCRIPT= -e 's,%%PKGNAME%%,${PKGNAME},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%LDAP_RUN_DIR%%,${LDAP_RUN_DIR},g' \ - -e 's,%%DATABASEDIR%%,${DATABASEDIR},g' \ - -e 's,%%SLURPDIR%%,${SLURPDIR},g' - -CONFIGURE_ARGS= --with-threads=posix \ - --with-tls=openssl \ - --enable-dynamic - -.if defined(WITH_SASL) && !defined(WITHOUT_SASL) -LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -CONFIGURE_ARGS+= --with-cyrus-sasl -.else -CONFIGURE_ARGS+= --without-cyrus-sasl -.endif - -.if defined(CLIENT_ONLY) -# client specific configuration - -CONFIGURE_ARGS+= --disable-slapd \ - --disable-monitor \ - --disable-bdb \ - --disable-relay \ - --disable-glue \ - --disable-syncprov - -INSTALLS_SHLIB= yes - -.else -# server specific configuration - -USE_RC_SUBR= yes - -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in - -.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) -USE_AUTOTOOLS+= libltdl:15 -CONFIGURE_ARGS+= --enable-modules -PLIST_SUB+= MODULES="" -.else -PLIST_SUB+= MODULES="@comment " -.endif - -SED_MODULES= -e 's/\(moduleload[ ]*back_[a-z]*\)\.la/\1/' - -.if !defined(WITHOUT_DYNAMIC_BACKENDS) -BACKEND_ENABLE= "mod" -BACKEND_PLIST= "" -SED_MODULES+= -e 's/\# *\(modulepath\)/\1/' \ - -e 's/\# *\(moduleload[ ]*back_bdb\)/\1/' -.else -BACKEND_ENABLE= "yes" -BACKEND_PLIST= "@comment " -.endif - -CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ - --enable-ldbm=${BACKEND_ENABLE} \ - --enable-crypt \ - --enable-lmpasswd \ - --enable-ldap=${BACKEND_ENABLE} \ - --enable-meta=${BACKEND_ENABLE} \ - --enable-rewrite \ - --enable-null=${BACKEND_ENABLE} \ - --enable-monitor=${BACKEND_ENABLE} - -PLIST_SUB+= BACKEND=${BACKEND_PLIST} - -.if defined(WITH_DYNGROUP) -CONFIGURE_ARGS+= --enable-dyngroup -.endif - -.if defined(WITH_PROXYCACHE) -CONFIGURE_ARGS+= --enable-proxycache -.endif - -.if defined(WITH_ACI) -CONFIGURE_ARGS+= --enable-aci -.endif - -.if defined(WITH_UNIQUE) -CONFIGURE_ARGS+= --enable-unique -.endif - -.if defined(WITH_PPOLICY) -CONFIGURE_ARGS+= --enable-ppolicy -.endif - -.if defined(WITH_SYNCPROV) -CONFIGURE_ARGS+= --enable-syncprov -.else -CONFIGURE_ARGS+= --disable-syncprov -.endif - -.if defined(WITH_RWM) -CONFIGURE_ARGS+= --enable-rwm -.endif - -.if defined(WITHOUT_BDB) -CONFIGURE_ARGS+= --disable-bdb \ - --disable-hdb \ - --with-ldbm-api=bcompat -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB="@comment " -.else - -WITH_BDB_VER?= 43 - -.if ${WITH_BDB_VER} == 43 -CONFIGURE_ARGS+= --enable-bdb=${BACKEND_ENABLE} \ - --enable-hdb=${BACKEND_ENABLE} -PLIST_SUB+= BACK_BDB=${BACKEND_PLIST} \ - BACK_HDB=${BACKEND_PLIST} -BDBLIB= db-4.3.0 -.elif ${WITH_BDB_VER} == 42 -CONFIGURE_ARGS+= --enable-bdb=${BACKEND_ENABLE} \ - --enable-hdb=${BACKEND_ENABLE} -PLIST_SUB+= BACK_BDB=${BACKEND_PLIST} \ - BACK_HDB=${BACKEND_PLIST} -BDBLIB= db-4.2.2 -.elif ${WITH_BDB_VER} == 41 -CONFIGURE_ARGS+= --disable-bdb \ - --enable-hdb=${BACKEND_ENABLE} -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB=${BACKEND_PLIST} -BDBLIB= db41.1 -.elif ${WITH_BDB_VER} == 4 -CONFIGURE_ARGS+= --disable-bdb \ - --enable-hdb=${BACKEND_ENABLE} -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB=${BACKEND_PLIST} -BDBLIB= db4.0 -.elif ${WITH_BDB_VER} == 3 -CONFIGURE_ARGS+= --disable-bdb \ - --disable-hdb -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB="@comment " -BDBLIB= db3.3 -.else -IGNORE= : WITH_BDB_VER must be 3, 4, 41, 42 or 43 -.endif - -LIB_DEPENDS+= ${BDBLIB}:${PORTSDIR}/databases/db${WITH_BDB_VER} -CPPFLAGS+= -I${LOCALBASE}/include/db${WITH_BDB_VER} -CONFIGURE_ARGS+= --with-ldbm-api=berkeley -CONFIGURE_SED+= -e 's,ol_DB_LIB=$$,&-l${BDBLIB:R},' \ - -e 's,(ol_cv_lib_db=)yes$$,\1-l${BDBLIB:R},' -.endif - -.if defined(WITHOUT_SHELL) -CONFIGURE_ARGS+= --enable-shell=${BACKEND_ENABLE} -PLIST_SUB+= BACK_SHELL=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_SHELL="@comment " -.endif - -.if defined(WITH_PERL) -USE_PERL5= yes -CONFIGURE_ARGS+= --enable-perl=${BACKEND_ENABLE} -CONFIGURE_ENV+= PERLBIN="${PERL}" -PLIST_SUB+= BACK_PERL=${BACKEND_PLIST} -.else -PLIST_SUB+= BACK_PERL="@comment " -.endif - -.if defined(WITH_SASL) && !defined(WITHOUT_SASL) -CONFIGURE_ARGS+= --enable-spasswd -.endif - -.if defined(WITH_ODBC) -CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE} -PLIST_SUB+= BACK_SQL=${BACKEND_PLIST} -WITH_ODBC_TYPE?= iODBC -.if ${WITH_ODBC_TYPE:L} == iodbc -LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc -.elif ${WITH_ODBC_TYPE:L} == unixodbc -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC -.else -IGNORE= : WITH_ODBC_TYPE must be iODBC or unixODBC -.endif -.else -PLIST_SUB+= BACK_SQL="@comment " -.endif - -.if defined(WITH_SLAPI) -CONFIGURE_ARGS+= --enable-slapi -PLIST_SUB+= SLAPI="" -INSTALLS_SHLIB= yes -.else -PLIST_SUB+= SLAPI="@comment " -.endif - -.if defined(WITH_SLP) -CONFIGURE_ARGS+= --enable-slp -LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp -.endif - -# Include tcp-wrapper support -.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h) -CONFIGURE_ARGS+= --enable-wrappers -.endif - -# end of client/server specific configuration -.endif - -.if defined(WITH_CLDAP) -CPPFLAGS+= -DLDAP_CONNECTIONLESS -.endif - -CPPFLAGS+= ${PTHREAD_CFLAGS} \ - -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -#LIBS+= ${PTHREAD_LIBS} - -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LIBS="${LIBS}" - -.if defined(CLIENT_ONLY) -.include "${FILESDIR}/manpages" -.else -.if defined(WITH_RCORDER) && ( defined(DFOSVERSION) || ${OSVERSION} >= 500038 ) -RC_DIR= / -RC_SUFX= -PLIST_SUB+= RCORDER="" RC_DIR="" -.else -RC_DIR= ${PREFIX} -RC_SUFX= .sh -PLIST_SUB+= RCORDER="@comment " RC_DIR="%D" -.endif -SED_SCRIPT+= -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ - -e 's,%%RC_DIR%%,${RC_DIR:S/\/$//},g' \ - -e 's,%%RC_SUFX%%,${RC_SUFX},g' -PLIST_SUB+= RC_SUFX=${RC_SUFX} -.endif - -post-patch: - @${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \ - ${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf -.if defined(CONFIGURE_SED) - @${REINPLACE_CMD} -E ${CONFIGURE_SED} \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} -.endif - -pre-configure: - @if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ - ${FALSE}; \ - fi - -post-build: -.for script in slapd slurpd - @${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh >${WRKDIR}/${script}.sh -.endfor -.for text in pkg-install pkg-message pkg-deinstall - @if [ -f ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \ - ${SED} ${SED_SCRIPT} ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} \ - >${WRKDIR}/${text}; \ - fi -.endfor - -.if !defined(CLIENT_ONLY) -test: build - @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \ - ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test -.endif - -pre-install: - @if [ -f ${PKGINSTALL} ]; then \ - ${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \ - fi -.if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) - @${MKDIR} ${DESTDIR}${PREFIX}/libexec/openldap -.endif - -post-install: -.if defined(CLIENT_ONLY) -.if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${DOCSDIR} - @for dir in drafts rfc; do \ - ${MKDIR} ${DESTDIR}${DOCSDIR}/$${dir}; \ - ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DESTDIR}${DOCSDIR}/$${dir}; \ - done -.endif -.else - @${MKDIR} ${DESTDIR}${LDAP_RUN_DIR} - @for schema in ${SCHEMATA}; do \ - ${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \ - "%D/etc/openldap/schema/$${schema}.schema.default; then" \ - "rm -f %D/etc/openldap/schema/$${schema}.schema; fi"; \ - ${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default"; \ - ${ECHO_CMD} "@exec [ -f %B/$${schema}.schema ] || ${CP} %B/%f %B/$${schema}.schema"; \ - done >>${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST} - @[ "${RC_DIR:S/\/$//}" = "${PREFIX}" ] || ${ECHO_CMD} "@cwd ${RC_DIR}" >>${TMPPLIST} -.for script in slapd slurpd - @${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${DESTDIR}${RC_DIR:S/\/$//}/etc/rc.d/${script}${RC_SUFX} - @${ECHO_CMD} "etc/rc.d/${script}${RC_SUFX}" >>${TMPPLIST} -.endfor - @[ "${RC_DIR:S/\/$//}" = "${PREFIX}" ] || ${ECHO_CMD} "@cwd ${PREFIX}" >>${TMPPLIST} -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo deleted file mode 100644 index 7606303a6a67..000000000000 --- a/net/openldap24-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (openldap-2.3.19.tgz) = 867ee197df0e4432fa00f2439e6094f6 -SHA256 (openldap-2.3.19.tgz) = cb58e741e6bdaed953af67cac726943436138fbe90b98c665557e77430f64cc3 -SIZE (openldap-2.3.19.tgz) = 3709244 diff --git a/net/openldap24-server/files/extrapatch-Makefile.in b/net/openldap24-server/files/extrapatch-Makefile.in deleted file mode 100644 index e274e6bd35f2..000000000000 --- a/net/openldap24-server/files/extrapatch-Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.in.orig Mon Apr 7 22:23:24 2003 -+++ Makefile.in Thu Jul 10 17:43:35 2003 -@@ -13,9 +13,11 @@ - ## top-level directory of the distribution or, alternatively, at - ## <http://www.OpenLDAP.org/license.html>. - --SUBDIRS= include libraries clients servers tests doc --CLEANDIRS= --INSTALLDIRS= -+SUBDIRS= -+ALLDIRS= include libraries clients servers tests doc -+CLEANDIRS= include libraries clients servers tests doc -+DEPENDDIRS= include libraries clients servers tests doc -+INSTALLDIRS= servers - - makefiles: FORCE - ./config.status diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages deleted file mode 100644 index 9c08b2ad84c3..000000000000 --- a/net/openldap24-server/files/manpages +++ /dev/null @@ -1,214 +0,0 @@ -# -# $FreeBSD$ -# - -MAN1+= ldapcompare.1 \ - ldapdelete.1 \ - ldapmodify.1 \ - ldapmodrdn.1 \ - ldappasswd.1 \ - ldapsearch.1 \ - ldapwhoami.1 -MLINKS+= \ - ldapmodify.1 ldapadd.1 - -MAN3+= lber-decode.3 \ - lber-encode.3 \ - lber-memory.3 \ - lber-types.3 \ - ldap.3 \ - ldap_abandon.3 \ - ldap_add.3 \ - ldap_bind.3 \ - ldap_compare.3 \ - ldap_delete.3 \ - ldap_error.3 \ - ldap_first_attribute.3 \ - ldap_first_entry.3 \ - ldap_first_message.3 \ - ldap_first_reference.3 \ - ldap_get_dn.3 \ - ldap_get_values.3 \ - ldap_modify.3 \ - ldap_modrdn.3 \ - ldap_open.3 \ - ldap_parse_reference.3 \ - ldap_parse_result.3 \ - ldap_result.3 \ - ldap_schema.3 \ - ldap_search.3 \ - ldap_sort.3 \ - ldap_url.3 -MLINKS+= \ - lber-decode.3 ber_first_element.3 \ - lber-decode.3 ber_get_bitstring.3 \ - lber-decode.3 ber_get_boolean.3 \ - lber-decode.3 ber_get_enum.3 \ - lber-decode.3 ber_get_int.3 \ - lber-decode.3 ber_get_next.3 \ - lber-decode.3 ber_get_null.3 \ - lber-decode.3 ber_get_stringa.3 \ - lber-decode.3 ber_get_stringb.3 \ - lber-decode.3 ber_next_element.3 \ - lber-decode.3 ber_peek_tag.3 \ - lber-decode.3 ber_scanf.3 \ - lber-decode.3 ber_skip_tag.3 \ - lber-encode.3 ber_alloc_t.3 \ - lber-encode.3 ber_flush.3 \ - lber-encode.3 ber_printf.3 \ - lber-encode.3 ber_put_enum.3 \ - lber-encode.3 ber_put_int.3 \ - lber-encode.3 ber_put_null.3 \ - lber-encode.3 ber_put_ostring.3 \ - lber-encode.3 ber_put_seq.3 \ - lber-encode.3 ber_put_set.3 \ - lber-encode.3 ber_put_string.3 \ - lber-encode.3 ber_start_set.3 \ - lber-types.3 ber_bvarray_add.3 \ - lber-types.3 ber_bvarray_free.3 \ - lber-types.3 ber_bvdup.3 \ - lber-types.3 ber_bvecadd.3 \ - lber-types.3 ber_bvecfree.3 \ - lber-types.3 ber_bvfree.3 \ - lber-types.3 ber_bvstr.3 \ - lber-types.3 ber_bvstrdup.3 \ - lber-types.3 ber_dupbv.3 \ - lber-types.3 ber_free.3 \ - lber-types.3 ber_str2bv.3 \ - ldap_abandon.3 ldap_abandon_ext.3 \ - ldap_add.3 ldap_add_ext.3 \ - ldap_add.3 ldap_add_ext_s.3 \ - ldap_add.3 ldap_add_s.3 \ - ldap_bind.3 ldap_bind_s.3 \ - ldap_bind.3 ldap_kerberos_bind1.3 \ - ldap_bind.3 ldap_kerberos_bind1_s.3 \ - ldap_bind.3 ldap_kerberos_bind2.3 \ - ldap_bind.3 ldap_kerberos_bind2_s.3 \ - ldap_bind.3 ldap_kerberos_bind_s.3 \ - ldap_bind.3 ldap_sasl_bind.3 \ - ldap_bind.3 ldap_sasl_bind_s.3 \ - ldap_bind.3 ldap_simple_bind.3 \ - ldap_bind.3 ldap_simple_bind_s.3 \ - ldap_bind.3 ldap_unbind.3 \ - ldap_bind.3 ldap_unbind_ext.3 \ - ldap_bind.3 ldap_unbind_ext_s.3 \ - ldap_bind.3 ldap_unbind_s.3 \ - ldap_compare.3 ldap_compare_ext.3 \ - ldap_compare.3 ldap_compare_ext_s.3 \ - ldap_compare.3 ldap_compare_s.3 \ - ldap_delete.3 ldap_delete_ext.3 \ - ldap_delete.3 ldap_delete_ext_s.3 \ - ldap_delete.3 ldap_delete_s.3 \ - ldap_error.3 ld_errno.3 \ - ldap_error.3 ldap_err2string.3 \ - ldap_error.3 ldap_errlist.3 \ - ldap_error.3 ldap_perror.3 \ - ldap_error.3 ldap_result2error.3 \ - ldap_first_attribute.3 ldap_next_attribute.3 \ - ldap_first_entry.3 ldap_count_entries.3 \ - ldap_first_entry.3 ldap_next_entry.3 \ - ldap_first_message.3 ldap_count_messages.3 \ - ldap_first_message.3 ldap_next_message.3 \ - ldap_first_reference.3 ldap_count_references.3 \ - ldap_first_reference.3 ldap_next_reference.3 \ - ldap_get_dn.3 ldap_dcedn2dn.3 \ - ldap_get_dn.3 ldap_dn2ad_canonical.3 \ - ldap_get_dn.3 ldap_dn2dcedn.3 \ - ldap_get_dn.3 ldap_dn2str.3 \ - ldap_get_dn.3 ldap_dn2ufn.3 \ - ldap_get_dn.3 ldap_explode_dn.3 \ - ldap_get_dn.3 ldap_explode_rdn.3 \ - ldap_get_dn.3 ldap_str2dn.3 \ - ldap_get_values.3 ldap_count_values.3 \ - ldap_get_values.3 ldap_count_values_len.3 \ - ldap_get_values.3 ldap_get_values_len.3 \ - ldap_get_values.3 ldap_value_free.3 \ - ldap_get_values.3 ldap_value_free_len.3 \ - ldap_modify.3 ldap_modify_ext.3 \ - ldap_modify.3 ldap_modify_ext_s.3 \ - ldap_modify.3 ldap_modify_s.3 \ - ldap_modify.3 ldap_mods_free.3 \ - ldap_modrdn.3 ldap_modrdn2.3 \ - ldap_modrdn.3 ldap_modrdn2_s.3 \ - ldap_modrdn.3 ldap_modrdn_s.3 \ - ldap_open.3 ldap_init.3 \ - ldap_parse_result.3 ldap_parse_extended_result.3 \ - ldap_parse_result.3 ldap_parse_sasl_bind_result.3 \ - ldap_result.3 ldap_msgfree.3 \ - ldap_result.3 ldap_msgid.3 \ - ldap_result.3 ldap_msgtype.3 \ - ldap_schema.3 ldap_attributetype2name.3 \ - ldap_schema.3 ldap_attributetype2str.3 \ - ldap_schema.3 ldap_attributetype_free.3 \ - ldap_schema.3 ldap_matchingrule2name.3 \ - ldap_schema.3 ldap_matchingrule2str.3 \ - ldap_schema.3 ldap_matchingrule_free.3 \ - ldap_schema.3 ldap_objectclass2name.3 \ - ldap_schema.3 ldap_objectclass2str.3 \ - ldap_schema.3 ldap_objectclass_free.3 \ - ldap_schema.3 ldap_scherr2str.3 \ - ldap_schema.3 ldap_str2attributetype.3 \ - ldap_schema.3 ldap_str2matchingrule.3 \ - ldap_schema.3 ldap_str2objectclass.3 \ - ldap_schema.3 ldap_str2syntax.3 \ - ldap_schema.3 ldap_syntax2name.3 \ - ldap_schema.3 ldap_syntax2str.3 \ - ldap_schema.3 ldap_syntax_free.3 \ - ldap_search.3 ldap_search_ext.3 \ - ldap_search.3 ldap_search_ext_s.3 \ - ldap_search.3 ldap_search_s.3 \ - ldap_search.3 ldap_search_st.3 \ - ldap_sort.3 ldap_sort_entries.3 \ - ldap_sort.3 ldap_sort_strcasecmp.3 \ - ldap_sort.3 ldap_sort_values.3 \ - ldap_url.3 ldap_free_urldesc.3 \ - ldap_url.3 ldap_is_ldap_url.3 \ - ldap_url.3 ldap_url_parse.3 - -MAN5+= ldap.conf.5 \ - ldif.5 \ - slapd-bdb.5 \ - slapd-dnssrv.5 \ - slapd-ldap.5 \ - slapd-ldbm.5 \ - slapd-ldif.5 \ - slapd-meta.5 \ - slapd-monitor.5 \ - slapd-null.5 \ - slapd-passwd.5 \ - slapd-perl.5 \ - slapd-relay.5 \ - slapd-shell.5 \ - slapd-sql.5 \ - slapd-tcl.5 \ - slapd.access.5 \ - slapd.conf.5 \ - slapd.plugin.5 \ - slapd.replog.5 \ - slapo-accesslog.5 \ - slapo-auditlog.5 \ - slapo-chain.5 \ - slapo-dynlist.5 \ - slapo-lastmod.5 \ - slapo-pcache.5 \ - slapo-ppolicy.5 \ - slapo-refint.5 \ - slapo-retcode.5 \ - slapo-rwm.5 \ - slapo-syncprov.5 \ - slapo-translucent.5 \ - slapo-unique.5 \ - slapo-valsort.5 -MLINKS+= \ - slapd-bdb.5 slapd-hdb.5 - -MAN8+= slapacl.8 \ - slapadd.8 \ - slapauth.8 \ - slapcat.8 \ - slapd.8 \ - slapdn.8 \ - slapindex.8 \ - slappasswd.8 \ - slaptest.8 \ - slurpd.8 diff --git a/net/openldap24-server/files/patch-build::top.mk b/net/openldap24-server/files/patch-build::top.mk deleted file mode 100644 index 105af6b35122..000000000000 --- a/net/openldap24-server/files/patch-build::top.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- build/top.mk.orig Mon Apr 12 20:21:07 2004 -+++ build/top.mk Wed May 5 12:49:13 2004 -@@ -196,6 +196,8 @@ - SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@ - SLURPD_LIBS = @SLURPD_LIBS@ - -+SLAPI_LIBS = @SLAPI_LIBS@ -+ - # Our Defaults - CC = $(AC_CC) - DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES) diff --git a/net/openldap24-server/files/patch-configure b/net/openldap24-server/files/patch-configure deleted file mode 100644 index 4198340d07c7..000000000000 --- a/net/openldap24-server/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Fri Sep 2 03:27:55 2005 -+++ configure Sun Sep 4 16:10:14 2005 -@@ -34922,7 +34922,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-liodbc $LIBS" -+LIBS="-liodbc $LIBS $LTHREAD_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -34995,7 +34995,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lodbc $LIBS" -+LIBS="-lodbc $LIBS $LTHREAD_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF diff --git a/net/openldap24-server/files/patch-include::ldap_defaults.h b/net/openldap24-server/files/patch-include::ldap_defaults.h deleted file mode 100644 index 6ea31dbcd65c..000000000000 --- a/net/openldap24-server/files/patch-include::ldap_defaults.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/ldap_defaults.h.orig Tue Sep 28 20:18:40 2004 -+++ include/ldap_defaults.h Tue Sep 28 20:20:01 2004 -@@ -39,7 +39,7 @@ - #define LDAP_ENV_PREFIX "LDAP" - - /* default ldapi:// socket */ --#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi" -+#define LDAPI_SOCK "/var/run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" - - /* - * SLAPD DEFINITIONS diff --git a/net/openldap24-server/files/patch-servers::slapd::Makefile.in b/net/openldap24-server/files/patch-servers::slapd::Makefile.in deleted file mode 100644 index 50cec0cf4511..000000000000 --- a/net/openldap24-server/files/patch-servers::slapd::Makefile.in +++ /dev/null @@ -1,44 +0,0 @@ ---- servers/slapd/Makefile.in.orig Fri Sep 2 00:28:10 2005 -+++ servers/slapd/Makefile.in Sun Sep 4 17:34:37 2005 -@@ -372,7 +372,6 @@ - - install-slapd: FORCE - -$(MKDIR) $(DESTDIR)$(libexecdir) -- -$(MKDIR) $(DESTDIR)$(localstatedir)/run - $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ - slapd$(EXEEXT) $(DESTDIR)$(libexecdir) - @for i in $(SUBDIRS); do \ -@@ -403,16 +402,18 @@ - touch all-cffiles - - install-schema: FORCE -- @if test -d $(DESTDIR)$(schemadir) ; then \ -- echo "MOVING EXISTING SCHEMA DIR to $(DESTDIR)$(schemadir).$$$$" ; \ -- mv $(DESTDIR)$(schemadir) $(DESTDIR)$(schemadir).$$$$ ; \ -- fi -- $(MKDIR) $(DESTDIR)$(schemadir) -+ @-$(MKDIR) $(DESTDIR)$(schemadir) - @SD=$(DESTDIR)$(schemadir) ; \ -- files=`cd $(srcdir)/schema ; echo README *.ldif *.schema` ; \ -+ files=`cd $(srcdir)/schema ; echo README *.ldif` ; \ -+ for i in $$files ; do \ -+ echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \ -+ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \ -+ done ; \ -+ files=`cd $(srcdir)/schema ; echo *.schema` ; \ - for i in $$files ; do \ - echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \ - $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \ -+ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i.default ; \ - done - - install-conf: FORCE -@@ -429,8 +430,6 @@ - install-db-config: FORCE - @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) - @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data -- $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ -- $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example - $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \ - $(DESTDIR)$(sysconfdir)/DB_CONFIG.example - diff --git a/net/openldap24-server/files/patch-servers_slapd_overlays_Makefile.in b/net/openldap24-server/files/patch-servers_slapd_overlays_Makefile.in deleted file mode 100644 index 67062675dbeb..000000000000 --- a/net/openldap24-server/files/patch-servers_slapd_overlays_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- servers/slapd/overlays/Makefile.in.orig Fri Sep 2 03:28:11 2005 -+++ servers/slapd/overlays/Makefile.in Sun Sep 4 16:11:22 2005 -@@ -30,6 +30,9 @@ - valsort.c - OBJS = overlays.o \ - @SLAPD_STATIC_OVERLAYS@ -+LIBTOOL_OBJS = overlays.lo \ -+ glue.lo \ -+ version.lo - - # Add here the objs that are needed by overlays, but do not make it - # into SLAPD_STATIC_OVERLAYS... diff --git a/net/openldap24-server/files/slapd.sh b/net/openldap24-server/files/slapd.sh deleted file mode 100644 index a663f674af2c..000000000000 --- a/net/openldap24-server/files/slapd.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: slapd -# REQUIRE: NETWORKING SERVERS -# BEFORE: securelevel -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable slapd: -# -#slapd_enable="YES" -#slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"' -#slapd_sockets="/var/run/openldap/ldapi" -# -# See slapd(8) for more flags -# -# The `-u' and `-g' flags are automatically extracted from slapd_owner, -# by default slapd runs under the non-privileged user id `ldap'. If you -# want to run slapd as root, override this in /etc/rc.conf with -# -#slapd_owner="DEFAULT" -# - -. "%%RC_SUBR%%" - -name="slapd" -rcvar=`set_rcvar` - -command="%%PREFIX%%/libexec/slapd" -pidfile="%%LDAP_RUN_DIR%%/slapd.pid" -required_dirs="%%LDAP_RUN_DIR%%" -required_files="%%PREFIX%%/etc/openldap/slapd.conf" - -start_precmd=start_precmd -start_postcmd=start_postcmd - -# extract user and group, adjust ownership of directories and database - -start_precmd() -{ - local slapd_ownername slapd_groupname - - case x"$slapd_owner" in - ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt]) - ;; - *) - chown "$slapd_owner" "%%LDAP_RUN_DIR%%" - chown -RL "$slapd_owner" "%%DATABASEDIR%%" - chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf" - - slapd_ownername=`expr //"$slapd_owner" : //'\([^:]*\)'` - slapd_groupname=`expr //"$slapd_owner" : //'.*:\([^:]*\)'` - - if [ -n "$slapd_ownername" ]; then - rc_flags="$rc_flags -u $slapd_ownername" - fi - if [ -n "$slapd_groupname" ]; then - rc_flags="$rc_flags -g $slapd_groupname" - fi - ;; - esac -} - -# adjust ownership of created unix sockets - -start_postcmd() -{ - local socket seconds - - for socket in $slapd_sockets; do - for seconds in 1 2 3 4 5; do - [ -e "$socket" ] && break - sleep 1 - done - if [ -S "$socket" ]; then - case "$slapd_owner" in - ""|[Nn][Oo][Nn][Ee]|[Dd][Ee][Ff][Aa][Uu][Ll][Tt]) - ;; - *) - chown "$slapd_owner" "$socket" - ;; - esac - chmod "$slapd_sockets_mode" "$socket" - else - warn "slapd: Can't find socket $socket" - fi - done -} - -# read settings, set defaults -load_rc_config $name -: ${slapd_enable="NO"} -if [ -n "${slapd_args+set}" ]; then - warn "slapd_args is deprecated, use slapd_flags" - : ${slapd_flags="$slapd_args"} -else - : ${slapd_flags=""} -fi -: ${slapd_owner="ldap:ldap"} -: ${slapd_sockets=""} -: ${slapd_sockets_mode="666"} - -run_rc_command "$1" diff --git a/net/openldap24-server/files/slurpd.sh b/net/openldap24-server/files/slurpd.sh deleted file mode 100644 index ea5e5b0642b6..000000000000 --- a/net/openldap24-server/files/slurpd.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: slurpd -# REQUIRE: slapd -# BEFORE: -# KEYWORD: shutdown - -# Add the following line to /etc/rc.conf to enable slurpd: -# -#slurpd_enable="YES" -# -# See slurpd(8) for more flags -# - -. "%%RC_SUBR%%" - -name="slurpd" -rcvar=`set_rcvar` - -command="%%PREFIX%%/libexec/slurpd" -required_files="%%PREFIX%%/etc/openldap/slapd.conf" - -# read settings, set defaults -load_rc_config $name -: ${slurpd_enable="NO"} -if [ -n "${slurpd_args+set}" ]; then - warn "slurpd_args is deprecated, use slurpd_flags" - : ${slurpd_flags="$slurpd_args"} -else - : ${slurpd_flags=""} -fi - -run_rc_command "$1" diff --git a/net/openldap24-server/pkg-deinstall b/net/openldap24-server/pkg-deinstall deleted file mode 100644 index 2a5ec1ef8f65..000000000000 --- a/net/openldap24-server/pkg-deinstall +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -ECHO_CMD=echo - -case $2 in -POST-DEINSTALL) - ${ECHO_CMD} - ${ECHO_CMD} "The OpenLDAP server package has been deleted." - ${ECHO_CMD} "If you're *not* upgrading and won't be using" - ${ECHO_CMD} "it any longer, you may want to issue the" - ${ECHO_CMD} "following commands:" - ${ECHO_CMD} - if [ -d %%DATABASEDIR%% ]; then - ${ECHO_CMD} "- to delete the OpenLDAP database permanently (losing all data):" - ${ECHO_CMD} " rm -Rf %%DATABASEDIR%%" - ${ECHO_CMD} - fi - if [ -d %%SLURPDIR%% ]; then - ${ECHO_CMD} "- to remove the OpenLDAP replication directory:" - ${ECHO_CMD} " rm -Rf %%SLURPDIR%%" - ${ECHO_CMD} - fi - ${ECHO_CMD} "- to remove the OpenLDAP user:" - ${ECHO_CMD} " pw userdel ldap" - ${ECHO_CMD} - ${ECHO_CMD} "If you are upgrading, don't forget to restart" - ${ECHO_CMD} "slapd and slurpd." - ${ECHO_CMD} - ;; -esac diff --git a/net/openldap24-server/pkg-descr b/net/openldap24-server/pkg-descr deleted file mode 100644 index 77cca2d8bc81..000000000000 --- a/net/openldap24-server/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers, -clients, utilities and development tools. - -This package includes the following major components: - - * slapd - a stand-alone LDAP directory server - * slurpd - a stand-alone LDAP replication server - * LDIF tools - data conversion tools for use with slapd - -This is an alpha release of OpenLDAP Software for evaluation purposes only. - -WWW: http://www.OpenLDAP.org/ diff --git a/net/openldap24-server/pkg-descr.client b/net/openldap24-server/pkg-descr.client deleted file mode 100644 index 76d4e00e69f6..000000000000 --- a/net/openldap24-server/pkg-descr.client +++ /dev/null @@ -1,11 +0,0 @@ -OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers, -clients, utilities and development tools. - -This package includes the following major components: - - * -lldap - a LDAP client library - * -llber - a lightweight BER/DER encoding/decoding library - * LDAP tools - A collection of command line LDAP utilities - * documentation - man pages for all components - -WWW: http://www.OpenLDAP.org/ diff --git a/net/openldap24-server/pkg-install b/net/openldap24-server/pkg-install deleted file mode 100644 index aa9b0cf46da9..000000000000 --- a/net/openldap24-server/pkg-install +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -CHOWN=/usr/sbin/chown -ECHO_CMD=echo -GREP=/usr/bin/grep -PKG_INFO=/usr/sbin/pkg_info -PW=/usr/sbin/pw - -FTPUSERS=/etc/ftpusers - -case $2 in -PRE-INSTALL) - if ! ${PW} usershow -n ldap >/dev/null 2>&1; then - ${ECHO_CMD} - if ! ${PW} groupshow -n ldap >/dev/null 2>&1; then - if ! ${PW} groupadd -n ldap -g 389; then - ${ECHO_CMD} "*** Failed to add a group ldap with id 389." - ${ECHO_CMD} - ${ECHO_CMD} "Please add the ldap user manually with" - ${ECHO_CMD} " ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\" - ${ECHO_CMD} " -d /nonexistent -s /sbin/nologin -h -" - ${ECHO_CMD} "and retry installing this package." - exit 1 - fi - ${ECHO_CMD} "===> Group 'ldap' created." - fi - if ! ${PW} useradd -n ldap -u 389 -g ldap -c 'OpenLDAP Server' \ - -d /nonexistent -s /sbin/nologin -h -; then - ${ECHO_CMD} "*** Failed to add an user ldap with id 389." - ${ECHO_CMD} - ${ECHO_CMD} "Please add the ldap user manually with" - ${ECHO_CMD} " ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\" - ${ECHO_CMD} " -d /nonexistent -s /sbin/nologin -h -" - ${ECHO_CMD} "and retry installing this package." - exit 1 - fi - ${GREP} -qs '^ldap$' ${FTPUSERS} || ${ECHO_CMD} ldap >> ${FTPUSERS} - ${ECHO_CMD} "===> Account 'ldap' created." - fi - ;; -esac diff --git a/net/openldap24-server/pkg-message b/net/openldap24-server/pkg-message deleted file mode 100644 index 61f386264246..000000000000 --- a/net/openldap24-server/pkg-message +++ /dev/null @@ -1,23 +0,0 @@ -************************************************************ - -The OpenLDAP server package has been successfully installed. - -In order to run the LDAP server, you need to edit - %%PREFIX%%/etc/openldap/slapd.conf -to suit your needs and add the following lines to /etc/rc.conf: - slapd_enable="YES" - slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"' - slapd_sockets="/var/run/openldap/ldapi" - -Then start the server with - %%RC_DIR%%/etc/rc.d/slapd%%RC_SUFX%% start -or reboot. - -Try `man slapd' and the online manual at - http://www.OpenLDAP.org/doc/ -for more information. - -slapd runs under a non-privileged user id (by default `ldap'), -see %%RC_DIR%%/etc/rc.d/slapd%%RC_SUFX%% for more information. - -************************************************************ diff --git a/net/openldap24-server/pkg-message.client b/net/openldap24-server/pkg-message.client deleted file mode 100644 index 92ef70d0f99b..000000000000 --- a/net/openldap24-server/pkg-message.client +++ /dev/null @@ -1,13 +0,0 @@ -************************************************************ - -The OpenLDAP client package has been successfully installed. - -Edit - %%PREFIX%%/etc/openldap/ldap.conf -to change the system-wide client defaults. - -Try `man ldap.conf' and visit the OpenLDAP FAQ-O-Matic at - http://www.OpenLDAP.org/faq/index.cgi?file=3 -for more information. - -************************************************************ diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist deleted file mode 100644 index 3e3bff42a860..000000000000 --- a/net/openldap24-server/pkg-plist +++ /dev/null @@ -1,73 +0,0 @@ -@comment $FreeBSD$ -@unexec %%RC_DIR%%/etc/rc.d/slapd%%RC_SUFX%% stop 2>&1 >/dev/null || true -@unexec %%RC_DIR%%/etc/rc.d/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true -etc/openldap/schema/README -etc/openldap/schema/core.ldif -etc/openldap/schema/openldap.ldif -@unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi -etc/openldap/slapd.conf.default -@exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf -etc/openldap/DB_CONFIG.example -%%SLAPI%%lib/libslapi.a -%%SLAPI%%lib/libslapi.la -%%SLAPI%%lib/libslapi.so -%%SLAPI%%lib/libslapi-2.3.so -%%SLAPI%%lib/libslapi-2.3.so.2 -%%MODULES%%@exec mkdir -p %D/libexec/openldap -%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so -%%BACK_BDB%%libexec/openldap/back_bdb-2.3.so.2 -%%BACK_BDB%%libexec/openldap/back_bdb.la -%%BACK_BDB%%libexec/openldap/back_bdb.so -%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so -%%BACK_HDB%%libexec/openldap/back_hdb-2.3.so.2 -%%BACK_HDB%%libexec/openldap/back_hdb.la -%%BACK_HDB%%libexec/openldap/back_hdb.so -%%BACKEND%%libexec/openldap/back_ldap-2.3.so -%%BACKEND%%libexec/openldap/back_ldap-2.3.so.2 -%%BACKEND%%libexec/openldap/back_ldap.la -%%BACKEND%%libexec/openldap/back_ldap.so -%%BACKEND%%libexec/openldap/back_ldbm-2.3.so -%%BACKEND%%libexec/openldap/back_ldbm-2.3.so.2 -%%BACKEND%%libexec/openldap/back_ldbm.la -%%BACKEND%%libexec/openldap/back_ldbm.so -%%BACKEND%%libexec/openldap/back_meta-2.3.so -%%BACKEND%%libexec/openldap/back_meta-2.3.so.2 -%%BACKEND%%libexec/openldap/back_meta.la -%%BACKEND%%libexec/openldap/back_meta.so -%%BACKEND%%libexec/openldap/back_monitor-2.3.so -%%BACKEND%%libexec/openldap/back_monitor-2.3.so.2 -%%BACKEND%%libexec/openldap/back_monitor.la -%%BACKEND%%libexec/openldap/back_monitor.so -%%BACKEND%%libexec/openldap/back_null-2.3.so -%%BACKEND%%libexec/openldap/back_null-2.3.so.2 -%%BACKEND%%libexec/openldap/back_null.la -%%BACKEND%%libexec/openldap/back_null.so -%%BACK_PERL%%libexec/openldap/back_perl-2.3.so -%%BACK_PERL%%libexec/openldap/back_perl-2.3.so.2 -%%BACK_PERL%%libexec/openldap/back_perl.la -%%BACK_PERL%%libexec/openldap/back_perl.so -%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so -%%BACK_SHELL%%libexec/openldap/back_shell-2.3.so.2 -%%BACK_SHELL%%libexec/openldap/back_shell.la -%%BACK_SHELL%%libexec/openldap/back_shell.so -%%BACK_SQL%%libexec/openldap/back_sql-2.3.so -%%BACK_SQL%%libexec/openldap/back_sql-2.3.so.2 -%%BACK_SQL%%libexec/openldap/back_sql.la -%%BACK_SQL%%libexec/openldap/back_sql.so -libexec/slapd -libexec/slurpd -@dirrmtry libexec/openldap -sbin/slapacl -sbin/slapadd -sbin/slapauth -sbin/slapcat -sbin/slapdn -sbin/slapindex -sbin/slappasswd -sbin/slaptest -@exec mkdir -p %%LDAP_RUN_DIR%% -@unexec rmdir %%LDAP_RUN_DIR%% 2>/dev/null || true -@exec mkdir -p %%DATABASEDIR%% -@unexec rmdir %%DATABASEDIR%% 2>/dev/null || true -@exec mkdir -p %%SLURPDIR%% -@unexec rmdir %%SLURPDIR%% 2>/dev/null || true diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client deleted file mode 100644 index 1fe93c92531c..000000000000 --- a/net/openldap24-server/pkg-plist.client +++ /dev/null @@ -1,46 +0,0 @@ -@comment $FreeBSD$ -bin/ldapadd -bin/ldapcompare -bin/ldapdelete -bin/ldapmodify -bin/ldapmodrdn -bin/ldappasswd -bin/ldapsearch -bin/ldapwhoami -@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi -etc/openldap/ldap.conf.default -@exec [ -f %B/ldap.conf ] || cp %B/%f %B/ldap.conf -@dirrmtry etc/openldap -include/lber.h -include/lber_types.h -include/ldap.h -include/ldap_cdefs.h -include/ldap_features.h -include/ldap_schema.h -include/ldap_utf8.h -include/slapi-plugin.h -lib/liblber-2.3.so -lib/liblber-2.3.so.2 -lib/liblber.a -lib/liblber.la -lib/liblber.so -lib/libldap-2.3.so -lib/libldap-2.3.so.2 -lib/libldap.a -lib/libldap.la -lib/libldap.so -lib/libldap_r-2.3.so -lib/libldap_r-2.3.so.2 -lib/libldap_r.a -lib/libldap_r.la -lib/libldap_r.so -@comment share/openldap/ucdata/case.dat -@comment share/openldap/ucdata/cmbcl.dat -@comment share/openldap/ucdata/comp.dat -@comment share/openldap/ucdata/ctype.dat -@comment share/openldap/ucdata/decomp.dat -@comment share/openldap/ucdata/kdecomp.dat -@comment share/openldap/ucdata/num.dat -@comment @dirrm share/openldap/ucdata -@comment @dirrm share/openldap -@dirrmtry libexec/openldap diff --git a/net/openslp/files/slpd.in b/net/openslp/files/slpd.in deleted file mode 100644 index 1ec3175a6d76..000000000000 --- a/net/openslp/files/slpd.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: slpd -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following line to /etc/rc.conf to enable slpd: -# -# slpd_enable="YES" -# - -slpd_enable=${slpd_enable-"NO"} -slpd_flags=${slpd_flags-"-p /var/run/slpd.pid"} - -. %%RC_SUBR%% - -name=slpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/slpd -pidfile="/var/run/${name}.pid" - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile deleted file mode 100644 index 0f885107c300..000000000000 --- a/net/p5-IO-Socket-INET6/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# New ports collection makefile for: p5-IO-INET6 -# Date created: 02 July 2003 -# Whom: Janos.Mohacsi@bsd.hu -# -# $FreeBSD$ -# - -PORTNAME= IO-Socket-INET6 -PORTVERSION= 2.51 -PORTREVISION= 1 -CATEGORIES= net perl5 ipv6 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= IO -PKGNAMEPREFIX= p5- - -MAINTAINER= janos.mohacsi@bsd.hu -COMMENT= Perl module with object interface to AF_INET6 domain sockets - -BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Socket6.pm:${PORTSDIR}/net/p5-Socket6 -RUN_DEPENDS= ${BUILD_DEPENDS} - -MAN3= IO::Socket::INET6.3 - -PERL_CONFIGURE= yes - -.include <bsd.port.pre.mk> -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES= ${PATCHDIR}/5.005_03.diff -.endif - -.include <bsd.port.post.mk> - diff --git a/net/p5-IO-Socket-INET6/distinfo b/net/p5-IO-Socket-INET6/distinfo deleted file mode 100644 index afe07fdf8505..000000000000 --- a/net/p5-IO-Socket-INET6/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (IO-Socket-INET6-2.51.tar.gz) = e4ef8b7944fa036cda19dc3e1cc688a6 -SHA256 (IO-Socket-INET6-2.51.tar.gz) = 09ce71fd016ed098ad7be78aa0ec1746360820e8d3a738a377bbcfffe8dd4208 -SIZE (IO-Socket-INET6-2.51.tar.gz) = 9618 diff --git a/net/p5-IO-Socket-INET6/files/5.005_03.diff b/net/p5-IO-Socket-INET6/files/5.005_03.diff deleted file mode 100644 index 10dc9fa57dae..000000000000 --- a/net/p5-IO-Socket-INET6/files/5.005_03.diff +++ /dev/null @@ -1,32 +0,0 @@ - -$FreeBSD$ - ---- INET6.pm.orig -+++ INET6.pm -@@ -10,7 +10,7 @@ - package IO::Socket::INET6; - - use strict; --our(@ISA, $VERSION); -+use vars qw(@ISA $VERSION); - use IO::Socket; - use Socket; - use Socket6; -@@ -22,7 +22,7 @@ - $VERSION = "2.51"; - #Purpose: allow protocol independent protocol and original interface. - --my $EINVAL = exists(&Errno::EINVAL) ? Errno::EINVAL() : 1; -+my $EINVAL = defined(&Errno::EINVAL) ? Errno::EINVAL() : 1; - - IO::Socket::INET6->register_domain( AF_INET6 ); - -@@ -190,7 +190,7 @@ - } - - if ($arg->{ReusePort}) { -- $sock->sockopt(SO_REUSEPORT,1) or -+ $sock->sockopt(0x0200,1) or - return _error($sock, $!, "sockopt: $!"); - } - diff --git a/net/p5-IO-Socket-INET6/pkg-descr b/net/p5-IO-Socket-INET6/pkg-descr deleted file mode 100644 index 714ad2896191..000000000000 --- a/net/p5-IO-Socket-INET6/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -IO::Socket::INET6 provides an object interface to creating and using sockets -in the AF_INET6 domain. It is built upon the IO::Socket interface and -inherits all the methods defined by IO::Socket. As a consequence, this module -is protocol independent, it can run both IPv6 & IPv4, when DNS names are -passed. - -WWW: http://search.cpan.org/dist/IO-INET6/ diff --git a/net/p5-IO-Socket-INET6/pkg-plist b/net/p5-IO-Socket-INET6/pkg-plist deleted file mode 100644 index aea89e1b2ff9..000000000000 --- a/net/p5-IO-Socket-INET6/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -%%SITE_PERL%%/IO/Socket/INET6.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6/.packlist -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket/INET6 -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/IO -@dirrmtry %%SITE_PERL%%/IO/Socket -@dirrmtry %%SITE_PERL%%/IO diff --git a/net/p5-Net-EPP/Makefile b/net/p5-Net-EPP/Makefile deleted file mode 100644 index 68721ccd56b8..000000000000 --- a/net/p5-Net-EPP/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: Net-EPP-Client -# Date created: 18 Feb 2006 -# Whom: Aaron Dalton <aaron@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= Net-EPP-Client -PORTVERSION= 0.05 -CATEGORIES= net perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= Net -PKGNAMEPREFIX= p5- - -MAINTAINER= aaron@FreeBSD.org -COMMENT= Client library for the TCP transport for EPP - -BUILD_DEPENDS= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL \ - ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \ - ${SITE_PERL}/Net/EPP/Frame.pm:${PORTSDIR}/net/p5-Net-EPP-Frame -RUN_DEPENDS+= ${BUILD_DEPENDS} - -MAN3= Net::EPP::Client.3 - -PERL_CONFIGURE= yes - -.include <bsd.port.mk> diff --git a/net/p5-Net-EPP/distinfo b/net/p5-Net-EPP/distinfo deleted file mode 100644 index a200088b27ae..000000000000 --- a/net/p5-Net-EPP/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (Net-EPP-Client-0.05.tar.gz) = e97754aae96b7e502c251693b5da4be0 -SHA256 (Net-EPP-Client-0.05.tar.gz) = 7bf95e94b0d249134a4eb15348de002389a62c279d2708dfde84f633d2a97600 -SIZE (Net-EPP-Client-0.05.tar.gz) = 10927 diff --git a/net/p5-Net-EPP/pkg-descr b/net/p5-Net-EPP/pkg-descr deleted file mode 100644 index 06626031dc44..000000000000 --- a/net/p5-Net-EPP/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -EPP is the Extensible Provisioning Protocol. EPP (defined in RFC 3730) is -an application layer client-server protocol for the provisioning and -management of objects stored in a shared central repository. Specified in -XML, the protocol defines generic object management operations and an -extensible framework that maps protocol operations to objects. As of -writing, its only well-developed application is the provisioning of -Internet domain names, hosts, and related contact details. - -RFC 3734 defines a TCP based transport model for EPP, and this module -implements a client for that model. You can establish and manage EPP -connections and send and receive responses over this connection. - -Net::EPP::Client also provides some time-saving features, such as being -able to provide request and response frames as Net::EPP::Frame objects. - -WWW: http://search.cpan.org/dist/Net-EPP-Client/ -Author: Gavin Brown <epp@centralnic.com> diff --git a/net/p5-Net-EPP/pkg-plist b/net/p5-Net-EPP/pkg-plist deleted file mode 100644 index 206119dfddaf..000000000000 --- a/net/p5-Net-EPP/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -%%SITE_PERL%%/Net/EPP/Client.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EPP/Client/.packlist -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EPP/Client -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/EPP -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net -@dirrmtry %%SITE_PERL%%/Net/EPP -@dirrmtry %%SITE_PERL%%/Net diff --git a/net/pear-Net_LDAP2/Makefile b/net/pear-Net_LDAP2/Makefile deleted file mode 100644 index 6814d6cc8933..000000000000 --- a/net/pear-Net_LDAP2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Ports collection makefile for: pear-Net_LDAP -# Date created: 26 June 2004 -# Whom: Gerrit Beine (<tux@pinguru.net>) -# -# $FreeBSD$ -# - -PORTNAME= Net_LDAP -PORTVERSION= 0.6.6 -CATEGORIES= net pear - -MAINTAINER= tux@pinguru.net -COMMENT= OO interface for searching and manipulating LDAP-entries - -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear -RUN_DEPENDS= ${BUILD_DEPENDS} - -USE_PHP= ldap -CATEGORY= Net -FILES= LDAP.php \ - LDAP/Entry.php LDAP/RootDSE.php LDAP/Schema.php \ - LDAP/Search.php LDAP/Util.php -DOCS= README.txt RootDSE.txt STATUS Schema.txt utf8.txt -_DOCSDIR= ./doc -TESTS= tests.php - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear/bsd.pear.mk" -.include <bsd.port.post.mk> diff --git a/net/pear-Net_LDAP2/distinfo b/net/pear-Net_LDAP2/distinfo deleted file mode 100644 index 71e83e55cc09..000000000000 --- a/net/pear-Net_LDAP2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (PEAR/Net_LDAP-0.6.6.tgz) = d19f11c671122d0ff30928d86a868096 -SHA256 (PEAR/Net_LDAP-0.6.6.tgz) = e56aff9e6894fb9472d08a9deaed36c466e96f99231b68ba229666e20a6a4512 -SIZE (PEAR/Net_LDAP-0.6.6.tgz) = 32776 diff --git a/net/pear-Net_LDAP2/pkg-descr b/net/pear-Net_LDAP2/pkg-descr deleted file mode 100644 index 92111429d672..000000000000 --- a/net/pear-Net_LDAP2/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -Net Ldap is a clone of Perls Net::LDAP object interface to -ldapservers. It does not contain all of Net::LDAPs features, -but has: -* A simple OO-interface to connections, searches and entries. -* Support for tls and ldap v3. -* Simple modification, deletion and creation of ldapentries. -* Support for schema handling. - -WWW: http://pear.php.net/package/Net_LDAP/ diff --git a/net/pear-Net_URL2/Makefile b/net/pear-Net_URL2/Makefile deleted file mode 100644 index e27a27b20b13..000000000000 --- a/net/pear-Net_URL2/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Ports collection makefile for: pear-Net_URL -# Date created: 2003-04-04 -# Whom: Roman Neuhauser (<neuhauser@bellavista.cz>) -# -# $FreeBSD$ -# - -PORTNAME= Net_URL -PORTVERSION= 1.0.14 -CATEGORIES= net www pear - -MAINTAINER= ports@FreeBSD.org -COMMENT= Easy parsing of URLs - -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear -RUN_DEPENDS= ${BUILD_DEPENDS} - -CATEGORY= Net -FILES= URL.php -EXAMPLES= example.php -_EXAMPLESDIR= docs - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear/bsd.pear.mk" -.include <bsd.port.post.mk> diff --git a/net/pear-Net_URL2/distinfo b/net/pear-Net_URL2/distinfo deleted file mode 100644 index 553b0d0ce450..000000000000 --- a/net/pear-Net_URL2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (PEAR/Net_URL-1.0.14.tgz) = 4be5ac05dc5a9bc54a33cec66d87eb0a -SHA256 (PEAR/Net_URL-1.0.14.tgz) = 36d2d3ac0ac2969513ca3a5e99a5a2e2cb401956ab03b47e718903f131677c45 -SIZE (PEAR/Net_URL-1.0.14.tgz) = 5173 diff --git a/net/pear-Net_URL2/pkg-descr b/net/pear-Net_URL2/pkg-descr deleted file mode 100644 index 665b71d7b107..000000000000 --- a/net/pear-Net_URL2/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Provides easy parsing of URLs and their constituent parts. - -WWW: http://pear.php.net/package/Net_URL/ diff --git a/net/phpldapadmin098/Makefile b/net/phpldapadmin098/Makefile deleted file mode 100644 index 546ff0e6f4a7..000000000000 --- a/net/phpldapadmin098/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# New ports collection makefile for: phpLDAPadmin -# Date created: 30 Apr 2004 -# Whom: Matthew Seaman -# -# $FreeBSD$ -# - -PORTNAME= phpldapadmin -PORTVERSION= 0.9.8 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= net www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= phpldapadmin -DISTNAME= ${PORTNAME}-${PORTVERSION} - -MAINTAINER= m.seaman@infracaninophile.co.uk -COMMENT= A set of PHP-scripts to administer LDAP servers over the web - -NO_BUILD= yes -USE_PHP= gettext ldap openssl pcre session - -.if defined(WITH_SUPHP) - -PKGNAMESUFFIX= -suphp -RUN_DEPENDS+= ${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp -WANT_PHP_CGI= yes - -PLAUSR?= pldapadm - -SUB_LIST+= PLAUSR=${PLAUSR} \ - PLAGRP=${PLAGRP} -SUB_FILES+= pkg-install pkg-deinstall - -.else - -WANT_PHP_WEB= yes - -.endif - -# PLAUSR is only used WITH_SUPHP -PLADIR?= www/${PORTNAME} -PLAGRP?= ${WWWGRP} -CFGDIR= config -CFGFILE= config.php - -SUB_LIST+= PKGNAME=${PKGNAME} \ - PLADIR=${PLADIR} -SUB_FILES+= pkg-message - -PLIST= ${WRKDIR}/plist -PLIST_SUB+= PLADIR=${PLADIR} PLAGRP=${PLAGRP} - -.SILENT: - -pre-everything:: - ${ECHO_MSG} "" - ${ECHO_MSG} "You may use the following build options:" - ${ECHO_MSG} "" - ${ECHO_MSG} " WITH_SUPHP=yes Install appropriately for use with" - ${ECHO_MSG} " the www/suphp port [default: no]" - ${ECHO_MSG} "" - -post-patch: - cd ${WRKSRC} ; \ - ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore | \ - ${SORT} | ${SED} -e "s!^\.!%%PLADIR%%!" >${PLIST} ; \ - ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ - ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e 's!^\./${CFGDIR}$$!@dirrmtry %%PLADIR%%/${CFGDIR}!' \ - -e 's!^\.$$!@dirrmtry %%PLADIR%%!' \ - -e 's!^\.!@dirrm %%PLADIR%%!' >>${PLIST} - -pre-install: -.if defined(WITH_SUPHP) - ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.endif - -do-install: install-app install-conf - -install-app: - cd ${WRKSRC} ; \ - for src in $$( ${FIND} . ! -name .cvsignore ) ; do \ - dst=${PREFIX}/${PLADIR}$${src#.} ; \ - if ${TEST} -d $$src ; then \ - ${MKDIR} $$dst ; \ - else \ - ${INSTALL_DATA} $$src $$dst ; \ - fi \ - done - -install-conf: - cd ${PREFIX}/${PLADIR}/${CFGDIR} ; \ - ${CHMOD} 0640 ${CFGFILE}.example ; \ - ${CHGRP} ${PLAGRP} ${CFGFILE}.example ; \ - if ${TEST} ! -f ${CFGFILE} ; then \ - ${CP} -p ${CFGFILE}.example ${CFGFILE} ; \ - fi - -post-install: -.if defined(WITH_SUPHP) - ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif - ${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/net/phpldapadmin098/distinfo b/net/phpldapadmin098/distinfo deleted file mode 100644 index fefa3f581d29..000000000000 --- a/net/phpldapadmin098/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (phpldapadmin-0.9.8.tar.gz) = 32251f799a5b1664003b4417f6fd96a8 -SHA256 (phpldapadmin-0.9.8.tar.gz) = 5bb3289a1ff058deda106f5d33623445b066b9881c76bc105f35b6855feb0542 -SIZE (phpldapadmin-0.9.8.tar.gz) = 751893 diff --git a/net/phpldapadmin098/files/pkg-deinstall.in b/net/phpldapadmin098/files/pkg-deinstall.in deleted file mode 100644 index 79aa1f894cc8..000000000000 --- a/net/phpldapadmin098/files/pkg-deinstall.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/net/phpldapadmin098/files/Attic/pkg-deinstall.in,v 1.1 2005-12-11 23:51:12 lawrance Exp $ -# - -case $2 in - POST-DEINSTALL) - cat <<EOMSG -The phpldapadmin-suphp port has been deleted. -If you are not upgrading and don't intend to use -phpLDAPadmin any more then you may wish to delete -the %%PLAUSR%% account, which can be done with -the following command: - - # pw userdel %%PLAUSR%% -EOMSG - if [ -d %%PREFIX%%/%%PLADIR%% ] ; then - echo " # rm -rf %%PREFIX%%/%%PLADIR%%/" - fi - echo - ;; -esac - -# -# That's All Folks! -# diff --git a/net/phpldapadmin098/files/pkg-install.in b/net/phpldapadmin098/files/pkg-install.in deleted file mode 100644 index 853f54b955e2..000000000000 --- a/net/phpldapadmin098/files/pkg-install.in +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: /tmp/pcvs/ports/net/phpldapadmin098/files/Attic/pkg-install.in,v 1.1 2005-12-11 23:51:12 lawrance Exp $ -# - -PATH=/usr/sbin:/usr/bin:/bin ; export PATH - -pladir=%%PREFIX%%/%%PLADIR%% -plausr=%%PLAUSR%% -plagrp=%%PLAGRP%% - -plagcos="phpLDAPadmin Owner" -plahome=/nonexistent -plashell=/sbin/nologin - -create_group() { - local user group gcos home shell - - user=$1 - group=$2 - gcos=$3 - home=$4 - shell=$5 - - if pw groupadd -n $group ; then - echo "===> Group $group created" - else - cat <<-EOERRORMSG - *** Failed to create the $group group. - - Please add the $user user and $group group - manually with the commands: - - pw groupadd -n $group - pw useradd -n $user -g $group -c "$gcos" \\ - -d $home -s $shell -h - - - and retry installing this package. - EOERRORMSG - exit 1 - fi -} - - -create_user() { - local user group gcos home shell - - user=$1 - group=$2 - gcos=$3 - home=$4 - shell=$5 - - if pw useradd -n $user -g $group -c "$gcos" -d $home -s $shell -h - ; then - echo "===> Created $user user" - else - cat <<-EOERRORMSG - *** Failed to create the $user user. - - Please add the $user user manually with the command: - - pw useradd -n $user -g $group -c "$gcos" \\ - -d $home -s $shell -h - - - and retry installing this package. - EOERRORMSG - exit 1 - fi -} - - -case $2 in - PRE-INSTALL) - - # Create the pla user and group if they do not already exist - - if pw user show -n $plausr >/dev/null 2>&1 ; then - echo "===> Using pre-existing user $plausr" - else - if ! pw group show -n $plagrp >/dev/null 2>&1 ; then - create_group $plausr $plagrp "$plagcos" $plahome \ - $plashell - fi - create_user $plausr $plagrp "$plagcos" $plahome $plashell - fi - ;; - POST-INSTALL) - - # Change ownership of the phpLDAPadmin directory - - echo "===> Adjusting file ownership in $pladir" - chown -R $plausr:$plagrp $pladir || exit 1 - ;; -esac - -# -# That's All Folks! -# diff --git a/net/phpldapadmin098/files/pkg-message.in b/net/phpldapadmin098/files/pkg-message.in deleted file mode 100644 index 365faf3c5f9f..000000000000 --- a/net/phpldapadmin098/files/pkg-message.in +++ /dev/null @@ -1,24 +0,0 @@ - -%%PKGNAME%% has been installed into: - - %%PREFIX%%/%%PLADIR%% - -Please edit config.php to suit your needs. - -To make phpLDAPadmin available through your web site, -I suggest that you add the following to httpd.conf: - - Alias /phpldapadmin/ "%%PREFIX%%/%%PLADIR%%/htdocs" - -Please note: if you are upgrading from version 0.9.7 or earlier, the -layout of the %%PKGNAME%% files has been completely reworked. You -will need to modify your apache configuration and merge the settings -from your original configuration file: - - %%PREFIX%%/%%PLADIR%%/config.php - - to - - %%PREFIX%%/%%PLADIR%%/config/config.php - - diff --git a/net/phpldapadmin098/pkg-descr b/net/phpldapadmin098/pkg-descr deleted file mode 100644 index 80de707d442b..000000000000 --- a/net/phpldapadmin098/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -phpLDAPadmin is a web-based LDAP client. It provides easy, -anywhere-accessible, multi-language administration for your LDAP -server. Its hierarchical tree-viewer and advanced search functionality -make it intuitive to browse and administer your LDAP directory. Since -it is a web application, this LDAP browser works on many platforms, -making your LDAP server easily manageable from any -location. phpLDAPadmin is the perfect LDAP browser for the LDAP -professional and novice alike. Its user base consists mostly of LDAP -administration professionals. - -WWW: http://phpldapadmin.sourceforge.net/ diff --git a/net/phpldapadmin098/pkg-plist-chunk b/net/phpldapadmin098/pkg-plist-chunk deleted file mode 100644 index 8a9de645dd50..000000000000 --- a/net/phpldapadmin098/pkg-plist-chunk +++ /dev/null @@ -1,7 +0,0 @@ -@mode 640 -@group %%PLAGRP%% -@unexec if cmp -s %D/%%PLADIR%%/config/config.php.example %D/%%PLADIR%%/config/config.php ; then rm -f %D/%%PLADIR%%/config/config.php ; fi -%%PLADIR%%/config/config.php.example -@exec [ ! -f %B/config.php ] && cp -p %B/%f %B/config.php || true -@mode -@group diff --git a/net/py-zsi-devel/Makefile b/net/py-zsi-devel/Makefile deleted file mode 100644 index 23fd4606b8b2..000000000000 --- a/net/py-zsi-devel/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# New ports collection makefile for: py-zsi -# Date created: 17 September 2001 -# Whom: Johann Visagie <wjv@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= zsi -PORTVERSION= 1.7 -PORTEPOCH= 1 -CATEGORIES= net python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= pywebsvcs -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME:U}-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A pure Python module that provides an implementation of SOAP 1.1 - -USE_PYTHON= 2.0+ -USE_PYDISTUTILS= yes - -post-install: -.if !defined(NOPORTDOCS) - @ ${MKDIR} ${DOCSDIR} -.for docfile in CHANGES README doc/zsi.* doc/*.tex - @ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR} -.endfor -.for subdir in interop samples test - @ ${MKDIR} ${EXAMPLESDIR}/${subdir} - @ ${CP} -rp ${WRKSRC}/${subdir}/* ${EXAMPLESDIR}/${subdir} -.endfor -.endif - -.include <bsd.port.mk> diff --git a/net/py-zsi-devel/distinfo b/net/py-zsi-devel/distinfo deleted file mode 100644 index c11181de479f..000000000000 --- a/net/py-zsi-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (ZSI-1.7.tar.gz) = b7f817444ec302ba0015f62146b3349c -SHA256 (ZSI-1.7.tar.gz) = 4f80ff19dfca80714123098fc9baafaa6802ca2d0da65e9f6eacbdd43f7e794f -SIZE (ZSI-1.7.tar.gz) = 414611 diff --git a/net/py-zsi-devel/pkg-descr b/net/py-zsi-devel/pkg-descr deleted file mode 100644 index 5c06fb17e68c..000000000000 --- a/net/py-zsi-devel/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -Paraphrasing the original (1.0 and 1.1) website: - - ZSI, the Zolera SOAP Infrastructure, is a pure Python module that provides - an implementation of the SOAP 1.1 specification. ZSI parses and generates - SOAP messages, and converts between native Python datatypes and SOAP - syntax. Simple client and server support are also provided. - - ZSI is built on top of DOM. It requires Python 2.0 or later, and PyXML 0.6 - or later. Feedback to <zsi@zolera.com>. - -Author: Rich Salz <rsalz@zolera.com> -WWW: http://pywebsvcs.sourceforge.net/ - --- Johann Visagie <wjv@FreeBSD.org> diff --git a/net/py-zsi-devel/pkg-plist b/net/py-zsi-devel/pkg-plist deleted file mode 100644 index 115ad6d7eac2..000000000000 --- a/net/py-zsi-devel/pkg-plist +++ /dev/null @@ -1,163 +0,0 @@ -bin/wsdl2dispatch.py -bin/wsdl2py.py -%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.py -%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.pyc -%%PYTHON_SITELIBDIR%%/ZSI/ServiceContainer.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/Namespaces.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/c14n.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/logging.pyo -%%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.py -%%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.pyc -%%PYTHON_SITELIBDIR%%/ZSI/ServiceProxy.pyo -%%PYTHON_SITELIBDIR%%/ZSI/TC.py -%%PYTHON_SITELIBDIR%%/ZSI/TC.pyc -%%PYTHON_SITELIBDIR%%/ZSI/TC.pyo -%%PYTHON_SITELIBDIR%%/ZSI/TCapache.py -%%PYTHON_SITELIBDIR%%/ZSI/TCapache.pyc -%%PYTHON_SITELIBDIR%%/ZSI/TCapache.pyo -%%PYTHON_SITELIBDIR%%/ZSI/TCcompound.py -%%PYTHON_SITELIBDIR%%/ZSI/TCcompound.pyc -%%PYTHON_SITELIBDIR%%/ZSI/TCcompound.pyo -%%PYTHON_SITELIBDIR%%/ZSI/TCnumbers.py -%%PYTHON_SITELIBDIR%%/ZSI/TCnumbers.pyc -%%PYTHON_SITELIBDIR%%/ZSI/TCnumbers.pyo -%%PYTHON_SITELIBDIR%%/ZSI/TCtimes.py -%%PYTHON_SITELIBDIR%%/ZSI/TCtimes.pyc -%%PYTHON_SITELIBDIR%%/ZSI/TCtimes.pyo -%%PYTHON_SITELIBDIR%%/ZSI/__init__.py -%%PYTHON_SITELIBDIR%%/ZSI/__init__.pyc -%%PYTHON_SITELIBDIR%%/ZSI/__init__.pyo -%%PYTHON_SITELIBDIR%%/ZSI/auth.py -%%PYTHON_SITELIBDIR%%/ZSI/auth.pyc -%%PYTHON_SITELIBDIR%%/ZSI/auth.pyo -%%PYTHON_SITELIBDIR%%/ZSI/client.py -%%PYTHON_SITELIBDIR%%/ZSI/client.pyc -%%PYTHON_SITELIBDIR%%/ZSI/client.pyo -%%PYTHON_SITELIBDIR%%/ZSI/compat.py -%%PYTHON_SITELIBDIR%%/ZSI/compat.pyc -%%PYTHON_SITELIBDIR%%/ZSI/compat.pyo -%%PYTHON_SITELIBDIR%%/ZSI/dispatch.py -%%PYTHON_SITELIBDIR%%/ZSI/dispatch.pyc -%%PYTHON_SITELIBDIR%%/ZSI/dispatch.pyo -%%PYTHON_SITELIBDIR%%/ZSI/fault.py -%%PYTHON_SITELIBDIR%%/ZSI/fault.pyc -%%PYTHON_SITELIBDIR%%/ZSI/fault.pyo -%%PYTHON_SITELIBDIR%%/ZSI/parse.py -%%PYTHON_SITELIBDIR%%/ZSI/parse.pyc -%%PYTHON_SITELIBDIR%%/ZSI/parse.pyo -%%PYTHON_SITELIBDIR%%/ZSI/resolvers.py -%%PYTHON_SITELIBDIR%%/ZSI/resolvers.pyc -%%PYTHON_SITELIBDIR%%/ZSI/resolvers.pyo -%%PYTHON_SITELIBDIR%%/ZSI/typeinterpreter.py -%%PYTHON_SITELIBDIR%%/ZSI/typeinterpreter.pyc -%%PYTHON_SITELIBDIR%%/ZSI/typeinterpreter.pyo -%%PYTHON_SITELIBDIR%%/ZSI/version.py -%%PYTHON_SITELIBDIR%%/ZSI/version.pyc -%%PYTHON_SITELIBDIR%%/ZSI/version.pyo -%%PYTHON_SITELIBDIR%%/ZSI/writer.py -%%PYTHON_SITELIBDIR%%/ZSI/writer.pyc -%%PYTHON_SITELIBDIR%%/ZSI/writer.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wsdl2python.py -%%PYTHON_SITELIBDIR%%/ZSI/wsdl2python.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wsdl2python.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wsdlInterface.py -%%PYTHON_SITELIBDIR%%/ZSI/wsdlInterface.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wsdlInterface.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/TimeoutSocket.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/TimeoutSocket.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/TimeoutSocket.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/UserTuple.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/UserTuple.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/UserTuple.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/Utility.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/Utility.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/Utility.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/WSDLTools.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/WSDLTools.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/WSDLTools.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLSchema.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLSchema.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLSchema.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLname.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLname.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/XMLname.pyo -%%PYTHON_SITELIBDIR%%/ZSI/wstools/__init__.py -%%PYTHON_SITELIBDIR%%/ZSI/wstools/__init__.pyc -%%PYTHON_SITELIBDIR%%/ZSI/wstools/__init__.pyo -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/c01-intro.tex -%%PORTDOCS%%%%DOCSDIR%%/c02-samples.tex -%%PORTDOCS%%%%DOCSDIR%%/c02a-coverage.tex -%%PORTDOCS%%%%DOCSDIR%%/c03-except.tex -%%PORTDOCS%%%%DOCSDIR%%/c04-utils.tex -%%PORTDOCS%%%%DOCSDIR%%/c05-parse.tex -%%PORTDOCS%%%%DOCSDIR%%/c06-tc.tex -%%PORTDOCS%%%%DOCSDIR%%/c07-writer.tex -%%PORTDOCS%%%%DOCSDIR%%/c08-fault.tex -%%PORTDOCS%%%%DOCSDIR%%/c09-resolve.tex -%%PORTDOCS%%%%DOCSDIR%%/c10-dispatch.tex -%%PORTDOCS%%%%DOCSDIR%%/c11-wsdl.tex -%%PORTDOCS%%%%DOCSDIR%%/version.tex -%%PORTDOCS%%%%DOCSDIR%%/zsi.css -%%PORTDOCS%%%%DOCSDIR%%/zsi.html -%%PORTDOCS%%%%DOCSDIR%%/zsi.pdf -%%PORTDOCS%%%%DOCSDIR%%/zsi.ps -%%PORTDOCS%%%%DOCSDIR%%/zsi.tex -%%PORTDOCS%%%%DOCSDIR%%/zsi.xsd -%%PORTDOCS%%%%DOCSDIR%%/zsixsd.tex -%%PORTDOCS%%%%EXAMPLESDIR%%/interop/InteropTest.wsdl -%%PORTDOCS%%%%EXAMPLESDIR%%/interop/InteropTestB.wsdl -%%PORTDOCS%%%%EXAMPLESDIR%%/interop/README -%%PORTDOCS%%%%EXAMPLESDIR%%/interop/client.py -%%PORTDOCS%%%%EXAMPLESDIR%%/interop/cpackets.py -%%PORTDOCS%%%%EXAMPLESDIR%%/interop/echoHeaderBindings.wsdl -%%PORTDOCS%%%%EXAMPLESDIR%%/interop/sclasses.py -%%PORTDOCS%%%%EXAMPLESDIR%%/interop/server.py -%%PORTDOCS%%%%EXAMPLESDIR%%/samples/README -%%PORTDOCS%%%%EXAMPLESDIR%%/samples/poly.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/README -%%PORTDOCS%%%%EXAMPLESDIR%%/test/cgicli.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t1.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t2.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t3.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t4.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t5.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t6.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_t7.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_zsi.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/test_zsi_net.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/tests_bad.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/tests_good.py -%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/Echo.wsdl -%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/EchoClient.py -%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/EchoServer.py -%%PORTDOCS%%%%EXAMPLESDIR%%/samples/Echo/README -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/README -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/ServiceTest.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/runTests.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_AmazonWebService.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_FreeDBService.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_GlobalWeather_gw.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_GlobalWeather_si.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_TerraService.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_ThreatService.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_XMethodsQuery.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_ZipCodeResolver.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_compile.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test/wsdl2py/test_wsdl2py.py -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test/wsdl2py -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/test -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/samples/Echo -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/samples -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/interop -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%PYTHON_SITELIBDIR%%/ZSI/wstools -@dirrm %%PYTHON_SITELIBDIR%%/ZSI diff --git a/net/rqm/Makefile b/net/rqm/Makefile deleted file mode 100644 index c651b7f9defb..000000000000 --- a/net/rqm/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# New ports collection makefile for: rqm -# Date created: 30 January 2000 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= rqm -PORTVERSION= 1.0.0 -CATEGORIES= mbone -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/ - -MAINTAINER= fenner@FreeBSD.org -COMMENT= A graphical RTP quality monitor - -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -WRKSRC= ${WRKDIR}/rqm/ - -HAS_CONFIGURE= yes -CONFIGURE_ENV= PREFIX=${PREFIX} X11BASE=${X11BASE} - -ALL_TARGET= rqm - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rqm ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/rqm - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rqm -.endif - -.include <bsd.port.mk> diff --git a/net/rqm/distinfo b/net/rqm/distinfo deleted file mode 100644 index 386a40bb1a63..000000000000 --- a/net/rqm/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rqm-1.0.0.tar.gz) = 406a9bfe4a3e9ad9f1a981701072f54a -SHA256 (rqm-1.0.0.tar.gz) = 8e9a2a0a2ed2abe7feb24f6e7fd47a195cb0e91ee8e0daea736c692f12a01f41 -SIZE (rqm-1.0.0.tar.gz) = 3853534 diff --git a/net/rqm/files/patch-aa b/net/rqm/files/patch-aa deleted file mode 100644 index ba0b3c041db2..000000000000 --- a/net/rqm/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.orig Sun Oct 3 08:47:46 1999 -+++ configure Sun Jan 30 16:05:14 2000 -@@ -53,9 +53,9 @@ - - echo "Configuring rqm v$VERSION for $OSTYPE" - --GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int -Werror" --TCL_LIBS="../tk-8.0/unix/libtk8.0.a ../tcl-8.0/unix/libtcl8.0.a" --TCL_INCL="-I../tk-8.0/generic -I../tcl-8.0/generic" -+GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int" -+TCL_LIBS="-L${PREFIX}/lib -ltk84 -ltcl84" -+TCL_INCL="-I${PREFIX}/include/tk8.4/generic -I${PREFIX}/include/tcl8.4/generic" - DEFS="" - - AR="ar" -@@ -103,7 +103,7 @@ - ;; - FreeBSD ) CC="gcc" - WFLAGS=$GCCWFLAGS -- INCLUDE="-I/usr/local/include" -+ INCLUDE="-I${PREFIX}/include -I${X11BASE}/include" - LDLIBS="-lm" - DEBUG="-g" - CHAR="-fsigned-char" -@@ -172,8 +172,8 @@ - s@__AR__@$AR@ - s@__RANLIB__@$RANLIB@ - s@__WFLAGS__@$WFLAGS@ --s@__INCLUDE__@$TCL_INCL $INCLUDE -I../common@g --s@__LDLIBS__@$TCL_LIBS -L../common -lcommon $LDLIBS@g -+s@__INCLUDE__@$TCL_INCL $INCLUDE -I${PREFIX}/include/uclmmbase@g -+s@__LDLIBS__@$TCL_LIBS -L${PREFIX}/lib -luclmmbase $LDLIBS@g - s@__CHAR__@$CHAR@ - s@__DEBUG__@$DEBUG2@ - s@__OPTIMIZE__@$OPTIMIZE2@ diff --git a/net/rqm/files/patch-ab b/net/rqm/files/patch-ab deleted file mode 100644 index c6f546039ba6..000000000000 --- a/net/rqm/files/patch-ab +++ /dev/null @@ -1,38 +0,0 @@ ---- main.c.orig Wed Mar 8 08:32:07 2000 -+++ main.c Wed Mar 8 08:32:28 2000 -@@ -67,7 +67,7 @@ - } - } - --static void rtp_callback(struct rtp *s, rtp_event *e) -+static void rqm_rtp_callback(struct rtp *s, rtp_event *e) - { - rtp_packet *p = (rtp_packet *) e->data; - rtcp_sr *sr = (rtcp_sr *) e->data; -@@ -177,7 +177,7 @@ - char *addr; - char *port; - char cmd[100]; -- u_int32 curr_rtp_time; -+ u_int32_t curr_rtp_time; - #ifdef WIN32 - WSADATA WSAdata; - if (WSAStartup(WS_VERSION_TWO, &WSAdata) != 0 && WSAStartup(WS_VERSION_ONE, &WSAdata) != 0) { -@@ -199,7 +199,7 @@ - addr = (char *) strtok(argv[1], "/"); - port = (char *) strtok(NULL, "\0"); - -- rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rtp_callback, NULL); -+ rtp_session = rtp_init(addr, atoi(port), atoi(port), 15, 64000, rqm_rtp_callback, NULL); - - /* Initialise the user interface... */ - if (tcl_init(argc, argv) == FALSE) { -@@ -215,7 +215,7 @@ - rtp_set_sdes(rtp_session, rtp_my_ssrc(rtp_session), RTCP_SDES_TOOL, VERSION, strlen(VERSION)); - - gettimeofday(&prev_t, NULL); -- curr_rtp_time = (u_int32) lrand48(); -+ curr_rtp_time = (u_int32_t) lrand48(); - while (Tk_GetNumMainWindows() > 0) { - gettimeofday(&curr_t, NULL); - curr_rtp_time += (int) (tv_diff(curr_t, prev_t) * 8000); diff --git a/net/rqm/files/patch-ac b/net/rqm/files/patch-ac deleted file mode 100644 index 00ed9055e3ea..000000000000 --- a/net/rqm/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Feb 1 17:22:05 2004 -+++ Makefile.in Sun Feb 1 17:22:12 2004 -@@ -6,7 +6,7 @@ - OBJS = main.o ui.o - BIN = rqm - --$(BIN): $(OBJS) ../common/libcommon.a -+$(BIN): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) __LDLIBS__ __PROFILE__ __OPTIMIZE__ __CHECK_LIB__ -o $(BIN) - - .c.o: diff --git a/net/rqm/pkg-descr b/net/rqm/pkg-descr deleted file mode 100644 index 0f66e31ecfde..000000000000 --- a/net/rqm/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The Real-time Transport Protocol, RTP [1], provides quality of service -feedback with reception reports sent alongside the media stream. If the -media is sent via IP multicast it is possible for a third party to snoop -on these reception reports, displaying reception quality for all members -of a group. The RQM application performs such snooping. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/ diff --git a/net/rqm/pkg-plist b/net/rqm/pkg-plist deleted file mode 100644 index bdf2098794d3..000000000000 --- a/net/rqm/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -bin/rqm -share/doc/rqm/README -@dirrm share/doc/rqm diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile deleted file mode 100644 index a4f8ef3f5c17..000000000000 --- a/net/rtptools/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# New ports collection makefile for: rtptools -# Date created: 5 January 1998 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= rtptools -PORTVERSION= 1.17 -CATEGORIES= mbone -MASTER_SITES= http://www.cs.columbia.edu/IRT/software/rtptools/download/ - -MAINTAINER= fenner@FreeBSD.org -COMMENT= A set of tools to record, playback and monitor RTPv2 data streams - -GNU_CONFIGURE= yes - -DOCFILES= README ChangeLog.html rtptools.html - -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/rtptools -.for i in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/rtptools -.endfor -.endif - -.include <bsd.port.mk> diff --git a/net/rtptools/distinfo b/net/rtptools/distinfo deleted file mode 100644 index d36057cd19fd..000000000000 --- a/net/rtptools/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rtptools-1.17.tar.gz) = 4af6ef6ba430f659d3d6478719911b65 -SHA256 (rtptools-1.17.tar.gz) = a4cd3e804fa4cb0cd935a1ef121fad4304ce541e18759d339c014cdfcdd5ac91 -SIZE (rtptools-1.17.tar.gz) = 96358 diff --git a/net/rtptools/files/patch-ab b/net/rtptools/files/patch-ab deleted file mode 100644 index c1d142b4a914..000000000000 --- a/net/rtptools/files/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ ---- rtp.h.orig Thu Mar 9 07:35:26 2000 -+++ rtp.h Sat Apr 21 21:52:49 2001 -@@ -110,13 +110,18 @@ - #define RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe) - #define RTCP_VALID_VALUE ((RTP_VERSION << 14) | RTCP_SR) - -+#define RTCP_FRACTION(x) (((x) >> 24) & 0xFF) -+#define RTCP_LOST(x) ((((x) & 0xFFFFFF) < 0x800000) ? \ -+ ((x) & 0xFFFFFF) \ -+ : (((x) & 0xFFFFFF) - 0x1000000)) -+ - /* - * Reception report block - */ - typedef struct { - u_int32 ssrc; /* data source being reported */ -- unsigned int fraction:8; /* fraction lost since last SR/RR */ -- int lost:24; /* cumul. no. pkts lost (signed!) */ -+ u_int32 fraclost; /* fraction lost since last SR/RR and */ -+ /* cumul. no. pkts lost (signed!) */ - u_int32 last_seq; /* extended last seq. no. received */ - u_int32 jitter; /* interarrival jitter */ - u_int32 lsr; /* last SR packet from this source */ diff --git a/net/rtptools/files/patch-ac b/net/rtptools/files/patch-ac deleted file mode 100644 index 28056951ca69..000000000000 --- a/net/rtptools/files/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ ---- rtpdump.c.orig Sat Apr 7 08:02:13 2001 -+++ rtpdump.c Sat Apr 21 21:54:10 2001 -@@ -429,8 +429,8 @@ - for (i = 0; i < r->common.count; i++) { - fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n", - (unsigned long)ntohl(r->r.sr.rr[i].ssrc), -- r->r.sr.rr[i].fraction / 256., -- (unsigned long)ntohl(r->r.sr.rr[i].lost), /* XXX I'm pretty sure this is wrong */ -+ RTCP_FRACTION(ntohl(r->r.sr.rr[i].fraclost)) / 256., -+ RTCP_LOST(ntohl(r->r.sr.rr[i].fraclost)), - (unsigned long)ntohl(r->r.sr.rr[i].last_seq), - (unsigned long)ntohl(r->r.sr.rr[i].jitter), - (unsigned long)ntohl(r->r.sr.rr[i].lsr), -@@ -446,8 +446,8 @@ - for (i = 0; i < r->common.count; i++) { - fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n", - (unsigned long)ntohl(r->r.rr.rr[i].ssrc), -- r->r.rr.rr[i].fraction / 256., -- (unsigned long)ntohl(r->r.rr.rr[i].lost), -+ RTCP_FRACTION(ntohl(r->r.rr.rr[i].fraclost)) / 256., -+ RTCP_LOST(ntohl(r->r.rr.rr[i].fraclost)), - (unsigned long)ntohl(r->r.rr.rr[i].last_seq), - (unsigned long)ntohl(r->r.rr.rr[i].jitter), - (unsigned long)ntohl(r->r.rr.rr[i].lsr), diff --git a/net/rtptools/files/patch-ad b/net/rtptools/files/patch-ad deleted file mode 100644 index e7bbdd966728..000000000000 --- a/net/rtptools/files/patch-ad +++ /dev/null @@ -1,24 +0,0 @@ ---- rtpsend.c.orig Fri Apr 6 18:18:26 2001 -+++ rtpsend.c Sat Apr 21 21:59:35 2001 -@@ -351,9 +351,9 @@ - if (strcmp(n->type, "ssrc") == 0) - rr->ssrc = htonl(n->num); - else if (strcmp(n->type, "fraction") == 0) -- rr->fraction = (n->num)*256; -- else if (strcmp(n->type, "lost") == 0) /* PP: alignment OK? */ -- rr->lost = htonl(n->num); -+ rr->fraclost = htonl((ntohl(rr->fraclost) & 0x00ffffff) | ((n->num)*256 << 24)); -+ else if (strcmp(n->type, "lost") == 0) -+ rr->fraclost = htonl((ntohl(rr->fraclost) & 0xff000000) | n->num); - else if (strcmp(n->type, "last_seq") == 0) - rr->last_seq = htonl(n->num); - else if (strcmp(n->type, "jit") == 0) -@@ -899,6 +899,8 @@ - - if (optind < argc) { - if (hpt(argv[optind], (struct sockaddr *)&sin, &ttl) < 0) usage(argv[0]); -+ } else { -+ usage(argv[0]); - } - - /* create/connect sockets */ diff --git a/net/rtptools/pkg-descr b/net/rtptools/pkg-descr deleted file mode 100644 index 4dc99ec5b4af..000000000000 --- a/net/rtptools/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -The rtptools distribution consists of a number of small applications that -can be used for processing RTP data. - -rtpplay - play back RTP sessions recorded by rtpdump -rtpsend - generate RTP packets from textual description, generated by hand or - rtpdump -rtpdump - parse and print RTP packets, generating output files suitable for - rtpplay and rtpsend -rtptrans - RTP translator between unicast and multicast networks diff --git a/net/rtptools/pkg-plist b/net/rtptools/pkg-plist deleted file mode 100644 index 8283c955a1fe..000000000000 --- a/net/rtptools/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/rtpdump -bin/rtpplay -bin/rtpsend -bin/rtptrans -share/doc/rtptools/README -share/doc/rtptools/ChangeLog.html -share/doc/rtptools/rtptools.html -@dirrm share/doc/rtptools diff --git a/net/rwhoisd/Makefile b/net/rwhoisd/Makefile deleted file mode 100644 index 131f873d6a5d..000000000000 --- a/net/rwhoisd/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# New ports collection makefile for: rwhois -# Date created: May 9th 1997 -# Whom: James FitzGibbon <jfitz@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= rwhois -PORTVERSION= 1.5.9.5 -CATEGORIES= net ipv6 -MASTER_SITES= http://www.rwhois.net/ftp/ \ - http://www.rwhois.net/ftp/older_releases/ -DISTNAME= ${PORTNAME}d-${PORTVERSION} - -MAINTAINER= garga@FreeBSD.org -COMMENT= The Internic referral whois server - -USE_REINPLACE= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX}/lib/rwhois -MAKE_ENV= RWHOIS_ROOT_DIR=${PREFIX}/lib/rwhois -MAKE_ARGS= -E RWHOIS_ROOT_DIR - -BINOWN= bin -BINGRP= bin - -MAN8= rwhois_indexer.8 rwhoisd.8 - -PORTDOCS= INSTALL.html TODO UPGRADE operations_guide.html \ - operations_guide.txt rfc2167.txt security.html security.txt - -post-patch: - @${REINPLACE_CMD} -e 's,userid: rwhoisd,userid: nobody,' \ - ${WRKSRC}/sample.data/rwhoisd.conf - -post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/rwhois_indexer.8 ${PREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/doc/rwhoisd.8 ${PREFIX}/man/man8 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} -.endfor -.endif - @${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..." - ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/rwhoisd.sh ${PREFIX}/etc/rc.d/rwhoisd.sh - -.include <bsd.port.mk> diff --git a/net/rwhoisd/distinfo b/net/rwhoisd/distinfo deleted file mode 100644 index 1870fa14c6ce..000000000000 --- a/net/rwhoisd/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (rwhoisd-1.5.9.5.tar.gz) = 08ab91152726f00c0e3bbccd54703f71 -SHA256 (rwhoisd-1.5.9.5.tar.gz) = 832da8faff58070fcc8685c67375dcced3b6bb225ffbe3542dd6052add61cf92 -SIZE (rwhoisd-1.5.9.5.tar.gz) = 491600 diff --git a/net/rwhoisd/files/rwhoisd.sh b/net/rwhoisd/files/rwhoisd.sh deleted file mode 100644 index cc977b591234..000000000000 --- a/net/rwhoisd/files/rwhoisd.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then - echo "$0: Cannot determine the PREFIX" >&2 - exit 1 -fi - -case "$1" in -start) - # remove or comment the following line and uncomment the one below it once you have - # configured your server's data - echo "rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details." - #if [ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ]; then (${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhoisd.conf &); echo -n ' rwhoisd'; fi - ;; -stop) - # killall rwhoisd && echo -n ' rwhoisd - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - ;; -esac - -exit 0 diff --git a/net/rwhoisd/pkg-descr b/net/rwhoisd/pkg-descr deleted file mode 100644 index 18465350eed2..000000000000 --- a/net/rwhoisd/pkg-descr +++ /dev/null @@ -1,23 +0,0 @@ -With the exponential growth of the Internet, a central Whois database that -provides host and network information of systems connected to the Internet, -and electronic mail (email) addresses of the users of those systems has -proven to be very inefficient. The sheer size and effort needed to maintain -a centralized database necessitates an alternate, decentralized approach to -storing and retrieving this information. - -RWhois is a Directory Services protocol which extends and enhances the Whois -concept in a hierarchical and scaleable fashion. It focuses on the -distribution of "network objects"--the data representing Internet resources -or people--and uses the inherently hierarchical nature of these network -objects (domain names, Internet Protocol (IP) networks, email addresses) to -more accurately discover the requested information. - -RWhois synthesizes concepts from other, established Internet protocols to -create a more useful way to find resources across the Internet. The RWhois -protocol and architecture derive a great deal of structure from the Domain -Name System (DNS) [RFC 1034] and borrow directory service concepts from -other directory service efforts, primarily [X.500]. The protocol is also -influenced by earlier established Internet protocols, such as the Simple -Mail Transport Protocol (SMTP) [RFC 821] for response codes. - -WWW: http://www.rwhois.net/ diff --git a/net/rwhoisd/pkg-plist b/net/rwhoisd/pkg-plist deleted file mode 100644 index 07ea527bb07c..000000000000 --- a/net/rwhoisd/pkg-plist +++ /dev/null @@ -1,69 +0,0 @@ -etc/rc.d/rwhoisd.sh -lib/rwhois/a.com/attribute_defs/asn.tmpl -lib/rwhois/a.com/attribute_defs/contact.tmpl -lib/rwhois/a.com/attribute_defs/domain.tmpl -lib/rwhois/a.com/attribute_defs/guardian.tmpl -lib/rwhois/a.com/attribute_defs/host.tmpl -lib/rwhois/a.com/attribute_defs/org.tmpl -lib/rwhois/a.com/attribute_defs/referral.tmpl -lib/rwhois/a.com/data/asn/asn.txt -lib/rwhois/a.com/data/contact/contact.txt -lib/rwhois/a.com/data/domain/domain.txt -lib/rwhois/a.com/data/guardian/guardian.txt -lib/rwhois/a.com/data/host/host.txt -lib/rwhois/a.com/data/org/org.txt -lib/rwhois/a.com/data/referral/referral.txt -lib/rwhois/a.com/schema -lib/rwhois/a.com/soa -lib/rwhois/bin/rwhois_deleter -lib/rwhois/bin/rwhois_indexer -lib/rwhois/bin/rwhois_repack -lib/rwhois/net-10.0.0.0-8/attribute_defs/contact.tmpl -lib/rwhois/net-10.0.0.0-8/attribute_defs/guardian.tmpl -lib/rwhois/net-10.0.0.0-8/attribute_defs/host.tmpl -lib/rwhois/net-10.0.0.0-8/attribute_defs/network.tmpl -lib/rwhois/net-10.0.0.0-8/attribute_defs/referral.tmpl -lib/rwhois/net-10.0.0.0-8/data/network/network.txt -lib/rwhois/net-10.0.0.0-8/data/referral/referral.txt -lib/rwhois/net-10.0.0.0-8/schema -lib/rwhois/net-10.0.0.0-8/soa -lib/rwhois/net-fd00:1234::-32/attribute_defs/host.tmpl -lib/rwhois/net-fd00:1234::-32/attribute_defs/referral.tmpl -lib/rwhois/net-fd00:1234::-32/attribute_defs/contact.tmpl -lib/rwhois/net-fd00:1234::-32/attribute_defs/guardian.tmpl -lib/rwhois/net-fd00:1234::-32/attribute_defs/network.tmpl -lib/rwhois/net-fd00:1234::-32/data/referral/referral.txt -lib/rwhois/net-fd00:1234::-32/data/network/network.txt -lib/rwhois/net-fd00:1234::-32/soa -lib/rwhois/net-fd00:1234::-32/schema -lib/rwhois/rwhoisd.allow -lib/rwhois/rwhoisd.auth_area -lib/rwhois/rwhoisd.conf -lib/rwhois/rwhoisd.deny -lib/rwhois/rwhoisd.dir -lib/rwhois/rwhoisd.root -lib/rwhois/rwhoisd.x.dir -lib/rwhois/sbin/rwhoisd -@dirrm lib/rwhois/sbin -@dirrm lib/rwhois/net-10.0.0.0-8/data/referral -@dirrm lib/rwhois/net-10.0.0.0-8/data/network -@dirrm lib/rwhois/net-10.0.0.0-8/data -@dirrm lib/rwhois/net-10.0.0.0-8/attribute_defs -@dirrm lib/rwhois/net-10.0.0.0-8 -@dirrm lib/rwhois/net-fd00:1234::-32/attribute_defs -@dirrm lib/rwhois/net-fd00:1234::-32/data/referral -@dirrm lib/rwhois/net-fd00:1234::-32/data/network -@dirrm lib/rwhois/net-fd00:1234::-32/data -@dirrm lib/rwhois/net-fd00:1234::-32 -@dirrm lib/rwhois/bin -@dirrm lib/rwhois/a.com/data/referral -@dirrm lib/rwhois/a.com/data/org -@dirrm lib/rwhois/a.com/data/host -@dirrm lib/rwhois/a.com/data/guardian -@dirrm lib/rwhois/a.com/data/domain -@dirrm lib/rwhois/a.com/data/contact -@dirrm lib/rwhois/a.com/data/asn -@dirrm lib/rwhois/a.com/data -@dirrm lib/rwhois/a.com/attribute_defs -@dirrm lib/rwhois/a.com -@dirrm lib/rwhois diff --git a/net/sdr/Makefile b/net/sdr/Makefile deleted file mode 100644 index a4003f4bb28c..000000000000 --- a/net/sdr/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# New ports collection makefile for: sdr -# Date created: 5 September 1996 -# Whom: Bill Fenner <fenner@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= sdr -PORTVERSION= 3.0 -CATEGORIES= mbone tk84 -MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/3.0/ - -MAINTAINER= fenner@FreeBSD.org -COMMENT= Multicast Session Directory - -LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase - -PLIST_FILES= bin/sdr -WRKSRC= ${WRKDIR}/sdr/freebsd -HAS_CONFIGURE= yes -USE_GMAKE= yes -USE_X_PREFIX= yes - -post-extract: - @${CP} ${FILESDIR}/Makefile.freebsd ${WRKSRC}/Makefile.freebsd - -.include <bsd.port.mk> diff --git a/net/sdr/distinfo b/net/sdr/distinfo deleted file mode 100644 index 4be266510e61..000000000000 --- a/net/sdr/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (sdr-3.0.tar.gz) = df7df7911b5c08df968296f970f9e31d -SHA256 (sdr-3.0.tar.gz) = 57a6d631e14b2270dad04048a0f50c38dfcf3bfda67b96d8265820d567761460 -SIZE (sdr-3.0.tar.gz) = 304691 diff --git a/net/sdr/files/Makefile.freebsd b/net/sdr/files/Makefile.freebsd deleted file mode 100644 index 303950175fa9..000000000000 --- a/net/sdr/files/Makefile.freebsd +++ /dev/null @@ -1,8 +0,0 @@ -CC = gcc -g -O -fwritable-strings -INCLUDES = -I${X11BASE}/include -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/uclmmbase -LIBS = -L${LOCALBASE}/lib -ltk84 -ltcl84 -luclmmbase -L${X11BASE}/lib -lX11 -lz -lm -CFLAGS = $(INCLUDES) -DDIFF_BYTE_ORDER -DFREEBSD -DNORANDPROTO -DDEFINED_ERRLIST -Wall -DAUTH -DHAVE_ZLIB -DFreeBSD - -all:: sdr -install: - install -s -c -o root -g wheel -m 555 sdr ${PREFIX}/bin diff --git a/net/sdr/files/patch-ab b/net/sdr/files/patch-ab deleted file mode 100644 index bb154934fbd1..000000000000 --- a/net/sdr/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src/Makefile.template.orig Tue May 25 16:27:44 1999 -+++ ../src/Makefile.template Thu Nov 4 11:05:39 1999 -@@ -88,7 +88,7 @@ - $(SDR_UI_FILES): tcl2c - - parsed_plugins.tcl: ../src/plugin2tcl.tcl -- tclsh8.0 ../src/plugin2tcl.tcl -+ tclsh8.4 ../src/plugin2tcl.tcl - - uweb: $(WWWOBJS) - $(CC) -ggdb -o uweb $(WWWOBJS) $(LIBS) diff --git a/net/sdr/pkg-descr b/net/sdr/pkg-descr deleted file mode 100644 index 4c6400374ee6..000000000000 --- a/net/sdr/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Sdr is a session directory tool designed to allow the advertisement -and joining of multicast conferences. It was originally based on -sd written by Van Jacobson at LBNL, but implements a later version -of the session description protocol than sd does. - -WWW: http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/ diff --git a/net/skype-devel/Makefile b/net/skype-devel/Makefile deleted file mode 100644 index 28af902671a7..000000000000 --- a/net/skype-devel/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# New ports collection makefile for: skype -# Date created: Jun 21. 2004 -# Whom: netchild@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= skype -PORTVERSION= 1.2.0.18 -CATEGORIES= net -MASTER_SITES= http://download.skype.com/linux/ -DISTNAME= skype_staticQT-${PORTVERSION} - -MAINTAINER= itetcu@people.tecnik93.com -COMMENT= P2P VoIP software - -RUN_DEPENDS= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \ - ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat - -.ifdef WITH_NVIDIA_GL -RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver -.else -RUN_DEPENDS+= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri -.endif - -USE_BZIP2= yes -USE_LINUX= yes -USE_X_PREFIX= yes -WANT_GNOME= yes -ONLY_FOR_ARCHS= i386 amd64 - -RESTRICTED= Redistribution not allowed yet. - -.include <bsd.port.pre.mk> - -.if ${HAVE_GNOME:Mgnomehier} != "" -PLIST_SUB+= GNOME="" -.else -PLIST_SUB+= GNOME="@comment " -.endif - -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -do-build: - ${BRANDELF} -t Linux ${WRKSRC}/skype - -do-install: - ${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/skype_bin -# ${INSTALL} ${WRKSRC}/skype-callto-handler ${PREFIX}/bin/ - ${ECHO_CMD} -e "#!/bin/sh\n\nSKYPE_RESOURCES_PATH='${DATADIR}' skype_bin \"\$$@\" 2>&1 | grep -v 'SOUND_MIXER_WRITE_IGAIN failed'" >${PREFIX}/bin/skype - ${CHMOD} a+rx ${PREFIX}/bin/skype -.if ${HAVE_GNOME:Mgnomehier} != "" - ${INSTALL_DATA} ${WRKSRC}/skype.desktop ${PREFIX}/share/gnome/applications/ - ${INSTALL_DATA} ${WRKSRC}/icons/skype_48_32.png ${PREFIX}/share/gnome/pixmaps/skype.png -.endif - ${MKDIR} ${DATADIR}/icons ${DATADIR}/lang ${DATADIR}/sound - ${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/ - ${INSTALL_DATA} ${WRKSRC}/lang/*.qm ${DATADIR}/lang/ - ${INSTALL_DATA} ${WRKSRC}/sound/*.wav ${DATADIR}/sound/ - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/ - -post-install: - @${ECHO} "There are known problems with some soundcards in 5.x. This is due to a bug in the kernel. It is fixed in 6.x. Additionally there is some further work in the sound subsystem going on which fixes some related problems. This work will not be available in 6.0-RELEASE. If you experience problems update to the most recent 6.x-RELEASE, if this does not fix your problems ask on multimedia@FreeBSD.org." | fmt - -.include <bsd.port.post.mk> diff --git a/net/skype-devel/distinfo b/net/skype-devel/distinfo deleted file mode 100644 index 45a776b79003..000000000000 --- a/net/skype-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (skype_staticQT-1.2.0.18.tar.bz2) = bc05f6883e8c0350186e1a376940d5c8 -SHA256 (skype_staticQT-1.2.0.18.tar.bz2) = fa825ff455b7c6fb53bd4090e7fb99038ce426b4078b4f1dda0307fc4fa216b3 -SIZE (skype_staticQT-1.2.0.18.tar.bz2) = 10678284 diff --git a/net/skype-devel/pkg-descr b/net/skype-devel/pkg-descr deleted file mode 100644 index 5d92fde2ea4f..000000000000 --- a/net/skype-devel/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Skype is a free program that uses the latest P2P technology to bring -affordable and high-quality voice communications to people all over -the world. - -WWW: http://www.skype.net/ diff --git a/net/skype-devel/pkg-plist b/net/skype-devel/pkg-plist deleted file mode 100644 index d1ddac4c78ab..000000000000 --- a/net/skype-devel/pkg-plist +++ /dev/null @@ -1,39 +0,0 @@ -bin/skype -bin/skype_bin -%%DATADIR%%/icons/skype_16_32.png -%%DATADIR%%/icons/skype_32_32.png -%%DATADIR%%/icons/skype_48_32.png -@dirrm %%DATADIR%%/icons -%%DATADIR%%/lang/skype_da.qm -%%DATADIR%%/lang/skype_de.qm -%%DATADIR%%/lang/skype_el.qm -%%DATADIR%%/lang/skype_en.qm -%%DATADIR%%/lang/skype_es.qm -%%DATADIR%%/lang/skype_es_AR.qm -%%DATADIR%%/lang/skype_et.qm -%%DATADIR%%/lang/skype_fi.qm -%%DATADIR%%/lang/skype_fr.qm -%%DATADIR%%/lang/skype_it.qm -%%DATADIR%%/lang/skype_iw.qm -%%DATADIR%%/lang/skype_ja.qm -%%DATADIR%%/lang/skype_ko.qm -%%DATADIR%%/lang/skype_nl.qm -%%DATADIR%%/lang/skype_no.qm -%%DATADIR%%/lang/skype_pl.qm -%%DATADIR%%/lang/skype_pt_BR.qm -%%DATADIR%%/lang/skype_ro.qm -%%DATADIR%%/lang/skype_ru.qm -%%DATADIR%%/lang/skype_sv.qm -%%DATADIR%%/lang/skype_zh_CN.qm -%%DATADIR%%/lang/skype_zh_TW.qm -@dirrm %%DATADIR%%/lang -%%DATADIR%%/sound/busy4.wav -%%DATADIR%%/sound/call_in.wav -%%DATADIR%%/sound/call_out.wav -%%DATADIR%%/sound/hangup.wav -%%DATADIR%%/sound/im.wav -@dirrm %%DATADIR%%/sound -%%DATADIR%%/LICENSE -@dirrm %%DATADIR%% -%%GNOME%%share/gnome/applications/skype.desktop -%%GNOME%%share/gnome/pixmaps/skype.png diff --git a/net/spread4/Makefile b/net/spread4/Makefile deleted file mode 100644 index f0689169a006..000000000000 --- a/net/spread4/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# New ports collection makefile for: spread -# Date created: 11 June 2001 -# Whom: Anders Nordby <anders@fix.no> -# -# $FreeBSD$ -# - -PORTNAME= spread -PORTVERSION= 3.17.3 -CATEGORIES= net perl5 -MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/ \ - http://www.roughtrade.net/distfiles/ -DISTNAME= ${PORTNAME}-src-${PORTVERSION} - -MAINTAINER= joshua@roughtrade.net -COMMENT= The Spread Group Communication System, a network toolkit - -USE_REINPLACE= yes -GNU_CONFIGURE= yes -USE_PERL5= yes -USE_RC_SUBR= yes -INSTALLS_SHLIB= yes - -MAKE_ARGS+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION} - -PKGMESSAGE= ${WRKSRC}/license.txt -PORTDOCS= Readme.txt LICENSE -HEADERFILES= sp_func.h sp_func.h sp_events.h -MAN1= spflooder.1 spmonitor.1 spread.1 sptuser.1 spuser.1 -MAN3= libsp.3 SP_connect.3 SP_disconnect.3 SP_equal_group_ids.3 \ - SP_error.3 SP_join.3 SP_leave.3 \ - SP_multicast.3 SP_multigroup_multicast.3 \ - SP_multigroup_scat_multicast.3 SP_poll.3 SP_receive.3 \ - SP_scat_multicast.3 SP_scat_receive.3 - -.include <bsd.port.pre.mk> - -# bsd.port.mk doesn't allow us to use GNU_CONFIGURE and PERL_CONFIGURE together. -PERL_CONFIGURE_ARGS= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ - INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" - -_MANPAGES+= ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/Spread.3 - -post-configure: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/docs/${PORTNAME}.1 ${WRKSRC}/docs/spmonitor.1 - -post-build: - @cd ${WRKSRC}/perl/Spread && \ - ${SETENV} ${CONFIGURE_ENV} ${PERL5} ./Makefile.PL ${PERL_CONFIGURE_ARGS} - @cd ${WRKSRC}/perl/Spread && \ - ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile - @cd ${WRKSRC}/perl/Spread && ${MAKE} - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME}.sh - -pre-install: - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh \ - ${PREFIX}/etc/rc.d/${PORTNAME}.sh -.for f in ${HEADERFILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/include -.endfor - ${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \ - ${PREFIX}/etc/spread.conf.sample -.if !exists(${PREFIX}/etc/${PORTNAME}.conf) - ${INSTALL_DATA} ${WRKSRC}/sample.spread.conf \ - ${PREFIX}/etc/${PORTNAME}.conf -.endif - ${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \ - ${PREFIX}/etc/spread.access_ip.sample -.if !exists(${PREFIX}/etc/spread.access_ip) - ${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip \ - ${PREFIX}/etc/spread.access_ip -.endif - (cd ${WRKSRC}/perl/Spread && ${MAKE} install) - ${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE -.endif - @${CAT} ${PKGMESSAGE} - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - -.include <bsd.port.post.mk> diff --git a/net/spread4/distinfo b/net/spread4/distinfo deleted file mode 100644 index 28d7768e919c..000000000000 --- a/net/spread4/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (spread-src-3.17.3.tar.gz) = 2eec25b5adc96fd840aa251e44325f9f -SHA256 (spread-src-3.17.3.tar.gz) = d675d581621b76aa26e9bcf10a825d4685966925578cbc8b3999e4e8bfdfcff3 -SIZE (spread-src-3.17.3.tar.gz) = 299975 diff --git a/net/spread4/files/patch-Makefile.in b/net/spread4/files/patch-Makefile.in deleted file mode 100644 index 382a7bafe925..000000000000 --- a/net/spread4/files/patch-Makefile.in +++ /dev/null @@ -1,105 +0,0 @@ ---- Makefile.in Thu Sep 23 12:12:52 2004 -+++ Makefile.in Tue Oct 4 14:49:56 2005 -@@ -26,7 +26,7 @@ - #Rules: major -- inc for incompatible change - # : minor -- inc for bugfix or forward compatible change - --LIBVERSION=1.0 -+LIBVERSION=1 - - PATHS= - -@@ -35,7 +35,7 @@ - CFLAGS=@CFLAGS@ - CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ - LDFLAGS=@LDFLAGS@ --LIBS=@LIBS@ -+LIBS=-L. @LIBS@ - THLDFLAGS=@THLDFLAGS@ - THLIBS=@THLIBS@ - AR=@AR@ -@@ -52,8 +52,10 @@ - PERL=@PERL@ - ENT=@ENT@ - EXEEXT=@EXEEXT@ -+SHLDSONAME=-Wl,-soname,libspread.so.$(LIBVERSION) -+TSHLDSONAME=-Wl,-soname,libtspread.so.$(LIBVERSION) - --TARGETS=spread$(EXEEXT) spuser$(EXEEXT) spflooder$(EXEEXT) spmonitor$(EXEEXT) sptuser${EXEEXT} @LIBSPSO@ @LIBTSPSO@ -+TARGETS=spread$(EXEEXT) spuser$(EXEEXT) spflooder$(EXEEXT) spmonitor$(EXEEXT) sptuser${EXEEXT} @LIBSPSO@ @LIBTSPSO@ libspread.a libtspread.a - - LIBSP_OBJS= alarm.o events.o memory.o sp.o - -@@ -127,8 +129,11 @@ - $(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib - (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.$(LIBVERSION).dylib libspread.dylib) - --libspread.so: $(LIBSP_SHOBJS) -- $(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS) -+libspread.so: $@.$(LIBVERSION) -+ $(SOFTLINK) $@.$(LIBVERSION) $@ -+ -+libspread.so.$(LIBVERSION): $(LIBSP_SHOBJS) -+ $(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDSONAME) $(SHLDFLAGS) $(SHLIBS) - - install-libspread.so: libspread.so - $(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION) -@@ -146,8 +151,11 @@ - $(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib - (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib libtspread.dylib) - --libtspread.so: $(LIBTSP_SHOBJS) -- $(SHLD) -o $@ $(LIBTSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(THLIBS) -+libtspread.so: $@.$(LIBVERSION) -+ $(SOFTLINK) $@.$(LIBVERSION) $@ -+ -+libtspread.so.$(LIBVERSION): $(LIBTSP_SHOBJS) -+ $(SHLD) -o $@ $(LIBTSP_SHOBJS) $(TSHLDSONAME) $(SHLDFLAGS) $(SHLIBS) $(THLIBS) - - install-libtspread.so: libtspread.so - $(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION) -@@ -156,11 +164,11 @@ - spread$(EXEEXT): $(SPREADOBJS) - $(LD) -o $@ $(SPREADOBJS) $(LDFLAGS) $(LIBS) - --spuser$(EXEEXT): libspread.a user.o -- $(LD) -o $@ user.o $(LDFLAGS) libspread.a $(LIBS) -+spuser$(EXEEXT): libspread.a user.o -+ $(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS) - - spflooder$(EXEEXT): libspread.a flooder.o -- $(LD) -o $@ flooder.o $(LDFLAGS) libspread.a $(LIBS) -+ $(LD) -o $@ flooder.o $(LDFLAGS) -lspread $(LIBS) - - spmonitor$(EXEEXT): $(MONITOR_OBJS) - $(LD) -o $@ $(MONITOR_OBJS) $(LDFLAGS) $(LIBS) -@@ -169,7 +177,7 @@ - $(LD) $(THLDFLAGS) -o $@ $(TMONITOR_OBJS) $(LDFLAGS) $(LIBS) $(THLIBS) - - sptuser$(EXEEXT): user.to libtspread.a -- $(LD) $(THLDFLAGS) -o $@ user.to libtspread.a $(LDFLAGS) $(LIBS) $(THLIBS) -+ $(LD) $(THLDFLAGS) -o $@ user.to -lspread $(LDFLAGS) $(LIBS) $(THLIBS) - - spsimple_user$(EXEEXT): simple_user.o libspread.a - $(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS) -@@ -198,7 +206,7 @@ - fi - - clean: -- rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user -+ rm -f *.lo *.tlo *.to *.o *.a *.dylib $(TARGETS) spsimple_user *.so.$(LIBVERSION) - rm -f config.cache config.log docs/*.out core - rm -rf autom4te.cache - -@@ -254,11 +262,6 @@ - done - if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ - $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ -- fi -- if [ ! -f $(DESTDIR)$(sysconfdir)/spread.conf ]; then \ -- $(INSTALL) -m 644 $(srcdir)/sample.spread.conf $(DESTDIR)$(sysconfdir)/spread.conf; \ -- else \ -- echo "$(DESTDIR)$(sysconfdir)/spread.conf already exists, install will not overwrite"; \ - fi - - uninstallall: uninstall diff --git a/net/spread4/files/patch-auth-ip.c b/net/spread4/files/patch-auth-ip.c deleted file mode 100644 index 6a28acdab04a..000000000000 --- a/net/spread4/files/patch-auth-ip.c +++ /dev/null @@ -1,17 +0,0 @@ ---- auth-ip.c Fri Mar 5 11:32:46 2004 -+++ auth-ip.c Thu Jul 15 21:38:09 2004 -@@ -90,12 +90,9 @@ - /* load spread.access_ip file */ - if (NULL != (fp = fopen(file_name,"r")) ) - Alarmp( SPLOG_INFO, ACM, "ip_init: using file: %s\n", file_name); -- if (fp == NULL) -- if (NULL != (fp = fopen("./spread.access_ip", "r")) ) -- Alarmp( SPLOG_INFO, ACM, "ip_init: using file: ./spread.access_ip\n"); - if (fp == NULL) -- if (NULL != (fp = fopen("/etc/spread.access_ip", "r")) ) -- Alarmp( SPLOG_INFO, ACM, "ip_init: using file: /etc/spread.access_ip\n"); -+ if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_ip", "r")) ) -+ Alarmp( SPLOG_INFO, ACM, "ip_init: using file: " SPREAD_ETCDIR "/spread.access_ip\n"); - if (fp == NULL) - { - Alarmp( SPLOG_ERROR, ACM, "ip_init: IP access control file not found.\nIf you are using IP based access controls, please make sure the file exists.\n"); diff --git a/net/spread4/files/patch-auth-pword.c b/net/spread4/files/patch-auth-pword.c deleted file mode 100644 index 3ff9f6426920..000000000000 --- a/net/spread4/files/patch-auth-pword.c +++ /dev/null @@ -1,17 +0,0 @@ ---- auth-pword.c Fri Mar 5 11:32:46 2004 -+++ auth-pword.c Thu Jul 15 21:40:16 2004 -@@ -118,12 +118,9 @@ - /* load spread.access_ip file */ - if (NULL != (fp = fopen(file_name,"r")) ) - Alarmp( SPLOG_INFO, ACM, "pword_init: using file: %s\n", file_name); -- if (fp == NULL) -- if (NULL != (fp = fopen("./spread.access_pword", "r")) ) -- Alarmp( SPLOG_INFO,ACM, "pword_init: using file: ./spread.access_pword\n"); - if (fp == NULL) -- if (NULL != (fp = fopen("/etc/spread.access_pword", "r")) ) -- Alarmp( SPLOG_INFO, ACM, "pword_init: using file: /etc/spread.access_pword\n"); -+ if (NULL != (fp = fopen(SPREAD_ETCDIR "/spread.access_pword", "r")) ) -+ Alarmp( SPLOG_INFO, ACM, "pword_init: using file: " SPREAD_ETCDIR "/spread.access_pword\n"); - if (fp == NULL) - Alarmp( SPLOG_FATAL, ACM, "pword_init: error opening config file %s in any of the standard locations. Please make sure the file exists\n", file_name); - diff --git a/net/spread4/files/patch-configuration.c b/net/spread4/files/patch-configuration.c deleted file mode 100644 index c925a9bfa812..000000000000 --- a/net/spread4/files/patch-configuration.c +++ /dev/null @@ -1,12 +0,0 @@ ---- configuration.c Mon Sep 27 00:15:48 2004 -+++ configuration.c Tue Oct 4 14:40:51 2005 -@@ -130,9 +130,6 @@ - - if (NULL != (yyin = fopen(file_name,"r")) ) - Alarm( PRINT, "Conf_init: using file: %s\n", file_name); -- if (yyin == NULL) -- if (NULL != (yyin = fopen("./spread.conf", "r")) ) -- Alarm( PRINT, "Conf_init: using file: ./spread.conf\n"); - if (yyin == NULL) - if (NULL != (yyin = fopen(configfile_location, "r")) ) - Alarm( PRINT, "Conf_init: using file: %s\n", configfile_location); diff --git a/net/spread4/files/patch-docs::spmonitor.1 b/net/spread4/files/patch-docs::spmonitor.1 deleted file mode 100644 index 982d5bb32913..000000000000 --- a/net/spread4/files/patch-docs::spmonitor.1 +++ /dev/null @@ -1,18 +0,0 @@ ---- docs/spmonitor.1 Thu Dec 13 02:01:49 2001 -+++ docs/spmonitor.1 Mon Dec 8 00:00:34 2003 -@@ -27,13 +27,11 @@ - Use an alternate configuration file - .I config-file - instead of --.IR ./spread.conf . -+.IR /etc/spread.conf . - .SH FILES --.I ./spread.conf -+.I /etc/spread.conf - .RS - The default config file location. --.I /etc/spread.conf --is also searched if a local file is not found. - .SH BUGS - The spmonitor works by sending UDP packets to the Spread daemon, so if network - losses occur, commands or status reports can be lost. It can also lose reports diff --git a/net/spread4/files/patch-docs::spread.1 b/net/spread4/files/patch-docs::spread.1 deleted file mode 100644 index 6dca20e2b73d..000000000000 --- a/net/spread4/files/patch-docs::spread.1 +++ /dev/null @@ -1,18 +0,0 @@ ---- docs/spread.1 Thu Dec 13 02:03:19 2001 -+++ docs/spread.1 Mon Dec 8 00:00:20 2003 -@@ -20,13 +20,11 @@ - Use an alternate configuration file - .I config-file - instead of --.IR ./spread.conf . -+.IR /etc/spread.conf . - .SH FILES --.I ./spread.conf -+.I /etc/spread.conf - .RS - The default config file location. --.I /etc/spread.conf --is also searched if a local file is not found. - .SH DIAGNOSTICS - The daemon will output some startup information to stdout - and any severe errors will also be output to stdout. Redirecting diff --git a/net/spread4/files/patch-perl::Spread::Spread.pm b/net/spread4/files/patch-perl::Spread::Spread.pm deleted file mode 100644 index a753b18f6b45..000000000000 --- a/net/spread4/files/patch-perl::Spread::Spread.pm +++ /dev/null @@ -1,13 +0,0 @@ ---- perl/Spread/Spread.pm Mon Dec 8 21:12:18 2003 -+++ perl/Spread/Spread.pm Mon Dec 8 21:15:44 2003 -@@ -177,8 +177,8 @@ - - # Connect - my($mailbox, $private_group) = Spread::connect( -- spread_name => '4444@host.domain.com', -- private_name => 'mrcool', -+ { spread_name => '4803@host.domain.com', -+ private_name => 'mrcool', } - ); - - # Join and leave groups diff --git a/net/spread4/files/patch-sample.spread.conf b/net/spread4/files/patch-sample.spread.conf deleted file mode 100644 index 1926dea8116c..000000000000 --- a/net/spread4/files/patch-sample.spread.conf +++ /dev/null @@ -1,20 +0,0 @@ ---- sample.spread.conf Mon Dec 8 01:26:39 2003 -+++ sample.spread.conf Mon Dec 8 01:26:53 2003 -@@ -50,7 +50,7 @@ - # cause the daemons to log to "spreadlog_machine1.mydomain.com.log" and - # "spreadlog_machine2.mydomain.com.log" respectively. - --#EventLogFile = testlog.out -+EventLogFile = /var/log/spread.log - - #Set whether to add a timestamp in front of all logged events or not. - # Default is no timestamps. Default format is "[%a %d %b %Y %H:%M:%S]". -@@ -62,7 +62,7 @@ - - #EventTimeStamp - # or --#EventTimeStamp = "[%a %d %b %Y %H:%M:%S]" -+EventTimeStamp = "[%a %d %b %Y %H:%M:%S]" - - #Set whether to allow dangerous monitor commands - # like "partition, flow_control, or kill" diff --git a/net/spread4/files/patch-session.c b/net/spread4/files/patch-session.c deleted file mode 100644 index c33d5523da84..000000000000 --- a/net/spread4/files/patch-session.c +++ /dev/null @@ -1,11 +0,0 @@ ---- session.c Tue Aug 5 21:35:52 2003 -+++ session.c Tue Aug 5 21:31:30 2003 -@@ -406,7 +406,7 @@ - Alarm( EXIT, "Sess_init: UNIX sock error\n" ); - - unix_addr.sun_family = AF_UNIX; -- sprintf( name, "/tmp/%d",My.port ); -+ sprintf( name, "%s/spread.sock", _PATH_SPREAD_PIDDIR ); - strcpy( unix_addr.sun_path, name ); - unlink( name ); - diff --git a/net/spread4/files/patch-sp.c b/net/spread4/files/patch-sp.c deleted file mode 100644 index fc0df37e5496..000000000000 --- a/net/spread4/files/patch-sp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sp.c Tue Oct 5 09:08:10 2004 -+++ sp.c Tue Oct 4 14:44:27 2005 -@@ -591,7 +591,7 @@ - set_large_socket_buffers(s); - - unix_addr.sun_family = AF_UNIX; -- sprintf( unix_addr.sun_path, "/tmp/%d", port ); -+ sprintf( unix_addr.sun_path, "%s/spread.sock", _PATH_SPREAD_PIDDIR ); - ret = connect_nointr_timeout( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr), &time_out); - #endif /* !ARCH_PC_WIN95 */ - } diff --git a/net/spread4/files/patch-spread.c b/net/spread4/files/patch-spread.c deleted file mode 100644 index 0de2385206a1..000000000000 --- a/net/spread4/files/patch-spread.c +++ /dev/null @@ -1,52 +0,0 @@ ---- spread.c Thu Jun 19 00:31:23 2003 -+++ spread.c Mon Dec 8 20:55:41 2003 -@@ -48,6 +48,8 @@ - #include <pwd.h> - #include <unistd.h> - #include <sys/types.h> -+#include <errno.h> -+#include <stdlib.h> - #endif - - #ifdef ARCH_PC_WIN95 -@@ -65,6 +67,7 @@ - - static void Invalid_privilege_decrease(char *user, char *group); - static void Usage(int argc, char *argv[]); -+static void writepidfile(); - - /* auth-null.c: */ - void null_init(void); -@@ -144,6 +147,11 @@ - - #endif /* ARCH_PC_WIN95 */ - -+ if (daemon(0,0) == -1) -+ Alarm( EXIT, "Spread: couldn't daemonise: %d", strerror(errno) ); -+ -+ writepidfile(); -+ - /* initialize each valid authentication protocol */ - null_init(); - ip_init(); -@@ -193,6 +201,20 @@ - E_handle_events(); - - return 0; -+} -+ -+static void -+writepidfile() -+{ -+ char pidbuf[11]; -+ int pidfd; -+ -+ if ((pidfd = open(_PATH_SPREAD_PIDDIR "/spread.pid", O_RDWR | O_CREAT, 0644)) == -1) -+ Alarm( EXIT, "Spread: couldn't open pidfile for writing" ); -+ -+ snprintf(pidbuf, sizeof(pidbuf), "%ld\n", (long)getpid()); -+ write(pidfd, pidbuf, strlen(pidbuf)); -+ close(pidfd); - } - - static void Print_help(void) diff --git a/net/spread4/files/spread.sh b/net/spread4/files/spread.sh deleted file mode 100644 index fc9fd9e85755..000000000000 --- a/net/spread4/files/spread.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: spread -# REQUIRE: LOGIN -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable spread: -# -#spread_enable="YES" -# -# See spread(1) for flags -# - -. %%RC_SUBR%% - -name=spread -rcvar=`set_rcvar` - -command="%%PREFIX%%/sbin/spread" -command_args="" -pidfile=/var/run/${name}.pid -required_files=%%PREFIX%%/etc/${name}.conf - -# set defaults - -spread_enable=${spread_enable:-"NO"} -spread_flags=${spread_flags:-""} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/net/spread4/pkg-deinstall b/net/spread4/pkg-deinstall deleted file mode 100644 index 1bc2206605ca..000000000000 --- a/net/spread4/pkg-deinstall +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -USER=spread -GROUP=spread - -echo "===> deinstall note:" -echo " Please note that user ${USER} and group ${GROUP} was not removed" -echo " from this system:" -echo "" - -if pw usershow "${USER}" 2>/dev/null 1>&2; then - echo " To delete spread user permanently" - echo " $ pw userdel ${USER}" - echo "" -fi - -if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then - echo " To delete spread group permanently" - echo " $ pw groupdel ${GROUP}" - echo "" -fi - -exit 0 diff --git a/net/spread4/pkg-descr b/net/spread4/pkg-descr deleted file mode 100644 index 43fac02d21a6..000000000000 --- a/net/spread4/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -Copyright (c) 1993-2002 Spread Concepts LLC. All rights reserved. -This product uses software developed by Spread Concepts LLC for use in the -Spread toolkit. For more information about Spread see http://www.spread.org/ - -Spread is a toolkit and daemon that provide multicast and group communications -support to applications across local and wide area networks. Spread is designed -to make it easy to write groupware, networked multimedia, reliable server, and -collaborative work applications. - -Spread consists of a library that user applications are linked with, a binary -daemon which runs on each computer that is part of the processor group, and -various utility and demonstration programs. - -WWW: http://www.spread.org/ - -- Joshua -joshua@roughtrade.net diff --git a/net/spread4/pkg-install b/net/spread4/pkg-install deleted file mode 100644 index fbbf68fd7932..000000000000 --- a/net/spread4/pkg-install +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -USER=spread -USER_HOMEDIR=/nonexistent -GROUP=spread -RUNDIR=/var/run/spread -NOLOGIN=/sbin/nologin - -case $2 in -PRE-INSTALL) - if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if pw groupadd ${GROUP}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - if pw usermod ${USER} -d ${USER_HOMEDIR} - then - echo "Changed home directory of \"${USER}\" to \"${USER_HOMEDIR}\"." - else - echo "Changing home directory of \"${USER}\" to \"${USER_HOMEDIR}\" failed." - exit 1 - fi - else - if pw useradd ${USER} -g ${GROUP} -h - \ - -d ${USER_HOMEDIR} -s ${NOLOGIN} -c "Spread User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - ;; -POST-INSTALL) - if [ ! -d ${RUNDIR} ]; then - install -d -o ${USER} -g ${GROUP} -m 0750 ${RUNDIR} - fi - ;; -*) - echo 'unexpect argument to pkg-install' - ;; -esac diff --git a/net/spread4/pkg-plist b/net/spread4/pkg-plist deleted file mode 100644 index c914635c6aa1..000000000000 --- a/net/spread4/pkg-plist +++ /dev/null @@ -1,31 +0,0 @@ -bin/spflooder -bin/spmonitor -bin/sptuser -bin/spuser -etc/rc.d/spread.sh -@unexec if cmp -s %D/etc/spread.access_ip %D/etc/spread.access_ip.sample; then rm -f %D/etc/spread.access_ip; fi -etc/spread.access_ip.sample -@exec [ -f %B/spread.access_ip ] || cp %B/%f %B/spread.access_ip -@unexec if cmp -s %D/etc/spread.conf %D/etc/spread.conf.sample; then rm -f %D/etc/spread.conf; fi -etc/spread.conf.sample -@exec [ -f %B/spread.conf ] || cp %B/%f %B/spread.conf -include/sp.h -include/sp_events.h -include/sp_func.h -lib/libspread.a -lib/libspread.so -lib/libspread.so.1 -lib/libtspread.a -lib/libtspread.so -lib/libtspread.so.1 -sbin/spread -%%SITE_PERL%%/%%PERL_ARCH%%/Spread.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.bs -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/Spread.so -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread/autosplit.ix -%%EXAMPLESDIR%%/test.pl -@exec mkdir -p /var/run/spread %B/var/run -@unexec rmdir /var/run/spread 2>/dev/null || true -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread -@dirrmtry %%EXAMPLESDIR%% diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile deleted file mode 100644 index 754d6cca4589..000000000000 --- a/net/tcptraceroute-devel/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: tcptraceroute -# Date created: 21 March 2002 -# Whom: jeff@cetlink.net -# -# $FreeBSD$ -# - -PORTNAME= tcptraceroute -PORTVERSION= 1.4 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= A traceroute implementation using TCP packets - -BUILD_DEPENDS= libnet*<=1.1.0,1:${PORTSDIR}/net/libnet10 - -MAN8= tcptraceroute.8 - -post-install: - @${CHMOD} u+s ${PREFIX}/sbin/tcptraceroute - -.include <bsd.port.mk> diff --git a/net/tcptraceroute-devel/distinfo b/net/tcptraceroute-devel/distinfo deleted file mode 100644 index e0db77591118..000000000000 --- a/net/tcptraceroute-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (tcptraceroute-1.4.tar.gz) = 35c5e7d960f2b073db0109e0004e134e -SHA256 (tcptraceroute-1.4.tar.gz) = 1ef6c4736b55f47d3a2bb26b999cbb409953a112f637bcbec4106da2a0937bde -SIZE (tcptraceroute-1.4.tar.gz) = 31918 diff --git a/net/tcptraceroute-devel/files/patch-Makefile b/net/tcptraceroute-devel/files/patch-Makefile deleted file mode 100644 index 6564b05352a2..000000000000 --- a/net/tcptraceroute-devel/files/patch-Makefile +++ /dev/null @@ -1,36 +0,0 @@ ---- Makefile.orig Mon May 20 03:11:38 2002 -+++ Makefile Tue Aug 20 01:49:27 2002 -@@ -3,20 +3,27 @@ - # tcptraceroute -- A traceroute implementation using TCP packets - # Copyright (c) 2001, 2002 Michael C. Toren <mct@toren.net> - --CC = gcc --CFLAGS = -O2 -Wall --DESTDIR=/usr/local/bin -+CC?= cc -+CFLAGS?= -O -pipe -Wall -+LNETINC= -I${LOCALBASE}/include -+LNETLIB= -L${LOCALBASE}/lib -+ -+BINDIR= ${PREFIX}/sbin -+MANDIR= ${PREFIX}/man -+ -+all: tcptraceroute - - tcptraceroute: tcptraceroute.c -- $(CC) $(CFLAGS) `libnet-config --defines` \ -+ $(CC) $(CFLAGS) `libnet-config --defines` $(LNETINC) \ - -o tcptraceroute tcptraceroute.c \ -- `libnet-config --libs` -lpcap -+ $(LNETLIB) `libnet-config --libs` -lpcap - - static: - $(MAKE) tcptraceroute CFLAGS="$(CFLAGS) -static" - - install: tcptraceroute -- install -D tcptraceroute $(DESTDIR)/tcptraceroute -+ install -c -s tcptraceroute $(BINDIR)/tcptraceroute -+ install -c -m 444 tcptraceroute.8 $(MANDIR)/man8/tcptraceroute.8 - - distrib: clean changelog man - diff --git a/net/tcptraceroute-devel/files/patch-tcptraceroute.c b/net/tcptraceroute-devel/files/patch-tcptraceroute.c deleted file mode 100644 index 28f15e1b7051..000000000000 --- a/net/tcptraceroute-devel/files/patch-tcptraceroute.c +++ /dev/null @@ -1,26 +0,0 @@ ---- tcptraceroute.c.orig Tue Oct 7 16:04:50 2003 -+++ tcptraceroute.c Tue Oct 7 16:05:22 2003 -@@ -391,9 +391,9 @@ - void usage(void) - { - printf("\n%s\n%s\n", VERSION, BANNER); -- fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>] -- [-l <packet length>] [-q <number of queries>] [-t <tos>] -- [-m <max ttl>] [-pP] <source port>] [-s <source address>] -+ fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>] \ -+ [-l <packet length>] [-q <number of queries>] [-t <tos>] \ -+ [-m <max ttl>] [-pP] <source port>] [-s <source address>] \ - [-w <wait time>] <host> [destination port] [packet length]\n\n", name); - } - -@@ -1182,8 +1182,8 @@ - if (! (pcap = pcap_open_live(device, offset + SNAPLEN, 0, 10, errbuf))) - fatal("pcap_open_live failed: %s", errbuf); - -- safe_snprintf(filter, TEXTSIZE, " -- (tcp and src host %s and src port %d and dst host %s) -+ safe_snprintf(filter, TEXTSIZE, " \ -+ (tcp and src host %s and src port %d and dst host %s) \ - or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)", - iptos(dst_ip), dst_prt, iptos(src_ip), iptos(src_ip)); - diff --git a/net/tcptraceroute-devel/pkg-descr b/net/tcptraceroute-devel/pkg-descr deleted file mode 100644 index b64b1179851b..000000000000 --- a/net/tcptraceroute-devel/pkg-descr +++ /dev/null @@ -1,20 +0,0 @@ -tcptraceroute is a traceroute implementation using TCP packets. - -The more traditional traceroute(8) sends out either UDP or ICMP ECHO -packets with a TTL of one, and increments the TTL until the destination -has been reached. By printing the gateways that generate ICMP time -exceeded messages along the way, it is able to determine the path -packets are taking to reach the destination. - -The problem is that with the widespread use of firewalls on the modern -Internet, many of the packets that traceroute(8) sends out end up being -filtered, making it impossible to completely trace the path to the -destination. However, in many cases, these firewalls will permit inbound -TCP packets to specific ports that hosts sitting behind the firewall are -listening for connections on. By sending out TCP SYN packets instead of -UDP or ICMP ECHO packets, tcptraceroute is able to bypass the most -common firewall filters. - -WWW: http://michael.toren.net/code/tcptraceroute/ - -- Simon 'corecode' Schubert diff --git a/net/tcptraceroute-devel/pkg-plist b/net/tcptraceroute-devel/pkg-plist deleted file mode 100644 index cbdc4f42fa33..000000000000 --- a/net/tcptraceroute-devel/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -@comment $FreeBSD$ -sbin/tcptraceroute diff --git a/net/tshark-lite/Makefile b/net/tshark-lite/Makefile deleted file mode 100644 index f83d5e3916cf..000000000000 --- a/net/tshark-lite/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# New ports collection makefile for: tethereal-lite -# Date created: 20 March 2004 -# Whom: Bill Fumerola <billf@mu.org> -# -# $FreeBSD$ -# - -LITE= yes -PKGNAMESUFFIX= -lite - -MASTERDIR= ${.CURDIR}/../tethereal -COMMENT= A powerful network analyzer/capture tool (lite package) - -.include "${MASTERDIR}/Makefile" diff --git a/net/tshark/Makefile b/net/tshark/Makefile deleted file mode 100644 index 64e7f0216b31..000000000000 --- a/net/tshark/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# New ports collection makefile for: tethereal -# Date created: 4 February 2002 -# Whom: Bill Fumerola <billf@mu.org> -# A slave of ports collection makefile for: ethereal -# Date created: 10 August 1998 -# Whom: Bill Fumerola <billf@chc-chimes.com> -# -# $FreeBSD$ -# - -PKGNAMEPREFIX= t -CATEGORIES= net ipv6 - -MASTERDIR= ${.CURDIR}/../ethereal - -WITHOUT_X11= yes - -.include "${MASTERDIR}/Makefile" diff --git a/net/udpcast/Makefile b/net/udpcast/Makefile deleted file mode 100644 index 681446a2c4f3..000000000000 --- a/net/udpcast/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# New ports collection makefile for: udpcast -# Date created: Mon Jul 19 19:10:56 UTC 2004 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= udpcast -PORTVERSION= 0.${RELEASE_DATE} -CATEGORIES= mbone sysutils -MASTER_SITES= http://udpcast.linux.lu/current/ -DISTNAME= ${PORTNAME}-${RELEASE_DATE} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A file transfer tool using ethernet's multicast - -USE_REINPLACE= yes -USE_GETOPT_LONG=yes -USE_GMAKE= yes -USE_PERL5_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME} - -RELEASE_DATE= 20040531 - -PROGRAM_SBIN_FILES= udp-receiver udp-sender - -PLIST_FILES= sbin/udp-receiver \ - sbin/udp-sender -PORTDOCS= Changelog.txt cmd.html - -MAN1= udp-receiver.1 udp-sender.1 - -post-patch: - @${REINPLACE_CMD} -E \ - -e 's|<malloc.h>|<stdlib.h>|' \ - ${WRKSRC}/libbb_udpcast.h - -do-configure: -# C{C,FLAGS}, PTHREAD_* safeness - @${REINPLACE_CMD} -E \ - -e 's|gcc|${CC}|' \ - -e 's|^(CFLAGS[[:space:]]*=.+)$$|\1 ${CFLAGS} ${CPPFLAGS} ${PTHREAD_CFLAGS}|' \ - -e 's|^(LDFLAGS[[:space:]]*=.+)$$|\1 ${LDFLAGS}|' \ - -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - ${BUILD_WRKSRC}/${MAKEFILE} - -do-install: -.ifndef(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -. for file in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -. endfor -.endif -.for file in ${PROGRAM_SBIN_FILES} - @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/sbin/ -.endfor -.for file in ${MAN1} - @${INSTALL_MAN} ${WRKSRC}/${file} ${MANPREFIX}/man/man1/ -.endfor - -.include <bsd.port.mk> diff --git a/net/udpcast/distinfo b/net/udpcast/distinfo deleted file mode 100644 index e8c6a0660840..000000000000 --- a/net/udpcast/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (udpcast-20040531.tar.gz) = e965fae35ae7450098c29984d3997344 -SHA256 (udpcast-20040531.tar.gz) = 47893ef09431abfc436f3e86703619587c7fad33b5fd16f3217650a003c8ba1d -SIZE (udpcast-20040531.tar.gz) = 67213 diff --git a/net/udpcast/files/patch-participants.h b/net/udpcast/files/patch-participants.h deleted file mode 100644 index f09b1aa4c62b..000000000000 --- a/net/udpcast/files/patch-participants.h +++ /dev/null @@ -1,10 +0,0 @@ ---- participants.h.orig Tue Jul 20 13:49:28 2004 -+++ participants.h Tue Jul 20 13:49:40 2004 -@@ -3,6 +3,7 @@ - - #define MAX_CLIENTS 1024 - -+#include <sys/types.h> - #include <sys/socket.h> - - typedef struct participantsDb *participantsDb_t; diff --git a/net/udpcast/files/patch-socklib.c b/net/udpcast/files/patch-socklib.c deleted file mode 100644 index 03d62095cdad..000000000000 --- a/net/udpcast/files/patch-socklib.c +++ /dev/null @@ -1,38 +0,0 @@ ---- socklib.c.orig Sat Feb 21 13:58:37 2004 -+++ socklib.c Tue Jul 20 17:58:51 2004 -@@ -16,6 +16,8 @@ - #include "log.h" - #include "socklib.h" - -+#undef SIOCGIFINDEX -+ - #ifdef LOSSTEST - /** - * Packet loss/swap testing... -@@ -289,7 +291,7 @@ - - int setTtl(int sock, int ttl) { - /* set the socket to broadcast */ -- return setsockopt(sock, SOL_IP, IP_MULTICAST_TTL, &ttl, sizeof(int)); -+ return setsockopt(sock, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(int)); - } - - #ifdef SIOCGIFINDEX -@@ -334,7 +336,7 @@ - int r; - - fillMreq(sock, ifname, addr, &mreq); -- r = setsockopt(sock, SOL_IP, code, &mreq, sizeof(mreq)); -+ r = setsockopt(sock, IPPROTO_IP, code, &mreq, sizeof(mreq)); - if(r < 0) { - perror(message); - exit(1); -@@ -366,7 +368,7 @@ - - - int setMcastDestination(int sock, char *ifname, struct sockaddr *addr) { --#ifdef __CYGWIN__ -+#if defined(__CYGWIN__) || defined(__FreeBSD__) - int r; - struct sockaddr interface_addr; - struct in_addr if_addr; diff --git a/net/udpcast/files/patch-statistics.c b/net/udpcast/files/patch-statistics.c deleted file mode 100644 index 176e5136b246..000000000000 --- a/net/udpcast/files/patch-statistics.c +++ /dev/null @@ -1,11 +0,0 @@ ---- statistics.c.orig Tue Jul 20 10:46:11 2004 -+++ statistics.c Tue Jul 20 12:00:59 2004 -@@ -37,7 +37,7 @@ - static void printFilePosition(int fd) { - #ifndef __CYGWIN__ - if(fd != -1) { -- loff_t offset = lseek64(fd, 0, SEEK_CUR); -+ off_t offset = lseek(fd, 0, SEEK_CUR); - printLongNum(offset); - } - #endif diff --git a/net/udpcast/files/patch-udpr-negotiate.c b/net/udpcast/files/patch-udpr-negotiate.c deleted file mode 100644 index db9f50ba147d..000000000000 --- a/net/udpcast/files/patch-udpr-negotiate.c +++ /dev/null @@ -1,60 +0,0 @@ ---- udpr-negotiate.c.orig Sat Feb 21 14:08:49 2004 -+++ udpr-negotiate.c Tue Jul 20 13:44:05 2004 -@@ -2,6 +2,10 @@ - #include <unistd.h> - #include <errno.h> - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include "log.h" - #include "socklib.h" - #include "udpcast.h" -@@ -16,6 +20,10 @@ - # define O_BINARY 0 - #endif - -+#ifdef __FreeBSD__ -+struct client_config client_config_on_exit_hack; -+#endif -+ - static int sendConnectReq(struct client_config *client_config, - struct net_config *net_config, - int haveServerAddress) { -@@ -48,6 +56,12 @@ - sendDisconnect(exitStatus, (struct client_config *) args); - } - -+#ifdef __FreeBSD__ -+static void sendDisconnectWrapper_on_exit_handler() { -+ sendDisconnectWrapper(0, &client_config_on_exit_hack); -+} -+#endif -+ - void sendDisconnect(int exitStatus, - struct client_config *client_config) { - int endianness = client_config->endianness; -@@ -144,7 +158,7 @@ - if(disk_config->fileName != NULL) { - int oflags = O_CREAT | O_WRONLY; - if(!(disk_config->flags & FLAG_NOSYNC)) { -- oflags |= O_SYNC; -+ oflags |= O_FSYNC; - } - outFile = open(disk_config->fileName, oflags | O_BINARY, 0644); - if(outFile < 0) { -@@ -333,7 +347,13 @@ - pipedOutFile = openPipe(client_config.toServer, outFile, disk_config, - &pipePid); - #ifndef __CYGWIN__ -+# ifdef __FreeBSD__ -+ client_config_on_exit_hack = client_config; -+ -+ atexit(sendDisconnectWrapper_on_exit_handler); -+# else - on_exit(sendDisconnectWrapper, &client_config); -+# endif - #endif - { - struct fifo fifo; diff --git a/net/udpcast/pkg-descr b/net/udpcast/pkg-descr deleted file mode 100644 index 834bd3b3e5e3..000000000000 --- a/net/udpcast/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -[ excerpt taken from developer's www site ] - -UDPcast is a file transfer tool that can send data simultaneously -to many destinations on a LAN. This can for instance be used to -install entire classrooms of PC's at once. The advantage of UDPcast -over using other methods (nfs, ftp, whatever) is that UDPcast uses -Ethernet's multicast abilities: it won't take longer to install 15 -machines than it would to install just 2. - -WWW: http://udpcast.linux.lu/ diff --git a/net/unison232/Makefile b/net/unison232/Makefile deleted file mode 100644 index 6039bd0515bf..000000000000 --- a/net/unison232/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# New ports collection makefile for: unison -# Date created: 4 October 2000 -# Whom: Dan Pelleg <dpelleg+unison@cs.cmu.edu> -# -# $FreeBSD$ -# - -PORTNAME= unison -PORTVERSION= 2.13.16 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/ -DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}.tar.gz - -MAINTAINER= daniel+unison@pelleg.org -COMMENT= A user-level file synchronization tool - -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml-nox11 -PATCH_DEPENDS= ${BUILD_DEPENDS} - -PLIST_SUB= PORTVERSION=${PORTVERSION} -USE_GMAKE= yes -MAKE_ARGS= CFLAGS="" - -.include <bsd.port.pre.mk> - -.if !defined(NOPORTDOCS) -DOCS= BUGS.txt NEWS README -EXTRA_DOCS= unison-${PORTVERSION}-manual.html \ - unison-${PORTVERSION}-manual.pdf unison-${PORTVERSION}-manual.ps -.endif - -.if !defined(WITHOUT_GTK2) && !defined(WITHOUT_X11) && exists(${LOCALBASE}/bin/lablgtk2) -WITH_GTK2= yes -.endif - -.if defined(WITH_GTK2) -MAKE_ARGS+= UISTYLE=gtk2 -RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 -PLIST_SUB+= TEXT="" -.else -MAKE_ARGS+= UISTYLE=text -PLIST_SUB+= TEXT="@comment " -.endif - -.if defined(WITH_GTK2) -post-build: - @${ECHO} Building text-only version - @${ECHO} ${WRKSRC} - @${GMAKE} -C ${WRKSRC} UISTYLE=text NAME=unison-text -.endif - -post-install: - @${STRIP_CMD} ${PREFIX}/bin/unison -.if defined(WITH_GTK2) - @${INSTALL_PROGRAM} ${WRKSRC}/unison-text ${PREFIX}/bin -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net/unison232/distinfo b/net/unison232/distinfo deleted file mode 100644 index 71682d2adf70..000000000000 --- a/net/unison232/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -MD5 (unison-2.13.16/unison-2.13.16.tar.gz) = a79bf5f4ebf2a1eaf15b1ac97f827374 -SHA256 (unison-2.13.16/unison-2.13.16.tar.gz) = 808400a933aeb67654edc770822cd186d1b2adc92e7cb5836996c71c69ffe656 -SIZE (unison-2.13.16/unison-2.13.16.tar.gz) = 393266 -MD5 (unison-2.13.16/unison-2.13.16-manual.html) = 2b39e52ec3893a112b28b7b0a294d941 -SHA256 (unison-2.13.16/unison-2.13.16-manual.html) = 52fbb03925c44c46837d919a3baebceefc723c09458ec7e95d3993f2a98f0e20 -SIZE (unison-2.13.16/unison-2.13.16-manual.html) = 196162 -MD5 (unison-2.13.16/unison-2.13.16-manual.pdf) = e7684d401d6f5ee194b9e631cc022dd6 -SHA256 (unison-2.13.16/unison-2.13.16-manual.pdf) = 8f0851b5b34e2d85a6a02f5a374a7d743e5067a419fca689d14d278c951597df -SIZE (unison-2.13.16/unison-2.13.16-manual.pdf) = 436229 -MD5 (unison-2.13.16/unison-2.13.16-manual.ps) = 49cd0eef6cc98a1af7fed38313ccab42 -SHA256 (unison-2.13.16/unison-2.13.16-manual.ps) = 8355ca8b150ee950c43543e6f99439fb883da2032646c39c581dc5312aa6dc54 -SIZE (unison-2.13.16/unison-2.13.16-manual.ps) = 414346 diff --git a/net/unison232/files/patch-aa b/net/unison232/files/patch-aa deleted file mode 100644 index 483f1bab2391..000000000000 --- a/net/unison232/files/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ ---- Makefile.orig Sat Aug 27 15:49:56 2005 -+++ Makefile Sat Aug 27 15:51:55 2005 -@@ -68,15 +68,15 @@ - ###################################################################### - # Installation - --INSTALLDIR = $(HOME)/bin/ -+INSTALLDIR = ${PREFIX}/bin/ - - # This has two names because on OSX the file INSTALL shadows the target 'install'! - install: doinstall - - doinstall: $(NAME)$(EXEC_EXT) -- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) -- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR) -- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT) -+# -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) -+ ${BSD_INSTALL_PROGRAM} $(NAME)$(EXEC_EXT) $(INSTALLDIR) -+# cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(MAJORVERSION)$(EXEC_EXT) - - - ###################################################################### -@@ -353,7 +353,7 @@ - .PHONY: tags - - tags: -- -$(ETAGS) *.mli */*.mli *.ml */*.ml *.m */*.m *.c */*.c *.txt -+ -$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt - - all:: TAGS - diff --git a/net/unison232/files/patch-pty.c b/net/unison232/files/patch-pty.c deleted file mode 100644 index 2066ff98bdcd..000000000000 --- a/net/unison232/files/patch-pty.c +++ /dev/null @@ -1,22 +0,0 @@ ---- pty.c.orig Mon May 30 15:15:43 2005 -+++ pty.c Sat Aug 27 15:47:55 2005 -@@ -21,6 +21,7 @@ - #endif - - #ifdef __FreeBSD__ -+#include <sys/types.h> - #include <libutil.h> - #define HAS_OPENPTY 1 - #endif -@@ -40,9 +41,10 @@ - /* c_openpty: unit -> (int * Unix.file_descr) */ - CAMLprim value c_openpty() { - int master,slave; -+ value pair; - if (openpty(&master,&slave,NULL,NULL,NULL) < 0) - uerror("openpty", (value) 0); -- value pair = alloc_tuple(2); -+ pair = alloc_tuple(2); - Store_field(pair,0,Val_int(master)); - Store_field(pair,1,Val_int(slave)); - return pair; diff --git a/net/unison232/pkg-descr b/net/unison232/pkg-descr deleted file mode 100644 index 10d805d9eb0a..000000000000 --- a/net/unison232/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -Unison is a file-synchronization tool for Unix and Windows. It allows two -replicas of a collection of files and directories to be stored on different -hosts (or different disks on the same host), modified separately, and then -brought up to date by propagating the changes in each replica to the other. - -Unison shares a number of features with tools such as configuration -management packages (CVS, PRCS, etc.) distributed filesystems (Coda, etc.) -uni-directional mirroring utilities (rsync, etc.) and other synchronizers -(Intellisync, Reconcile, etc). - -WWW: http://www.cis.upenn.edu/~bcpierce/unison/ - -- Dan Pelleg - -daniel+unison@pelleg.org diff --git a/net/unison232/pkg-message b/net/unison232/pkg-message deleted file mode 100644 index c7cedb69cfdc..000000000000 --- a/net/unison232/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - ATTENTION: - -1) Unison archive format has changed since 2.10.2. The old archive -won't be deleted automatically in case you want to downgrade it. - -2) Merge functionality has seriously changed. Check the manual. - -3) Together with gtk-enabled version, a text-only unison-text binary -is installed as it depends on a smaller number of libraries. -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/net/unison232/pkg-plist b/net/unison232/pkg-plist deleted file mode 100644 index 7fc5e3d995b4..000000000000 --- a/net/unison232/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/unison -%%TEXT%%bin/unison-text -%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.html -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.pdf -%%PORTDOCS%%%%DOCSDIR%%/unison-%%PORTVERSION%%-manual.ps -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net/vde2/Makefile b/net/vde2/Makefile deleted file mode 100644 index af5c40036dba..000000000000 --- a/net/vde2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: vde -# Date created: 30 Janurary 2005 -# Whom: Craig Boston <craig@yekse.gank.org> -# -# $FreeBSD$ -# - -PORTNAME= vde -PORTVERSION= 1.5.7 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= vde -EXTRACT_SUFX= .tgz - -MAINTAINER= craig@yekse.gank.org -COMMENT= User-mode virtual ethernet infrastructure - -USE_GMAKE= yes -USE_GETOPT_LONG=yes -INSTALLS_SHLIB= yes - -.include <bsd.port.pre.mk> - -CFLAGS+= ${CPPFLAGS} -fPIC -MAKE_ENV+= LDFLAGS="${LDFLAGS}" - -MAN1= dpipe.1 slirpvde.1 vdetaplib.1 vdeq.1 vde_plug.1 vde_switch.1 - -.include <bsd.port.post.mk> diff --git a/net/vde2/distinfo b/net/vde2/distinfo deleted file mode 100644 index ce04af4db698..000000000000 --- a/net/vde2/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (vde-1.5.7.tgz) = f89a958a6997114b46abd66c00e217c8 -SHA256 (vde-1.5.7.tgz) = a80d907c1705e9b4f5eb62593753f5120e8e71066395fa3241eb425825ccf82b -SIZE (vde-1.5.7.tgz) = 139314 diff --git a/net/vde2/files/patch-Makefile b/net/vde2/files/patch-Makefile deleted file mode 100644 index 5d0cf76b3e4b..000000000000 --- a/net/vde2/files/patch-Makefile +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile Sat Jan 29 15:02:08 2005 -+++ Makefile Sun Jan 30 13:46:59 2005 -@@ -1,14 +1,15 @@ --TUNTAP = $(shell [ -e /usr/include/linux/if_tun.h ] && echo -DTUNTAP) -+TUNTAP = $(shell [ -e /usr/include/net/if_tun.h ] && echo -DTUNTAP) - - OBJSSW = hash.o port.o vde_switch.o tuntap.o - BINSW = vde_switch - BIN = $(BINSW) dpipe vde_plug - #CFLAGS = -g -Wall $(TUNTAP) -DINFO -O3 --CFLAGS = -Wall $(TUNTAP) -O3 -+CFLAGS += -Wall $(TUNTAP) -O - --BIN_DIR ?= /usr/local/bin --LIB_DIR ?= /usr/local/lib --MAN_DIR ?= /usr/local/man -+PREFIX ?= /usr/local -+BIN_DIR ?= $(PREFIX)/bin -+LIB_DIR ?= $(PREFIX)/lib -+MAN_DIR ?= $(PREFIX)/man - - ifneq ($(TUNTAP),) - OBJS += tuntap.o -@@ -30,13 +31,13 @@ - vde_switch.o: vde_switch.c vde.h switch.h hash.h port.h tuntap.h - - $(BINSW) : $(OBJSSW) -- $(CC) $(CFLAGS) -o $(BINSW) $(OBJSSW) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(BINSW) $(OBJSSW) - - dpipe: dpipe.o -- $(CC) $(CFLAGS) -o dpipe dpipe.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -o dpipe dpipe.o - - vde_plug: vde_plug.o -- $(CC) $(CFLAGS) -o vde_plug vde_plug.o -+ $(CC) $(CFLAGS) $(LDFLAGS) -o vde_plug vde_plug.o - - clean : - rm -f $(BIN) *.o *~ diff --git a/net/vde2/files/patch-hash.c b/net/vde2/files/patch-hash.c deleted file mode 100644 index e4cdaef6e90b..000000000000 --- a/net/vde2/files/patch-hash.c +++ /dev/null @@ -1,23 +0,0 @@ ---- hash.c Sat Jan 29 15:02:08 2005 -+++ hash.c Sat Jan 29 15:08:18 2005 -@@ -14,7 +14,11 @@ - #include <syslog.h> - #include <sys/types.h> - #include <sys/time.h> -+#ifdef __FreeBSD__ -+#include <signal.h> -+#else - #include <sys/signal.h> -+#endif - #include "switch.h" - #include "hash.h" - -@@ -129,7 +133,7 @@ - printf("Hash: %d Addr: %02x:%02x:%02x:%02x:%02x:%02x to port: %s " - "age %ld secs\n", calc_hash(e->dst), - e->dst[0], e->dst[1], e->dst[2], e->dst[3], e->dst[4], e->dst[5], -- (*p->port_id)(e->port), (int) p->now - e->last_seen); -+ (*p->port_id)(e->port), (long) p->now - e->last_seen); - } - - void print_hash(char *(*port_id)(void *)) diff --git a/net/vde2/files/patch-port.c b/net/vde2/files/patch-port.c deleted file mode 100644 index 02d2359c0e15..000000000000 --- a/net/vde2/files/patch-port.c +++ /dev/null @@ -1,34 +0,0 @@ ---- port.c Sat Jan 29 15:02:08 2005 -+++ port.c Sun Jan 30 11:36:03 2005 -@@ -10,6 +10,9 @@ - #include <syslog.h> - #include <sys/socket.h> - #include <sys/un.h> -+#ifdef __FreeBSD__ -+#include <string.h> -+#endif - #include "switch.h" - #include "hash.h" - #include "port.h" -@@ -316,10 +319,19 @@ - port=p->data; - //if(match_sock(p->control, fd, p->data, p->data_len, &data)) break; - if(p->data_len == sizeof(struct sock_data) && -- !(memcmp(&(port->sock), &mine->sock, sizeof(mine->sock)))) break; -+#ifdef __FreeBSD__ -+ port->sock.sun_family == mine->sock.sun_family && -+ !(strcmp(port->sock.sun_path, mine->sock.sun_path))) -+#else -+ !(memcmp(&(port->sock), &mine->sock, sizeof(mine->sock)))) -+#endif -+ break; - } - } -- handle_direct_data(p,hub,&packet,len); -+ if (i < g_nfds) -+ handle_direct_data(p,hub,&packet,len); -+ else -+ printlog(LOG_WARNING, "No port associated with descriptor %d", fd); - return 0; - } - diff --git a/net/vde2/files/patch-qemu::Makefile b/net/vde2/files/patch-qemu::Makefile deleted file mode 100644 index 1b460436f1d3..000000000000 --- a/net/vde2/files/patch-qemu::Makefile +++ /dev/null @@ -1,8 +0,0 @@ ---- qemu/Makefile Sat Jan 29 15:02:08 2005 -+++ qemu/Makefile Sun Jan 30 12:59:52 2005 -@@ -1,4 +1,4 @@ --ALL: vdeq -+all: vdeq - - vdeq.o: vdeq.c ../vde.h - diff --git a/net/vde2/files/patch-qemu::vdeq.c b/net/vde2/files/patch-qemu::vdeq.c deleted file mode 100644 index 9c34761c145e..000000000000 --- a/net/vde2/files/patch-qemu::vdeq.c +++ /dev/null @@ -1,103 +0,0 @@ ---- qemu/vdeq.c Sat Jan 29 15:02:08 2005 -+++ qemu/vdeq.c Sun Jan 30 13:31:46 2005 -@@ -7,14 +7,20 @@ - #include <signal.h> - #include <errno.h> - #include <unistd.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <libgen.h> - #include <sys/ioctl.h> - #include <sys/socket.h> - #include <sys/un.h> - #include <sys/uio.h> - #include <sys/poll.h> -+#ifdef __FreeBSD__ -+#include <string.h> -+#include <sys/time.h> - #include "../vde.h" -+#endif - - #define SWITCH_MAGIC 0xfeedface - #define BUFSIZE 2048 -@@ -29,6 +35,15 @@ - struct sockaddr_un sock; - }; - -+#ifdef __FreeBSD__ -+static char *data_socket = NULL; -+ -+static void cleanup() -+{ -+ if(data_socket != NULL) -+ unlink(data_socket); -+} -+#endif - - static int send_fd(char *name, int fddata, struct sockaddr_un *datasock, int intno, int group) - { -@@ -37,6 +52,9 @@ - int fdctl; - - struct sockaddr_un sock; -+#ifdef __FreeBSD__ -+ struct timeval tv; -+#endif - - if((fdctl = socket(AF_UNIX, SOCK_STREAM, 0)) < 0){ - perror("socket"); -@@ -56,7 +74,14 @@ - - req.sock.sun_family=AF_UNIX; - memset(req.sock.sun_path, 0, sizeof(req.sock.sun_path)); -+#ifdef __FreeBSD__ -+ gettimeofday(&tv, NULL); -+ snprintf(req.sock.sun_path, sizeof(req.sock.sun_path), "%s.%i.%li", -+ VDEDATSOCK, pid, tv.tv_usec); -+ data_socket = strdup(req.sock.sun_path); -+#else - sprintf(&req.sock.sun_path[1], "%5d-%2d", pid, intno); -+#endif - - if(bind(fddata, (struct sockaddr *) &req.sock, sizeof(req.sock)) < 0){ - perror("bind"); -@@ -111,20 +136,23 @@ - static void leave() - { - fprintf(stderr,"qemu exited: %s quits\n", vdeqname); -+#ifdef __FreeBSD__ -+ cleanup(0, NULL); -+#endif - exit(0); - } - - int main(int argc, char **argv) - { - int *fddata; -- char *argsock,**sockname; -+ char *argsock = NULL,**sockname; - struct sockaddr_un *dataout,datain; - int datainsize; - int result; - int group=0; - int *connected_fd; - register ssize_t nx; -- int args; -+ int args = 0; - int newargc; - char **newargv; - typedef int pair[2]; -@@ -154,10 +182,10 @@ - )) { - usage(); - } else if (argc > args+1 && -- (strcmp(argv[args],"-vdesock")==0) || -+ ((strcmp(argv[args],"-vdesock")==0) || - (strcmp(argv[args],"-sock")==0) || - (strcmp(argv[args],"-unix")==0) || -- (strcmp(argv[args],"-s")==0) -+ (strcmp(argv[args],"-s")==0)) - ){ - argsock=argv[args+1]; - args+=2; diff --git a/net/vde2/files/patch-slirpvde::Makefile b/net/vde2/files/patch-slirpvde::Makefile deleted file mode 100644 index 05f3bea2367d..000000000000 --- a/net/vde2/files/patch-slirpvde::Makefile +++ /dev/null @@ -1,20 +0,0 @@ ---- slirpvde/Makefile Sat Jan 29 15:02:08 2005 -+++ slirpvde/Makefile Sun Jan 30 14:02:57 2005 -@@ -3,7 +3,7 @@ - tcp_timer.o udp.o \ - bootp.o - --CFLAGS=-I. -DVDE -+CFLAGS+=-I. -DVDE - - all: libslirp.a slirpvde - -@@ -34,7 +34,7 @@ - udp.o: udp.c ip_icmp.h - - slirpvde: slirpvde.o libslirp.a -- $(CC) -o slirpvde slirpvde.o libslirp.a -+ $(CC) $(LDFLAGS) -o slirpvde slirpvde.o libslirp.a - - clean: - rm -rf *.o slirpvde libslirp.a diff --git a/net/vde2/files/patch-slirpvde::ip.h b/net/vde2/files/patch-slirpvde::ip.h deleted file mode 100644 index 7f19d53739d6..000000000000 --- a/net/vde2/files/patch-slirpvde::ip.h +++ /dev/null @@ -1,34 +0,0 @@ ---- slirpvde/ip.h Sat Jan 29 15:02:08 2005 -+++ slirpvde/ip.h Sun Jan 30 14:00:32 2005 -@@ -37,6 +37,31 @@ - #ifndef _IP_H_ - #define _IP_H_ - -+#ifdef __FreeBSD__ -+#include <sys/endian.h> -+ -+#if !defined(__BYTE_ORDER) -+#if defined(_BYTE_ORDER) -+#define __BYTE_ORDER _BYTE_ORDER -+#elif defined(BYTE_ORDER) -+#define __BYTE_ORDER BYTE_ORDER -+#else -+#error BYTE_ORDER not defined -+#endif -+#endif /* !defined(__BYTE_ORDER) */ -+ -+#if !defined(__BIG_ENDIAN) -+#if defined(_BIG_ENDIAN) -+#define __BIG_ENDIAN _BIG_ENDIAN -+#elif defined(BIG_ENDIAN) -+#define __BIG_ENDIAN BIG_ENDIAN -+#else -+#error BIG_ENDIAN not defined -+#endif -+#endif /* !defined(__BIG_ENDIAN) */ -+ -+#endif /* __FreeBSD__ */ -+ - #if __BYTE_ORDER == __BIG_ENDIAN - # ifndef NTOHL - # define NTOHL(d) diff --git a/net/vde2/files/patch-slirpvde::libslirp.h b/net/vde2/files/patch-slirpvde::libslirp.h deleted file mode 100644 index b8a62739b93f..000000000000 --- a/net/vde2/files/patch-slirpvde::libslirp.h +++ /dev/null @@ -1,14 +0,0 @@ ---- slirpvde/libslirp.h Sat Jan 29 15:02:08 2005 -+++ slirpvde/libslirp.h Sun Jan 30 13:55:31 2005 -@@ -2,7 +2,11 @@ - #define _LIBSLIRP_H - - #include <sys/select.h> -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#else - #include <stdint.h> -+#endif - - void slirp_init(char *network); - diff --git a/net/vde2/files/patch-slirpvde::slirp_config.h b/net/vde2/files/patch-slirpvde::slirp_config.h deleted file mode 100644 index dfd1288b6c2e..000000000000 --- a/net/vde2/files/patch-slirpvde::slirp_config.h +++ /dev/null @@ -1,33 +0,0 @@ ---- slirpvde/slirp_config.h Sat Jan 29 15:02:08 2005 -+++ slirpvde/slirp_config.h Sat Jan 29 15:15:18 2005 -@@ -61,10 +61,18 @@ - #define HAVE_STDLIB_H - - /* Define if you have sys/ioctl.h */ -+#ifdef __FreeBSD__ -+#define HAVE_SYS_IOCTL_H -+#else - #undef HAVE_SYS_IOCTL_H -+#endif - - /* Define if you have sys/filio.h */ -+#ifdef __FreeBSD__ -+#define HAVE_SYS_FILIO_H -+#else - #undef HAVE_SYS_FILIO_H -+#endif - - /* Define if you have strerror */ - #define HAVE_STRERROR -@@ -162,7 +170,11 @@ - #define HAVE_MEMMOVE - - /* Define if you have <termios.h> */ -+#ifdef __FreeBSD__ -+#define HAVE_TERMIOS_H -+#else - #undef HAVE_TERMIOS_H -+#endif - - /* Define if you have gethostid */ - #undef HAVE_GETHOSTID diff --git a/net/vde2/files/patch-slirpvde::slirpvde.c b/net/vde2/files/patch-slirpvde::slirpvde.c deleted file mode 100644 index f76790701b07..000000000000 --- a/net/vde2/files/patch-slirpvde::slirpvde.c +++ /dev/null @@ -1,95 +0,0 @@ ---- slirpvde/slirpvde.c Sat Jan 29 15:02:08 2005 -+++ slirpvde/slirpvde.c Sun Jan 30 14:24:33 2005 -@@ -7,7 +7,9 @@ - #include <signal.h> - #include <errno.h> - #include <unistd.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <libgen.h> - #include <sys/ioctl.h> - #include <sys/socket.h> -@@ -16,6 +18,10 @@ - #include <sys/poll.h> - #include <libslirp.h> - #include <getopt.h> -+#ifdef __FreeBSD__ -+#include <string.h> -+#include <sys/time.h> -+#endif - - #define SWITCH_MAGIC 0xfeedface - #define BUFSIZE 2048 -@@ -32,6 +38,25 @@ - struct sockaddr_un sock; - }; - -+#ifdef __FreeBSD__ -+#include "../vde.h" -+static char *data_socket = NULL; -+ -+static void cleanup() -+{ -+ if(data_socket != NULL) -+ unlink(data_socket); -+} -+ -+static void sig_handler(int sig) -+{ -+ fprintf(stderr, "Caught signal %d, cleaning up and exiting\n", sig); -+ cleanup(1,NULL); -+ signal(sig, SIG_DFL); -+ kill(getpid(), sig); -+} -+#endif -+ - static int send_fd(char *name, int fddata, struct sockaddr_un *datasock, int group) - { - int pid = getpid(); -@@ -39,6 +64,9 @@ - int fdctl; - - struct sockaddr_un sock; -+#ifdef __FreeBSD__ -+ struct timeval tv; -+#endif - - if((fdctl = socket(AF_UNIX, SOCK_STREAM, 0)) < 0){ - perror("socket"); -@@ -58,7 +86,14 @@ - - req.sock.sun_family=AF_UNIX; - memset(req.sock.sun_path, 0, sizeof(req.sock.sun_path)); -+#ifdef __FreeBSD__ -+ gettimeofday(&tv, NULL); -+ snprintf(req.sock.sun_path, sizeof(req.sock.sun_path), "%s.%i.%li", -+ VDEDATSOCK, pid, tv.tv_usec); -+ data_socket = strdup(req.sock.sun_path); -+#else - sprintf(&req.sock.sun_path[1], "%5d", pid); -+#endif - - if(bind(fddata, (struct sockaddr *) &req.sock, sizeof(req.sock)) < 0){ - perror("bind"); -@@ -149,7 +184,6 @@ - int group=0; - int connected_fd; - register ssize_t nx; -- register int i; - fd_set rs,ws,xs; - int opt,longindx; - char *netw=NULL; -@@ -175,6 +209,12 @@ - exit(1); - } - connected_fd=send_fd(sockname, fddata, &dataout, group); -+#ifdef __FreeBSD__ -+ if(signal(SIGINT, sig_handler) < 0) { -+ perror("signal"); -+ } -+ signal(SIGPIPE, SIG_IGN); /* FreeBSD 4.x sends SIGPIPE on reset sockets */ -+#endif - slirp_init(netw); - - for(;;) { diff --git a/net/vde2/files/patch-slirpvde::tcp.h b/net/vde2/files/patch-slirpvde::tcp.h deleted file mode 100644 index 1dade2d0986c..000000000000 --- a/net/vde2/files/patch-slirpvde::tcp.h +++ /dev/null @@ -1,34 +0,0 @@ ---- slirpvde/tcp.h Sat Jan 29 15:02:08 2005 -+++ slirpvde/tcp.h Sun Jan 30 14:00:50 2005 -@@ -37,6 +37,31 @@ - #ifndef _TCP_H_ - #define _TCP_H_ - -+#ifdef __FreeBSD__ -+#include <sys/endian.h> -+ -+#if !defined(__BYTE_ORDER) -+#if defined(_BYTE_ORDER) -+#define __BYTE_ORDER _BYTE_ORDER -+#elif defined(BYTE_ORDER) -+#define __BYTE_ORDER BYTE_ORDER -+#else -+#error BYTE_ORDER not defined -+#endif -+#endif /* !defined(__BYTE_ORDER) */ -+ -+#if !defined(__BIG_ENDIAN) -+#if defined(_BIG_ENDIAN) -+#define __BIG_ENDIAN _BIG_ENDIAN -+#elif defined(BIG_ENDIAN) -+#define __BIG_ENDIAN BIG_ENDIAN -+#else -+#error BIG_ENDIAN not defined -+#endif -+#endif /* !defined(__BIG_ENDIAN) */ -+ -+#endif /* __FreeBSD__ */ -+ - typedef u_int32_t tcp_seq; - - #define PR_SLOWHZ 2 /* 2 slow timeouts per second (approx) */ diff --git a/net/vde2/files/patch-tuntap.c b/net/vde2/files/patch-tuntap.c deleted file mode 100644 index 43b31617ea17..000000000000 --- a/net/vde2/files/patch-tuntap.c +++ /dev/null @@ -1,45 +0,0 @@ ---- tuntap.c Sat Jan 29 15:02:08 2005 -+++ tuntap.c Sun Jan 30 00:27:23 2005 -@@ -11,8 +11,16 @@ - #include <unistd.h> - #include <syslog.h> - #include <sys/ioctl.h> -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#endif - #include <net/if.h> -+#ifdef __FreeBSD__ -+#include <net/if_tun.h> -+#else - #include <linux/if_tun.h> -+#endif - #include "port.h" - #include "switch.h" - -@@ -28,13 +36,16 @@ - - int open_tap(char *dev) - { -+#ifndef __FreeBSD__ - struct ifreq ifr; -+#endif - int fd; - -- if((fd = open("/dev/net/tun", O_RDWR)) < 0){ -- printlog(LOG_ERR,"Failed to open /dev/net/tun %s",strerror(errno)); -+ if((fd = open(dev, O_RDWR)) < 0){ -+ printlog(LOG_ERR,"Failed to open %s %s", dev, strerror(errno)); - return(-1); - } -+#ifndef __FreeBSD__ - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_flags = IFF_TAP | IFF_NO_PI; - strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name) - 1); -@@ -43,5 +54,6 @@ - close(fd); - return(-1); - } -+#endif - return(fd); - } diff --git a/net/vde2/files/patch-vde.h b/net/vde2/files/patch-vde.h deleted file mode 100644 index 8097ca0bcce2..000000000000 --- a/net/vde2/files/patch-vde.h +++ /dev/null @@ -1,15 +0,0 @@ ---- vde.h Sat Jan 29 15:02:08 2005 -+++ vde.h Sun Jan 30 11:39:43 2005 -@@ -2,6 +2,12 @@ - #define VDESTDSOCK "/tmp/vde.ctl" - #endif - -+#ifdef __FreeBSD__ -+#ifndef VDEDATSOCK -+#define VDEDATSOCK "/tmp/.vde.data" -+#endif -+#endif -+ - #define DO_SYSLOG - #define VDE_IP_LOG - diff --git a/net/vde2/files/patch-vde_plug.c b/net/vde2/files/patch-vde_plug.c deleted file mode 100644 index 416291e4337e..000000000000 --- a/net/vde2/files/patch-vde_plug.c +++ /dev/null @@ -1,98 +0,0 @@ ---- vde_plug.c Sat Jan 29 15:02:08 2005 -+++ vde_plug.c Sun Jan 30 13:52:57 2005 -@@ -7,7 +7,9 @@ - #include <signal.h> - #include <errno.h> - #include <unistd.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <getopt.h> - #include <sys/ioctl.h> - #include <sys/socket.h> -@@ -15,6 +17,11 @@ - #include <sys/uio.h> - #include <sys/poll.h> - #include <sys/utsname.h> -+#ifdef __FreeBSD__ -+#include <sys/time.h> -+#include <netinet/in.h> -+#include <string.h> -+#endif - #include "vde.h" - #ifdef VDE_IP_LOG - #define DO_SYSLOG -@@ -47,6 +54,24 @@ - static struct passwd *callerpwd; - static char host[256]; - -+#ifdef __FreeBSD__ -+static char *data_socket = NULL; -+ -+static void cleanup() -+{ -+ if(data_socket != NULL) -+ unlink(data_socket); -+} -+ -+static void sig_handler(int sig) -+{ -+ fprintf(stderr, "Caught signal %d, cleaning up and exiting\n", sig); -+ cleanup(1,NULL); -+ signal(sig, SIG_DFL); -+ kill(getpid(), sig); -+} -+#endif -+ - void write_syslog_entry(char *message) - { - char *ssh_client; -@@ -183,6 +208,9 @@ - int fdctl; - - struct sockaddr_un sock; -+#ifdef __FreeBSD__ -+ struct timeval tv; -+#endif - - if((fdctl = socket(AF_UNIX, SOCK_STREAM, 0)) < 0){ - perror("socket"); -@@ -202,7 +230,14 @@ - - req.sock.sun_family=AF_UNIX; - memset(req.sock.sun_path, 0, sizeof(req.sock.sun_path)); -+#ifdef __FreeBSD__ -+ gettimeofday(&tv, NULL); -+ snprintf(req.sock.sun_path, sizeof(req.sock.sun_path), "%s.%i.%li", -+ VDEDATSOCK, pid, tv.tv_usec); -+ data_socket = strdup(req.sock.sun_path); -+#else - sprintf(&req.sock.sun_path[1], "%5d", pid); -+#endif - - if(bind(fddata, (struct sockaddr *) &req.sock, sizeof(req.sock)) < 0){ - perror("bind"); -@@ -309,6 +344,10 @@ - int connected_fd; - register ssize_t nx; - -+#ifdef __FreeBSD__ -+ atexit(cleanup); -+#endif -+ - uname(&me); - if (argv[0][0] == '-') - netusage(); //implies exit -@@ -383,6 +422,12 @@ - } - connected_fd=send_fd(sockname, fddata, &dataout, group); - pollv[1].fd=fddata; -+ -+#ifdef __FreeBSD__ -+ if(signal(SIGINT, sig_handler) < 0) { -+ perror("signal"); -+ } -+#endif - - for(;;) { - result=poll(pollv,2,-1); diff --git a/net/vde2/files/patch-vde_switch.c b/net/vde2/files/patch-vde_switch.c deleted file mode 100644 index c95f04789071..000000000000 --- a/net/vde2/files/patch-vde_switch.c +++ /dev/null @@ -1,80 +0,0 @@ ---- vde_switch.c Sat Jan 29 15:02:08 2005 -+++ vde_switch.c Sun Jan 30 13:33:00 2005 -@@ -8,7 +8,9 @@ - #include <stdlib.h> - #include <signal.h> - #include <fcntl.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <getopt.h> - #include <sys/socket.h> - #include <sys/un.h> -@@ -17,7 +19,11 @@ - #include <unistd.h> - #include <syslog.h> - #include <libgen.h> -+#ifdef __FreeBSD__ -+#include <string.h> -+#else - #include <endian.h> -+#endif - #include "vde.h" - #include "switch.h" - #include "port.h" -@@ -95,6 +101,13 @@ - } - } - -+#ifdef __FreeBSD__ -+static void cleanupwrapper() -+{ -+ cleanup(0, NULL); -+} -+#endif -+ - void **g_fdsdata = NULL; - int g_nfds = 0; - int g_minfds = 0; -@@ -276,19 +289,27 @@ - - void bind_data_socket(int fd, struct sockaddr_un *sun) - { -+ struct timeval tv; -+ -+ sun->sun_family = AF_UNIX; -+#ifdef __FreeBSD__ -+ gettimeofday(&tv, NULL); -+ snprintf(sun->sun_path, sizeof(sun->sun_path), "%s.%i.%li", -+ VDEDATSOCK, getpid(), tv.tv_usec); -+ data_socket = strdup(sun->sun_path); -+#else - struct { - char zero; - int pid; - int usecs; - } name; -- struct timeval tv; - - name.zero = 0; - name.pid = getpid(); - gettimeofday(&tv, NULL); - name.usecs = tv.tv_usec; -- sun->sun_family = AF_UNIX; - memcpy(sun->sun_path, &name, sizeof(name)); -+#endif - if(bind(fd, (struct sockaddr *) sun, sizeof(*sun)) < 0){ - printlog(LOG_ERR,"Binding to data socket %s",strerror(errno)); - exit(1); -@@ -338,7 +359,11 @@ - int tap_fd = -1; - #endif - -+#ifdef __FreeBSD__ -+ atexit(cleanupwrapper); -+#else - on_exit(cleanup, NULL); -+#endif - prog = argv[0]; - /* option parsing */ - { diff --git a/net/vde2/files/patch-vdetaplib::Makefile b/net/vde2/files/patch-vdetaplib::Makefile deleted file mode 100644 index ff72703ce702..000000000000 --- a/net/vde2/files/patch-vdetaplib::Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- vdetaplib/Makefile Sat Jan 29 15:02:08 2005 -+++ vdetaplib/Makefile Sun Jan 30 12:21:39 2005 -@@ -9,7 +9,7 @@ - all: vdetap libvdetap.so - - libvdetap.so: libvdetap.a -- $(LD) -E -o $@ -L./ -ldl -shared -export-dynamic -Bdynamic \ -+ $(LD) -E -o $@ -L./ -shared -export-dynamic -Bdynamic \ - --whole-archive libvdetap.a - - libvdetap.a: libvdetap.o diff --git a/net/vde2/files/patch-vdetaplib::libvdetap.c b/net/vde2/files/patch-vdetaplib::libvdetap.c deleted file mode 100644 index 7c304913b035..000000000000 --- a/net/vde2/files/patch-vdetaplib::libvdetap.c +++ /dev/null @@ -1,260 +0,0 @@ ---- vdetaplib/libvdetap.c Sat Jan 29 15:02:08 2005 -+++ vdetaplib/libvdetap.c Sun Jan 30 13:29:07 2005 -@@ -5,26 +5,39 @@ - #include <sys/socket.h> - #include <sys/syscall.h> - #include <sys/stat.h> -+#include <limits.h> -+#include <dlfcn.h> - #include <stdarg.h> - #include <string.h> - #include <unistd.h> - #include <stdlib.h> --#define __USE_LARGEFILE64 - #include <fcntl.h> - #include <errno.h> - #include <signal.h> --#include <linux/ioctl.h> --#include <linux/if.h> --#include <linux/if_tun.h> -+#include <stdio.h> -+#include <sys/ioctl.h> -+#include <net/if.h> -+#include <net/if_tun.h> - --#define TUNTAPPATH "/dev/net/tun" -+#define TUNTAPPATH "/dev/tap" - #define VDETAPEXEC "vdetap" - #define VDEALLTAP "VDEALLTAP" - #define MAX 10 - -+#if defined(RTLD_NEXT) -+#define REAL_LIBC RTLD_NEXT -+#else -+#define REAL_LIBC ((void *) -1L) -+#endif -+ -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__bsdi__) -+typedef unsigned long request_t; -+#else -+typedef int request_t; -+#endif -+ - int tapfd[2] = {-1,-1}; - static int tapcount=0; --static int tuncount=0; - - static struct pidlist { - pid_t pid; -@@ -39,11 +52,6 @@ - return rv; - } - --static void plfree (struct pidlist *el) { -- el->next=flh; -- flh=el; --} -- - static int addpid(int pid) { - struct pidlist *plp; - if ((plp=plmalloc ()) != NULL) { -@@ -74,105 +82,41 @@ - } - } - -- int --native_open(const char *pathname, int flags, mode_t data) --{ -- return (syscall(SYS_open, pathname, flags, data)); --} -- -- int --native_ioctl(int fd, unsigned long int command, char *data) --{ -- return (syscall(SYS_ioctl, fd, command, data)); --} -- -- - int open(const char *path, int flags, ...) - { -- static char buf[PATH_MAX]; -+ static int (*func) (const char *, int, mode_t) = NULL; -+ char *vdesock; -+ int pid; - va_list ap; - mode_t data; - -- va_start(ap, flags); -- data = va_arg(ap, mode_t); -- va_end(ap); -- -- if (strcmp(path,TUNTAPPATH)==0 && tapfd[0] == -1) { -- if (socketpair(PF_UNIX, SOCK_DGRAM, 0,tapfd) == 0) { -- return tapfd[0]; -- } -- else -- return -1; -- -- } else -- return native_open(path, flags, data); --} -- --int open64(const char *path, int flags, ...) --{ -- static char buf[PATH_MAX]; -- va_list ap; -- mode_t data; -+ if (!func) -+ func = (int (*) (const char *, int, mode_t)) -+ dlsym (REAL_LIBC, "open"); - - va_start(ap, flags); -- data = va_arg(ap, mode_t); -+ data = va_arg(ap, int); - va_end(ap); - - if (strcmp(path,TUNTAPPATH)==0 && tapfd[0] == -1) { - if (socketpair(PF_UNIX, SOCK_DGRAM, 0,tapfd) == 0) { -- return tapfd[0]; -- } -- else -- return -1; -- -- } else -- return native_open(path, flags | O_LARGEFILE, data); --} -- --int ioctl(int fd, unsigned long int command, ...) --{ -- va_list ap; -- char *data; -- char *vdesock; -- int pid; -- -- va_start(ap, command); -- data = va_arg(ap, char *); -- va_end(ap); -- -- if (fd == tapfd[0]) { -- if (command == TUNSETIFF) { -- struct ifreq *ifr = (struct ifreq *) data; - char num[5]; - char name[10]; -- -- ifr->ifr_name[IFNAMSIZ-1] = '\0'; -- if (ifr->ifr_name[0] == 0) { -- if (ifr->ifr_flags & IFF_TAP) -- sprintf(name,"tap%d",tapcount++); -- else -- sprintf(name,"tun%d",tuncount++); -- strncpy(ifr->ifr_name,name,IFNAMSIZ); -- } -- else if (strchr(ifr->ifr_name, '%') != NULL) { -- sprintf(name,ifr->ifr_name,tapcount++); -- strncpy(ifr->ifr_name,name,IFNAMSIZ); -- } -- if (ifr->ifr_flags & IFF_TAP && -- ((vdesock=getenv(ifr->ifr_name)) != NULL) -- ||(vdesock=getenv(VDEALLTAP)) != NULL){ -+ sprintf(name,"tap%d",tapcount++); -+ if (((vdesock=getenv(name)) != NULL) -+ ||(vdesock=getenv(VDEALLTAP)) != NULL){ - if ((pid=fork()) < 0) { - close(tapfd[1]); - errno=EINVAL; - return -1; - } else if (pid > 0) { /*father*/ -- if(pid=addpid(pid) < 0) { -+ if((pid=addpid(pid)) < 0) { - close(tapfd[0]); - close(tapfd[1]); - return -1; - } else { - close(tapfd[1]); -- return 0; -+ return tapfd[0]; - } - } else { /*son*/ - plh=NULL; -@@ -181,34 +125,53 @@ - execlp(VDETAPEXEC,"-",num,vdesock,(char *) 0); - } - } -- else /*roll back to the native tuntap*/ -- { -- int newfd; -- int saverrno; -- int resultioctl; -- close(tapfd[1]); -- if ((newfd=native_open(TUNTAPPATH, O_RDWR, 0)) < 0) { -- saverrno=errno; -- close(tapfd[0]); -- errno=saverrno; -- return -1; -- } else -- { -- resultioctl=native_ioctl(fd, command, data); -- if (resultioctl < 0) { -- saverrno=errno; -- close(tapfd[0]); -- errno=saverrno; -- return -1; -- } else { -- dup2(newfd,tapfd[0]); -- return resultioctl; -- } -- } -- } -- } else -- return 0; -+ return tapfd[0]; -+ } -+ else -+ return -1; -+ - } else -- return (native_ioctl(fd, command, data)); -+ return (*func)(path, flags, data); -+} -+ -+int ioctl(int fd, unsigned long int command, ...) -+{ -+ static int (*func) (int, request_t, void *) = NULL; -+ int dummy; -+ va_list ap; -+ char *data; -+ struct ifstat *ifs; -+ -+ if (!func) -+ func = (int (*) (int, request_t, void *)) -+ dlsym (REAL_LIBC, "ioctl"); -+ -+ va_start(ap, command); -+ data = va_arg(ap, char *); -+ va_end(ap); -+ -+ if (fd == tapfd[0]) { -+ switch(command) { -+ case SIOCSIFFLAGS: -+ case SIOCADDMULTI: -+ case SIOCDELMULTI: -+ break; -+ -+ case SIOCGIFSTATUS: -+ ifs = (struct ifstat *)data; -+ dummy = strlen(ifs->ascii); -+ if(plh && dummy < sizeof(ifs->ascii)) -+ snprintf(ifs->ascii + dummy, -+ sizeof(ifs->ascii) - dummy, -+ "\tOpened by PID %d\n", -+ plh[0].pid); -+ break; -+ -+ default: -+ return (*func) (fd, command, data); -+ } -+ } -+ -+ return (*func) (fd, command, data); - } - diff --git a/net/vde2/files/patch-vdetaplib::test.c b/net/vde2/files/patch-vdetaplib::test.c deleted file mode 100644 index d26ffa326253..000000000000 --- a/net/vde2/files/patch-vdetaplib::test.c +++ /dev/null @@ -1,46 +0,0 @@ ---- vdetaplib/test.c Sat Jan 29 15:02:08 2005 -+++ vdetaplib/test.c Sun Jan 30 12:27:35 2005 -@@ -6,35 +6,28 @@ - #include <errno.h> - #include <string.h> - #include <unistd.h> -+#include <sys/types.h> - #include <sys/ioctl.h> -+#include <sys/socket.h> - #include <net/if.h> --#include <linux/if_tun.h> -+#include <net/if_tun.h> - - static int tun_alloc(char *dev) - { -- struct ifreq ifr; -+ struct ifstat ifs; - int fd, err; - -- if( (fd = open("/dev/net/tun", O_RDWR)) < 0 ) -+ if( (fd = open("/dev/tap", O_RDWR)) < 0 ) - return (-1); - -- memset(&ifr, 0, sizeof(ifr)); -+ memset(&ifs, 0, sizeof(ifs)); - -- /* Flags: IFF_TUN - TUN device (no Ethernet headers) -- * IFF_TAP - TAP device -- * -- * IFF_NO_PI - Do not provide packet information -- */ -- ifr.ifr_flags = IFF_TAP; -- if( *dev ) -- strncpy(ifr.ifr_name, dev, IFNAMSIZ); -- -- if( (err = ioctl(fd, TUNSETIFF, (void *) &ifr)) < 0 ){ -+ if( (err = ioctl(fd, SIOCGIFSTATUS, (void *) &ifs)) < 0 ){ - close(fd); - return err; - } - printf("ioctl returns\n"); -- strcpy(dev, ifr.ifr_name); -+ puts(ifs.ascii); - printf("ioctl idev\n"); - return fd; - } diff --git a/net/vde2/files/patch-vdetaplib::vdetap.c b/net/vde2/files/patch-vdetaplib::vdetap.c deleted file mode 100644 index 3e5ded1cc07b..000000000000 --- a/net/vde2/files/patch-vdetaplib::vdetap.c +++ /dev/null @@ -1,107 +0,0 @@ ---- vdetaplib/vdetap.c Sat Jan 29 15:02:08 2005 -+++ vdetaplib/vdetap.c Sun Jan 30 14:05:26 2005 -@@ -2,11 +2,25 @@ - * Reseased under the GPLv2 */ - - #include <stdio.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/time.h> -+#include <unistd.h> -+#else - #include <sys/select.h> -+#endif - #include <sys/poll.h> - #include <sys/socket.h> - #include <sys/un.h> -+#ifdef __FreeBSD__ -+#include "../vde.h" -+#include <signal.h> -+#include <stdlib.h> -+#include <string.h> -+#endif - - #define SWITCH_MAGIC 0xfeedface - #define BUFSIZE 2048 -@@ -21,6 +35,23 @@ - - static unsigned char bufin[BUFSIZE]; - -+#ifdef __FreeBSD__ -+static char *data_socket = NULL; -+ -+static void cleanup() -+{ -+ if(data_socket != NULL) -+ unlink(data_socket); -+} -+ -+static void sig_handler(int sig) -+{ -+ cleanup(1, NULL); -+ signal(sig, SIG_DFL); -+ kill(getpid(), sig); -+} -+#endif -+ - static int send_fd(char *name, int fddata, struct sockaddr_un *datasock, int intno, int group) - { - int pid = getpid(); -@@ -28,6 +59,9 @@ - int fdctl; - - struct sockaddr_un sock; -+#ifdef __FreeBSD__ -+ struct timeval tv; -+#endif - - if((fdctl = socket(AF_UNIX, SOCK_STREAM, 0)) < 0){ - perror("socket"); -@@ -47,7 +81,14 @@ - - req.sock.sun_family=AF_UNIX; - memset(req.sock.sun_path, 0, sizeof(req.sock.sun_path)); -+#ifdef __FreeBSD__ -+ gettimeofday(&tv, NULL); -+ snprintf(req.sock.sun_path, sizeof(req.sock.sun_path), "%s.%i.%li", -+ VDEDATSOCK, pid, tv.tv_usec); -+ data_socket = strdup(req.sock.sun_path); -+#else - sprintf(&req.sock.sun_path[1], "%5d-%2d", pid, intno); -+#endif - - if(bind(fddata, (struct sockaddr *) &req.sock, sizeof(req.sock)) < 0){ - perror("bind"); -@@ -69,7 +110,7 @@ - - static struct pollfd pollv[]={{0,POLLIN|POLLHUP,0},{0,POLLIN|POLLHUP,0}}; - --main(int argc,char *argv[]) -+int main(int argc,char *argv[]) - { - int fd,fddata; - struct sockaddr_un dataout,datain; -@@ -96,6 +137,12 @@ - send_fd(argv[2],fddata,&dataout,0,0); - pollv[0].fd=fd; - pollv[1].fd=fddata; -+ -+#ifdef __FreeBSD__ -+ if(signal(SIGINT, sig_handler) < 0) { -+ perror("signal"); -+ } -+#endif - for(;;) { - result=poll(pollv,2,-1); - if (pollv[0].revents & POLLHUP || pollv[1].revents & POLLHUP) -@@ -113,5 +160,7 @@ - write(fd,bufin,nx); - } - } -+ cleanup(0, NULL); -+ return 0; - } - diff --git a/net/vde2/pkg-descr b/net/vde2/pkg-descr deleted file mode 100644 index 0787b5b905df..000000000000 --- a/net/vde2/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Virtual Distributed Ethernet is a user-mode virtual network (layer -2) infrastructure. It can be used for network simulations, joining -multiple qemu instances together in a shared virtual network, or -tunneling over the Internet. Physical hosts can be joined to the -virtual network by means of the tap(4) driver. - -WWW: http://vde.sourceforge.net/ diff --git a/net/vde2/pkg-plist b/net/vde2/pkg-plist deleted file mode 100644 index 5d6c79f75ade..000000000000 --- a/net/vde2/pkg-plist +++ /dev/null @@ -1,8 +0,0 @@ -bin/dpipe -bin/slirpvde -bin/vde_plug -bin/vde_switch -bin/vdeq -bin/vdeqemu -bin/vdetap -lib/libvdetap.so diff --git a/net/wb/Makefile b/net/wb/Makefile deleted file mode 100644 index 4f865b3f9338..000000000000 --- a/net/wb/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# New ports collection makefile for: wb -# Date created: 2 Novermber 1996 -# Whom: fenner -# -# $FreeBSD$ -# - -PORTNAME= wb -PORTVERSION= 1.59 -CATEGORIES= mbone -MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/ -DISTFILES= i386-wb-1.59.tar.Z - -MAINTAINER= fenner@FreeBSD.org -COMMENT= A shared drawing (whiteboard) tool using multicast - -NO_WRKSUBDIR= yes -NO_BUILD= yes -USE_X_PREFIX= yes - -# ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do. -USE_GHOSTSCRIPT_RUN= yes - -.include <bsd.port.pre.mk> - -.if ${PORTOBJFORMAT} == "elf" -STRIP= -.endif - -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin -.if !defined(NOPORTDOCS) - ${MKDIR} ${PREFIX}/share/doc/wb - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wb - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/wb - ${INSTALL_DATA} ${WRKSRC}/NOTES ${PREFIX}/share/doc/wb - ${INSTALL_DATA} ${WRKSRC}/lblwb.ps ${PREFIX}/share/doc/wb -.endif - -.include <bsd.port.post.mk> diff --git a/net/wb/distinfo b/net/wb/distinfo deleted file mode 100644 index 83c5d40e0f98..000000000000 --- a/net/wb/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (i386-wb-1.59.tar.Z) = 7601eb1192ee2774940d805500c0a9ce -SHA256 (i386-wb-1.59.tar.Z) = 0bae5c24f4c65031e99ac5c5df08e91eab92e5542c5a9f9a278f838c84bb035e -SIZE (i386-wb-1.59.tar.Z) = 2049555 diff --git a/net/wb/pkg-descr b/net/wb/pkg-descr deleted file mode 100644 index 9c196397ccc9..000000000000 --- a/net/wb/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -This is a beta-release of the LBL 'whiteboard'. - -Before using wb, read the file NOTES from the distribution (note -especially the .sd.tcl change needed if you are running sd v1.14 -or earlier) and print and read the postscript file lblwb.ps. - -If you simply want a shared "whiteboard" drawing surface, you -don't need to do anything but install wb. But wb can also be -used to export, view and annotate arbitrary PostScript files. -If you want to include PostScript images in your wb conference, -either your X server has to support Display PostScript (the DEC -& SGI X servers do) or wb has to be able to exec the public -domain postscript renderer `GhostScript'. If you want to -render postscript with Ghostscript, it has to be installed on -your machine and has to be in your shell search path with the -name "gs". diff --git a/net/wb/pkg-plist b/net/wb/pkg-plist deleted file mode 100644 index 084fc240b5dd..000000000000 --- a/net/wb/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -bin/wb -share/doc/wb/README -share/doc/wb/CHANGES -share/doc/wb/NOTES -share/doc/wb/lblwb.ps -@dirrm share/doc/wb diff --git a/net/wireshark-lite/Makefile b/net/wireshark-lite/Makefile deleted file mode 100644 index dbf8b12b8218..000000000000 --- a/net/wireshark-lite/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Ports collection makefile for: ethereal-lite -# Date created: 20 March 2004 -# Whom: Bill Fumerola <billf@mu.org> -# -# $FreeBSD$ -# - -LITE= yes -PKGNAMESUFFIX= -lite - -MASTERDIR= ${.CURDIR}/../ethereal -COMMENT= A powerful network analyzer/capture tool (lite package) - -.include "${MASTERDIR}/Makefile" diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile deleted file mode 100644 index 1cc0e2d38e47..000000000000 --- a/net/wireshark/Makefile +++ /dev/null @@ -1,120 +0,0 @@ -# New ports collection makefile for: ethereal -# Date created: 10 August 1998 -# Whom: Bill Fumerola <billf@chc-chimes.com> -# -# $FreeBSD$ -# - -PORTNAME= ethereal -PORTVERSION= 0.10.14 -PORTREVISION= 1 -CATEGORIES= net ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - ftp://ftp.ethereal.com/pub/ethereal/all-versions/ -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= marcus@FreeBSD.org -COMMENT?= A powerful network analyzer/capture tool - -USE_PERL5_BUILD=yes -USE_PYTHON_BUILD=yes -USE_ICONV= yes -#USE_BZIP2= yes -USE_GNOME= gnometarget -WANT_GNOME= yes -CONFIGURE_ENV= MIBDIRS="/dev/null" -CONFIGURE_ARGS+= --program-transform-name="" -MAKE_ENV= MIBDIRS="/dev/null" -INSTALLS_SHLIB= yes - -.for x in capinfos editcap idl2eth mergecap text2pcap -.if defined(LITE) -PLIST_SUB+= ${x:U}="@comment $x not installed" -CONFIGURE_ARGS+= --enable-$x=no -.else -PLIST_SUB+= ${x:U}=bin/$x -MAN1+= $x.1 -.endif -.endfor - -.for x in dftest randpkt -.if defined(LITE) -PLIST_SUB+= ${x:U}="@comment $x not installed" -CONFIGURE_ARGS+= --enable-$x=no -.else -PLIST_SUB+= ${x:U}=bin/$x -.endif -.endfor - -.if !defined(WITHOUT_X11) -USE_X_PREFIX= yes -.endif - -.include <bsd.port.pre.mk> - -.if !defined(WITHOUT_X11) -MAN1+= ethereal.1 -PLIST_SUB+= ETHEREAL=bin/ethereal -.if defined(WITHOUT_GTK2) -USE_GNOME+= gtk12 -CONFIGURE_ARGS+= --disable-gtk2 -.else -USE_GNOME+= gtk20 -.endif -.else -PLIST_SUB+= ETHEREAL="@comment ethereal not built" -USE_GNOME+= glib12 -CONFIGURE_ARGS+= --enable-ethereal=no \ - --disable-gtktest \ - --with-gtk-prefix=/nonexistent \ - --disable-gtk2 -.endif - -GNU_CONFIGURE= yes -LIBTOOLFILES= configure wiretap/configure -PLIST_SUB+= PORTVERSION=${PORTVERSION} - -.if ${OSVERSION} >= 400014 && !defined(WITHOUT_IPV6) -CONFIGURE_ARGS+= --enable-ipv6=yes -.else -CONFIGURE_ARGS+= --enable-ipv6=no -.endif - -.if ${OSVERSION} < 504103 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-capture_loop.h -.endif - -.if exists(/usr/include/openssl/crypto.h) -CONFIGURE_ARGS+= --with-ssl=/usr -.endif - -# XXX - untested -.if defined(WITH_THREADS) -CONFIGURE_ARGS+= --enable-threads -.endif - -.if !defined(WITHOUT_PCRE) && !defined(LITE) -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -CONFIGURE_ARGS+= --with-pcre=${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --with-pcre=no -.endif - -.if !defined(WITHOUT_SNMP) && !defined(LITE) -LIB_DEPENDS+= netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp -CONFIGURE_ARGS+= --with-net-snmp=${LOCALBASE}/bin/net-snmp-config -.else -CONFIGURE_ARGS+= --enable-snmp=no --with-ucd-snmp=no --with-net-snmp=no -.endif - -.if !defined(WITHOUT_ADNS) && !defined(LITE) -LIB_DEPENDS+= adns.1:${PORTSDIR}/dns/adns -CONFIGURE_ARGS+= --with-adns=${LOCALBASE}/lib -.else -CONFIGURE_ARGS+= --with-adns=no -.endif - -MAN1+= tethereal.1 -MAN4+= ethereal-filter.4 - -.include <bsd.port.post.mk> diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo deleted file mode 100644 index 019263953ecf..000000000000 --- a/net/wireshark/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (ethereal-0.10.14.tar.gz) = 44e7418a9a820d6e6dce6315c70fa6e2 -SHA256 (ethereal-0.10.14.tar.gz) = 323e62471d224cf33bbcfa7877ed3586a4fc510a4e23843b1d52e28eb98f8bfc -SIZE (ethereal-0.10.14.tar.gz) = 10909355 diff --git a/net/wireshark/files/extra-patch-capture_loop.h b/net/wireshark/files/extra-patch-capture_loop.h deleted file mode 100644 index 157b80dba806..000000000000 --- a/net/wireshark/files/extra-patch-capture_loop.h +++ /dev/null @@ -1,11 +0,0 @@ ---- capture_loop.h.orig Sat Dec 31 01:44:43 2005 -+++ capture_loop.h Sat Dec 31 01:45:19 2005 -@@ -68,7 +68,7 @@ extern void capture_loop_stop(void); - * XXX - the various BSDs appear to define BSD in <sys/param.h>; we don't - * want to include it if it's not present on this platform, however. - */ --#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && \ -+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && \ - !defined(__bsdi__) && !defined(__APPLE__) && !defined(_WIN32) && \ - !defined(__CYGWIN__) - # define MUST_DO_SELECT diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure deleted file mode 100644 index 87b2baa4bdda..000000000000 --- a/net/wireshark/files/patch-configure +++ /dev/null @@ -1,81 +0,0 @@ ---- configure.orig Wed May 4 17:32:34 2005 -+++ configure Sat May 7 21:07:38 2005 -@@ -21806,6 +21806,7 @@ - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` -+ GLIB_LIBS="-liconv $GLIB_LIBS" - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ -@@ -21816,7 +21817,7 @@ - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$GLIB_LIBS $LIBS" -+ LIBS="$GLIB_LIBS -liconv $LIBS" - rm -f conf.glibtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -@@ -22452,6 +22453,7 @@ - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` -+ GLIB_LIBS="-liconv $GLIB_LIBS" - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ -@@ -22462,7 +22464,7 @@ - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$GLIB_LIBS $LIBS" -+ LIBS="$GLIB_LIBS -liconv $LIBS" - rm -f conf.glibtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -@@ -22683,7 +22685,7 @@ - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" --LIBS="$GLIB_LIBS $LIBS" -+LIBS="$GLIB_LIBS -liconv $LIBS" - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" - ac_cv_glib_supports_modules=yes -@@ -27560,7 +27562,7 @@ - # - CFLAGS="$CFLAGS -I$krb5_dir/include" - CPPFLAGS="$CPPFLAGS -I$krb5_dir/include" -- ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'` -+ ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'` - ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'` - ac_krb5_version="$ac_heimdal_version$ac_mit_version" - if test "x$ac_krb5_version" = "xHEIMDAL" -@@ -27618,7 +27620,7 @@ - - if test -x "$KRB5_CONFIG" - then -- KRB5_FLAGS=`"$KRB5_CONFIG" --cflags` -+ KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'` - KRB5_LIBS=`"$KRB5_CONFIG" --libs` - CFLAGS="$CFLAGS $KRB5_FLAGS" - CPPFLAGS="$CPPFLAGS $KRB5_FLAGS" -@@ -29121,7 +29123,7 @@ - - - ac_save_LIBS="$LIBS" --LIBS="$GLIB_LIBS $LIBS" -+LIBS="$GLIB_LIBS -liconv $LIBS" - G_ASCII_STRTOULL_C="" - G_ASCII_STRTOULL_O="" - G_ASCII_STRTOULL_LO="" -@@ -30094,7 +30096,7 @@ - # - # The plugin dissectors reside in ./plugins/PROTO/ - # --PLUGIN_LIBS="-L../../epan -lethereal $GLIB_LIBS" -+PLUGIN_LIBS="-L../../epan -lethereal -liconv $GLIB_LIBS" - - - # diff --git a/net/wireshark/files/patch-epan_dissectors_packet-diameter.c b/net/wireshark/files/patch-epan_dissectors_packet-diameter.c deleted file mode 100644 index 4fc63bb0d227..000000000000 --- a/net/wireshark/files/patch-epan_dissectors_packet-diameter.c +++ /dev/null @@ -1,19 +0,0 @@ ---- epan/dissectors/packet-diameter.c.orig Thu May 12 03:07:06 2005 -+++ epan/dissectors/packet-diameter.c Thu May 12 02:54:14 2005 -@@ -2022,13 +2022,13 @@ - { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0, - "", HFILL }}, - { &hf_diameter_flags_request, -- { "Request", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R, -+ { "Request ", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R, - "", HFILL }}, - { &hf_diameter_flags_proxyable, -- { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P, -+ { "Proxyable ", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P, - "", HFILL }}, - { &hf_diameter_flags_error, -- { "Error","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E, -+ { "Error ","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E, - "", HFILL }}, - { &hf_diameter_flags_T, - { "T(Potentially re-transmitted message)","diameter.flags.T", FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T, diff --git a/net/wireshark/files/patch-epan_dissectors_packet-ieee80211.c b/net/wireshark/files/patch-epan_dissectors_packet-ieee80211.c deleted file mode 100644 index 3eebfaf9daac..000000000000 --- a/net/wireshark/files/patch-epan_dissectors_packet-ieee80211.c +++ /dev/null @@ -1,235 +0,0 @@ ---- epan/dissectors/packet-ieee80211.c.orig Mon Dec 26 21:21:13 2005 -+++ epan/dissectors/packet-ieee80211.c Thu Dec 29 17:44:58 2005 -@@ -74,6 +74,10 @@ - #include <ctype.h> - #include "isprint.h" - -+#ifndef roundup2 -+#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */ -+#endif -+ - /* Defragment fragmented 802.11 datagrams */ - static gboolean wlan_defragment = TRUE; - -@@ -636,7 +640,7 @@ find_header_length (guint16 fcf) - case DATA_FRAME: - len = (COOK_ADDR_SELECTOR(fcf) == DATA_ADDR_T4) ? DATA_LONG_HDR_LEN : - DATA_SHORT_HDR_LEN; -- if( IS_DATA_QOS(COMPOSE_FRAME_TYPE(fcf))) -+ if(COMPOSE_FRAME_TYPE(fcf) & 0x80) - return len + 2; - else - return len; -@@ -1958,6 +1962,23 @@ set_dst_addr_cols(packet_info *pinfo, co - ether_to_str(addr)); - } - -+static guint32 -+crc32_802_tvb_padded(tvbuff_t *tvb, guint hdr_len, guint hdr_size, guint len) -+{ -+ guint32 c_crc; -+ -+ c_crc = crc32_ccitt_tvb(tvb, hdr_len); -+ c_crc = crc32_ccitt_seed(tvb_get_ptr(tvb, hdr_size, len), len, ~c_crc); -+ -+ /* Byte reverse. */ -+ c_crc = ((unsigned char)(c_crc>>0)<<24) | -+ ((unsigned char)(c_crc>>8)<<16) | -+ ((unsigned char)(c_crc>>16)<<8) | -+ ((unsigned char)(c_crc>>24)<<0); -+ -+ return ( c_crc ); -+} -+ - typedef enum { - ENCAP_802_2, - ENCAP_IPX, -@@ -1971,7 +1992,7 @@ static void - dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, - proto_tree * tree, gboolean fixed_length_header, - gboolean has_radio_information, gint fcs_len, -- gboolean wlan_broken_fc) -+ gboolean wlan_broken_fc, gboolean datapad) - { - guint16 fcf, flags, frame_type_subtype; - guint16 seq_control; -@@ -1986,7 +2007,7 @@ dissect_ieee80211_common (tvbuff_t * tvb - proto_tree *hdr_tree = NULL; - proto_tree *flag_tree; - proto_tree *fc_tree; -- guint16 hdr_len; -+ guint16 hdr_len, ohdr_len; - gboolean has_fcs; - gint len, reported_len, ivlen; - gboolean save_fragmented; -@@ -2030,6 +2051,9 @@ dissect_ieee80211_common (tvbuff_t * tvb - hdr_len = DATA_LONG_HDR_LEN; - else - hdr_len = find_header_length (fcf); -+ ohdr_len = hdr_len; -+ if (datapad) -+ hdr_len = roundup2(hdr_len, 4); - frame_type_subtype = COMPOSE_FRAME_TYPE(fcf); - - if (check_col (pinfo->cinfo, COL_PROTOCOL)) -@@ -2526,9 +2550,13 @@ dissect_ieee80211_common (tvbuff_t * tvb - reported_len -= 4; - if (tree) - { -- guint32 fcs = crc32_802_tvb(tvb, hdr_len + len); - guint32 sent_fcs = tvb_get_ntohl(tvb, hdr_len + len); -+ guint32 fcs; - -+ if (datapad) -+ fcs = crc32_802_tvb_padded(tvb, ohdr_len, hdr_len, len); -+ else -+ fcs = crc32_802_tvb(tvb, hdr_len + len); - if (fcs == sent_fcs) - proto_tree_add_uint_format(hdr_tree, hf_fcs, tvb, - hdr_len + len, 4, sent_fcs, -@@ -2561,35 +2589,46 @@ dissect_ieee80211_common (tvbuff_t * tvb - proto_item *qos_fields; - proto_tree *qos_tree; - -+ guint16 qosoff; - guint16 qos_control; - guint16 qos_priority; - guint16 qos_ack_policy; - guint16 qos_eosp; - guint16 qos_field_content; - -- qos_fields = proto_tree_add_text(hdr_tree, tvb, hdr_len - 2, 2, -+ /* -+ * We calculate the offset to the QoS header data as -+ * an offset relative to the end of the header. But -+ * when the header has been padded to align the data -+ * this must be done relative to true header size, not -+ * the padded/aligned value. To simplify this work we -+ * stash the original header size in ohdr_len instead -+ * of recalculating it. -+ */ -+ qosoff = ohdr_len - 2; -+ qos_fields = proto_tree_add_text(hdr_tree, tvb, qosoff, 2, - "QoS parameters"); - qos_tree = proto_item_add_subtree (qos_fields, ett_qos_parameters); - -- qos_control = tvb_get_letohs(tvb, hdr_len - 2); -+ qos_control = tvb_get_letohs(tvb, qosoff + 0); - qos_priority = COOK_QOS_PRIORITY(qos_control); - qos_ack_policy = COOK_QOS_ACK_POLICY(qos_control); - qos_eosp = COOK_QOS_EOSP(qos_control); - qos_field_content = COOK_QOS_FIELD_CONTENT( qos_control); - - proto_tree_add_uint_format (qos_tree, hf_qos_priority, tvb, -- hdr_len - 2, 2, qos_priority, -+ qosoff, 2, qos_priority, - "Priority: %d (%s) (%s)", - qos_priority, qos_tags[qos_priority], qos_acs[qos_priority]); - - if(flags & FLAG_FROM_DS) { - proto_tree_add_boolean (qos_tree, hf_qos_eosp, tvb, -- hdr_len - 2, 1, qos_eosp); -+ qosoff, 1, qos_eosp); - - if(IS_DATA_CF_POLL(frame_type_subtype)) { - /* txop limit */ - proto_tree_add_uint_format (qos_tree, hf_qos_field_content, tvb, -- hdr_len - 1, 1, qos_field_content, "TXOP Limit: %d ", qos_field_content); -+ qosoff + 1, 1, qos_field_content, "TXOP Limit: %d ", qos_field_content); - - }else { - /* qap ps buffer state */ -@@ -2603,7 +2642,7 @@ dissect_ieee80211_common (tvbuff_t * tvb - buf_ac = COOK_PS_BUF_AC(qos_field_content); /*access category */ - buf_load = COOK_PS_BUF_LOAD(qos_field_content); - -- qos_ps_buf_state_fields = proto_tree_add_text(qos_tree, tvb, hdr_len - 1, 1, -+ qos_ps_buf_state_fields = proto_tree_add_text(qos_tree, tvb, qosoff + 1, 1, - "QAP PS Buffer State: 0x%x", qos_field_content); - qos_ps_buf_state_tree = proto_item_add_subtree (qos_ps_buf_state_fields, ett_qos_ps_buf_state); - -@@ -2612,25 +2651,25 @@ dissect_ieee80211_common (tvbuff_t * tvb - 1, 1, buf_state); - - proto_tree_add_uint_format (qos_ps_buf_state_tree, hf_qos_buf_ac, tvb, -- hdr_len - 1, 1, buf_ac, "Priority: %d (%s)", -+ qosoff + 1, 1, buf_ac, "Priority: %d (%s)", - buf_ac, wme_acs[buf_ac]); - - proto_tree_add_uint_format (qos_ps_buf_state_tree, hf_qos_buf_load, tvb, -- hdr_len - 1, 1, buf_load, "Buffered load: %d ", (buf_load * 4096)); -+ qosoff + 1, 1, buf_load, "Buffered load: %d ", (buf_load * 4096)); - */ - - } - } else if(qos_eosp) { - /* txop limit requested */ - proto_tree_add_uint_format (qos_tree, hf_qos_field_content, tvb, -- hdr_len - 1, 1, qos_field_content, "Queue Size: %d ", (qos_field_content * 254)); -+ qosoff + 1, 1, qos_field_content, "Queue Size: %d ", (qos_field_content * 254)); - } else { - /* queue size */ - proto_tree_add_uint_format (qos_tree, hf_qos_field_content, tvb, -- hdr_len - 1, 1, qos_field_content, "TXOP Limit Requested: %d ", qos_field_content); -+ qosoff + 1, 1, qos_field_content, "TXOP Limit Requested: %d ", qos_field_content); - } - -- proto_tree_add_uint (qos_tree, hf_qos_ack_policy, tvb, hdr_len - 2, 1, -+ proto_tree_add_uint (qos_tree, hf_qos_ack_policy, tvb, qosoff, 1, - qos_ack_policy); - - } /* end of qos control field */ -@@ -2988,7 +3027,17 @@ static void - dissect_ieee80211 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) - { - dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, -- pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE); -+ pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, FALSE); -+} -+ -+/* -+ * Dissect 802.11 with a variable-length link-layer header and data padding. -+ */ -+static void -+dissect_ieee80211_datapad (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) -+{ -+ dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, -+ pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, TRUE); - } - - /* -@@ -2999,7 +3048,7 @@ static void - dissect_ieee80211_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) - { - dissect_ieee80211_common (tvb, pinfo, tree, FALSE, TRUE, -- pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE); -+ pinfo->pseudo_header->ieee_802_11.fcs_len, FALSE, FALSE); - } - - /* -@@ -3010,7 +3059,7 @@ dissect_ieee80211_radio (tvbuff_t * tvb, - static void - dissect_ieee80211_bsfc (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) - { -- dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, 0, TRUE); -+ dissect_ieee80211_common (tvb, pinfo, tree, FALSE, FALSE, 0, TRUE, FALSE); - } - - /* -@@ -3020,7 +3069,7 @@ dissect_ieee80211_bsfc (tvbuff_t * tvb, - static void - dissect_ieee80211_fixed (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) - { -- dissect_ieee80211_common (tvb, pinfo, tree, TRUE, FALSE, 0, FALSE); -+ dissect_ieee80211_common (tvb, pinfo, tree, TRUE, FALSE, 0, FALSE, FALSE); - } - - static void -@@ -3809,6 +3858,7 @@ proto_register_ieee80211 (void) - register_dissector("wlan", dissect_ieee80211, proto_wlan); - register_dissector("wlan_fixed", dissect_ieee80211_fixed, proto_wlan); - register_dissector("wlan_bsfc", dissect_ieee80211_bsfc, proto_wlan); -+ register_dissector("wlan_datapad", dissect_ieee80211_datapad, proto_wlan); - register_init_routine(wlan_defragment_init); - - wlan_tap = register_tap("wlan"); diff --git a/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c b/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c deleted file mode 100644 index ece82f94e19e..000000000000 --- a/net/wireshark/files/patch-epan_dissectors_packet-radiotap.c +++ /dev/null @@ -1,206 +0,0 @@ ---- epan/dissectors/packet-radiotap.c.orig Mon Oct 10 06:23:07 2005 -+++ epan/dissectors/packet-radiotap.c Tue Dec 6 18:34:19 2005 -@@ -73,7 +73,6 @@ - IEEE80211_RADIOTAP_ANTENNA = 11, - IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12, - IEEE80211_RADIOTAP_DB_ANTNOISE = 13, -- IEEE80211_RADIOTAP_FCS = 14, - IEEE80211_RADIOTAP_EXT = 31 - }; - -@@ -121,6 +120,11 @@ - #define IEEE80211_RADIOTAP_F_FRAG 0x08 /* sent/received - * with fragmentation - */ -+#define IEEE80211_RADIOTAP_F_FCS 0x10 /* frame includes FCS */ -+#define IEEE80211_RADIOTAP_F_DATAPAD 0x20 /* frame has padding between -+ * 802.11 header and payload -+ * (to 32-bit boundary) -+ */ - - /* protocol */ - static int proto_radiotap = -1; -@@ -140,11 +144,14 @@ - static int hf_radiotap_db_antnoise = -1; - static int hf_radiotap_txpower = -1; - static int hf_radiotap_preamble = -1; -+static int hf_radiotap_fcs = -1; -+static int hf_radiotap_datapad = -1; - - static gint ett_radiotap = -1; - static gint ett_radiotap_present = -1; - - static dissector_handle_t ieee80211_handle; -+static dissector_handle_t ieee80211_datapad_handle; - - static void - dissect_radiotap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -@@ -190,6 +197,12 @@ - { 0, NULL }, - }; - -+ static const value_string truefalse_type[] = { -+ { 0, "False" }, -+ { 1, "True" }, -+ { 0, NULL }, -+ }; -+ - static hf_register_info hf[] = { - { &hf_radiotap_version, - { "Header revision", "radiotap.version", -@@ -208,6 +221,14 @@ - { "Preamble", "radiotap.flags.preamble", - FT_UINT32, BASE_DEC, VALS(preamble_type), 0x0, "", HFILL } }, - -+ /* XXX for debugging */ -+ { &hf_radiotap_fcs, -+ { "FCS", "radiotap.flags.fcs", -+ FT_UINT32, BASE_DEC, VALS(truefalse_type), 0x0, "", HFILL } }, -+ { &hf_radiotap_datapad, -+ { "DATAPAD", "radiotap.flags.datapad", -+ FT_UINT32, BASE_DEC, VALS(truefalse_type), 0x0, "", HFILL } }, -+ - { &hf_radiotap_mactime, - { "MAC timestamp", "radiotap.mactime", - FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL } }, -@@ -257,6 +278,7 @@ - static int - ieee80211_mhz2ieee(int freq, int flags) - { -+#define IS_CHAN_IN_PUBLIC_SAFETY_BAND(_c) ((_c) > 4940 && (_c) < 4990) - if (flags & IEEE80211_CHAN_2GHZ) { /* 2GHz band */ - if (freq == 2484) - return 14; -@@ -265,16 +287,28 @@ - else - return 15 + ((freq - 2512) / 20); - } else if (flags & IEEE80211_CHAN_5GHZ) { /* 5Ghz band */ -- return (freq - 5000) / 5; -+ if (IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq)) -+ return ((freq * 10) + (((freq % 5) == 2) ? 5 : 0) - 49400) / 5; -+ if (freq <= 5000) -+ return (freq - 4000) / 5; -+ else -+ return (freq - 5000) / 5; - } else { /* either, guess */ - if (freq == 2484) - return 14; - if (freq < 2484) - return (freq - 2407) / 5; -- if (freq < 5000) -- return 15 + ((freq - 2512) / 20); -+ if (freq < 5000) { -+ if (IS_CHAN_IN_PUBLIC_SAFETY_BAND(freq)) -+ return ((freq * 10) + (((freq % 5) == 2) ? 5 : 0) - 49400)/5; -+ else if (freq > 4900) -+ return (freq - 4000) / 5; -+ else -+ return 15 + ((freq - 2512) / 20); -+ } - return (freq - 5000) / 5; - } -+#undef IS_CHAN_IN_PUBLIC_SAFETY_BAND - } - - static void -@@ -294,7 +328,7 @@ - guint32 length; - guint32 rate, freq, flags; - gint8 dbm; -- guint8 db; -+ guint8 db, rflags; - guint32 present, next_present; - int bit; - -@@ -334,6 +368,7 @@ - */ - offset += sizeof(struct ieee80211_radiotap_header); - -+ rflags = 0; - for (; present; present = next_present) { - /* clear the least significant bit that is set */ - next_present = present & (present - 1); -@@ -344,45 +379,16 @@ - switch (bit) { - case IEEE80211_RADIOTAP_FLAGS: - if (tree) { -+ rflags = tvb_get_guint8(tvb, offset); - proto_tree_add_uint(radiotap_tree, hf_radiotap_preamble, -- tvb, 0, 0, (tvb_get_guint8(tvb, offset) & -- IEEE80211_RADIOTAP_F_SHORTPRE) != 0); -+ tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_SHORTPRE) != 0); -+ proto_tree_add_uint(radiotap_tree, hf_radiotap_fcs, -+ tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_FCS) != 0); -+ proto_tree_add_uint(radiotap_tree, hf_radiotap_datapad, -+ tvb, 0, 0, (rflags&IEEE80211_RADIOTAP_F_DATAPAD) != 0); - } - offset++; - /* XXX CFP, WEP, FRAG */ --#if 0 -- capability = tvb_get_letohs (tvb, offset); -- -- cap_item = proto_tree_add_uint_format (tree, ff_capture, -- tvb, offset, 2, -- capability, -- "Capability Information: 0x%04X", -- capability); -- cap_tree = proto_item_add_subtree (cap_item, ett_cap_tree); -- proto_tree_add_boolean (cap_tree, ff_cf_ess, tvb, offset, 2, -- capability); -- proto_tree_add_boolean (cap_tree, ff_cf_ibss, tvb, offset, 2, -- capability); -- if (ESS_SET (capability) != 0) /* This is an AP */ -- proto_tree_add_uint (cap_tree, ff_cf_ap_poll, tvb, offset, 2, -- capability); -- -- else /* This is a STA */ -- proto_tree_add_uint (cap_tree, ff_cf_sta_poll, tvb, offset, 2, -- capability); -- proto_tree_add_boolean (cap_tree, ff_cf_privacy, tvb, offset, 2, -- capability); -- proto_tree_add_boolean (cap_tree, ff_cf_preamble, tvb, offset, 2, -- capability); -- proto_tree_add_boolean (cap_tree, ff_cf_pbcc, tvb, offset, 2, -- capability); -- proto_tree_add_boolean (cap_tree, ff_cf_agility, tvb, offset, 2, -- capability); -- proto_tree_add_boolean (cap_tree, ff_short_slot_time, tvb, offset, 2, -- capability); -- proto_tree_add_boolean (cap_tree, ff_dsss_ofdm, tvb, offset, 2, -- capability); --#endif - break; - case IEEE80211_RADIOTAP_RATE: - rate = tvb_get_guint8(tvb, offset) & 0x7f; -@@ -480,8 +486,8 @@ - break; - case IEEE80211_RADIOTAP_TSFT: - if (tree) { -- proto_tree_add_item(radiotap_tree, hf_radiotap_mactime, -- tvb, offset, 8, FALSE); -+ proto_tree_add_uint64(radiotap_tree, hf_radiotap_mactime, -+ tvb, offset, 8, tvb_get_letoh64(tvb, offset)); - } - offset+=8; - break; -@@ -495,8 +501,11 @@ - } - } - -+ if (rflags & IEEE80211_RADIOTAP_F_FCS) -+ pinfo->pseudo_header->ieee_802_11.fcs_len = 4; - /* dissect the 802.11 header next */ -- call_dissector(ieee80211_handle, -+ call_dissector((rflags & IEEE80211_RADIOTAP_F_DATAPAD) ? -+ ieee80211_datapad_handle : ieee80211_handle, - tvb_new_subset(tvb, length, -1, -1), pinfo, tree); - #undef BITNO_32 - #undef BITNO_16 -@@ -513,6 +522,7 @@ - - /* handle for 802.11 dissector */ - ieee80211_handle = find_dissector("wlan"); -+ ieee80211_datapad_handle = find_dissector("wlan_datapad"); - - radiotap_handle = create_dissector_handle(dissect_radiotap, proto_radiotap); - diff --git a/net/wireshark/files/patch-wiretap_configure b/net/wireshark/files/patch-wiretap_configure deleted file mode 100644 index 420db3bf111d..000000000000 --- a/net/wireshark/files/patch-wiretap_configure +++ /dev/null @@ -1,20 +0,0 @@ ---- wiretap/configure.orig Sat May 7 21:04:37 2005 -+++ wiretap/configure Sat May 7 21:05:31 2005 -@@ -20092,7 +20092,7 @@ - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" -- LIBS="$GLIB_LIBS $LIBS" -+ LIBS="$GLIB_LIBS -liconv $LIBS" - rm -f conf.glibtest - if test "$cross_compiling" = yes; then - echo $ac_n "cross compiling; assumed OK... $ac_c" -@@ -20206,7 +20206,7 @@ - if test "x$no_glib" = x ; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -- CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS -liconv $GLIB_LIBS" - else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 diff --git a/net/wireshark/pkg-descr b/net/wireshark/pkg-descr deleted file mode 100644 index fd7658ffd4b6..000000000000 --- a/net/wireshark/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -A network analyzer that lets you capture and interactively browse the -contents of Ethernet frames. Packet data can be read from a file, or -live from a local network interface. - -WWW: http://www.ethereal.com/ - -Bill Fumerola <billf@chc-chimes.com> diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist deleted file mode 100644 index 9e122c401675..000000000000 --- a/net/wireshark/pkg-plist +++ /dev/null @@ -1,171 +0,0 @@ -%%CAPINFOS%% -%%DFTEST%% -%%EDITCAP%% -%%ETHEREAL%% -%%IDL2ETH%% -%%MERGECAP%% -%%RANDPKT%% -bin/tethereal -%%TEXT2PCAP%% -lib/ethereal/plugins/%%PORTVERSION%%/acn.la -lib/ethereal/plugins/%%PORTVERSION%%/acn.so -lib/ethereal/plugins/%%PORTVERSION%%/agentx.la -lib/ethereal/plugins/%%PORTVERSION%%/agentx.so -lib/ethereal/plugins/%%PORTVERSION%%/artnet.la -lib/ethereal/plugins/%%PORTVERSION%%/artnet.so -lib/ethereal/plugins/%%PORTVERSION%%/asn1.la -lib/ethereal/plugins/%%PORTVERSION%%/asn1.so -lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.la -lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.so -lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.la -lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.so -lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.la -lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.so -lib/ethereal/plugins/%%PORTVERSION%%/docsis.la -lib/ethereal/plugins/%%PORTVERSION%%/docsis.so -lib/ethereal/plugins/%%PORTVERSION%%/enttec.la -lib/ethereal/plugins/%%PORTVERSION%%/enttec.so -lib/ethereal/plugins/%%PORTVERSION%%/gryphon.la -lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so -lib/ethereal/plugins/%%PORTVERSION%%/h223.la -lib/ethereal/plugins/%%PORTVERSION%%/h223.so -lib/ethereal/plugins/%%PORTVERSION%%/irda.la -lib/ethereal/plugins/%%PORTVERSION%%/irda.so -lib/ethereal/plugins/%%PORTVERSION%%/lwres.la -lib/ethereal/plugins/%%PORTVERSION%%/lwres.so -lib/ethereal/plugins/%%PORTVERSION%%/mate.la -lib/ethereal/plugins/%%PORTVERSION%%/mate.so -lib/ethereal/plugins/%%PORTVERSION%%/megaco.la -lib/ethereal/plugins/%%PORTVERSION%%/megaco.so -lib/ethereal/plugins/%%PORTVERSION%%/mgcp.la -lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so -lib/ethereal/plugins/%%PORTVERSION%%/opsi.la -lib/ethereal/plugins/%%PORTVERSION%%/opsi.so -lib/ethereal/plugins/%%PORTVERSION%%/parlay.la -lib/ethereal/plugins/%%PORTVERSION%%/parlay.so -lib/ethereal/plugins/%%PORTVERSION%%/pcli.la -lib/ethereal/plugins/%%PORTVERSION%%/pcli.so -lib/ethereal/plugins/%%PORTVERSION%%/profinet.la -lib/ethereal/plugins/%%PORTVERSION%%/profinet.so -lib/ethereal/plugins/%%PORTVERSION%%/rdm.la -lib/ethereal/plugins/%%PORTVERSION%%/rdm.so -lib/ethereal/plugins/%%PORTVERSION%%/rlm.la -lib/ethereal/plugins/%%PORTVERSION%%/rlm.so -lib/ethereal/plugins/%%PORTVERSION%%/rtnet.la -lib/ethereal/plugins/%%PORTVERSION%%/rtnet.so -lib/ethereal/plugins/%%PORTVERSION%%/rudp.la -lib/ethereal/plugins/%%PORTVERSION%%/rudp.so -lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.la -lib/ethereal/plugins/%%PORTVERSION%%/stats_tree.so -lib/ethereal/plugins/%%PORTVERSION%%/tango.la -lib/ethereal/plugins/%%PORTVERSION%%/tango.so -lib/ethereal/plugins/%%PORTVERSION%%/v5ua.la -lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so -lib/libethereal.la -lib/libethereal.so -lib/libethereal.so.0 -lib/libwiretap.la -lib/libwiretap.so -lib/libwiretap.so.0 -%%DATADIR%%/AUTHORS-SHORT -%%DATADIR%%/capinfos.html -%%DATADIR%%/cfilters -%%DATADIR%%/colorfilters -%%DATADIR%%/dfilters -%%DATADIR%%/diameter/TGPPSh.xml -%%DATADIR%%/diameter/chargecontrol.xml -%%DATADIR%%/diameter/dictionary.dtd -%%DATADIR%%/diameter/dictionary.xml -%%DATADIR%%/diameter/imscxdx.xml -%%DATADIR%%/diameter/mobileipv4.xml -%%DATADIR%%/diameter/nasreq.xml -%%DATADIR%%/diameter/sunping.xml -%%DATADIR%%/dtds/dc.dtd -%%DATADIR%%/dtds/itunes.dtd -%%DATADIR%%/dtds/rss.dtd -%%DATADIR%%/dtds/smil.dtd -%%DATADIR%%/editcap.html -%%DATADIR%%/ethereal-filter.html -%%DATADIR%%/ethereal.html -%%DATADIR%%/help/capture_filters.txt -%%DATADIR%%/help/capturing.txt -%%DATADIR%%/help/display_filters.txt -%%DATADIR%%/help/faq.txt -%%DATADIR%%/help/getting_started.txt -%%DATADIR%%/help/overview.txt -%%DATADIR%%/help/toc -%%DATADIR%%/idl2eth.html -%%DATADIR%%/manuf -%%DATADIR%%/mergecap.html -%%DATADIR%%/radius/dictionary -%%DATADIR%%/radius/dictionary.3com -%%DATADIR%%/radius/dictionary.3gpp -%%DATADIR%%/radius/dictionary.3gpp2 -%%DATADIR%%/radius/dictionary.acc -%%DATADIR%%/radius/dictionary.alcatel -%%DATADIR%%/radius/dictionary.alteon -%%DATADIR%%/radius/dictionary.altiga -%%DATADIR%%/radius/dictionary.aptis -%%DATADIR%%/radius/dictionary.ascend -%%DATADIR%%/radius/dictionary.bay -%%DATADIR%%/radius/dictionary.bintec -%%DATADIR%%/radius/dictionary.bristol -%%DATADIR%%/radius/dictionary.cablelabs -%%DATADIR%%/radius/dictionary.cabletron -%%DATADIR%%/radius/dictionary.cisco -%%DATADIR%%/radius/dictionary.cisco.bbsm -%%DATADIR%%/radius/dictionary.cisco.vpn3000 -%%DATADIR%%/radius/dictionary.cisco.vpn5000 -%%DATADIR%%/radius/dictionary.colubris -%%DATADIR%%/radius/dictionary.columbia_university -%%DATADIR%%/radius/dictionary.compat -%%DATADIR%%/radius/dictionary.cosine -%%DATADIR%%/radius/dictionary.ericsson -%%DATADIR%%/radius/dictionary.erx -%%DATADIR%%/radius/dictionary.extreme -%%DATADIR%%/radius/dictionary.foundry -%%DATADIR%%/radius/dictionary.freeradius -%%DATADIR%%/radius/dictionary.gandalf -%%DATADIR%%/radius/dictionary.garderos -%%DATADIR%%/radius/dictionary.gemtek -%%DATADIR%%/radius/dictionary.itk -%%DATADIR%%/radius/dictionary.juniper -%%DATADIR%%/radius/dictionary.karlnet -%%DATADIR%%/radius/dictionary.livingston -%%DATADIR%%/radius/dictionary.localweb -%%DATADIR%%/radius/dictionary.merit -%%DATADIR%%/radius/dictionary.microsoft -%%DATADIR%%/radius/dictionary.mikrotik -%%DATADIR%%/radius/dictionary.navini -%%DATADIR%%/radius/dictionary.netscreen -%%DATADIR%%/radius/dictionary.nokia -%%DATADIR%%/radius/dictionary.nomadix -%%DATADIR%%/radius/dictionary.propel -%%DATADIR%%/radius/dictionary.quintum -%%DATADIR%%/radius/dictionary.redback -%%DATADIR%%/radius/dictionary.redcreek -%%DATADIR%%/radius/dictionary.shasta -%%DATADIR%%/radius/dictionary.shiva -%%DATADIR%%/radius/dictionary.sonicwall -%%DATADIR%%/radius/dictionary.springtide -%%DATADIR%%/radius/dictionary.t_systems_nova -%%DATADIR%%/radius/dictionary.telebit -%%DATADIR%%/radius/dictionary.trapeze -%%DATADIR%%/radius/dictionary.tunnel -%%DATADIR%%/radius/dictionary.unisphere -%%DATADIR%%/radius/dictionary.unix -%%DATADIR%%/radius/dictionary.usr -%%DATADIR%%/radius/dictionary.valemount -%%DATADIR%%/radius/dictionary.versanet -%%DATADIR%%/radius/dictionary.wispr -%%DATADIR%%/radius/dictionary.xedia -%%DATADIR%%/tethereal.html -%%DATADIR%%/text2pcap.html -@dirrm lib/ethereal/plugins/%%PORTVERSION%% -@dirrm lib/ethereal/plugins -@dirrm lib/ethereal -@dirrm %%DATADIR%%/radius -@dirrm %%DATADIR%%/help -@dirrm %%DATADIR%%/dtds -@dirrm %%DATADIR%%/diameter -@dirrm %%DATADIR%% diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile deleted file mode 100644 index 1254f96d6cb5..000000000000 --- a/net/xmlrpc-c-devel/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# ex:ts=8 -# New ports collection makefile for: xmlrpc-c -# Date created: Mar 8, 2001 -# Whom: Ying-Chieh Liao <ijliao@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= xmlrpc-c -PORTVERSION= 0.9.10 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= XML-RPC library for C and C++ - -LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww -RUN_DEPENDS= ${SITE_PERL}/Frontier/Client.pm:${PORTSDIR}/net/p5-Frontier-RPC - -USE_GMAKE= yes -GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -USE_REINPLACE= yes - -MAN1= meerkat-app-list.1 xml-rpc-api2cpp.1 xmlrpc-c-config.1 \ - query-meerkat.1 xml-rpc-api2txt.1 -MAN7= xmlrpc-c.7 - -post-patch: - @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ - ${WRKSRC}/configure - -.include <bsd.port.mk> diff --git a/net/xmlrpc-c-devel/distinfo b/net/xmlrpc-c-devel/distinfo deleted file mode 100644 index 243774fcc760..000000000000 --- a/net/xmlrpc-c-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (xmlrpc-c-0.9.10.tar.gz) = 847410fae881f0fb641a186db6c8c015 -SHA256 (xmlrpc-c-0.9.10.tar.gz) = fbe8c4899325edbc005807d7e6e06c8709299d7324a00a87fc8cf3d44752622b -SIZE (xmlrpc-c-0.9.10.tar.gz) = 436181 diff --git a/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.cc b/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.cc deleted file mode 100644 index 241207275aa7..000000000000 --- a/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- examples/interop-client/InteropEchoProxy.cc.orig Wed Apr 25 00:17:25 2001 -+++ examples/interop-client/InteropEchoProxy.cc Tue Mar 2 23:39:39 2004 -@@ -12,7 +12,7 @@ - public: - InteropEchoProxy (const XmlRpcClient& client) - : mClient(client) {} -- InteropEchoProxy (const string& server_url) -+ InteropEchoProxy (const std::string& server_url) - : mClient(XmlRpcClient(server_url)) {} - InteropEchoProxy (const InteropEchoProxy& o) - : mClient(o.mClient) {} -@@ -23,7 +23,7 @@ - } - - /* Echo an arbitrary XML-RPC string. */ -- string echoString (string string1); -+ std::string echoString (std::string string1); - - /* Echo an arbitrary XML-RPC integer. */ - XmlRpcValue::int32 echoInteger (XmlRpcValue::int32 int1); -@@ -55,7 +55,7 @@ - #include <XmlRpcCpp.h> - #include "InteropEchoProxy.h" - --string InteropEchoProxy::echoString (string string1) { -+std::string InteropEchoProxy::echoString (std::string string1) { - XmlRpcValue params = XmlRpcValue::makeArray(); - params.arrayAppendItem(XmlRpcValue::makeString(string1)); - XmlRpcValue result = this->mClient.call("interopEchoTests.echoString", params); diff --git a/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.h b/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.h deleted file mode 100644 index 96bb666fb511..000000000000 --- a/net/xmlrpc-c-devel/files/patch-examples::interop-client::InteropEchoProxy.h +++ /dev/null @@ -1,20 +0,0 @@ ---- examples/interop-client/InteropEchoProxy.h.orig Wed Apr 25 00:17:42 2001 -+++ examples/interop-client/InteropEchoProxy.h Tue Mar 2 23:39:39 2004 -@@ -12,7 +12,7 @@ - public: - InteropEchoProxy (const XmlRpcClient& client) - : mClient(client) {} -- InteropEchoProxy (const string& server_url) -+ InteropEchoProxy (const std::string& server_url) - : mClient(XmlRpcClient(server_url)) {} - InteropEchoProxy (const InteropEchoProxy& o) - : mClient(o.mClient) {} -@@ -23,7 +23,7 @@ - } - - /* Echo an arbitrary XML-RPC string. */ -- string echoString (string string1); -+ std::string echoString (std::string string1); - - /* Echo an arbitrary XML-RPC integer. */ - XmlRpcValue::int32 echoInteger (XmlRpcValue::int32 int1); diff --git a/net/xmlrpc-c-devel/files/patch-examples::interop-client::interop-client.cc b/net/xmlrpc-c-devel/files/patch-examples::interop-client::interop-client.cc deleted file mode 100644 index a8bde406790b..000000000000 --- a/net/xmlrpc-c-devel/files/patch-examples::interop-client::interop-client.cc +++ /dev/null @@ -1,108 +0,0 @@ ---- examples/interop-client/interop-client.cc.orig Thu Jun 28 11:54:08 2001 -+++ examples/interop-client/interop-client.cc Tue Mar 2 23:39:39 2004 -@@ -1,8 +1,8 @@ - // Run various interop test cases against a list of servers. - // This code is incomplete. - --#include <iostream.h> --#include <fstream.h> -+#include <iostream> -+#include <fstream> - #include <stdexcept> - - #include <XmlRpcCpp.h> -@@ -17,13 +17,13 @@ - //========================================================================= - - class TestResults { -- string m_server_name; -- string m_server_url; -+ std::string m_server_name; -+ std::string m_server_url; - XmlRpcValue m_toolkit_info; - XmlRpcValue m_test_results; - - public: -- TestResults(string server_name, string server_url); -+ TestResults(std::string server_name, std::string server_url); - - }; - -@@ -33,24 +33,24 @@ - //========================================================================= - - static void --run_interop_tests(const string& server_url_file, -- const string& output_html_file) -+run_interop_tests(const std::string& server_url_file, -+ const std::string& output_html_file) - { -- ifstream urls(server_url_file.c_str()); -- ofstream out(output_html_file.c_str()); -+ std::ifstream urls(server_url_file.c_str()); -+ std::ofstream out(output_html_file.c_str()); - - while (!urls.eof()) { -- string url_info; -+ std::string url_info; - getline(urls, url_info); - size_t comma = url_info.find(','); -- if (comma == string::npos) -- throw domain_error("Lines of " + server_url_file + -+ if (comma == std::string::npos) -+ throw std::domain_error("Lines of " + server_url_file + - " must be of the form \"name,url\""); -- string server_name(url_info, 0, comma); -- string server_url(url_info, comma + 1); -+ std::string server_name(url_info, 0, comma); -+ std::string server_url(url_info, comma + 1); - -- cout << "Name: " << server_name << endl; -- cout << "URL: " << server_url << endl << endl; -+ std::cout << "Name: " << server_name << std::endl; -+ std::cout << "URL: " << server_url << std::endl << std::endl; - } - } - -@@ -62,8 +62,8 @@ - // Print out a usage message. - static void usage (void) - { -- cerr << "Usage: interop-client <server-url-file> <output-html-file>"; -- cerr << endl; -+ std::cerr << "Usage: interop-client <server-url-file> <output-html-file>"; -+ std::cerr << std::endl; - exit(1); - } - -@@ -73,8 +73,8 @@ - // Parse our command-line arguments. - if (argc != 3) - usage(); -- string server_url_file(argv[1]); -- string output_html_file(argv[2]); -+ std::string server_url_file(argv[1]); -+ std::string output_html_file(argv[2]); - - // Start up our client library. - XmlRpcClient::Initialize(NAME, VERSION); -@@ -83,14 +83,14 @@ - try { - run_interop_tests(server_url_file, output_html_file); - } catch (XmlRpcFault& fault) { -- cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode() -- << ": " << fault.getFaultString() << endl; -+ std::cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode() -+ << ": " << fault.getFaultString() << std::endl; - status = 1; -- } catch (logic_error& err) { -- cerr << argv[0] << ": " << err.what() << endl; -+ } catch (std::logic_error& err) { -+ std::cerr << argv[0] << ": " << err.what() << std::endl; - status = 1; - } catch (...) { -- cerr << argv[0] << ": Unknown exception" << endl; -+ std::cerr << argv[0] << ": Unknown exception" << std::endl; - status = 1; - } - diff --git a/net/xmlrpc-c-devel/files/patch-examples::meerkat-app-list.cc b/net/xmlrpc-c-devel/files/patch-examples::meerkat-app-list.cc deleted file mode 100644 index 6e6e770f69a4..000000000000 --- a/net/xmlrpc-c-devel/files/patch-examples::meerkat-app-list.cc +++ /dev/null @@ -1,88 +0,0 @@ ---- examples/meerkat-app-list.cc.orig Wed Apr 25 04:18:36 2001 -+++ examples/meerkat-app-list.cc Tue Mar 2 23:39:39 2004 -@@ -2,8 +2,8 @@ - // For more details about O'Reilly's excellent Meerkat news service, see: - // http://www.oreillynet.com/pub/a/rss/2000/11/14/meerkat_xmlrpc.html */ - --#include <iostream.h> --#include <strstream.h> -+#include <iostream> -+#include <sstream> - - #include <XmlRpcCpp.h> - -@@ -15,12 +15,9 @@ - static void list_apps (int hours) { - - // Build our time_period parameter. -- ostrstream time_period_stream; -- time_period_stream << hours << "HOUR" << ends; -- string time_period = time_period_stream.str(); -- -- // (Ask the ostrstream to reclaim ownership of its buffer.) -- time_period_stream.freeze(false); -+ std::ostringstream time_period_stream; -+ time_period_stream << hours << "HOUR" << std::ends; -+ std::string time_period = time_period_stream.str(); - - // Assemble our meerkat query recipe. - XmlRpcValue recipe = XmlRpcValue::makeStruct(); -@@ -45,21 +42,21 @@ - XmlRpcValue app = apps.arrayGetItem(i); - - // Get some information about our application. -- string title = app.structGetValue("title").getString(); -- string link = app.structGetValue("link").getString(); -- string description = app.structGetValue("description").getString(); -+ std::string title = app.structGetValue("title").getString(); -+ std::string link = app.structGetValue("link").getString(); -+ std::string description = app.structGetValue("description").getString(); - - // Print a separator line if necessary. - if (first) - first = 0; - else -- cout << endl; -+ std::cout << std::endl; - - // Print this application entry. - if (description.size() > 0) { -- cout << title << endl << description << endl << link << endl; -+ std::cout << title << std::endl << description << std::endl << link << std::endl; - } else { -- cout << title << endl << description << endl << link << endl; -+ std::cout << title << std::endl << description << std::endl << link << std::endl; - } - } - } -@@ -67,8 +64,8 @@ - // Print out a usage message. - static void usage (void) - { -- cerr << "Usage: meekat-app-list [hours]" << endl; -- cerr << "Data from <http://www.oreillynet.com/meerkat/>." << endl; -+ std::cerr << "Usage: meekat-app-list [hours]" << std::endl; -+ std::cerr << "Data from <http://www.oreillynet.com/meerkat/>." << std::endl; - exit(1); - } - -@@ -85,7 +82,7 @@ - if (hours == 0) - usage(); - if (hours > 49) { -- cerr << "It's not nice to ask for > 49 hours at once." << endl; -+ std::cerr << "It's not nice to ask for > 49 hours at once." << std::endl; - exit(1); - } - -@@ -96,8 +93,8 @@ - try { - list_apps(hours); - } catch (XmlRpcFault& fault) { -- cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode() -- << ": " << fault.getFaultString() << endl; -+ std::cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode() -+ << ": " << fault.getFaultString() << std::endl; - status = 1; - } - diff --git a/net/xmlrpc-c-devel/files/patch-lib::abyss::src::data.c b/net/xmlrpc-c-devel/files/patch-lib::abyss::src::data.c deleted file mode 100644 index 906e288fca76..000000000000 --- a/net/xmlrpc-c-devel/files/patch-lib::abyss::src::data.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/abyss/src/data.c.orig Fri Feb 2 02:18:08 2001 -+++ lib/abyss/src/data.c Fri Mar 5 02:05:24 2004 -@@ -32,7 +32,6 @@ - ** - *******************************************************************************/ - --#include <malloc.h> - #include <string.h> - #include "abyss.h" - diff --git a/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.cc b/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.cc deleted file mode 100644 index e5886b27a3ea..000000000000 --- a/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.cc +++ /dev/null @@ -1,103 +0,0 @@ ---- src/XmlRpcCpp.cc.orig Sat Apr 14 03:43:55 2001 -+++ src/XmlRpcCpp.cc Tue Mar 2 23:39:39 2004 -@@ -38,7 +38,7 @@ - fault.mFault.fault_string); - } - --XmlRpcFault::XmlRpcFault (const int faultCode, const string faultString) { -+XmlRpcFault::XmlRpcFault (const int faultCode, const std::string faultString) { - xmlrpc_env_init(&mFault); - xmlrpc_env_set_fault(&mFault, faultCode, - const_cast<char*>(faultString.c_str())); -@@ -57,9 +57,9 @@ - xmlrpc_env_clean(&mFault); - } - --string XmlRpcFault::getFaultString (void) const { -+std::string XmlRpcFault::getFaultString (void) const { - XMLRPC_ASSERT(mFault.fault_occurred); -- return string(mFault.fault_string); -+ return std::string(mFault.fault_string); - } - - -@@ -117,7 +117,7 @@ - return XmlRpcValue(value, CONSUME_REFERENCE); - } - --XmlRpcValue XmlRpcValue::makeDateTime (const string& dateTime) { -+XmlRpcValue XmlRpcValue::makeDateTime (const std::string& dateTime) { - XmlRpcEnv env; - xmlrpc_value *value; - const char *data = dateTime.c_str(); // Make sure we're not using wchar_t. -@@ -126,7 +126,7 @@ - return XmlRpcValue(value, CONSUME_REFERENCE); - } - --XmlRpcValue XmlRpcValue::makeString (const string& str) { -+XmlRpcValue XmlRpcValue::makeString (const std::string& str) { - XmlRpcEnv env; - const char *data = str.data(); // Make sure we're not using wchar_t. - size_t size = str.size(); -@@ -196,21 +196,21 @@ - return result; - } - --string XmlRpcValue::getRawDateTime (void) const { -+std::string XmlRpcValue::getRawDateTime (void) const { - XmlRpcEnv env; - char *result; - xmlrpc_parse_value(env, mValue, "8", &result); - env.throwIfFaultOccurred(); -- return string(result); -+ return std::string(result); - } - --string XmlRpcValue::getString (void) const { -+std::string XmlRpcValue::getString (void) const { - XmlRpcEnv env; - char *result; - size_t result_len; - xmlrpc_parse_value(env, mValue, "s#", &result, &result_len); - env.throwIfFaultOccurred(); -- return string(result, result_len); -+ return std::string(result, result_len); - - } - -@@ -265,7 +265,7 @@ - return result; - } - --bool XmlRpcValue::structHasKey (const string& key) { -+bool XmlRpcValue::structHasKey (const std::string& key) { - XmlRpcEnv env; - const char *keystr = key.data(); - size_t keylen = key.size(); -@@ -275,7 +275,7 @@ - return result; - } - --XmlRpcValue XmlRpcValue::structGetValue (const string& key) { -+XmlRpcValue XmlRpcValue::structGetValue (const std::string& key) { - XmlRpcEnv env; - const char *keystr = key.data(); - size_t keylen = key.size(); -@@ -286,7 +286,7 @@ - return XmlRpcValue(result); - } - --void XmlRpcValue::structSetValue (const string& key, const XmlRpcValue& value) -+void XmlRpcValue::structSetValue (const std::string& key, const XmlRpcValue& value) - { - XmlRpcEnv env; - const char *keystr = key.data(); -@@ -297,7 +297,7 @@ - } - - void XmlRpcValue::structGetKeyAndValue (const int index, -- string& out_key, -+ std::string& out_key, - XmlRpcValue& out_value) - { - XmlRpcEnv env; diff --git a/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.h b/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.h deleted file mode 100644 index 56393f19ca1f..000000000000 --- a/net/xmlrpc-c-devel/files/patch-src::XmlRpcCpp.h +++ /dev/null @@ -1,97 +0,0 @@ ---- src/XmlRpcCpp.h.orig Sat Apr 14 03:46:16 2001 -+++ src/XmlRpcCpp.h Tue Mar 2 23:39:39 2004 -@@ -71,12 +71,12 @@ - - public: - XmlRpcFault (const XmlRpcFault &fault); -- XmlRpcFault (const int faultCode, const string faultString); -+ XmlRpcFault (const int faultCode, const std::string faultString); - XmlRpcFault (const xmlrpc_env *env); - ~XmlRpcFault (void); - - int getFaultCode (void) const; -- string getFaultString (void) const; -+ std::string getFaultString (void) const; - xmlrpc_env *getFaultEnv (void); - }; - -@@ -167,8 +167,8 @@ - static XmlRpcValue makeInt (const XmlRpcValue::int32 i); - static XmlRpcValue makeBool (const bool b); - static XmlRpcValue makeDouble (const double d); -- static XmlRpcValue makeDateTime (const string& dateTime); -- static XmlRpcValue makeString (const string& str); -+ static XmlRpcValue makeDateTime (const std::string& dateTime); -+ static XmlRpcValue makeString (const std::string& str); - static XmlRpcValue makeString (const char *const str); - static XmlRpcValue makeString (const char *const str, size_t len); - static XmlRpcValue makeArray (void); -@@ -185,8 +185,8 @@ - XmlRpcValue::int32 getInt (void) const; - bool getBool (void) const; - double getDouble (void) const; -- string getRawDateTime (void) const; -- string getString (void) const; -+ std::string getRawDateTime (void) const; -+ std::string getString (void) const; - XmlRpcValue getArray (void) const; - XmlRpcValue getStruct (void) const; - -@@ -209,11 +209,11 @@ - // Struct functions. These will throw an XmlRpcFault if the value - // isn't a struct. - size_t structSize (void); -- bool structHasKey (const string& key); -- XmlRpcValue structGetValue (const string& key); -- void structSetValue (const string& key, const XmlRpcValue& value); -+ bool structHasKey (const std::string& key); -+ XmlRpcValue structGetValue (const std::string& key); -+ void structSetValue (const std::string& key, const XmlRpcValue& value); - void structGetKeyAndValue (const int index, -- string& out_key, -+ std::string& out_key, - XmlRpcValue& out_value); - }; - -@@ -265,19 +265,19 @@ - class XmlRpcClient { - - private: -- string mServerUrl; -+ std::string mServerUrl; - - public: -- static void Initialize (string appname, string appversion); -+ static void Initialize (std::string appname, std::string appversion); - static void Terminate (void); - -- XmlRpcClient (const string& server_url) : mServerUrl(server_url) {} -+ XmlRpcClient (const std::string& server_url) : mServerUrl(server_url) {} - ~XmlRpcClient (void) {} - - XmlRpcClient (const XmlRpcClient& client); - XmlRpcClient& operator= (const XmlRpcClient& client); - -- XmlRpcValue call (string method_name, XmlRpcValue param_array); -+ XmlRpcValue call (std::string method_name, XmlRpcValue param_array); - }; - - -@@ -299,7 +299,7 @@ - return *this; - } - --inline void XmlRpcClient::Initialize (string appname, string appversion) { -+inline void XmlRpcClient::Initialize (std::string appname, std::string appversion) { - xmlrpc_client_init(XMLRPC_CLIENT_NO_FLAGS, - const_cast<char*>(appname.c_str()), - const_cast<char*>(appversion.c_str())); -@@ -309,7 +309,7 @@ - xmlrpc_client_cleanup(); - } - --inline XmlRpcValue XmlRpcClient::call (string method_name, -+inline XmlRpcValue XmlRpcClient::call (std::string method_name, - XmlRpcValue param_array) - { - XmlRpcEnv env; diff --git a/net/xmlrpc-c-devel/files/patch-src::cpptest.cc b/net/xmlrpc-c-devel/files/patch-src::cpptest.cc deleted file mode 100644 index 67395f125644..000000000000 --- a/net/xmlrpc-c-devel/files/patch-src::cpptest.cc +++ /dev/null @@ -1,89 +0,0 @@ ---- src/cpptest.cc.orig Wed May 2 00:26:13 2001 -+++ src/cpptest.cc Tue Mar 2 23:39:39 2004 -@@ -28,15 +28,15 @@ - void test_failure (char* file, int line, char* statement) - { - total_failures++; -- cout << endl -- << file << ":" << line << ": expected (" << statement << ")" << endl; -+ std::cout << std::endl -+ << file << ":" << line << ": expected (" << statement << ")" << std::endl; - } - - #define TEST(statement) \ - do { \ - total_tests++; \ - if ((statement)) { \ -- cout << "."; \ -+ std::cout << "."; \ - } else { \ - test_failure(__FILE__, __LINE__, #statement); \ - } \ -@@ -45,7 +45,7 @@ - #define TEST_PASSED() \ - do { \ - total_tests++; \ -- cout << "."; \ -+ std::cout << "."; \ - } while (0) - - #define TEST_FAILED(reason) \ -@@ -187,7 +187,7 @@ - TEST(XmlRpcValue::makeString("foo").getString() == "foo"); - TEST(XmlRpcValue::makeString("bar", 3).getString() == "bar"); - TEST(XmlRpcValue::makeString("bar", 3).getString() == "bar"); -- TEST(XmlRpcValue::makeString("a\0b").getString() == string("a\0b")); -+ TEST(XmlRpcValue::makeString("a\0b").getString() == std::string("a\0b")); - XmlRpcValue::makeArray().getArray(); - XmlRpcValue::makeStruct().getStruct(); - -@@ -219,7 +219,7 @@ - TEST(strct.structHasKey("bar")); - TEST(!strct.structHasKey("nosuch")); - for (size_t i = 0; i < strct.structSize(); i++) { -- string key; -+ std::string key; - XmlRpcValue value; - strct.structGetKeyAndValue(i, key, value); - TEST(key + "val" == value.getString()); -@@ -248,30 +248,30 @@ - test_errors(); - - } catch (XmlRpcFault& fault) { -- cout << "Unexpected XML-RPC fault when running test suites." << endl -+ std::cout << "Unexpected XML-RPC fault when running test suites." << std::endl - << "Fault #" << fault.getFaultCode() -- << ": " << fault.getFaultString() << endl -- << "FAILED" << endl; -+ << ": " << fault.getFaultString() << std::endl -+ << "FAILED" << std::endl; - exit(1); - } catch (...) { -- cout << "Unexpected exception when running test suites." << endl -- << "FAILED" << endl; -+ std::cout << "Unexpected exception when running test suites." << std::endl -+ << "FAILED" << std::endl; - exit(1); - } - - // Summarize our test run. -- cout << endl << "Ran " << total_tests << " tests, " -+ std::cout << std::endl << "Ran " << total_tests << " tests, " - << total_failures << " failed, " -- << setprecision(4) -+ << std::setprecision(4) - << (100.0 - (100.0 * total_failures) / total_tests) -- << "% passed" << endl; -+ << "% passed" << std::endl; - - // Print the final result. - if (total_failures == 0) { -- cout << "OK" << endl; -+ std::cout << "OK" << std::endl; - return 0; - } - -- cout << "FAILED" << endl; -+ std::cout << "FAILED" << std::endl; - return 1; - } diff --git a/net/xmlrpc-c-devel/files/patch-src::validatee.c b/net/xmlrpc-c-devel/files/patch-src::validatee.c deleted file mode 100644 index cd5ace445e2f..000000000000 --- a/net/xmlrpc-c-devel/files/patch-src::validatee.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/validatee.c.orig Sat Apr 14 04:04:07 2001 -+++ src/validatee.c Tue Mar 2 23:39:39 2004 -@@ -33,6 +33,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - #include "xmlrpc.h" - #include "xmlrpc_abyss.h" diff --git a/net/xmlrpc-c-devel/files/patch-src::xmlrpc.h b/net/xmlrpc-c-devel/files/patch-src::xmlrpc.h deleted file mode 100644 index d486bcb288f8..000000000000 --- a/net/xmlrpc-c-devel/files/patch-src::xmlrpc.h +++ /dev/null @@ -1,38 +0,0 @@ ---- src/xmlrpc.h.orig Thu Jun 28 01:35:01 2001 -+++ src/xmlrpc.h Tue Mar 2 23:39:39 2004 -@@ -152,7 +152,7 @@ - - /* The same as the above, but using a printf-style format string. */ - void xmlrpc_env_set_fault_formatted (xmlrpc_env* env, int code, -- char *format, ...); -+ const char *format, ...); - - /* A simple debugging assertion. */ - #define XMLRPC_ASSERT_ENV_OK(env) \ -@@ -362,17 +362,23 @@ - ** Increments the reference counts of input arguments if necessary. - ** See the xmlrpc-c documentation for more information. */ - extern xmlrpc_value * --xmlrpc_build_value (xmlrpc_env* env, char* format, ...); -+xmlrpc_build_value (xmlrpc_env* env, const char* format, ...); - - /* The same as the above, but using a va_list. */ - extern xmlrpc_value * --xmlrpc_build_value_va (xmlrpc_env* env, char* format, va_list args); -+xmlrpc_build_value_va (xmlrpc_env* env, const char* format, va_list args); - - /* Extract values from an xmlrpc_value and store them into C variables. - ** Does not increment the reference counts of output values. - ** See the xmlrpc-c documentation for more information. */ - extern void --xmlrpc_parse_value (xmlrpc_env* env, xmlrpc_value* value, char* format, ...); -+xmlrpc_parse_value (xmlrpc_env* env, xmlrpc_value* value, -+ const char* format, ...); -+ -+/* The same as the above, but using a va_list. */ -+extern void -+xmlrpc_parse_value_va (xmlrpc_env* env, xmlrpc_value* value, -+ const char* format, va_list args); - - /* Return the number of elements in an XML-RPC array. - ** Sets XMLRPC_TYPE_ERROR if 'array' is not an array. */ diff --git a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_abyss.c b/net/xmlrpc-c-devel/files/patch-src::xmlrpc_abyss.c deleted file mode 100644 index 23d48599af58..000000000000 --- a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_abyss.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/xmlrpc_abyss.c.orig Wed May 2 05:18:48 2001 -+++ src/xmlrpc_abyss.c Tue Mar 2 23:39:39 2004 -@@ -34,6 +34,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - #include "xmlrpc.h" - diff --git a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_data.c b/net/xmlrpc-c-devel/files/patch-src::xmlrpc_data.c deleted file mode 100644 index 8491c186b043..000000000000 --- a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_data.c +++ /dev/null @@ -1,117 +0,0 @@ ---- src/xmlrpc_data.c.orig Wed Apr 25 04:20:20 2001 -+++ src/xmlrpc_data.c Tue Mar 2 23:39:39 2004 -@@ -182,10 +182,11 @@ - ** (in theory) also be portable. - */ - --static xmlrpc_value* mkvalue(xmlrpc_env* env, char** format, va_list* args); -+static xmlrpc_value* mkvalue(xmlrpc_env* env, -+ const char** format, va_list* args); - - static xmlrpc_value* mkarray(xmlrpc_env* env, -- char** format, -+ const char** format, - char delimiter, - va_list* args) - { -@@ -236,7 +237,7 @@ - } - - static xmlrpc_value* mkstruct(xmlrpc_env* env, -- char** format, -+ const char** format, - char delimiter, - va_list* args) - { -@@ -357,7 +358,8 @@ - } - #endif /* HAVE_UNICODE_WCHAR */ - --static xmlrpc_value* mkvalue(xmlrpc_env* env, char** format, va_list* args) -+static xmlrpc_value* mkvalue(xmlrpc_env* env, -+ const char** format, va_list* args) - { - xmlrpc_value* val; - char *str, *contents; -@@ -497,10 +499,10 @@ - } - - xmlrpc_value* xmlrpc_build_value_va (xmlrpc_env* env, -- char* format, -+ const char* format, - va_list args) - { -- char *format_copy; -+ const char *format_copy; - va_list args_copy; - xmlrpc_value* retval; - -@@ -520,7 +522,7 @@ - } - - xmlrpc_value* xmlrpc_build_value (xmlrpc_env* env, -- char* format, ...) -+ const char* format, ...) - { - va_list args; - xmlrpc_value* retval; -@@ -542,12 +544,12 @@ - - static void parsevalue (xmlrpc_env* env, - xmlrpc_value* val, -- char** format, -+ const char** format, - va_list* args); - - static void parsearray (xmlrpc_env* env, - xmlrpc_value* array, -- char** format, -+ const char** format, - char delimiter, - va_list* args) - { -@@ -584,7 +586,7 @@ - - static void parsestruct(xmlrpc_env* env, - xmlrpc_value* strct, -- char** format, -+ const char** format, - char delimiter, - va_list* args) - { -@@ -633,7 +635,7 @@ - - static void parsevalue (xmlrpc_env* env, - xmlrpc_value* val, -- char** format, -+ const char** format, - va_list* args) - { - xmlrpc_int32 *int32ptr; -@@ -783,12 +785,12 @@ - return; - } - --static void xmlrpc_parse_value_va (xmlrpc_env* env, -- xmlrpc_value* value, -- char* format, -- va_list args) -+void xmlrpc_parse_value_va (xmlrpc_env* env, -+ xmlrpc_value* value, -+ const char* format, -+ va_list args) - { -- char *format_copy; -+ const char *format_copy; - va_list args_copy; - - XMLRPC_ASSERT_ENV_OK(env); -@@ -808,7 +810,7 @@ - - void xmlrpc_parse_value (xmlrpc_env* env, - xmlrpc_value* value, -- char* format, ...) -+ const char* format, ...) - { - va_list args; - diff --git a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_support.c b/net/xmlrpc-c-devel/files/patch-src::xmlrpc_support.c deleted file mode 100644 index 0de4f49e28b9..000000000000 --- a/net/xmlrpc-c-devel/files/patch-src::xmlrpc_support.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/xmlrpc_support.c.orig Sat Apr 14 03:25:08 2001 -+++ src/xmlrpc_support.c Tue Mar 2 23:39:39 2004 -@@ -99,7 +99,7 @@ - } - - void xmlrpc_env_set_fault_formatted (xmlrpc_env* env, int code, -- char *format, ...) -+ const char *format, ...) - { - va_list args; - char buffer[ERROR_BUFFER_SZ]; diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.cc b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.cc deleted file mode 100644 index ce9bf0654d30..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.cc +++ /dev/null @@ -1,187 +0,0 @@ ---- tools/xml-rpc-api2cpp/DataType.cc.orig Fri Mar 30 05:39:06 2001 -+++ tools/xml-rpc-api2cpp/DataType.cc Tue Mar 2 23:39:39 2004 -@@ -1,5 +1,5 @@ --#include <iostream.h> --#include <strstream.h> -+#include <iostream> -+#include <sstream> - #include <stdexcept> - - #include <XmlRpcCpp.h> -@@ -12,12 +12,10 @@ - // Instances of DataType know how generate code fragments for manipulating - // a specific XML-RPC data type. - --string DataType::defaultParameterBaseName (int position) const { -- ostrstream name_stream; -- name_stream << typeName() << position << ends; -- string name(name_stream.str()); -- // (Ask the ostrstream to reclaim ownership of its buffer.) -- name_stream.freeze(false); -+std::string DataType::defaultParameterBaseName (int position) const { -+ std::ostringstream name_stream; -+ name_stream << typeName() << position << std::ends; -+ std::string name(name_stream.str()); - return name; - } - -@@ -29,27 +27,27 @@ - - class RawDataType : public DataType { - public: -- RawDataType (const string& type_name) : DataType(type_name) {} -+ RawDataType (const std::string& type_name) : DataType(type_name) {} - -- virtual string parameterFragment (const string& base_name) const; -- virtual string inputConversionFragment (const string& base_name) const; -- virtual string returnTypeFragment () const; -- virtual string outputConversionFragment (const string& var_name) const; -+ virtual std::string parameterFragment (const std::string& base_name) const; -+ virtual std::string inputConversionFragment (const std::string& base_name) const; -+ virtual std::string returnTypeFragment () const; -+ virtual std::string outputConversionFragment (const std::string& var_name) const; - }; - --string RawDataType::parameterFragment (const string& base_name) const { -+std::string RawDataType::parameterFragment (const std::string& base_name) const { - return "XmlRpcValue /*" + typeName() + "*/ " + base_name; - } - --string RawDataType::inputConversionFragment (const string& base_name) const { -+std::string RawDataType::inputConversionFragment (const std::string& base_name) const { - return base_name; - } - --string RawDataType::returnTypeFragment () const { -+std::string RawDataType::returnTypeFragment () const { - return "XmlRpcValue /*" + typeName() + "*/"; - } - --string RawDataType::outputConversionFragment (const string& var_name) const { -+std::string RawDataType::outputConversionFragment (const std::string& var_name) const { - return var_name; - } - -@@ -60,26 +58,26 @@ - // Other types can be easily converted to and from a single native type. - - class SimpleDataType : public DataType { -- string mNativeType; -- string mMakerFunc; -- string mGetterFunc; -+ std::string mNativeType; -+ std::string mMakerFunc; -+ std::string mGetterFunc; - - public: -- SimpleDataType (const string& type_name, -- const string& native_type, -- const string& maker_func, -- const string& getter_func); -- -- virtual string parameterFragment (const string& base_name) const; -- virtual string inputConversionFragment (const string& base_name) const; -- virtual string returnTypeFragment () const; -- virtual string outputConversionFragment (const string& var_name) const; -+ SimpleDataType (const std::string& type_name, -+ const std::string& native_type, -+ const std::string& maker_func, -+ const std::string& getter_func); -+ -+ virtual std::string parameterFragment (const std::string& base_name) const; -+ virtual std::string inputConversionFragment (const std::string& base_name) const; -+ virtual std::string returnTypeFragment () const; -+ virtual std::string outputConversionFragment (const std::string& var_name) const; - }; - --SimpleDataType::SimpleDataType (const string& type_name, -- const string& native_type, -- const string& maker_func, -- const string& getter_func) -+SimpleDataType::SimpleDataType (const std::string& type_name, -+ const std::string& native_type, -+ const std::string& maker_func, -+ const std::string& getter_func) - : DataType(type_name), - mNativeType(native_type), - mMakerFunc(maker_func), -@@ -87,20 +85,20 @@ - { - } - --string SimpleDataType::parameterFragment (const string& base_name) const { -+std::string SimpleDataType::parameterFragment (const std::string& base_name) const { - return mNativeType + " " + base_name; - } - --string SimpleDataType::inputConversionFragment (const string& base_name) const -+std::string SimpleDataType::inputConversionFragment (const std::string& base_name) const - { - return mMakerFunc + "(" + base_name + ")"; - } - --string SimpleDataType::returnTypeFragment () const { -+std::string SimpleDataType::returnTypeFragment () const { - return mNativeType; - } - --string SimpleDataType::outputConversionFragment (const string& var_name) const -+std::string SimpleDataType::outputConversionFragment (const std::string& var_name) const - { - return var_name + "." + mGetterFunc + "()"; - } -@@ -116,26 +114,26 @@ - public: - VoidDataType () : DataType("void") {} - -- virtual string parameterFragment (const string& base_name) const; -- virtual string inputConversionFragment (const string& base_name) const; -- virtual string returnTypeFragment () const; -- virtual string outputConversionFragment (const string& var_name) const; -+ virtual std::string parameterFragment (const std::string& base_name) const; -+ virtual std::string inputConversionFragment (const std::string& base_name) const; -+ virtual std::string returnTypeFragment () const; -+ virtual std::string outputConversionFragment (const std::string& var_name) const; - }; - --string VoidDataType::parameterFragment (const string& base_name) const { -- throw domain_error("Can't handle functions with 'void' arguments'"); -+std::string VoidDataType::parameterFragment (const std::string& base_name) const { -+ throw std::domain_error("Can't handle functions with 'void' arguments'"); - - } - --string VoidDataType::inputConversionFragment (const string& base_name) const { -- throw domain_error("Can't handle functions with 'void' arguments'"); -+std::string VoidDataType::inputConversionFragment (const std::string& base_name) const { -+ throw std::domain_error("Can't handle functions with 'void' arguments'"); - } - --string VoidDataType::returnTypeFragment () const { -+std::string VoidDataType::returnTypeFragment () const { - return "void"; - } - --string VoidDataType::outputConversionFragment (const string& var_name) const { -+std::string VoidDataType::outputConversionFragment (const std::string& var_name) const { - return "/* Return value ignored. */"; - } - -@@ -166,7 +164,7 @@ - - VoidDataType voidType; - --const DataType& findDataType (const string& name) { -+const DataType& findDataType (const std::string& name) { - if (name == "int" || name == "i4") - return intType; - else if (name == "boolean") -@@ -186,7 +184,7 @@ - else if (name == "void") - return voidType; - else -- throw domain_error("Unknown XML-RPC type " + name); -+ throw std::domain_error("Unknown XML-RPC type " + name); - - // This code should never be executed. - XMLRPC_ASSERT(0); diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.h b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.h deleted file mode 100644 index 1c8a9ad32bd1..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::DataType.h +++ /dev/null @@ -1,40 +0,0 @@ ---- tools/xml-rpc-api2cpp/DataType.h.orig Mon Mar 26 03:34:53 2001 -+++ tools/xml-rpc-api2cpp/DataType.h Tue Mar 2 23:39:39 2004 -@@ -1,28 +1,28 @@ - - class DataType { -- string mTypeName; -+ std::string mTypeName; - - DataType (const DataType&) { XMLRPC_ASSERT(0); } - DataType& operator= (const DataType&) { XMLRPC_ASSERT(0); return *this; } - - public: -- DataType (const string& type_name) : mTypeName(type_name) {} -+ DataType (const std::string& type_name) : mTypeName(type_name) {} - virtual ~DataType () {} - - // Return the name for this XML-RPC type. -- virtual string typeName () const { return mTypeName; } -+ virtual std::string typeName () const { return mTypeName; } - - // Given a parameter position, calculate a unique base name for all - // parameter-related variables. -- virtual string defaultParameterBaseName (int position) const; -+ virtual std::string defaultParameterBaseName (int position) const; - - // Virtual functions for processing parameters. -- virtual string parameterFragment (const string& base_name) const = 0; -- virtual string inputConversionFragment (const string& base_name) const = 0; -+ virtual std::string parameterFragment (const std::string& base_name) const = 0; -+ virtual std::string inputConversionFragment (const std::string& base_name) const = 0; - - // Virtual functions for processing return values. -- virtual string returnTypeFragment () const = 0; -- virtual string outputConversionFragment (const string& var_name) const = 0; -+ virtual std::string returnTypeFragment () const = 0; -+ virtual std::string outputConversionFragment (const std::string& var_name) const = 0; - }; - --const DataType& findDataType (const string& name); -+const DataType& findDataType (const std::string& name); diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.cc b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.cc deleted file mode 100644 index 9032880678b4..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- tools/xml-rpc-api2cpp/SystemProxy.cc.orig Mon Mar 26 08:46:28 2001 -+++ tools/xml-rpc-api2cpp/SystemProxy.cc Tue Mar 2 23:39:39 2004 -@@ -10,14 +10,14 @@ - return result; - } - --XmlRpcValue /*array*/ SystemProxy::methodSignature (string string1) { -+XmlRpcValue /*array*/ SystemProxy::methodSignature (std::string string1) { - XmlRpcValue params = XmlRpcValue::makeArray(); - params.arrayAppendItem(XmlRpcValue::makeString(string1)); - XmlRpcValue result = this->mClient.call("system.methodSignature", params); - return result; - } - --string SystemProxy::methodHelp (string string1) { -+std::string SystemProxy::methodHelp (std::string string1) { - XmlRpcValue params = XmlRpcValue::makeArray(); - params.arrayAppendItem(XmlRpcValue::makeString(string1)); - XmlRpcValue result = this->mClient.call("system.methodHelp", params); diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.h b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.h deleted file mode 100644 index ed3d4b6e4cc3..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::SystemProxy.h +++ /dev/null @@ -1,28 +0,0 @@ ---- tools/xml-rpc-api2cpp/SystemProxy.h.orig Mon Mar 26 08:49:56 2001 -+++ tools/xml-rpc-api2cpp/SystemProxy.h Tue Mar 2 23:39:39 2004 -@@ -12,7 +12,7 @@ - public: - SystemProxy (const XmlRpcClient& client) - : mClient(client) {} -- SystemProxy (const string& server_url) -+ SystemProxy (const std::string& server_url) - : mClient(XmlRpcClient(server_url)) {} - SystemProxy (const SystemProxy& o) - : mClient(o.mClient) {} -@@ -29,13 +29,13 @@ - signatures. Each signature is an array of strings. The first item of - each signature is the return type, and any others items are - parameter types. */ -- XmlRpcValue /*array*/ methodSignature (string string1); -+ XmlRpcValue /*array*/ methodSignature (std::string string1); - - /* Given the name of a method, return a help string. */ -- string methodHelp (string string1); -+ std::string methodHelp (std::string string1); - - /* Process an array of calls, and return an array of results. Calls -- should be structs of the form {'methodName': string, 'params': -+ should be structs of the form {'methodName': std::string, 'params': - array}. Each result will either be a single-item array containg the - result value, or a struct of the form {'faultCode': int, - 'faultString': string}. This is useful when you need to make lots of diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.cc b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.cc deleted file mode 100644 index 794d218df932..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.cc +++ /dev/null @@ -1,81 +0,0 @@ ---- tools/xml-rpc-api2cpp/XmlRpcClass.cc.orig Mon Mar 26 08:49:19 2001 -+++ tools/xml-rpc-api2cpp/XmlRpcClass.cc Tue Mar 2 23:39:39 2004 -@@ -1,6 +1,6 @@ --#include <iostream.h> -+#include <iostream> - #include <stdexcept> --#include <vector.h> -+#include <vector> - - #include <XmlRpcCpp.h> - #include "DataType.h" -@@ -14,7 +14,7 @@ - // This class stores information about a proxy class, and knows how to - // generate code. - --XmlRpcClass::XmlRpcClass (string class_name) -+XmlRpcClass::XmlRpcClass (std::string class_name) - : mClassName(class_name) - { - } -@@ -39,37 +39,37 @@ - mFunctions.push_back(function); - } - --void XmlRpcClass::printDeclaration (ostream& out) -+void XmlRpcClass::printDeclaration (std::ostream& out) - { -- cout << "class " << mClassName << " {" << endl; -- cout << " XmlRpcClient mClient;" << endl; -- cout << endl; -- cout << "public:" << endl; -- cout << " " << mClassName << " (const XmlRpcClient& client)" << endl; -- cout << " : mClient(client) {}" << endl; -- cout << " " << mClassName << " (const string& server_url)" << endl; -- cout << " : mClient(XmlRpcClient(server_url)) {}" << endl; -- cout << " " << mClassName << " (const " << mClassName << "& o)" << endl; -- cout << " : mClient(o.mClient) {}" << endl; -- cout << endl; -- cout << " " << mClassName << "& operator= (const " -- << mClassName << "& o) {" << endl; -- cout << " if (this != &o) mClient = o.mClient;" << endl; -- cout << " return *this;" << endl; -- cout << " }" << endl; -+ std::cout << "class " << mClassName << " {" << std::endl; -+ std::cout << " XmlRpcClient mClient;" << std::endl; -+ std::cout << std::endl; -+ std::cout << "public:" << std::endl; -+ std::cout << " " << mClassName << " (const XmlRpcClient& client)" << std::endl; -+ std::cout << " : mClient(client) {}" << std::endl; -+ std::cout << " " << mClassName << " (const std::string& server_url)" << std::endl; -+ std::cout << " : mClient(XmlRpcClient(server_url)) {}" << std::endl; -+ std::cout << " " << mClassName << " (const " << mClassName << "& o)" << std::endl; -+ std::cout << " : mClient(o.mClient) {}" << std::endl; -+ std::cout << std::endl; -+ std::cout << " " << mClassName << "& operator= (const " -+ << mClassName << "& o) {" << std::endl; -+ std::cout << " if (this != &o) mClient = o.mClient;" << std::endl; -+ std::cout << " return *this;" << std::endl; -+ std::cout << " }" << std::endl; - -- vector<XmlRpcFunction>::iterator f; -+ std::vector<XmlRpcFunction>::iterator f; - for (f = mFunctions.begin(); f < mFunctions.end(); ++f) { -- f->printDeclarations(cout); -+ f->printDeclarations(std::cout); - } - -- cout << "};" << endl; -+ std::cout << "};" << std::endl; - } - --void XmlRpcClass::printDefinition (ostream& out) -+void XmlRpcClass::printDefinition (std::ostream& out) - { -- vector<XmlRpcFunction>::iterator f; -+ std::vector<XmlRpcFunction>::iterator f; - for (f = mFunctions.begin(); f < mFunctions.end(); ++f) { -- f->printDefinitions(cout, mClassName); -+ f->printDefinitions(std::cout, mClassName); - } - } diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.h b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.h deleted file mode 100644 index 3c9ed6b4c7cf..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcClass.h +++ /dev/null @@ -1,29 +0,0 @@ ---- tools/xml-rpc-api2cpp/XmlRpcClass.h.orig Mon Mar 26 08:43:07 2001 -+++ tools/xml-rpc-api2cpp/XmlRpcClass.h Tue Mar 2 23:39:39 2004 -@@ -1,19 +1,19 @@ --#include <vector.h> -+#include <vector> - - class XmlRpcClass { -- string mClassName; -- vector<XmlRpcFunction> mFunctions; -+ std::string mClassName; -+ std::vector<XmlRpcFunction> mFunctions; - - - public: -- XmlRpcClass (string class_name); -+ XmlRpcClass (std::string class_name); - XmlRpcClass (const XmlRpcClass&); - XmlRpcClass& operator= (const XmlRpcClass&); - -- string className () const { return mClassName; } -+ std::string className () const { return mClassName; } - - void addFunction (const XmlRpcFunction& function); - -- void printDeclaration (ostream& out); -- void printDefinition (ostream& out); -+ void printDeclaration (std::ostream& out); -+ void printDefinition (std::ostream& out); - }; diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.cc b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.cc deleted file mode 100644 index 1fe27ce99876..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.cc +++ /dev/null @@ -1,123 +0,0 @@ ---- tools/xml-rpc-api2cpp/XmlRpcFunction.cc.orig Mon Mar 26 08:21:07 2001 -+++ tools/xml-rpc-api2cpp/XmlRpcFunction.cc Tue Mar 2 23:39:39 2004 -@@ -1,4 +1,4 @@ --#include <iostream.h> -+#include <iostream> - #include <stdexcept> - - #include <XmlRpcCpp.h> -@@ -12,9 +12,9 @@ - // Contains everything we know about a given server function, and knows - // how to print local bindings. - --XmlRpcFunction::XmlRpcFunction(const string& function_name, -- const string& method_name, -- const string& help, -+XmlRpcFunction::XmlRpcFunction(const std::string& function_name, -+ const std::string& method_name, -+ const std::string& help, - XmlRpcValue synopsis) - : mFunctionName(function_name), mMethodName(method_name), - mHelp(help), mSynopsis(synopsis) -@@ -37,10 +37,10 @@ - return *this; - } - --void XmlRpcFunction::printDeclarations (ostream& out) { -+void XmlRpcFunction::printDeclarations (std::ostream& out) { - - // XXX - Do a sloppy job of printing documentation. -- out << endl << " /* " << mHelp << " */" << endl; -+ out << std::endl << " /* " << mHelp << " */" << std::endl; - - // Print each declaration. - size_t end = mSynopsis.arraySize(); -@@ -48,16 +48,16 @@ - printDeclaration(out, i); - } - --void XmlRpcFunction::printDefinitions (ostream& out, const string& className) { -+void XmlRpcFunction::printDefinitions (std::ostream& out, const std::string& className) { - size_t end = mSynopsis.arraySize(); - for (size_t i = 0; i < end; i++) { -- out << endl; -+ out << std::endl; - printDefinition(out, className, i); - } - } - - // Print the parameter declarations. --void XmlRpcFunction::printParameters (ostream& out, size_t synopsis_index) { -+void XmlRpcFunction::printParameters (std::ostream& out, size_t synopsis_index) { - size_t end = parameterCount(synopsis_index); - bool first = true; - for (size_t i = 0; i < end; i++) { -@@ -67,47 +67,47 @@ - out << ", "; - - const DataType& ptype (parameterType(synopsis_index, i)); -- string basename = ptype.defaultParameterBaseName(i + 1); -+ std::string basename = ptype.defaultParameterBaseName(i + 1); - out << ptype.parameterFragment(basename); - } - } - --void XmlRpcFunction::printDeclaration (ostream& out, size_t synopsis_index) { -+void XmlRpcFunction::printDeclaration (std::ostream& out, size_t synopsis_index) { - const DataType& rtype (returnType(synopsis_index)); - out << " " << rtype.returnTypeFragment() << " " - << mFunctionName << " ("; - printParameters(out, synopsis_index); -- out << ");" << endl; -+ out << ");" << std::endl; - } - --void XmlRpcFunction::printDefinition (ostream& out, -- const string& className, -+void XmlRpcFunction::printDefinition (std::ostream& out, -+ const std::string& className, - size_t synopsis_index) - { - const DataType& rtype (returnType(synopsis_index)); - out << rtype.returnTypeFragment() << " " - << className << "::" << mFunctionName << " ("; - printParameters(out, synopsis_index); -- out << ") {" << endl; -- out << " XmlRpcValue params = XmlRpcValue::makeArray();" << endl; -+ out << ") {" << std::endl; -+ out << " XmlRpcValue params = XmlRpcValue::makeArray();" << std::endl; - - /* Emit code to convert the parameters into an array of XML-RPC objects. */ - size_t end = parameterCount(synopsis_index); - for (size_t i = 0; i < end; i++) { - const DataType& ptype (parameterType(synopsis_index, i)); -- string basename = ptype.defaultParameterBaseName(i + 1); -+ std::string basename = ptype.defaultParameterBaseName(i + 1); - out << " params.arrayAppendItem(" -- << ptype.inputConversionFragment(basename) << ");" << endl; -+ << ptype.inputConversionFragment(basename) << ");" << std::endl; - } - - /* Emit the function call.*/ - out << " XmlRpcValue result = this->mClient.call(\"" -- << mMethodName << "\", params);" << endl; -+ << mMethodName << "\", params);" << std::endl; - - /* Emit the return statement. */ - out << " return " << rtype.outputConversionFragment("result") -- << ";" << endl; -- out << "}" << endl; -+ << ";" << std::endl; -+ out << "}" << std::endl; - } - - const DataType& XmlRpcFunction::returnType (size_t synopsis_index) { -@@ -119,7 +119,7 @@ - XmlRpcValue func_synop = mSynopsis.arrayGetItem(synopsis_index); - size_t size = func_synop.arraySize(); - if (size < 1) -- throw domain_error("Synopsis contained no items"); -+ throw std::domain_error("Synopsis contained no items"); - return size - 1; - } - diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.h b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.h deleted file mode 100644 index c366bac5cd54..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::XmlRpcFucntion.h +++ /dev/null @@ -1,42 +0,0 @@ ---- tools/xml-rpc-api2cpp/XmlRpcFunction.h.orig Mon Mar 26 05:17:50 2001 -+++ tools/xml-rpc-api2cpp/XmlRpcFunction.h Tue Mar 2 23:39:39 2004 -@@ -1,27 +1,27 @@ - - class XmlRpcFunction { -- string mFunctionName; -- string mMethodName; -- string mHelp; -+ std::string mFunctionName; -+ std::string mMethodName; -+ std::string mHelp; - XmlRpcValue mSynopsis; - - public: -- XmlRpcFunction(const string& function_name, -- const string& method_name, -- const string& help, -+ XmlRpcFunction(const std::string& function_name, -+ const std::string& method_name, -+ const std::string& help, - XmlRpcValue synopsis); - - XmlRpcFunction (const XmlRpcFunction&); - XmlRpcFunction& operator= (const XmlRpcFunction&); - -- void printDeclarations (ostream& out); -- void printDefinitions (ostream& out, const string& className); -+ void printDeclarations (std::ostream& out); -+ void printDefinitions (std::ostream& out, const std::string& className); - - private: -- void printParameters (ostream& out, size_t synopsis_index); -- void printDeclaration (ostream& out, size_t synopsis_index); -- void printDefinition (ostream& out, -- const string& className, -+ void printParameters (std::ostream& out, size_t synopsis_index); -+ void printDeclaration (std::ostream& out, size_t synopsis_index); -+ void printDefinition (std::ostream& out, -+ const std::string& className, - size_t synopsis_index); - - const DataType& returnType (size_t synopsis_index); diff --git a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::xml-rpc-api2cpp b/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::xml-rpc-api2cpp deleted file mode 100644 index 95b9194227a6..000000000000 --- a/net/xmlrpc-c-devel/files/patch-tools::xml-rpc-api2cpp::xml-rpc-api2cpp +++ /dev/null @@ -1,170 +0,0 @@ ---- tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cc.orig Thu Apr 12 08:21:38 2001 -+++ tools/xml-rpc-api2cpp/xml-rpc-api2cpp.cc Tue Mar 2 23:39:39 2004 -@@ -1,4 +1,4 @@ --#include <iostream.h> -+#include <iostream> - #include <stdexcept> - - #include <XmlRpcCpp.h> -@@ -17,9 +17,9 @@ - // Connect to a remote server and extract the information we'll need to - // build a proxy class. - --XmlRpcClass get_class_info (string server_url, -- string class_prefix, -- string class_name) -+XmlRpcClass get_class_info (std::string server_url, -+ std::string class_prefix, -+ std::string class_name) - { - // Create a place to store our data. - XmlRpcClass info(class_name); -@@ -33,22 +33,22 @@ - for (size_t i = 0; i < end; i++) { - - // Break the method name into two pieces. -- string method_prefix; -- string function_name; -- string method_name = methods.arrayGetItem(i).getString(); -+ std::string method_prefix; -+ std::string function_name; -+ std::string method_name = methods.arrayGetItem(i).getString(); - size_t last_dot = method_name.rfind('.'); -- if (last_dot == string::npos) { -+ if (last_dot == std::string::npos) { - function_name = method_name; - } else { -- method_prefix = string(method_name, 0, last_dot); -- function_name = string(method_name, last_dot + 1); -+ method_prefix = std::string(method_name, 0, last_dot); -+ function_name = std::string(method_name, last_dot + 1); - } - - // Decide whether we care about this function. - if (method_prefix == class_prefix) { - - // Fetch some information about the function. -- string help = system.methodHelp(method_name); -+ std::string help = system.methodHelp(method_name); - XmlRpcValue signature = system.methodSignature(method_name); - - // Add this function to our class information. -@@ -66,23 +66,23 @@ - //========================================================================= - // Print a complete header for the specified class. - --void print_header (ostream& out, XmlRpcClass& class_info) { -- string class_name = class_info.className(); -- out << "// " << class_name << ".h - xmlrpc-c C++ proxy class" << endl; -- out << "// Auto-generated by xml-rpc-api2cpp." << endl; -- out << endl; -- -- string header_symbol = "_" + class_name + "_H_"; -- out << "#ifndef " << header_symbol << endl; -- out << "#define " << header_symbol << " 1" << endl; -- out << endl; -- out << "#include <XmlRpcCpp.h>" << endl; -- out << endl; -+void print_header (std::ostream& out, XmlRpcClass& class_info) { -+ std::string class_name = class_info.className(); -+ out << "// " << class_name << ".h - xmlrpc-c C++ proxy class" << std::endl; -+ out << "// Auto-generated by xml-rpc-api2cpp." << std::endl; -+ out << std::endl; -+ -+ std::string header_symbol = "_" + class_name + "_H_"; -+ out << "#ifndef " << header_symbol << std::endl; -+ out << "#define " << header_symbol << " 1" << std::endl; -+ out << std::endl; -+ out << "#include <XmlRpcCpp.h>" << std::endl; -+ out << std::endl; - -- class_info.printDeclaration(cout); -+ class_info.printDeclaration(std::cout); - -- out << endl; -- out << "#endif /* " << header_symbol << " */" << endl; -+ out << std::endl; -+ out << "#endif /* " << header_symbol << " */" << std::endl; - } - - -@@ -91,16 +91,16 @@ - //========================================================================= - // Print a complete header for the specified class. - --void print_cc_file (ostream& out, XmlRpcClass& class_info) { -- string class_name = class_info.className(); -- out << "// " << class_name << ".cc - xmlrpc-c C++ proxy class" << endl; -- out << "// Auto-generated by xml-rpc-api2cpp." << endl; -- out << endl; -+void print_cc_file (std::ostream& out, XmlRpcClass& class_info) { -+ std::string class_name = class_info.className(); -+ out << "// " << class_name << ".cc - xmlrpc-c C++ proxy class" << std::endl; -+ out << "// Auto-generated by xml-rpc-api2cpp." << std::endl; -+ out << std::endl; - -- out << "#include <XmlRpcCpp.h>" << endl; -- out << "#include \"" << class_name << ".h\"" << endl; -+ out << "#include <XmlRpcCpp.h>" << std::endl; -+ out << "#include \"" << class_name << ".h\"" << std::endl; - -- class_info.printDefinition(cout); -+ class_info.printDefinition(std::cout); - } - - -@@ -113,18 +113,18 @@ - - /* Parse our command-line arguments. */ - if (argc != 4) { -- cerr << argv[0] << ": Usage:" << endl -+ std::cerr << argv[0] << ": Usage:" << std::endl - << " xml-rpc-api2cpp <server_url> <method_prefix> <local_class>" -- << endl << endl -- << "Sample arguments:" << endl -- << " server_url = http://localhost/RPC2" << endl -- << " method_prefix = system" << endl -- << " local_class = SystemProxy" << endl; -+ << std::endl << std::endl -+ << "Sample arguments:" << std::endl -+ << " server_url = http://localhost/RPC2" << std::endl -+ << " method_prefix = system" << std::endl -+ << " local_class = SystemProxy" << std::endl; - exit(1); - } -- string server_url = argv[1]; -- string method_prefix = argv[2]; -- string local_class = argv[3]; -+ std::string server_url = argv[1]; -+ std::string method_prefix = argv[2]; -+ std::string local_class = argv[3]; - - int status = 0; - XmlRpcClient::Initialize(NAME, VERSION); -@@ -133,18 +133,18 @@ - XmlRpcClass system = get_class_info(server_url, - method_prefix, - local_class); -- print_header(cout, system); -- cout << endl; -- print_cc_file(cout, system); -+ print_header(std::cout, system); -+ std::cout << std::endl; -+ print_cc_file(std::cout, system); - } catch (XmlRpcFault& fault) { -- cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode() -- << ": " << fault.getFaultString() << endl; -+ std::cerr << argv[0] << ": XML-RPC fault #" << fault.getFaultCode() -+ << ": " << fault.getFaultString() << std::endl; - status = 1; -- } catch (logic_error& err) { -- cerr << argv[0] << ": " << err.what() << endl; -+ } catch (std::logic_error& err) { -+ std::cerr << argv[0] << ": " << err.what() << std::endl; - status = 1; - } catch (...) { -- cerr << argv[0] << ": Unknown exception" << endl; -+ std::cerr << argv[0] << ": Unknown exception" << std::endl; - status = 1; - } - diff --git a/net/xmlrpc-c-devel/pkg-descr b/net/xmlrpc-c-devel/pkg-descr deleted file mode 100644 index 41931be8cb1d..000000000000 --- a/net/xmlrpc-c-devel/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -XML-RPC is a quick-and-easy way to make procedure calls over the Internet. -It converts the procedure call into XML document, sends it to a remote -server using HTTP, and gets back the response as XML. - -This library provides a modular implementation of XML-RPC for C and C++. - - - C API and experimental C++ API. - - Modular XML-RPC core: If you want, you can supply all your own HTTP - code. - - Synchronous and asynchronous XML-RPC clients based on w3c-libwww. - - Multithreaded XML-RPC server based on the Abyss web server. - - Full support for basic types, including <struct>, <array> and <base64>. - - Extensive test suites to help verify correct behavior and correct - error handling. - - Passes the official XML-RPC validator1 test suite. - -WWW: http://xmlrpc-c.sourceforge.net/ diff --git a/net/xmlrpc-c-devel/pkg-plist b/net/xmlrpc-c-devel/pkg-plist deleted file mode 100644 index 84b051da9b65..000000000000 --- a/net/xmlrpc-c-devel/pkg-plist +++ /dev/null @@ -1,39 +0,0 @@ -bin/meerkat-app-list -bin/query-meerkat -bin/xml-rpc-api2cpp -bin/xml-rpc-api2txt -bin/xmlrpc-c-config -include/XmlRpcCpp.h -include/xmlrpc.h -include/xmlrpc_abyss.h -include/xmlrpc_cgi.h -include/xmlrpc_client.h -lib/libxmlrpc.a -lib/libxmlrpc.la -lib/libxmlrpc.so -lib/libxmlrpc.so.7 -lib/libxmlrpc_abyss.a -lib/libxmlrpc_abyss.la -lib/libxmlrpc_abyss.so -lib/libxmlrpc_abyss.so.7 -lib/libxmlrpc_abyss_server.a -lib/libxmlrpc_abyss_server.la -lib/libxmlrpc_abyss_server.so -lib/libxmlrpc_abyss_server.so.7 -lib/libxmlrpc_cgi.a -lib/libxmlrpc_cgi.la -lib/libxmlrpc_cgi.so -lib/libxmlrpc_cgi.so.7 -lib/libxmlrpc_client.a -lib/libxmlrpc_client.la -lib/libxmlrpc_client.so -lib/libxmlrpc_client.so.7 -lib/libxmlrpc_cpp.a -lib/libxmlrpc_xmlparse.a -lib/libxmlrpc_xmlparse.la -lib/libxmlrpc_xmlparse.so -lib/libxmlrpc_xmlparse.so.7 -lib/libxmlrpc_xmltok.a -lib/libxmlrpc_xmltok.la -lib/libxmlrpc_xmltok.so -lib/libxmlrpc_xmltok.so.7 diff --git a/net/zaptel12/Makefile b/net/zaptel12/Makefile deleted file mode 100644 index 97102d98a06c..000000000000 --- a/net/zaptel12/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# Ports collection makefile for: zaptel -# Date created: 29 April 2004 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= zaptel -PORTVERSION= 0.11 -CATEGORIES= misc -MASTER_SITES= http://www.pbxpress.com/~gonzo/ -DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION} - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= A FreeBSD Driver for FXO, FXS, BRI and PRI Telephony Cards - -LIB_DEPENDS= newt.51:${PORTSDIR}/devel/newt - -USE_REINPLACE= yes - -NO_PACKAGE= Should be in sync with the kernel to work correctly - -ONLY_FOR_ARCHS= i386 - -PKGMESSAGE= ${WRKSRC}/.MESSAGE -MAKE_ENV= KMODDIR=${PREFIX}/lib/zaptel - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= "does not build on FreeBSD \< 5.x" -.endif - -pre-everything:: - @if [ ! -f /usr/src/sys/Makefile ]; then \ - ${ECHO_MSG} ">> The zaptel port needs FreeBSD kernel source code to compile."; \ - ${ECHO_MSG} ">> Please install FreeBSD kernel source code in /usr/src/sys."; \ - ${FALSE}; \ - fi - -post-patch: - @${REINPLACE_CMD} -e "s|<getopt.h>|<unistd.h>|g" \ - ${WRKSRC}/test/ztmonitor.c ${WRKSRC}/test/zttool.c \ - ${WRKSRC}/ztcfg/ztcfg.c - -pre-su-install: - @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${PKGDIR}/pkg-message > \ - ${PKGMESSAGE} - @${SED} 's|%%PREFIX%%|${PREFIX}|g' ${FILESDIR}/zaptel.sh > \ - ${WRKDIR}/zaptel.sh.sample - @${MKDIR} ${PREFIX}/lib/zaptel - -post-install: - @${TOUCH} ${PREFIX}/lib/zaptel/linker.hints - @${INSTALL_SCRIPT} ${WRKDIR}/zaptel.sh.sample ${PREFIX}/etc/rc.d - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net/zaptel12/distinfo b/net/zaptel12/distinfo deleted file mode 100644 index 02ef95ed65e8..000000000000 --- a/net/zaptel12/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (zaptel-freebsd-0.11.tar.gz) = 0e0c967b720ec7fb64d1bbcd91a6f250 -SHA256 (zaptel-freebsd-0.11.tar.gz) = 1b36597b5a1d87f1bb8b1fc12bdba9edd4b063a3ffc937a9e684842daebaea34 -SIZE (zaptel-freebsd-0.11.tar.gz) = 457064 diff --git a/net/zaptel12/files/zaptel.sh b/net/zaptel12/files/zaptel.sh deleted file mode 100644 index 4356f95d1374..000000000000 --- a/net/zaptel12/files/zaptel.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -PREFIX=%%PREFIX%% -LIBDIR=${PREFIX}/lib/zaptel - -case "$1" in - start) - /sbin/kldload ${LIBDIR}/zaptel.ko || exit 1 - /sbin/kldload ${LIBDIR}/qozap.ko || exit 1 - /sbin/kldload ${LIBDIR}/wcfxo.ko || exit 1 - /sbin/kldload ${LIBDIR}/wcfxs.ko || exit 1 - /sbin/kldload ${LIBDIR}/wct1xxp.ko || exit 1 - /sbin/kldload ${LIBDIR}/wct4xxp.ko || exit 1 - /sbin/kldload ${LIBDIR}/wcte11xp.ko || exit 1 - ${PREFIX}/bin/ztcfg - echo -n " zaptel" - ;; - - stop) - /sbin/kldunload qozap.ko || exit 1 - /sbin/kldunload wcfxs.ko || exit 1 - /sbin/kldunload wcfxo.ko || exit 1 - /sbin/kldunload wct1xxp.ko || exit 1 - /sbin/kldunload wct4xxp.ko || exit 1 - /sbin/kldunload wcte11xp.ko || exit 1 - /sbin/kldunload zaptel.ko || exit 1 - echo -n " zaptel" - ;; - - *) - echo "" - echo "Usage: `basename $0` { start | stop }" - echo "" - exit 64 - ;; -esac diff --git a/net/zaptel12/pkg-descr b/net/zaptel12/pkg-descr deleted file mode 100644 index aaf4997bb845..000000000000 --- a/net/zaptel12/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A FreeBSD Driver for FXO, FXS, BRI and PRI Telephony Cards. - -WWW: http://www.digium.com/index.php?menu=hardware_products diff --git a/net/zaptel12/pkg-message b/net/zaptel12/pkg-message deleted file mode 100644 index ede328a91c72..000000000000 --- a/net/zaptel12/pkg-message +++ /dev/null @@ -1,28 +0,0 @@ -------------------------------------------------------------------------------- -IMPORTANT! MAKE SURE TO READ THE FOLLOWING! - -To use the driver, make a copy of %%PREFIX%%/etc/rc.d/zaptel.sh.sample -under %%PREFIX%%/etc/rc.d/zaptel.sh. - -To load the driver run (as root): - -# %%PREFIX%%/etc/rc.d/zaptel.sh start - -To unload it: - -# %%PREFIX%%/etc/rc.d/zaptel.sh stop - -It'll also load the driver automatically when the system is started. - -Report problems to Alexander Timoshenko <gonzo@portaone.com>. Please note that -it is still "work in progress" so that your bug reports are welcome and will -help to improve quality of the drivers. - -Great thanks to all companies and individuals who made this driver happen, -including but not limited to, John Todd, Chris Coleman, Alexander Timoshenko, -Porta Software Ltd, Max Khon, LF.net, Luigi Rizzo and others contributors. - -Thanks and enjoy! - --Maxim -------------------------------------------------------------------------------- diff --git a/net/zaptel12/pkg-plist b/net/zaptel12/pkg-plist deleted file mode 100644 index fb3e1b5c7628..000000000000 --- a/net/zaptel12/pkg-plist +++ /dev/null @@ -1,20 +0,0 @@ -bin/fxo_test -bin/ztcfg -bin/ztmonitor -bin/zttest -bin/zttool -etc/rc.d/zaptel.sh.sample -include/tonezone.h -include/zaptel.h -lib/libtonezone.a -lib/zaptel/linker.hints -lib/zaptel/qozap.ko -lib/zaptel/wcfxo.ko -lib/zaptel/wcfxs.ko -lib/zaptel/wct1xxp.ko -lib/zaptel/wct4xxp.ko -lib/zaptel/wcte11xp.ko -lib/zaptel/zaphfc.ko -lib/zaptel/zaptel.ko -lib/zaptel/ztdummy.ko -@dirrm lib/zaptel |