diff options
Diffstat (limited to 'net')
756 files changed, 0 insertions, 48102 deletions
diff --git a/net/AquaGatekeeper2/Makefile b/net/AquaGatekeeper2/Makefile deleted file mode 100644 index b2fe2c140f9a..000000000000 --- a/net/AquaGatekeeper2/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# New ports collection makefile for: AquaGatekeeper -# Date created: 2 November 2003 -# Whom: Eugene Grosbein <eugen@grosbein.pp.ru> -# -# $FreeBSD$ -# - -PORTNAME= AquaGatekeeper -PORTVERSION= 1.22 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= ftp://ftp.aqua.comptek.ru/pub/GateKeeper/ \ - ftp://www.kuzbass.ru/pub/FreeBSD/ports/distfiles/ -EXTRACT_SUFX= .tgz - -MAINTAINER= eugen@grosbein.pp.ru -COMMENT= Aqua H323 Gatekeeper and proxy - -WRKSRC= ${WRKDIR}/${PORTNAME} -NO_BUILD= yes -ONLY_FOR_ARCHS= amd64 i386 -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} - -NO_PACKAGE= "No commercial redistribution" -NO_CDROM= "No commercial redistribution" - -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -IS_INTERACTIVE= yes -.endif - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/AquaGatekeeper ${PREFIX}/sbin/ - @${INSTALL_SCRIPT} ${FILESDIR}/agk.sh.sample ${PREFIX}/etc/rc.d/ - @${INSTALL_DATA} ${WRKSRC}/Config/AquaGatekeeper.cfg ${PREFIX}/etc/AquaGatekeeper.cfg.sample - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/Config/Example.cfg ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @for docfile in ${WRKSRC}/Help/*; \ - do ${INSTALL_MAN} $$docfile ${DOCSDIR}; \ - done - @${MKDIR} ${DOCSDIR}/Rus - @for docfile in ${WRKSRC}/Help.Rus/*; \ - do ${INSTALL_MAN} $$docfile ${DOCSDIR}/Rus; \ - done -.endif - -post-install: - @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${SED} "s'%%PREFIX%%'${PREFIX}'" < pkg-message - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 400000 -BROKEN= "Supported only on 4.x systems and later" -.elif ${OSVERSION} >= 500000 && ${ARCH} == "i386" -LIB_DEPENDS= c.4:${PORTSDIR}/misc/compat4x -.endif - -.if ${ARCH} == "amd64" -DISTNAME= AquaGatekeeper122FreeBSDamd64Build131 -.else -DISTNAME= AquaGatekeeper122FreeBSDBuild131 -.endif - -.include <bsd.port.post.mk> diff --git a/net/AquaGatekeeper2/distinfo.amd64 b/net/AquaGatekeeper2/distinfo.amd64 deleted file mode 100644 index 903a02118719..000000000000 --- a/net/AquaGatekeeper2/distinfo.amd64 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (AquaGatekeeper122FreeBSDamd64Build131.tgz) = 3ae343325e21fd49ef71c865bc5e22dc -SIZE (AquaGatekeeper122FreeBSDamd64Build131.tgz) = 2926031 diff --git a/net/AquaGatekeeper2/distinfo.i386 b/net/AquaGatekeeper2/distinfo.i386 deleted file mode 100644 index 2f846298a151..000000000000 --- a/net/AquaGatekeeper2/distinfo.i386 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (AquaGatekeeper122FreeBSDBuild131.tgz) = e5dede37d29462641f214a5076eb4766 -SIZE (AquaGatekeeper122FreeBSDBuild131.tgz) = 3011253 diff --git a/net/AquaGatekeeper2/files/agk.sh.sample b/net/AquaGatekeeper2/files/agk.sh.sample deleted file mode 100644 index c989f61899db..000000000000 --- a/net/AquaGatekeeper2/files/agk.sh.sample +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -PREFIX=$(expr `realpath $0` : "\(/.*\)/etc/rc\.d/`basename $0`\$") -PROG=$PREFIX/sbin/AquaGatekeeper -CFG=$PREFIX/etc/agk.cfg -TIMEOUT=30 - -case "$1" in -start) - shift - su -m agk -c "[ -x $PROG -a -r $CFG ] && - echo -n ' AquaGatekeeper' && $PROG -d --configuration=$CFG $@" - ;; -stop) - shift - signal=-TERM - [ -n "$1" ] && signal="$1" - killall $signal AquaGatekeeper - [ $signal != -2 -a $signal != -INT ] && exit 0 - i=1 - while [ $i -le $TIMEOUT ] - do - ps -axc | grep -q AquaGatekeeper || break - i=$(($i+1)) - sleep 1 - done - ;; -restart) - `realpath $0` stop -INT - `realpath $0` start - ;; -*) - echo "Usage: `basename $0` {start|stop|restart}" >&2 - ;; -esac - -exit 0 diff --git a/net/AquaGatekeeper2/pkg-deinstall b/net/AquaGatekeeper2/pkg-deinstall deleted file mode 100644 index d89d859698b4..000000000000 --- a/net/AquaGatekeeper2/pkg-deinstall +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -USER=agk -GROUP=agk - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -delete_account() { - local u g - - u=$1 - g=$2 - if yesno "Do you want me to remove group \"${g}\"" y; then - pw groupdel -n ${g} - echo "Done." - fi - if yesno "Do you want me to remove user \"${u}\"" y; then - pw userdel -n ${u} - echo "Done." - fi -} - -[ "$2" = DEINSTALL ] || exit 0 - -export PATH=/bin:/usr/bin:/usr/sbin - -if ps -axc | grep -q AquaGatekeeper; then - if yesno "There are some AquaGatekeeper processes running. Shall I kill them" y - then - killall AquaGatekeeper - sleep 2 - else - echo "OK ... I hope you know what you are doing." - fi -fi - -delete_account ${USER} ${GROUP} -exit 0 diff --git a/net/AquaGatekeeper2/pkg-descr b/net/AquaGatekeeper2/pkg-descr deleted file mode 100644 index a8ba595db4a2..000000000000 --- a/net/AquaGatekeeper2/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Aqua Gatekeeper is H.323 gatekeeper and proxy by Aqua Project Group. -It is compatible with many hardware/software like Cisco H.323 gateways and -Microsoft NetMeeting 3.01 for Windows 2000 and later. - -This port presents Aqua Gatekeeper Startup Edition. -It is not a free software but may be used free of charge. -The Aqua Gatekeeper Startup Edition is limited to 30 concurrent calls. - -WWW: http://www.aqua.comptek.ru/man/voip/gatekeeper/index.htm - -- Grosbein -eugen@grosbein.pp.ru diff --git a/net/AquaGatekeeper2/pkg-install b/net/AquaGatekeeper2/pkg-install deleted file mode 100644 index 233bb70ff96a..000000000000 --- a/net/AquaGatekeeper2/pkg-install +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -USER=agk -UID=172 -GROUP=${USER} -GID=${UID} - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - echo ${answer} -} - -yesno() { - local dflt question answer - - question=$1 - dflt=$2 - while :; do - answer=$(ask "${question}" "${dflt}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -make_account() { - local u g uid gid gcos - - u=$1 - uid=$2 - g=$3 - gid=$4 - gcos=$5 - - if pw group show "${g}" >/dev/null 2>&1; then - echo "You already have a group \"${g}\", so I will use it." - else - echo "You need a group \"${g}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw groupadd -n ${g} -g ${gid} || exit - echo "Done." - else - echo "Please create it, and try again." - if ! grep -q "^${u}:" /etc/passwd; then - echo "While you're at it, please create a user \"${u}\" too," - echo "with a default group of \"${g}\"." - fi - exit 1 - fi - fi - - if pw user show "${u}" >/dev/null 2>&1; then - echo "You already have a user \"${u}\", so I will use it." - else - echo "You need a user \"${u}\"." - if which -s pw && yesno "Would you like me to create it" y; then - pw useradd -n ${u} -u ${uid} -g ${g} -h - -d /nonexistent \ - -s /nonexistent -c "${gcos}" || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi - fi -} - -[ "$2" = POST-INSTALL ] || exit 0 - -make_account ${USER} ${UID} ${GROUP} ${GID} "AquaGateKeeper" diff --git a/net/AquaGatekeeper2/pkg-message b/net/AquaGatekeeper2/pkg-message deleted file mode 100644 index 005fb0e618f2..000000000000 --- a/net/AquaGatekeeper2/pkg-message +++ /dev/null @@ -1,5 +0,0 @@ -**************************************************************************** - Please read documentation located in %%PREFIX%%/share/doc/AquaGatekeeper - You will need to write configuration file to run the Gatekeeper. - Some examples are in %%PREFIX%%/share/examples/AquaGatekeeper -**************************************************************************** diff --git a/net/AquaGatekeeper2/pkg-plist b/net/AquaGatekeeper2/pkg-plist deleted file mode 100644 index 1a4fc5ac43b0..000000000000 --- a/net/AquaGatekeeper2/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -sbin/AquaGatekeeper -etc/rc.d/agk.sh.sample -etc/AquaGatekeeper.cfg.sample -%%PORTDOCS%%%%DOCSDIR%%/AdministratorGuide.pdf -%%PORTDOCS%%%%DOCSDIR%%/AquaGatekeeper.htm -%%PORTDOCS%%%%DOCSDIR%%/CommandLineOptions.htm -%%PORTDOCS%%%%DOCSDIR%%/ConfigSyntax.htm -%%PORTDOCS%%%%DOCSDIR%%/License.rtf -%%PORTDOCS%%%%DOCSDIR%%/LicenseRus.rtf -%%PORTDOCS%%%%DOCSDIR%%/OperationPrinciples.htm -%%PORTDOCS%%%%DOCSDIR%%/RevisionHistory.htm -%%PORTDOCS%%%%DOCSDIR%%/default.css -%%PORTDOCS%%%%DOCSDIR%%/Rus/AdministratorGuideRus.pdf -%%PORTDOCS%%%%DOCSDIR%%/Rus/AquaGatekeeper.htm -%%PORTDOCS%%%%DOCSDIR%%/Rus/CommandLineOptions.htm -%%PORTDOCS%%%%DOCSDIR%%/Rus/ConfigSyntax.htm -%%PORTDOCS%%%%DOCSDIR%%/Rus/OperationPrinciples.htm -%%PORTDOCS%%%%DOCSDIR%%/Rus/RevisionHistory.htm -%%PORTDOCS%%%%DOCSDIR%%/Rus/default.css -%%EXAMPLESDIR%%/Example.cfg -%%PORTDOCS%%@dirrm %%DOCSDIR%%/Rus -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/net/amule1/Makefile b/net/amule1/Makefile deleted file mode 100644 index b265a274bd69..000000000000 --- a/net/amule1/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# New ports collection makefile for: amule -# Date created: Wed Nov 05 09:30:00 UTC 2003 -# Whom: Ganael LAPLANCHE <ganael.laplanche@martymac.com> -# -# $FreeBSD$ -# - -PORTNAME= aMule -PORTVERSION= 1.2.8 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://download.berlios.de/amule/ - -MAINTAINER= ganael.laplanche@martymac.com -COMMENT= The all-platform eMule p2p client - -LIB_DEPENDS= wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2 \ - curl.3:${PORTSDIR}/ftp/curl - -CONFLICTS= aMule-devel-* - -USE_X_PREFIX= yes -USE_GNOME= gnomehier gnomehack gnomeprefix -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --without-included-gettext \ - --with-libintl-prefix=${LOCALBASE} \ - --with-libiconv-prefix=${LOCALBASE} \ - --with-wx-config=${WX_CONFIG} \ - --with-wxbase-config=${WX_CONFIG} \ - --with-curl-config=${CURL_CONFIG} \ - --program-transform-name="s/ed2k/amule-ed2k-handler/" - -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" - -OPTIONS= OPTIMIZE "Build with optimization" on \ - STATIC "Enable static linking" off - -WX_CONFIG?= ${X11BASE}/bin/wxgtk2-2.4-config -CURL_CONFIG?= ${LOCALBASE}/bin/curl-config - -.include <bsd.port.pre.mk> - -# Configure options -.if !defined(WITHOUT_OPTIMIZE) -CONFIGURE_ARGS+= --enable-optimise -.endif - -.if defined(WITH_STATIC) -CONFIGURE_ARGS+= --enable-static -.endif - -.include <bsd.port.post.mk> diff --git a/net/amule1/distinfo b/net/amule1/distinfo deleted file mode 100644 index adfd1fb00ae2..000000000000 --- a/net/amule1/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (aMule-1.2.8.tar.gz) = c2594ab3f7a5cb6f0d2eb68c7b5f9135 -SIZE (aMule-1.2.8.tar.gz) = 2506663 diff --git a/net/amule1/files/patch-SysTray.cpp b/net/amule1/files/patch-SysTray.cpp deleted file mode 100644 index a313e720d9ea..000000000000 --- a/net/amule1/files/patch-SysTray.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/SysTray.cpp.orig Tue Jul 6 07:32:56 2004 -+++ src/SysTray.cpp Tue Jul 6 07:33:44 2004 -@@ -23,8 +23,8 @@ - #include "sys.h" - #include <libintl.h> - #include <clocale> // Needed for setlocale(3) --#include <net/if.h> // Needed for struct ifreq - #include <sys/socket.h> // -+#include <net/if.h> // Needed for struct ifreq - #include <netinet/in.h> // Needed for inet_ntoa - #include <arpa/inet.h> // - #include <sys/ioctl.h> // Needed for SIOCGIFADDR diff --git a/net/amule1/pkg-descr b/net/amule1/pkg-descr deleted file mode 100644 index afd986a280da..000000000000 --- a/net/amule1/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -aMule, the all-platform eMule p2p client - -aMule is a multiplatform fork of xMule -client using wxWindows class library. - -WWW: http://www.amule.org diff --git a/net/amule1/pkg-plist b/net/amule1/pkg-plist deleted file mode 100644 index 7000b37e9957..000000000000 --- a/net/amule1/pkg-plist +++ /dev/null @@ -1,78 +0,0 @@ -bin/amule -bin/amule-ed2k-handler -bin/amulecmd -bin/amulecmdDLG -bin/amuleweb -bin/amulewebDLG -share/gnome/pixmaps/amule.xpm -share/gnome/applications/amule.desktop -share/gnome/doc/aMule-1.2.8/ABOUT-NLS -share/gnome/doc/aMule-1.2.8/AUTHORS -share/gnome/doc/aMule-1.2.8/Changelog -share/gnome/doc/aMule-1.2.8/ED2K-Links.HOWTO -share/gnome/doc/aMule-1.2.8/INSTALL -share/gnome/doc/aMule-1.2.8/README -share/gnome/doc/aMule-1.2.8/TODO -share/gnome/doc/aMule-1.2.8/amulesig.txt -share/gnome/doc/aMule-1.2.8/eMule-Imports-Status -share/gnome/doc/aMule-1.2.8/license.txt -@dirrm share/gnome/doc/aMule-1.2.8 -share/locale/en/LC_MESSAGES/amule.mo -share/locale/es/LC_MESSAGES/amule.mo -share/locale/de/LC_MESSAGES/amule.mo -share/locale/fr/LC_MESSAGES/amule.mo -share/locale/it/LC_MESSAGES/amule.mo -share/locale/ko/LC_MESSAGES/amule.mo -share/locale/pl/LC_MESSAGES/amule.mo -share/locale/ee/LC_MESSAGES/amule.mo -share/locale/ru/LC_MESSAGES/amule.mo -share/locale/bg/LC_MESSAGES/amule.mo -share/locale/es_MX/LC_MESSAGES/amule.mo -share/locale/pt_BR/LC_MESSAGES/amule.mo -share/locale/gl/LC_MESSAGES/amule.mo -share/locale/eu/LC_MESSAGES/amule.mo -share/locale/nl/LC_MESSAGES/amule.mo -share/gnome/amuleweb/webserver/GraphCon.gif -share/gnome/amuleweb/webserver/GraphDL.gif -share/gnome/amuleweb/webserver/GraphUL.gif -share/gnome/amuleweb/webserver/add_server.gif -share/gnome/amuleweb/webserver/arrow_down.gif -share/gnome/amuleweb/webserver/arrow_right.gif -share/gnome/amuleweb/webserver/arrow_up.gif -share/gnome/amuleweb/webserver/black.gif -share/gnome/amuleweb/webserver/blue.gif -share/gnome/amuleweb/webserver/blue1.gif -share/gnome/amuleweb/webserver/blue2.gif -share/gnome/amuleweb/webserver/blue3.gif -share/gnome/amuleweb/webserver/blue4.gif -share/gnome/amuleweb/webserver/blue5.gif -share/gnome/amuleweb/webserver/blue6.gif -share/gnome/amuleweb/webserver/cp_download.gif -share/gnome/amuleweb/webserver/cp_kad.gif -share/gnome/amuleweb/webserver/cp_search.gif -share/gnome/amuleweb/webserver/cp_servers.gif -share/gnome/amuleweb/webserver/cp_settings.gif -share/gnome/amuleweb/webserver/cp_shared.gif -share/gnome/amuleweb/webserver/cp_stats.gif -share/gnome/amuleweb/webserver/emule.gif -share/gnome/amuleweb/webserver/green.gif -share/gnome/amuleweb/webserver/greenpercent.gif -share/gnome/amuleweb/webserver/l_cancel.gif -share/gnome/amuleweb/webserver/l_connect.gif -share/gnome/amuleweb/webserver/l_down.gif -share/gnome/amuleweb/webserver/l_ed2klink.gif -share/gnome/amuleweb/webserver/l_info.gif -share/gnome/amuleweb/webserver/l_pause.gif -share/gnome/amuleweb/webserver/l_resume.gif -share/gnome/amuleweb/webserver/l_up.gif -share/gnome/amuleweb/webserver/log.gif -share/gnome/amuleweb/webserver/main_bg.gif -share/gnome/amuleweb/webserver/main_top_bg.gif -share/gnome/amuleweb/webserver/red.gif -share/gnome/amuleweb/webserver/top_bar_bg.gif -share/gnome/amuleweb/webserver/top_bar_bg2.gif -share/gnome/amuleweb/webserver/transparent.gif -share/gnome/amuleweb/webserver/yellow.gif -share/gnome/amuleweb/aMule.tmpl -@dirrm share/gnome/amuleweb/webserver -@dirrm share/gnome/amuleweb diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile deleted file mode 100644 index 97b6dcea0d10..000000000000 --- a/net/asterisk-bristuff/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.0.2 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= 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 - -ONLY_FOR_ARCHS= i386 sparc64 - -BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex -RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 - -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -MAKE_ENV+= WITHOUT_H323=1 -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323:build -PLIST_SUB+= WITH_H323="" -.endif - -.if defined(WITHOUT_ZAPTEL) -MAKE_ENV+= WITHOUT_ZAPTEL=1 -PLIST_SUB+= WITH_ZAPTEL="@comment " -.else -BUILD_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -.endif - -post-install: - @${INSTALL_SCRIPT} ${FILESDIR}/asterisk.sh ${PREFIX}/etc/rc.d - -.include <bsd.port.post.mk> diff --git a/net/asterisk-bristuff/distinfo b/net/asterisk-bristuff/distinfo deleted file mode 100644 index 5fa2ddcf1403..000000000000 --- a/net/asterisk-bristuff/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (asterisk-1.0.2.tar.gz) = 58b2c912b4e7c1f0438f06eb26c4b369 -SIZE (asterisk-1.0.2.tar.gz) = 9562949 diff --git a/net/asterisk-bristuff/files/asterisk.sh b/net/asterisk-bristuff/files/asterisk.sh deleted file mode 100644 index deee10c0cbe4..000000000000 --- a/net/asterisk-bristuff/files/asterisk.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -name=asterisk -rcvar=`set_rcvar` - -command=/usr/local/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 77acd5fecf7d..000000000000 --- a/net/asterisk-bristuff/files/patch-Makefile +++ /dev/null @@ -1,412 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -44,6 +44,15 @@ - PROC=$(shell uname -m) - endif - -+ifeq (${OSARCH},FreeBSD) -+ifeq ($(PROC),sparc64) -+PROC=ultrasparc -+OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi) -+OPTIONS+=$(shell if $(CC) -mcpu=v9 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v9"; fi) -+OPTIONS+=-fomit-frame-pointerendif -+endif -+endif -+ - # Pentium Pro Optimize - #PROC=i686 - -@@ -62,10 +71,10 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the asterisk's code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - - #Include debug symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g #-pg -+#DEBUG=-g #-pg - - # If you are running a radio application, define RADIO_RELAX so that the DTMF - # will be received more reliably -@@ -90,7 +99,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 -@@ -110,23 +119,23 @@ - # Don't use together with -DBUSYDETECT_TONEONLY - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - --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 - - INCLUDE=-Iinclude -I../include --CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY - CFLAGS+=$(OPTIMIZE) - - ifneq ($(PROC),ultrasparc) -@@ -137,11 +146,8 @@ - CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) - - ifeq (${OSARCH},FreeBSD) --OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) --CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) --LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) --INCLUDE+=-I/usr/local/include --CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) -+CFLAGS+=$(PTHREAD_CFLAGS) -+LIBS+=$(PTHREAD_LIBS) - endif # FreeBSD - - ifeq (${OSARCH},NetBSD) -@@ -157,7 +163,10 @@ - #CFLAGS+=-DOLD_DSP_ROUTINES - - CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) --CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPTEL_OPTIMIZATIONS -+endif - - LIBEDIT=editline/libedit.a - -@@ -219,7 +228,7 @@ - SOLINK=-shared -Xlinker -x - endif - --CC=gcc -+CC?=gcc - INSTALL=install - - _all: all -@@ -231,7 +240,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: depend asterisk subdirs -+all: depend asterisk subdirs manpage - - editline/config.h: - cd editline && unset CFLAGS LIBS && ./configure ; \ -@@ -240,13 +249,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 -@@ -268,13 +277,10 @@ - - asterisk.o: asterisk.c build.h - --manpage: asterisk.8.gz -+manpage: asterisk.8 - --asterisk.8.gz: asterisk.sgml -- rm -f asterisk.8 -- docbook2man asterisk.sgml -- mv ./*.8 asterisk.8 -- gzip asterisk.8 -+asterisk.8: asterisk.8.gz -+ gzcat asterisk.8.gz > asterisk.8 - - ifneq ($(strip $(ASTERISKVERSION)),) - build.h: .version -@@ -292,8 +298,8 @@ - exit 1; \ - fi - --asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS) -+ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) -o muted muted.o -@@ -312,28 +318,28 @@ - $(MAKE) -C stdtime clean - - datafiles: all -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits - 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/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; \ -@@ -341,18 +347,18 @@ - done - for x in 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-*; 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 CVS ]; then \ -@@ -364,111 +370,86 @@ - fi - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/ -- install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ - 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) - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm -- rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \ -- mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- else \ -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \ -- fi -- ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- 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.gz $(DESTDIR)$(ASTMANDIR)/man8 -+ ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(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 - 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)/vm . ) -- ( 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 " +-------------------------------------------+" -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/vm . ) -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/voicemail . ) - --install: all datafiles bininstall -+install: all datafiles bininstall samples - - upgrade: all bininstall - - adsi: all -- 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: all datafiles adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ for x in configs/*.sample channels/h323/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - fi ; \ -- install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done -- echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -+ echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \ -+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \ -+ fi - 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 - 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 ; \ -@@ -483,7 +464,7 @@ - @[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) - @[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) - install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk - for x in images/*.gif; do \ - install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \ - done -@@ -503,10 +484,10 @@ - - __rpm: _version - 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 redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \ - sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \ - 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 32efb5d2b101..000000000000 --- a/net/asterisk-bristuff/files/patch-agi::Makefile +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Tue Jun 22 20:42:13 2004 -+++ agi/Makefile Tue Oct 5 21:03:40 2004 -@@ -11,15 +11,18 @@ - # 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+= - - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) $(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 diff --git a/net/asterisk-bristuff/files/patch-apps::Makefile b/net/asterisk-bristuff/files/patch-apps::Makefile deleted file mode 100644 index 00b77dfe2434..000000000000 --- a/net/asterisk-bristuff/files/patch-apps::Makefile +++ /dev/null @@ -1,49 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig Sat Sep 25 00:32:56 2004 -+++ apps/Makefile Sun Oct 10 16:20:06 2004 -@@ -40,7 +40,7 @@ - #APPS+=app_rpt.so - - APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) --APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) -+APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) - APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) - - CFLAGS+=-fPIC -@@ -65,12 +65,12 @@ - $(CC) $(SOLINK) -o $@ $< -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 - - app_voicemail.so : app_voicemail.o - ifeq ($(USE_MYSQL_VM_INTERFACE),1) -- $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz -+ $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz - else - ifeq ($(USE_POSTGRES_VM_INTERFACE),1) - $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq -@@ -80,16 +80,16 @@ - 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 $@ $< -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ $< -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) $(CFLAGS) look.c -o look -lncurses - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk-bristuff/files/patch-astman::Makefile b/net/asterisk-bristuff/files/patch-astman::Makefile deleted file mode 100644 index 2745860cdd36..000000000000 --- a/net/asterisk-bristuff/files/patch-astman::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- astman/Makefile.orig Sat Jun 26 22:25:39 2004 -+++ astman/Makefile Thu Oct 14 19:14:22 2004 -@@ -5,16 +5,16 @@ - - OSARCH=$(shell uname -s) - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I/usr/local/include -L/usr/local/lib -+CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib - endif - --TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi) -+TARGET=astman - all: depend $(TARGET) - - install: - if [ "$(TARGET)" != "none" ]; then \ - for x in $(TARGET); do \ -- install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ - done ; \ - fi - diff --git a/net/asterisk-bristuff/files/patch-cdr::Makefile b/net/asterisk-bristuff/files/patch-cdr::Makefile deleted file mode 100644 index f646d2c9a3dc..000000000000 --- a/net/asterisk-bristuff/files/patch-cdr::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Aug 31 19:33:00 2004 -+++ cdr/Makefile Thu Oct 14 19:13:38 2004 -@@ -21,7 +21,7 @@ - OSARCH=$(shell uname -s) - - ifeq (${OSARCH},FreeBSD) --SOLINK+=-L/usr/local/lib -+SOLINK+=-L$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -71,7 +71,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 e82a0299756d..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::Makefile +++ /dev/null @@ -1,90 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -57,10 +57,10 @@ - - endif - ifeq (${OSARCH},FreeBSD) --PTLIB=-lpt_FreeBSD_x86_r --H323LIB=-lh323_FreeBSD_x86_r --CHANH323LIB=-pthread --SOLINK+=-L/usr/local/lib -+PTLIB=-lpt_FreeBSD_x86_r_s -+H323LIB=-lh323_FreeBSD_x86_r_s -+CHANH323LIB= -+SOLINK+=-L$(LOCALBASE)/lib - endif - ifeq (${OSARCH},NetBSD) - PTLIB=-lpt_NetBSD_x86_r -@@ -72,8 +72,10 @@ - endif - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so) -+ifndef WITHOUT_H323 -+CHANNEL_LIBS+=chan_h323.so -+endif - - CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations - CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -@@ -84,7 +86,7 @@ - ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") - ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") -+CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include") - CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) - CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") - -@@ -107,7 +109,7 @@ - ZAPDIR=/usr/lib - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so") - - CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) - -@@ -156,6 +158,8 @@ - chan_oss.so: chan_oss.o - $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio - endif -+chan_oss.so: chan_oss.o -+ $(CC) $(SOLINK) -o $@ chan_oss.o - - chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o - ifeq ($(USE_MYSQL_FRIENDS),1) -@@ -175,7 +179,7 @@ - $(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c - - chan_zap.so: chan_zap.o -- $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -ltonezone -+ $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone - - chan_sip.so: chan_sip.o - ifeq ($(USE_SIP_MYSQL_FRIENDS),1) -@@ -199,15 +203,17 @@ - chan_vpb.so: chan_vpb.o - $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl - --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 -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r - -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - - #chan_modem.so : chan_modem.o - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi - - 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 de2ed3978663..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c 2004/10/10 13:00:17 1.1 -+++ channels/chan_h323.c 2004/10/10 13:00:39 -@@ -26,7 +26,7 @@ - * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $ - */ - -- -+#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 521d6a46d256..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,120 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig -+++ channels/chan_sip.c -@@ -139,7 +139,7 @@ - - static char default_language[MAX_LANGUAGE] = ""; - --static char default_callerid[AST_MAX_EXTENSION] = "asterisk"; -+static char default_callerid[AST_MAX_EXTENSION] = "Unknown"; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; - -@@ -244,6 +244,7 @@ - struct sip_route { - struct sip_route *next; - char hop[0]; -+ int lr; - }; - - struct sip_history { -@@ -4573,6 +4574,10 @@ - /* Make a struct route */ - thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); - if (thishop) { -+ if (strnstr(rr, ";lr", len) != NULL) -+ thishop->lr = 1; -+ else -+ thishop->lr = 0; - strncpy(thishop->hop, rr, len); /* safe */ - thishop->hop[len] = '\0'; - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); -@@ -4596,31 +4601,41 @@ - rr += len+1; - } - } -- /* 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, ">"); -- } else { -- /* No <> - just take the lot */ -- c = contact; len = strlen(contact); -- } -- thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ /* 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) { -- strncpy(thishop->hop, c, len); /* safe */ -- thishop->hop[len] = '\0'; -- 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, ">"); -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; len = strlen(contact); -+ } -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ if (thishop) { -+ strncpy(thishop->hop, c, len); /* safe */ -+ thishop->hop[len] = '\0'; -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - /* Store as new route */ -@@ -7197,7 +7212,11 @@ - /* Get destination right away */ - 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) { -@@ -7225,7 +7244,6 @@ - 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); 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 965a643bb687..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c -+++ channels/chan_zap.c -@@ -42,7 +42,9 @@ - #include <sys/signal.h> - #include <errno.h> - #include <stdlib.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <unistd.h> - #include <sys/ioctl.h> - #ifdef __linux__ diff --git a/net/asterisk-bristuff/files/patch-channels::h323::Makefile b/net/asterisk-bristuff/files/patch-channels::h323::Makefile deleted file mode 100644 index bc34083e2ff3..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::h323::Makefile +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/Makefile.orig Tue Aug 31 16:32:11 2004 -+++ channels/h323/Makefile Sun Oct 10 15:25:42 2004 -@@ -53,7 +53,7 @@ - LIBS+=-lpthread - endif - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS += -pthread -+CFLAGS += $(PTHREAD_LIBS) - endif - CFLAGS += -D_REENTRANT -D_GNU_SOURCE - CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS -@@ -74,19 +74,19 @@ - - - ast_h323.o: ast_h323.cpp -- $(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $< -+ $(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $< - - libchanh323.a: ast_h323.o - ar cr libchanh323.a ast_h323.o - - chan_h323.so: -- $(CXX) -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB) - - chan_h323_d.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB) - - chan_h323_s.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB) - clean: - rm -f *.o *.so core.* libchanh323.a - 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 6cfae1ec5d05..000000000000 --- a/net/asterisk-bristuff/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig -+++ channels/h323/ast_h323.cpp -@@ -722,7 +722,7 @@ - if (h323debug) { - cout << " -- Sending user input tone (" << tone << ") to remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - H323Connection::SendUserInputTone(tone, duration); - } - -@@ -732,18 +732,20 @@ - if (h323debug) { - cout << " -- Received user input tone (" << tone << ") from remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - } - H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp); - } - - void MyH323Connection::OnUserInputString(const PString &value) - { -+ char val; - if (mode == H323_DTMF_RFC2833) { - if (h323debug) { - cout << " -- Received user input string (" << value << ") from remote." << endl; - } -- on_send_digit(GetCallReference(), value[0]); -+ val = value[0]; -+ on_send_digit(GetCallReference(), &val); - } - } - diff --git a/net/asterisk-bristuff/files/patch-codecs::Makefile b/net/asterisk-bristuff/files/patch-codecs::Makefile deleted file mode 100644 index de9aff4c34fe..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::Makefile +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Mon Jul 19 18:52:57 2004 -+++ codecs/Makefile Sun Oct 10 15:28:35 2004 -@@ -17,23 +17,23 @@ - # g723.1b) - # - #MODG723=codec_g723_1.so codec_g723_1b.so --MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") --MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") --MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") --MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") -+MODG723=codec_g723_1_dummy.so -+MODG729=codec_g729_dummy.so -+MODSPEEX=codec_speex.so -+MODILBC=codec_ilbc.so - CFLAGS+=-fPIC --CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") -+CFLAGS+=-I$(LOCALBASE)/include - - LIBG723=g723.1/libg723.a - LIBG723B=g723.1b/libg723b.a - LIBGSM=gsm/lib/libgsm.a - LIBGSMT=gsm/lib/libgsm.a - LIBLPC10=lpc10/liblpc10.a --LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib") -+LIBSPEEX=-L$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - LIBILBC=ilbc/libilbc.a - --CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ - codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ - codec_g726.so - -@@ -91,7 +91,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::codec_g723_1_dummy.c b/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c deleted file mode 100644 index 3ce9571013ec..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::codec_g723_1_dummy.c +++ /dev/null @@ -1,314 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g723_1_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g723_1_dummy.c Sun Oct 10 16:07:05 2004 -@@ -0,0 +1,308 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.723.1 (dummy!) -+ * -+ * The G.723.1 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g723_ex.h" -+#include "g723_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator"; -+ -+struct g723_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g723_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g723tolin_new() -+{ -+ struct g723_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog723_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g723_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g723_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g723_ex; -+ return &f; -+} -+ -+static struct ast_frame *g723tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G723_1; -+ f.datalen = sizeof(g723_slin_ex); -+ /* All frames are 30 ms long */ -+ f.samples = 30; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g723_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog723_new() -+{ -+ struct g723_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+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 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ int len = 0; -+ int res; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ res = g723_len(((unsigned char *)f->data + len)[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Invalid data\n"); -+ return -1; -+ } -+ if (res + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 480 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 480); -+ tmp->tail+=480; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += res; -+ } -+ return 0; -+} -+ -+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 480) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G723_1; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 480) { -+ /* Encode a frame of data */ -+ if (cnt + 24 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 24); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 30; -+ cnt += 24; -+ tmp->tail -= 480; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g723_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g723tolin = -+ { "g723tolin_dummy", -+ AST_FORMAT_G723_1, AST_FORMAT_SLINEAR, -+ g723tolin_new, -+ g723tolin_framein, -+ g723tolin_frameout, -+ g723_destroy, -+ g723tolin_sample -+ }; -+ -+static struct ast_translator lintog723 = -+ { "lintog723_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G723_1, -+ lintog723_new, -+ lintog723_framein, -+ lintog723_frameout, -+ g723_destroy, -+ lintog723_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog723); -+ if (!res) -+ res = ast_unregister_translator(&g723tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g723tolin); -+ if (!res) -+ res=ast_register_translator(&lintog723); -+ else -+ ast_unregister_translator(&g723tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c b/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c deleted file mode 100644 index 9fcc7b19ca35..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::codec_g729_dummy.c +++ /dev/null @@ -1,281 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g729_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g729_dummy.c Sun Oct 10 16:07:12 2004 -@@ -0,0 +1,275 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.729 (dummy!) -+ * -+ * The G.729 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g729_ex.h" -+#include "g729_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.729/PCM16 Codec Translator"; -+ -+struct g729_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g729_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g729tolin_new() -+{ -+ struct g729_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog729_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g729_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g729_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g729_ex; -+ return &f; -+} -+ -+static struct ast_frame *g729tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G729A; -+ f.datalen = sizeof(g729_slin_ex); -+ /* All frames are 10 ms long */ -+ f.samples = 10; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g729_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog729_new() -+{ -+ struct g729_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ int len = 0; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ if (10 + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 160 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 160); -+ tmp->tail+=160; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += 10; -+ } -+ return 0; -+} -+ -+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 160) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G729A; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 160) { -+ /* Encode a frame of data */ -+ if (cnt + 10 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 10); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 10; -+ cnt += 10; -+ tmp->tail -= 160; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g729_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g729tolin = -+ { "g729tolin_dummy", -+ AST_FORMAT_G729A, AST_FORMAT_SLINEAR, -+ g729tolin_new, -+ g729tolin_framein, -+ g729tolin_frameout, -+ g729_destroy, -+ g729tolin_sample -+ }; -+ -+static struct ast_translator lintog729 = -+ { "lintog729_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G729A, -+ lintog729_new, -+ lintog729_framein, -+ lintog729_frameout, -+ g729_destroy, -+ lintog729_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog729); -+ if (!res) -+ res = ast_unregister_translator(&g729tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g729tolin); -+ if (!res) -+ res=ast_register_translator(&lintog729); -+ else -+ ast_unregister_translator(&g729tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk-bristuff/files/patch-codecs::g729_slin_ex.h b/net/asterisk-bristuff/files/patch-codecs::g729_slin_ex.h deleted file mode 100644 index 44e60f2de848..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::g729_slin_ex.h +++ /dev/null @@ -1,20 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/g729_slin_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,14 @@ -+/* -+ * g729_slin_ex.h -- -+ * -+ * 8-bit G.729 data, 10 milliseconds worth at 8 kHz. -+ * -+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static unsigned char g729_slin_ex[] = { -+120,82,175,64,0,250,219,0,7,214 -+}; 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 7770e07550a4..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Sun Apr 27 21:13:11 2003 -+++ codecs/ilbc/Makefile Fri Jan 30 01:47:34 2004 -@@ -1,4 +1,4 @@ --CFLAGS+= -fPIC -O3 -+CFLAGS+= -fPIC - LIB=libilbc.a - - OBJS= anaFilter.o iCBSearch.o packing.o \ diff --git a/net/asterisk-bristuff/files/patch-codecs::slin_g729_ex.h b/net/asterisk-bristuff/files/patch-codecs::slin_g729_ex.h deleted file mode 100644 index e1236d2498dc..000000000000 --- a/net/asterisk-bristuff/files/patch-codecs::slin_g729_ex.h +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/slin_g729_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,25 @@ -+/* -+ * slin_g729_ex.h -- -+ * -+ * Signed 16-bit audio data, 10 milliseconds worth at 8 kHz. -+ * -+ * Source: g723.example -+ * -+ * Copyright (C) 2001, Linux Support Services, Inc. -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static signed short slin_g729_ex[] = { -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -+}; diff --git a/net/asterisk-bristuff/files/patch-db.c b/net/asterisk-bristuff/files/patch-db.c deleted file mode 100644 index 6c2bdcd443c8..000000000000 --- a/net/asterisk-bristuff/files/patch-db.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jul 9 13:08:09 2004 -+++ db.c Sun Oct 10 15:32:33 2004 -@@ -33,7 +33,7 @@ - #include <asterisk/cli.h> - #include <asterisk/utils.h> - #include <asterisk/lock.h> --#include "db1-ast/include/db.h" -+#include <db.h> - #include "asterisk.h" - #include "astconf.h" - 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-formats::Makefile b/net/asterisk-bristuff/files/patch-formats::Makefile deleted file mode 100644 index dacfd7b08303..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Tue Nov 4 04:40:09 2003 -+++ formats/Makefile Fri Jan 30 01:47:34 2004 -@@ -18,7 +18,7 @@ - # - # G723 simple frame is depricated - # --#FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - GSMLIB=../codecs/gsm/lib/libgsm.a - -@@ -40,7 +40,7 @@ - $(CC) $(SOLINK) -o $@ $< -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 fb5eb12833dc..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,351 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g723_1.c.orig Sun Oct 10 15:59:18 2004 -+++ formats/format_g723_1.c Sun Oct 10 16:05:05 2004 -@@ -0,0 +1,345 @@ -+/* -+ * 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 <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 <stdio.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 */ -+ int fd; /* 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(int fd) -+{ -+ /* 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->fd = fd; -+ 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(int fd, 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->fd = fd; -+ 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(); -+ close(s->fd); -+ 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 = read(s->fd, s->g723, 1)) != 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 = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != 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 = write(fs->fd, f->data, f->datalen)) != 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 ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ 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 (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 && lseek(fs->fd, soffset, SEEK_SET) != soffset) { -+ 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(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 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 = lseek(fs->fd, 0, SEEK_CUR); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 (lseek(fs->fd, offset, SEEK_SET) != offset) { -+ 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 a144d1b0f6bf..000000000000 --- a/net/asterisk-bristuff/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Wed Jan 28 23:32:48 2004 -+++ formats/format_g729.c Thu Feb 19 01:03:30 2004 -@@ -45,7 +45,7 @@ - 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 */ - }; - - -@@ -126,11 +126,11 @@ - 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 = read(s->fd, s->g729, 20)) != 20) { -+ if ((res = read(s->fd, s->g729, 10)) != 10) { - if (res) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -174,7 +174,7 @@ - cur = lseek(fs->fd, 0, SEEK_CUR); - max = lseek(fs->fd, 0, SEEK_END); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -202,7 +202,7 @@ - { - off_t offset; - offset = lseek(fs->fd, 0, SEEK_CUR); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() 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 dca6672c389a..000000000000 --- a/net/asterisk-bristuff/files/patch-pbx::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig Sun Oct 26 20:50:49 2003 -+++ pbx/Makefile Fri Jan 30 01:47:34 2004 -@@ -16,7 +16,7 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate --PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - -@@ -62,7 +62,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 3377b4aa1c8e..000000000000 --- a/net/asterisk-bristuff/files/patch-res::Makefile +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile.orig -+++ res/Makefile -@@ -21,7 +21,10 @@ - - CFLAGS+= - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPATA_MOH -+endif - # - # Work around buggy RedHat 9.0 - # -@@ -34,7 +37,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 - - res_crypto.so: res_crypto.o - $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS) diff --git a/net/asterisk-bristuff/files/patch-rtp.c b/net/asterisk-bristuff/files/patch-rtp.c deleted file mode 100644 index 06289f357208..000000000000 --- a/net/asterisk-bristuff/files/patch-rtp.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Sat Sep 18 16:56:28 2004 -+++ rtp.c Sun Oct 10 15:57:22 2004 -@@ -127,7 +127,7 @@ - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; -@@ -841,8 +841,10 @@ - /* Must be an even port number by RTP spec */ - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - 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)))) - break; 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 d503a8741743..000000000000 --- a/net/asterisk-bristuff/pkg-plist +++ /dev/null @@ -1,642 +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_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/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/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/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi -etc/asterisk/h323.conf-dist -@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.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/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_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi -etc/asterisk/res_config_odbc.conf-dist -@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.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/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 -etc/rc.d/asterisk.sh -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/astosp.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/channel_pvt.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/config.h -include/asterisk/config_pvt.h -include/asterisk/crypto.h -include/asterisk/cvsid.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dsp.h -include/asterisk/enum.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/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/options.h -include/asterisk/pbx.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/srv.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/utils.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_controlplayback.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.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_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_intercom.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_qcall.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_record.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_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_striplsd.so -lib/asterisk/modules/app_substring.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 -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_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_manager.so -lib/asterisk/modules/chan_agent.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_modem.so -lib/asterisk/modules/chan_modem_aopen.so -lib/asterisk/modules/chan_modem_bestdata.so -lib/asterisk/modules/chan_modem_i4l.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_g723_1_dummy.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_g729_dummy.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_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/pbx_config.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/pbx_wilcalu.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.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_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/safe_asterisk -share/asterisk/agi-bin/agi-test.agi -share/asterisk/agi-bin/eagi-sphinx-test -share/asterisk/agi-bin/eagi-test -share/asterisk/firmware/iax/iaxy.bin -share/asterisk/images/asterisk-intro.jpg -share/asterisk/keys/freeworlddialup.pub -share/asterisk/keys/iaxtel.pub -share/asterisk/mohmp3/fpm-calm-river.mp3 -share/asterisk/mohmp3/fpm-sunshine.mp3 -share/asterisk/mohmp3/fpm-world-mix.mp3 -share/asterisk/sounds/agent-alreadyon.gsm -share/asterisk/sounds/agent-incorrect.gsm -share/asterisk/sounds/agent-loggedoff.gsm -share/asterisk/sounds/agent-loginok.gsm -share/asterisk/sounds/agent-newlocation.gsm -share/asterisk/sounds/agent-pass.gsm -share/asterisk/sounds/agent-user.gsm -share/asterisk/sounds/auth-incorrect.gsm -share/asterisk/sounds/auth-thankyou.gsm -share/asterisk/sounds/beep.gsm -share/asterisk/sounds/conf-adminmenu.gsm -share/asterisk/sounds/conf-enteringno.gsm -share/asterisk/sounds/conf-errormenu.gsm -share/asterisk/sounds/conf-getchannel.gsm -share/asterisk/sounds/conf-getconfno.gsm -share/asterisk/sounds/conf-getpin.gsm -share/asterisk/sounds/conf-invalid.gsm -share/asterisk/sounds/conf-invalidpin.gsm -share/asterisk/sounds/conf-kicked.gsm -share/asterisk/sounds/conf-locked.gsm -share/asterisk/sounds/conf-lockednow.gsm -share/asterisk/sounds/conf-muted.gsm -share/asterisk/sounds/conf-noempty.gsm -share/asterisk/sounds/conf-onlyperson.gsm -share/asterisk/sounds/conf-unlockednow.gsm -share/asterisk/sounds/conf-unmuted.gsm -share/asterisk/sounds/conf-usermenu.gsm -share/asterisk/sounds/demo-abouttotry.gsm -share/asterisk/sounds/demo-congrats.gsm -share/asterisk/sounds/demo-echodone.gsm -share/asterisk/sounds/demo-echotest.gsm -share/asterisk/sounds/demo-enterkeywords.gsm -share/asterisk/sounds/demo-instruct.gsm -share/asterisk/sounds/demo-moreinfo.gsm -share/asterisk/sounds/demo-nogo.gsm -share/asterisk/sounds/demo-nomatch.gsm -share/asterisk/sounds/demo-thanks.gsm -share/asterisk/sounds/digits/0.gsm -share/asterisk/sounds/digits/1.gsm -share/asterisk/sounds/digits/10.gsm -share/asterisk/sounds/digits/11.gsm -share/asterisk/sounds/digits/12.gsm -share/asterisk/sounds/digits/13.gsm -share/asterisk/sounds/digits/14.gsm -share/asterisk/sounds/digits/15.gsm -share/asterisk/sounds/digits/16.gsm -share/asterisk/sounds/digits/17.gsm -share/asterisk/sounds/digits/18.gsm -share/asterisk/sounds/digits/19.gsm -share/asterisk/sounds/digits/2.gsm -share/asterisk/sounds/digits/20.gsm -share/asterisk/sounds/digits/3.gsm -share/asterisk/sounds/digits/30.gsm -share/asterisk/sounds/digits/4.gsm -share/asterisk/sounds/digits/40.gsm -share/asterisk/sounds/digits/5.gsm -share/asterisk/sounds/digits/50.gsm -share/asterisk/sounds/digits/6.gsm -share/asterisk/sounds/digits/60.gsm -share/asterisk/sounds/digits/7.gsm -share/asterisk/sounds/digits/70.gsm -share/asterisk/sounds/digits/8.gsm -share/asterisk/sounds/digits/80.gsm -share/asterisk/sounds/digits/9.gsm -share/asterisk/sounds/digits/90.gsm -share/asterisk/sounds/digits/a-m.gsm -share/asterisk/sounds/digits/at.gsm -share/asterisk/sounds/digits/day-0.gsm -share/asterisk/sounds/digits/day-1.gsm -share/asterisk/sounds/digits/day-2.gsm -share/asterisk/sounds/digits/day-3.gsm -share/asterisk/sounds/digits/day-4.gsm -share/asterisk/sounds/digits/day-5.gsm -share/asterisk/sounds/digits/day-6.gsm -share/asterisk/sounds/digits/dollars.gsm -share/asterisk/sounds/digits/h-1.gsm -share/asterisk/sounds/digits/h-10.gsm -share/asterisk/sounds/digits/h-11.gsm -share/asterisk/sounds/digits/h-12.gsm -share/asterisk/sounds/digits/h-13.gsm -share/asterisk/sounds/digits/h-14.gsm -share/asterisk/sounds/digits/h-15.gsm -share/asterisk/sounds/digits/h-16.gsm -share/asterisk/sounds/digits/h-17.gsm -share/asterisk/sounds/digits/h-18.gsm -share/asterisk/sounds/digits/h-19.gsm -share/asterisk/sounds/digits/h-2.gsm -share/asterisk/sounds/digits/h-20.gsm -share/asterisk/sounds/digits/h-3.gsm -share/asterisk/sounds/digits/h-30.gsm -share/asterisk/sounds/digits/h-4.gsm -share/asterisk/sounds/digits/h-5.gsm -share/asterisk/sounds/digits/h-6.gsm -share/asterisk/sounds/digits/h-7.gsm -share/asterisk/sounds/digits/h-8.gsm -share/asterisk/sounds/digits/h-9.gsm -share/asterisk/sounds/digits/hundred.gsm -share/asterisk/sounds/digits/million.gsm -share/asterisk/sounds/digits/mon-0.gsm -share/asterisk/sounds/digits/mon-1.gsm -share/asterisk/sounds/digits/mon-10.gsm -share/asterisk/sounds/digits/mon-11.gsm -share/asterisk/sounds/digits/mon-2.gsm -share/asterisk/sounds/digits/mon-3.gsm -share/asterisk/sounds/digits/mon-4.gsm -share/asterisk/sounds/digits/mon-5.gsm -share/asterisk/sounds/digits/mon-6.gsm -share/asterisk/sounds/digits/mon-7.gsm -share/asterisk/sounds/digits/mon-8.gsm -share/asterisk/sounds/digits/mon-9.gsm -share/asterisk/sounds/digits/oclock.gsm -share/asterisk/sounds/digits/oh.gsm -share/asterisk/sounds/digits/p-m.gsm -share/asterisk/sounds/digits/pound.gsm -share/asterisk/sounds/digits/star.gsm -share/asterisk/sounds/digits/thousand.gsm -share/asterisk/sounds/digits/today.gsm -share/asterisk/sounds/digits/tomorrow.gsm -share/asterisk/sounds/digits/yesterday.gsm -share/asterisk/sounds/dir-instr.gsm -share/asterisk/sounds/dir-intro.gsm -share/asterisk/sounds/dir-intro-fn.gsm -share/asterisk/sounds/dir-nomatch.gsm -share/asterisk/sounds/dir-nomore.gsm -share/asterisk/sounds/invalid.gsm -share/asterisk/sounds/letters/a.gsm -share/asterisk/sounds/letters/at.gsm -share/asterisk/sounds/letters/b.gsm -share/asterisk/sounds/letters/c.gsm -share/asterisk/sounds/letters/d.gsm -share/asterisk/sounds/letters/dash.gsm -share/asterisk/sounds/letters/dollar.gsm -share/asterisk/sounds/letters/dot.gsm -share/asterisk/sounds/letters/e.gsm -share/asterisk/sounds/letters/equals.gsm -share/asterisk/sounds/letters/exclaimation-point.gsm -share/asterisk/sounds/letters/f.gsm -share/asterisk/sounds/letters/g.gsm -share/asterisk/sounds/letters/h.gsm -share/asterisk/sounds/letters/i.gsm -share/asterisk/sounds/letters/j.gsm -share/asterisk/sounds/letters/k.gsm -share/asterisk/sounds/letters/l.gsm -share/asterisk/sounds/letters/m.gsm -share/asterisk/sounds/letters/n.gsm -share/asterisk/sounds/letters/o.gsm -share/asterisk/sounds/letters/p.gsm -share/asterisk/sounds/letters/plus.gsm -share/asterisk/sounds/letters/q.gsm -share/asterisk/sounds/letters/r.gsm -share/asterisk/sounds/letters/s.gsm -share/asterisk/sounds/letters/slash.gsm -share/asterisk/sounds/letters/space.gsm -share/asterisk/sounds/letters/t.gsm -share/asterisk/sounds/letters/u.gsm -share/asterisk/sounds/letters/v.gsm -share/asterisk/sounds/letters/w.gsm -share/asterisk/sounds/letters/x.gsm -share/asterisk/sounds/letters/y.gsm -share/asterisk/sounds/letters/z.gsm -share/asterisk/sounds/letters/zed.gsm -share/asterisk/sounds/pbx-invalid.gsm -share/asterisk/sounds/pbx-invalidpark.gsm -share/asterisk/sounds/pbx-transfer.gsm -share/asterisk/sounds/phonetic/9_p.gsm -share/asterisk/sounds/phonetic/a_p.gsm -share/asterisk/sounds/phonetic/b_p.gsm -share/asterisk/sounds/phonetic/c_p.gsm -share/asterisk/sounds/phonetic/d_p.gsm -share/asterisk/sounds/phonetic/e_p.gsm -share/asterisk/sounds/phonetic/f_p.gsm -share/asterisk/sounds/phonetic/g_p.gsm -share/asterisk/sounds/phonetic/h_p.gsm -share/asterisk/sounds/phonetic/i_p.gsm -share/asterisk/sounds/phonetic/j_p.gsm -share/asterisk/sounds/phonetic/k_p.gsm -share/asterisk/sounds/phonetic/l_p.gsm -share/asterisk/sounds/phonetic/m_p.gsm -share/asterisk/sounds/phonetic/n_p.gsm -share/asterisk/sounds/phonetic/o_p.gsm -share/asterisk/sounds/phonetic/p_p.gsm -share/asterisk/sounds/phonetic/q_p.gsm -share/asterisk/sounds/phonetic/r_p.gsm -share/asterisk/sounds/phonetic/s_p.gsm -share/asterisk/sounds/phonetic/t_p.gsm -share/asterisk/sounds/phonetic/u_p.gsm -share/asterisk/sounds/phonetic/v_p.gsm -share/asterisk/sounds/phonetic/w_p.gsm -share/asterisk/sounds/phonetic/x_p.gsm -share/asterisk/sounds/phonetic/y_p.gsm -share/asterisk/sounds/phonetic/z_p.gsm -share/asterisk/sounds/privacy-incorrect.gsm -share/asterisk/sounds/privacy-prompt.gsm -share/asterisk/sounds/privacy-thankyou.gsm -share/asterisk/sounds/privacy-unident.gsm -share/asterisk/sounds/queue-callswaiting.gsm -share/asterisk/sounds/queue-holdtime.gsm -share/asterisk/sounds/queue-less-than.gsm -share/asterisk/sounds/queue-minutes.gsm -share/asterisk/sounds/queue-seconds.gsm -share/asterisk/sounds/queue-thankyou.gsm -share/asterisk/sounds/queue-thereare.gsm -share/asterisk/sounds/queue-youarenext.gsm -share/asterisk/sounds/ss-noservice.gsm -share/asterisk/sounds/transfer.gsm -share/asterisk/sounds/tt-allbusy.gsm -share/asterisk/sounds/tt-monkeys.gsm -share/asterisk/sounds/tt-monkeysintro.gsm -share/asterisk/sounds/tt-somethingwrong.gsm -share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm -share/asterisk/sounds/vm-Cust1.gsm -share/asterisk/sounds/vm-Cust2.gsm -share/asterisk/sounds/vm-Cust3.gsm -share/asterisk/sounds/vm-Cust4.gsm -share/asterisk/sounds/vm-Cust5.gsm -share/asterisk/sounds/vm-Family.gsm -share/asterisk/sounds/vm-Friends.gsm -share/asterisk/sounds/vm-INBOX.gsm -share/asterisk/sounds/vm-Old.gsm -share/asterisk/sounds/vm-Work.gsm -share/asterisk/sounds/vm-advopts.gsm -share/asterisk/sounds/vm-and.gsm -share/asterisk/sounds/vm-calldiffnum.gsm -share/asterisk/sounds/vm-changeto.gsm -share/asterisk/sounds/vm-delete.gsm -share/asterisk/sounds/vm-deleted.gsm -share/asterisk/sounds/vm-dialout.gsm -share/asterisk/sounds/vm-enter-num-to-call.gsm -share/asterisk/sounds/vm-extension.gsm -share/asterisk/sounds/vm-first.gsm -share/asterisk/sounds/vm-for.gsm -share/asterisk/sounds/vm-forwardoptions.gsm -share/asterisk/sounds/vm-from-extension.gsm -share/asterisk/sounds/vm-from-phonenumber.gsm -share/asterisk/sounds/vm-from.gsm -share/asterisk/sounds/vm-goodbye.gsm -share/asterisk/sounds/vm-helpexit.gsm -share/asterisk/sounds/vm-incorrect.gsm -share/asterisk/sounds/vm-incorrect-mailbox.gsm -share/asterisk/sounds/vm-instructions.gsm -share/asterisk/sounds/vm-intro.gsm -share/asterisk/sounds/vm-isonphone.gsm -share/asterisk/sounds/vm-isunavail.gsm -share/asterisk/sounds/vm-last.gsm -share/asterisk/sounds/vm-leavemsg.gsm -share/asterisk/sounds/vm-login.gsm -share/asterisk/sounds/vm-mailboxfull.gsm -share/asterisk/sounds/vm-message.gsm -share/asterisk/sounds/vm-messages.gsm -share/asterisk/sounds/vm-mismatch.gsm -share/asterisk/sounds/vm-msginstruct.gsm -share/asterisk/sounds/vm-msgsaved.gsm -share/asterisk/sounds/vm-newpassword.gsm -share/asterisk/sounds/vm-next.gsm -share/asterisk/sounds/vm-no.gsm -share/asterisk/sounds/vm-nobodyavail.gsm -share/asterisk/sounds/vm-nobox.gsm -share/asterisk/sounds/vm-nomore.gsm -share/asterisk/sounds/vm-nonumber.gsm -share/asterisk/sounds/vm-num-i-have.gsm -share/asterisk/sounds/vm-onefor.gsm -share/asterisk/sounds/vm-options.gsm -share/asterisk/sounds/vm-opts.gsm -share/asterisk/sounds/vm-passchanged.gsm -share/asterisk/sounds/vm-password.gsm -share/asterisk/sounds/vm-press.gsm -share/asterisk/sounds/vm-prev.gsm -share/asterisk/sounds/vm-reachoper.gsm -share/asterisk/sounds/vm-rec-busy.gsm -share/asterisk/sounds/vm-rec-name.gsm -share/asterisk/sounds/vm-rec-unv.gsm -share/asterisk/sounds/vm-received.gsm -share/asterisk/sounds/vm-reenterpassword.gsm -share/asterisk/sounds/vm-repeat.gsm -share/asterisk/sounds/vm-review.gsm -share/asterisk/sounds/vm-saved.gsm -share/asterisk/sounds/vm-savedto.gsm -share/asterisk/sounds/vm-savefolder.gsm -share/asterisk/sounds/vm-savemessage.gsm -share/asterisk/sounds/vm-sorry.gsm -share/asterisk/sounds/vm-star-cancel.gsm -share/asterisk/sounds/vm-starmain.gsm -share/asterisk/sounds/vm-then-pound.gsm -share/asterisk/sounds/vm-theperson.gsm -share/asterisk/sounds/vm-tocallback.gsm -share/asterisk/sounds/vm-tocallnum.gsm -share/asterisk/sounds/vm-tocancel.gsm -share/asterisk/sounds/vm-tocancelmsg.gsm -share/asterisk/sounds/vm-toenternumber.gsm -share/asterisk/sounds/vm-toforward.gsm -share/asterisk/sounds/vm-tohearenv.gsm -share/asterisk/sounds/vm-tomakecall.gsm -share/asterisk/sounds/vm-tooshort.gsm -share/asterisk/sounds/vm-toreply.gsm -share/asterisk/sounds/vm-torerecord.gsm -share/asterisk/sounds/vm-undelete.gsm -share/asterisk/sounds/vm-undeleted.gsm -share/asterisk/sounds/vm-unknown-caller.gsm -share/asterisk/sounds/vm-whichbox.gsm -share/asterisk/sounds/vm-youhave.gsm -share/asterisk/sounds/voicemail -@dirrm share/asterisk/sounds/phonetic -@dirrm share/asterisk/sounds/letters -@dirrm share/asterisk/sounds/digits -@dirrm share/asterisk/sounds -@dirrm share/asterisk/mohmp3 -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/share/asterisk/astdb -@cwd /var -spool/asterisk/vm -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/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 diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile deleted file mode 100644 index 97b6dcea0d10..000000000000 --- a/net/asterisk-devel/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.0.2 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= 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 - -ONLY_FOR_ARCHS= i386 sparc64 - -BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex -RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 - -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -MAKE_ENV+= WITHOUT_H323=1 -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323:build -PLIST_SUB+= WITH_H323="" -.endif - -.if defined(WITHOUT_ZAPTEL) -MAKE_ENV+= WITHOUT_ZAPTEL=1 -PLIST_SUB+= WITH_ZAPTEL="@comment " -.else -BUILD_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -.endif - -post-install: - @${INSTALL_SCRIPT} ${FILESDIR}/asterisk.sh ${PREFIX}/etc/rc.d - -.include <bsd.port.post.mk> diff --git a/net/asterisk-devel/distinfo b/net/asterisk-devel/distinfo deleted file mode 100644 index 5fa2ddcf1403..000000000000 --- a/net/asterisk-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (asterisk-1.0.2.tar.gz) = 58b2c912b4e7c1f0438f06eb26c4b369 -SIZE (asterisk-1.0.2.tar.gz) = 9562949 diff --git a/net/asterisk-devel/files/asterisk.sh b/net/asterisk-devel/files/asterisk.sh deleted file mode 100644 index deee10c0cbe4..000000000000 --- a/net/asterisk-devel/files/asterisk.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -name=asterisk -rcvar=`set_rcvar` - -command=/usr/local/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-devel/files/patch-Makefile b/net/asterisk-devel/files/patch-Makefile deleted file mode 100644 index 77acd5fecf7d..000000000000 --- a/net/asterisk-devel/files/patch-Makefile +++ /dev/null @@ -1,412 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -44,6 +44,15 @@ - PROC=$(shell uname -m) - endif - -+ifeq (${OSARCH},FreeBSD) -+ifeq ($(PROC),sparc64) -+PROC=ultrasparc -+OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi) -+OPTIONS+=$(shell if $(CC) -mcpu=v9 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v9"; fi) -+OPTIONS+=-fomit-frame-pointerendif -+endif -+endif -+ - # Pentium Pro Optimize - #PROC=i686 - -@@ -62,10 +71,10 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the asterisk's code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - - #Include debug symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g #-pg -+#DEBUG=-g #-pg - - # If you are running a radio application, define RADIO_RELAX so that the DTMF - # will be received more reliably -@@ -90,7 +99,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 -@@ -110,23 +119,23 @@ - # Don't use together with -DBUSYDETECT_TONEONLY - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - --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 - - INCLUDE=-Iinclude -I../include --CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY - CFLAGS+=$(OPTIMIZE) - - ifneq ($(PROC),ultrasparc) -@@ -137,11 +146,8 @@ - CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) - - ifeq (${OSARCH},FreeBSD) --OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) --CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) --LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) --INCLUDE+=-I/usr/local/include --CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) -+CFLAGS+=$(PTHREAD_CFLAGS) -+LIBS+=$(PTHREAD_LIBS) - endif # FreeBSD - - ifeq (${OSARCH},NetBSD) -@@ -157,7 +163,10 @@ - #CFLAGS+=-DOLD_DSP_ROUTINES - - CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) --CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPTEL_OPTIMIZATIONS -+endif - - LIBEDIT=editline/libedit.a - -@@ -219,7 +228,7 @@ - SOLINK=-shared -Xlinker -x - endif - --CC=gcc -+CC?=gcc - INSTALL=install - - _all: all -@@ -231,7 +240,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: depend asterisk subdirs -+all: depend asterisk subdirs manpage - - editline/config.h: - cd editline && unset CFLAGS LIBS && ./configure ; \ -@@ -240,13 +249,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 -@@ -268,13 +277,10 @@ - - asterisk.o: asterisk.c build.h - --manpage: asterisk.8.gz -+manpage: asterisk.8 - --asterisk.8.gz: asterisk.sgml -- rm -f asterisk.8 -- docbook2man asterisk.sgml -- mv ./*.8 asterisk.8 -- gzip asterisk.8 -+asterisk.8: asterisk.8.gz -+ gzcat asterisk.8.gz > asterisk.8 - - ifneq ($(strip $(ASTERISKVERSION)),) - build.h: .version -@@ -292,8 +298,8 @@ - exit 1; \ - fi - --asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS) -+ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) -o muted muted.o -@@ -312,28 +318,28 @@ - $(MAKE) -C stdtime clean - - datafiles: all -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits - 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/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; \ -@@ -341,18 +347,18 @@ - done - for x in 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-*; 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 CVS ]; then \ -@@ -364,111 +370,86 @@ - fi - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/ -- install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ - 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) - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm -- rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \ -- mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- else \ -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \ -- fi -- ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- 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.gz $(DESTDIR)$(ASTMANDIR)/man8 -+ ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(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 - 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)/vm . ) -- ( 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 " +-------------------------------------------+" -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/vm . ) -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/voicemail . ) - --install: all datafiles bininstall -+install: all datafiles bininstall samples - - upgrade: all bininstall - - adsi: all -- 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: all datafiles adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ for x in configs/*.sample channels/h323/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - fi ; \ -- install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done -- echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -+ echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \ -+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \ -+ fi - 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 - 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 ; \ -@@ -483,7 +464,7 @@ - @[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) - @[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) - install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk - for x in images/*.gif; do \ - install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \ - done -@@ -503,10 +484,10 @@ - - __rpm: _version - 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 redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \ - sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \ - rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec diff --git a/net/asterisk-devel/files/patch-agi::Makefile b/net/asterisk-devel/files/patch-agi::Makefile deleted file mode 100644 index 32efb5d2b101..000000000000 --- a/net/asterisk-devel/files/patch-agi::Makefile +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Tue Jun 22 20:42:13 2004 -+++ agi/Makefile Tue Oct 5 21:03:40 2004 -@@ -11,15 +11,18 @@ - # 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+= - - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) $(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 diff --git a/net/asterisk-devel/files/patch-apps::Makefile b/net/asterisk-devel/files/patch-apps::Makefile deleted file mode 100644 index 00b77dfe2434..000000000000 --- a/net/asterisk-devel/files/patch-apps::Makefile +++ /dev/null @@ -1,49 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig Sat Sep 25 00:32:56 2004 -+++ apps/Makefile Sun Oct 10 16:20:06 2004 -@@ -40,7 +40,7 @@ - #APPS+=app_rpt.so - - APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) --APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) -+APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) - APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) - - CFLAGS+=-fPIC -@@ -65,12 +65,12 @@ - $(CC) $(SOLINK) -o $@ $< -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 - - app_voicemail.so : app_voicemail.o - ifeq ($(USE_MYSQL_VM_INTERFACE),1) -- $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz -+ $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz - else - ifeq ($(USE_POSTGRES_VM_INTERFACE),1) - $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq -@@ -80,16 +80,16 @@ - 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 $@ $< -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ $< -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) $(CFLAGS) look.c -o look -lncurses - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk-devel/files/patch-astman::Makefile b/net/asterisk-devel/files/patch-astman::Makefile deleted file mode 100644 index 2745860cdd36..000000000000 --- a/net/asterisk-devel/files/patch-astman::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- astman/Makefile.orig Sat Jun 26 22:25:39 2004 -+++ astman/Makefile Thu Oct 14 19:14:22 2004 -@@ -5,16 +5,16 @@ - - OSARCH=$(shell uname -s) - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I/usr/local/include -L/usr/local/lib -+CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib - endif - --TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi) -+TARGET=astman - all: depend $(TARGET) - - install: - if [ "$(TARGET)" != "none" ]; then \ - for x in $(TARGET); do \ -- install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ - done ; \ - fi - diff --git a/net/asterisk-devel/files/patch-cdr::Makefile b/net/asterisk-devel/files/patch-cdr::Makefile deleted file mode 100644 index f646d2c9a3dc..000000000000 --- a/net/asterisk-devel/files/patch-cdr::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Aug 31 19:33:00 2004 -+++ cdr/Makefile Thu Oct 14 19:13:38 2004 -@@ -21,7 +21,7 @@ - OSARCH=$(shell uname -s) - - ifeq (${OSARCH},FreeBSD) --SOLINK+=-L/usr/local/lib -+SOLINK+=-L$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -71,7 +71,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-devel/files/patch-channels::Makefile b/net/asterisk-devel/files/patch-channels::Makefile deleted file mode 100644 index e82a0299756d..000000000000 --- a/net/asterisk-devel/files/patch-channels::Makefile +++ /dev/null @@ -1,90 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -57,10 +57,10 @@ - - endif - ifeq (${OSARCH},FreeBSD) --PTLIB=-lpt_FreeBSD_x86_r --H323LIB=-lh323_FreeBSD_x86_r --CHANH323LIB=-pthread --SOLINK+=-L/usr/local/lib -+PTLIB=-lpt_FreeBSD_x86_r_s -+H323LIB=-lh323_FreeBSD_x86_r_s -+CHANH323LIB= -+SOLINK+=-L$(LOCALBASE)/lib - endif - ifeq (${OSARCH},NetBSD) - PTLIB=-lpt_NetBSD_x86_r -@@ -72,8 +72,10 @@ - endif - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so) -+ifndef WITHOUT_H323 -+CHANNEL_LIBS+=chan_h323.so -+endif - - CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations - CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -@@ -84,7 +86,7 @@ - ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") - ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") -+CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include") - CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) - CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") - -@@ -107,7 +109,7 @@ - ZAPDIR=/usr/lib - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so") - - CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) - -@@ -156,6 +158,8 @@ - chan_oss.so: chan_oss.o - $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio - endif -+chan_oss.so: chan_oss.o -+ $(CC) $(SOLINK) -o $@ chan_oss.o - - chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o - ifeq ($(USE_MYSQL_FRIENDS),1) -@@ -175,7 +179,7 @@ - $(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c - - chan_zap.so: chan_zap.o -- $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -ltonezone -+ $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone - - chan_sip.so: chan_sip.o - ifeq ($(USE_SIP_MYSQL_FRIENDS),1) -@@ -199,15 +203,17 @@ - chan_vpb.so: chan_vpb.o - $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl - --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 -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r - -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - - #chan_modem.so : chan_modem.o - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi - - depend: .depend diff --git a/net/asterisk-devel/files/patch-channels::chan_h323.c b/net/asterisk-devel/files/patch-channels::chan_h323.c deleted file mode 100644 index de2ed3978663..000000000000 --- a/net/asterisk-devel/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c 2004/10/10 13:00:17 1.1 -+++ channels/chan_h323.c 2004/10/10 13:00:39 -@@ -26,7 +26,7 @@ - * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $ - */ - -- -+#include <sys/types.h> - #include <sys/socket.h> - #include <sys/signal.h> - #include <sys/param.h> diff --git a/net/asterisk-devel/files/patch-channels::chan_sip.c b/net/asterisk-devel/files/patch-channels::chan_sip.c deleted file mode 100644 index 521d6a46d256..000000000000 --- a/net/asterisk-devel/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,120 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig -+++ channels/chan_sip.c -@@ -139,7 +139,7 @@ - - static char default_language[MAX_LANGUAGE] = ""; - --static char default_callerid[AST_MAX_EXTENSION] = "asterisk"; -+static char default_callerid[AST_MAX_EXTENSION] = "Unknown"; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; - -@@ -244,6 +244,7 @@ - struct sip_route { - struct sip_route *next; - char hop[0]; -+ int lr; - }; - - struct sip_history { -@@ -4573,6 +4574,10 @@ - /* Make a struct route */ - thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); - if (thishop) { -+ if (strnstr(rr, ";lr", len) != NULL) -+ thishop->lr = 1; -+ else -+ thishop->lr = 0; - strncpy(thishop->hop, rr, len); /* safe */ - thishop->hop[len] = '\0'; - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); -@@ -4596,31 +4601,41 @@ - rr += len+1; - } - } -- /* 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, ">"); -- } else { -- /* No <> - just take the lot */ -- c = contact; len = strlen(contact); -- } -- thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ /* 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) { -- strncpy(thishop->hop, c, len); /* safe */ -- thishop->hop[len] = '\0'; -- 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, ">"); -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; len = strlen(contact); -+ } -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ if (thishop) { -+ strncpy(thishop->hop, c, len); /* safe */ -+ thishop->hop[len] = '\0'; -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - /* Store as new route */ -@@ -7197,7 +7212,11 @@ - /* Get destination right away */ - 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) { -@@ -7225,7 +7244,6 @@ - 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); diff --git a/net/asterisk-devel/files/patch-channels::chan_zap.c b/net/asterisk-devel/files/patch-channels::chan_zap.c deleted file mode 100644 index 965a643bb687..000000000000 --- a/net/asterisk-devel/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c -+++ channels/chan_zap.c -@@ -42,7 +42,9 @@ - #include <sys/signal.h> - #include <errno.h> - #include <stdlib.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <unistd.h> - #include <sys/ioctl.h> - #ifdef __linux__ diff --git a/net/asterisk-devel/files/patch-channels::h323::Makefile b/net/asterisk-devel/files/patch-channels::h323::Makefile deleted file mode 100644 index bc34083e2ff3..000000000000 --- a/net/asterisk-devel/files/patch-channels::h323::Makefile +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/Makefile.orig Tue Aug 31 16:32:11 2004 -+++ channels/h323/Makefile Sun Oct 10 15:25:42 2004 -@@ -53,7 +53,7 @@ - LIBS+=-lpthread - endif - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS += -pthread -+CFLAGS += $(PTHREAD_LIBS) - endif - CFLAGS += -D_REENTRANT -D_GNU_SOURCE - CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS -@@ -74,19 +74,19 @@ - - - ast_h323.o: ast_h323.cpp -- $(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $< -+ $(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $< - - libchanh323.a: ast_h323.o - ar cr libchanh323.a ast_h323.o - - chan_h323.so: -- $(CXX) -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB) - - chan_h323_d.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB) - - chan_h323_s.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB) - clean: - rm -f *.o *.so core.* libchanh323.a - diff --git a/net/asterisk-devel/files/patch-channels::h323::ast_h323.cpp b/net/asterisk-devel/files/patch-channels::h323::ast_h323.cpp deleted file mode 100644 index 6cfae1ec5d05..000000000000 --- a/net/asterisk-devel/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig -+++ channels/h323/ast_h323.cpp -@@ -722,7 +722,7 @@ - if (h323debug) { - cout << " -- Sending user input tone (" << tone << ") to remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - H323Connection::SendUserInputTone(tone, duration); - } - -@@ -732,18 +732,20 @@ - if (h323debug) { - cout << " -- Received user input tone (" << tone << ") from remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - } - H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp); - } - - void MyH323Connection::OnUserInputString(const PString &value) - { -+ char val; - if (mode == H323_DTMF_RFC2833) { - if (h323debug) { - cout << " -- Received user input string (" << value << ") from remote." << endl; - } -- on_send_digit(GetCallReference(), value[0]); -+ val = value[0]; -+ on_send_digit(GetCallReference(), &val); - } - } - diff --git a/net/asterisk-devel/files/patch-codecs::Makefile b/net/asterisk-devel/files/patch-codecs::Makefile deleted file mode 100644 index de9aff4c34fe..000000000000 --- a/net/asterisk-devel/files/patch-codecs::Makefile +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Mon Jul 19 18:52:57 2004 -+++ codecs/Makefile Sun Oct 10 15:28:35 2004 -@@ -17,23 +17,23 @@ - # g723.1b) - # - #MODG723=codec_g723_1.so codec_g723_1b.so --MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") --MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") --MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") --MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") -+MODG723=codec_g723_1_dummy.so -+MODG729=codec_g729_dummy.so -+MODSPEEX=codec_speex.so -+MODILBC=codec_ilbc.so - CFLAGS+=-fPIC --CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") -+CFLAGS+=-I$(LOCALBASE)/include - - LIBG723=g723.1/libg723.a - LIBG723B=g723.1b/libg723b.a - LIBGSM=gsm/lib/libgsm.a - LIBGSMT=gsm/lib/libgsm.a - LIBLPC10=lpc10/liblpc10.a --LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib") -+LIBSPEEX=-L$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - LIBILBC=ilbc/libilbc.a - --CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ - codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ - codec_g726.so - -@@ -91,7 +91,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-devel/files/patch-codecs::codec_g723_1_dummy.c b/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c deleted file mode 100644 index 3ce9571013ec..000000000000 --- a/net/asterisk-devel/files/patch-codecs::codec_g723_1_dummy.c +++ /dev/null @@ -1,314 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g723_1_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g723_1_dummy.c Sun Oct 10 16:07:05 2004 -@@ -0,0 +1,308 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.723.1 (dummy!) -+ * -+ * The G.723.1 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g723_ex.h" -+#include "g723_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator"; -+ -+struct g723_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g723_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g723tolin_new() -+{ -+ struct g723_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog723_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g723_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g723_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g723_ex; -+ return &f; -+} -+ -+static struct ast_frame *g723tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G723_1; -+ f.datalen = sizeof(g723_slin_ex); -+ /* All frames are 30 ms long */ -+ f.samples = 30; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g723_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog723_new() -+{ -+ struct g723_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+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 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ int len = 0; -+ int res; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ res = g723_len(((unsigned char *)f->data + len)[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Invalid data\n"); -+ return -1; -+ } -+ if (res + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 480 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 480); -+ tmp->tail+=480; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += res; -+ } -+ return 0; -+} -+ -+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 480) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G723_1; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 480) { -+ /* Encode a frame of data */ -+ if (cnt + 24 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 24); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 30; -+ cnt += 24; -+ tmp->tail -= 480; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g723_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g723tolin = -+ { "g723tolin_dummy", -+ AST_FORMAT_G723_1, AST_FORMAT_SLINEAR, -+ g723tolin_new, -+ g723tolin_framein, -+ g723tolin_frameout, -+ g723_destroy, -+ g723tolin_sample -+ }; -+ -+static struct ast_translator lintog723 = -+ { "lintog723_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G723_1, -+ lintog723_new, -+ lintog723_framein, -+ lintog723_frameout, -+ g723_destroy, -+ lintog723_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog723); -+ if (!res) -+ res = ast_unregister_translator(&g723tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g723tolin); -+ if (!res) -+ res=ast_register_translator(&lintog723); -+ else -+ ast_unregister_translator(&g723tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c b/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c deleted file mode 100644 index 9fcc7b19ca35..000000000000 --- a/net/asterisk-devel/files/patch-codecs::codec_g729_dummy.c +++ /dev/null @@ -1,281 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g729_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g729_dummy.c Sun Oct 10 16:07:12 2004 -@@ -0,0 +1,275 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.729 (dummy!) -+ * -+ * The G.729 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g729_ex.h" -+#include "g729_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.729/PCM16 Codec Translator"; -+ -+struct g729_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g729_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g729tolin_new() -+{ -+ struct g729_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog729_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g729_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g729_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g729_ex; -+ return &f; -+} -+ -+static struct ast_frame *g729tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G729A; -+ f.datalen = sizeof(g729_slin_ex); -+ /* All frames are 10 ms long */ -+ f.samples = 10; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g729_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog729_new() -+{ -+ struct g729_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ int len = 0; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ if (10 + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 160 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 160); -+ tmp->tail+=160; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += 10; -+ } -+ return 0; -+} -+ -+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 160) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G729A; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 160) { -+ /* Encode a frame of data */ -+ if (cnt + 10 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 10); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 10; -+ cnt += 10; -+ tmp->tail -= 160; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g729_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g729tolin = -+ { "g729tolin_dummy", -+ AST_FORMAT_G729A, AST_FORMAT_SLINEAR, -+ g729tolin_new, -+ g729tolin_framein, -+ g729tolin_frameout, -+ g729_destroy, -+ g729tolin_sample -+ }; -+ -+static struct ast_translator lintog729 = -+ { "lintog729_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G729A, -+ lintog729_new, -+ lintog729_framein, -+ lintog729_frameout, -+ g729_destroy, -+ lintog729_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog729); -+ if (!res) -+ res = ast_unregister_translator(&g729tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g729tolin); -+ if (!res) -+ res=ast_register_translator(&lintog729); -+ else -+ ast_unregister_translator(&g729tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk-devel/files/patch-codecs::g729_slin_ex.h b/net/asterisk-devel/files/patch-codecs::g729_slin_ex.h deleted file mode 100644 index 44e60f2de848..000000000000 --- a/net/asterisk-devel/files/patch-codecs::g729_slin_ex.h +++ /dev/null @@ -1,20 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/g729_slin_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,14 @@ -+/* -+ * g729_slin_ex.h -- -+ * -+ * 8-bit G.729 data, 10 milliseconds worth at 8 kHz. -+ * -+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static unsigned char g729_slin_ex[] = { -+120,82,175,64,0,250,219,0,7,214 -+}; diff --git a/net/asterisk-devel/files/patch-codecs::ilbc::Makefile b/net/asterisk-devel/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 7770e07550a4..000000000000 --- a/net/asterisk-devel/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Sun Apr 27 21:13:11 2003 -+++ codecs/ilbc/Makefile Fri Jan 30 01:47:34 2004 -@@ -1,4 +1,4 @@ --CFLAGS+= -fPIC -O3 -+CFLAGS+= -fPIC - LIB=libilbc.a - - OBJS= anaFilter.o iCBSearch.o packing.o \ diff --git a/net/asterisk-devel/files/patch-codecs::slin_g729_ex.h b/net/asterisk-devel/files/patch-codecs::slin_g729_ex.h deleted file mode 100644 index e1236d2498dc..000000000000 --- a/net/asterisk-devel/files/patch-codecs::slin_g729_ex.h +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/slin_g729_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,25 @@ -+/* -+ * slin_g729_ex.h -- -+ * -+ * Signed 16-bit audio data, 10 milliseconds worth at 8 kHz. -+ * -+ * Source: g723.example -+ * -+ * Copyright (C) 2001, Linux Support Services, Inc. -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static signed short slin_g729_ex[] = { -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -+}; diff --git a/net/asterisk-devel/files/patch-db.c b/net/asterisk-devel/files/patch-db.c deleted file mode 100644 index 6c2bdcd443c8..000000000000 --- a/net/asterisk-devel/files/patch-db.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jul 9 13:08:09 2004 -+++ db.c Sun Oct 10 15:32:33 2004 -@@ -33,7 +33,7 @@ - #include <asterisk/cli.h> - #include <asterisk/utils.h> - #include <asterisk/lock.h> --#include "db1-ast/include/db.h" -+#include <db.h> - #include "asterisk.h" - #include "astconf.h" - diff --git a/net/asterisk-devel/files/patch-editline::configure b/net/asterisk-devel/files/patch-editline::configure deleted file mode 100644 index f6b9c5b76eee..000000000000 --- a/net/asterisk-devel/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-devel/files/patch-formats::Makefile b/net/asterisk-devel/files/patch-formats::Makefile deleted file mode 100644 index dacfd7b08303..000000000000 --- a/net/asterisk-devel/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Tue Nov 4 04:40:09 2003 -+++ formats/Makefile Fri Jan 30 01:47:34 2004 -@@ -18,7 +18,7 @@ - # - # G723 simple frame is depricated - # --#FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - GSMLIB=../codecs/gsm/lib/libgsm.a - -@@ -40,7 +40,7 @@ - $(CC) $(SOLINK) -o $@ $< -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-devel/files/patch-formats::format_g723_1.c b/net/asterisk-devel/files/patch-formats::format_g723_1.c deleted file mode 100644 index fb5eb12833dc..000000000000 --- a/net/asterisk-devel/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,351 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g723_1.c.orig Sun Oct 10 15:59:18 2004 -+++ formats/format_g723_1.c Sun Oct 10 16:05:05 2004 -@@ -0,0 +1,345 @@ -+/* -+ * 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 <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 <stdio.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 */ -+ int fd; /* 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(int fd) -+{ -+ /* 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->fd = fd; -+ 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(int fd, 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->fd = fd; -+ 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(); -+ close(s->fd); -+ 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 = read(s->fd, s->g723, 1)) != 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 = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != 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 = write(fs->fd, f->data, f->datalen)) != 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 ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ 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 (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 && lseek(fs->fd, soffset, SEEK_SET) != soffset) { -+ 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(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 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 = lseek(fs->fd, 0, SEEK_CUR); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 (lseek(fs->fd, offset, SEEK_SET) != offset) { -+ 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-devel/files/patch-formats::format_g729.c b/net/asterisk-devel/files/patch-formats::format_g729.c deleted file mode 100644 index a144d1b0f6bf..000000000000 --- a/net/asterisk-devel/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Wed Jan 28 23:32:48 2004 -+++ formats/format_g729.c Thu Feb 19 01:03:30 2004 -@@ -45,7 +45,7 @@ - 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 */ - }; - - -@@ -126,11 +126,11 @@ - 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 = read(s->fd, s->g729, 20)) != 20) { -+ if ((res = read(s->fd, s->g729, 10)) != 10) { - if (res) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -174,7 +174,7 @@ - cur = lseek(fs->fd, 0, SEEK_CUR); - max = lseek(fs->fd, 0, SEEK_END); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -202,7 +202,7 @@ - { - off_t offset; - offset = lseek(fs->fd, 0, SEEK_CUR); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() diff --git a/net/asterisk-devel/files/patch-include::asterisk::utils.h b/net/asterisk-devel/files/patch-include::asterisk::utils.h deleted file mode 100644 index a06f7d065c84..000000000000 --- a/net/asterisk-devel/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-devel/files/patch-pbx::Makefile b/net/asterisk-devel/files/patch-pbx::Makefile deleted file mode 100644 index dca6672c389a..000000000000 --- a/net/asterisk-devel/files/patch-pbx::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig Sun Oct 26 20:50:49 2003 -+++ pbx/Makefile Fri Jan 30 01:47:34 2004 -@@ -16,7 +16,7 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate --PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - -@@ -62,7 +62,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-devel/files/patch-res::Makefile b/net/asterisk-devel/files/patch-res::Makefile deleted file mode 100644 index 3377b4aa1c8e..000000000000 --- a/net/asterisk-devel/files/patch-res::Makefile +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile.orig -+++ res/Makefile -@@ -21,7 +21,10 @@ - - CFLAGS+= - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPATA_MOH -+endif - # - # Work around buggy RedHat 9.0 - # -@@ -34,7 +37,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 - - res_crypto.so: res_crypto.o - $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS) diff --git a/net/asterisk-devel/files/patch-rtp.c b/net/asterisk-devel/files/patch-rtp.c deleted file mode 100644 index 06289f357208..000000000000 --- a/net/asterisk-devel/files/patch-rtp.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Sat Sep 18 16:56:28 2004 -+++ rtp.c Sun Oct 10 15:57:22 2004 -@@ -127,7 +127,7 @@ - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; -@@ -841,8 +841,10 @@ - /* Must be an even port number by RTP spec */ - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - 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)))) - break; diff --git a/net/asterisk-devel/pkg-descr b/net/asterisk-devel/pkg-descr deleted file mode 100644 index 28b7a1deb011..000000000000 --- a/net/asterisk-devel/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-devel/pkg-plist b/net/asterisk-devel/pkg-plist deleted file mode 100644 index d503a8741743..000000000000 --- a/net/asterisk-devel/pkg-plist +++ /dev/null @@ -1,642 +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_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/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/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/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi -etc/asterisk/h323.conf-dist -@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.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/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_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi -etc/asterisk/res_config_odbc.conf-dist -@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.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/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 -etc/rc.d/asterisk.sh -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/astosp.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/channel_pvt.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/config.h -include/asterisk/config_pvt.h -include/asterisk/crypto.h -include/asterisk/cvsid.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dsp.h -include/asterisk/enum.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/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/options.h -include/asterisk/pbx.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/srv.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/utils.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_controlplayback.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.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_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_intercom.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_qcall.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_record.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_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_striplsd.so -lib/asterisk/modules/app_substring.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 -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_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_manager.so -lib/asterisk/modules/chan_agent.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_modem.so -lib/asterisk/modules/chan_modem_aopen.so -lib/asterisk/modules/chan_modem_bestdata.so -lib/asterisk/modules/chan_modem_i4l.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_g723_1_dummy.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_g729_dummy.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_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/pbx_config.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/pbx_wilcalu.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.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_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/safe_asterisk -share/asterisk/agi-bin/agi-test.agi -share/asterisk/agi-bin/eagi-sphinx-test -share/asterisk/agi-bin/eagi-test -share/asterisk/firmware/iax/iaxy.bin -share/asterisk/images/asterisk-intro.jpg -share/asterisk/keys/freeworlddialup.pub -share/asterisk/keys/iaxtel.pub -share/asterisk/mohmp3/fpm-calm-river.mp3 -share/asterisk/mohmp3/fpm-sunshine.mp3 -share/asterisk/mohmp3/fpm-world-mix.mp3 -share/asterisk/sounds/agent-alreadyon.gsm -share/asterisk/sounds/agent-incorrect.gsm -share/asterisk/sounds/agent-loggedoff.gsm -share/asterisk/sounds/agent-loginok.gsm -share/asterisk/sounds/agent-newlocation.gsm -share/asterisk/sounds/agent-pass.gsm -share/asterisk/sounds/agent-user.gsm -share/asterisk/sounds/auth-incorrect.gsm -share/asterisk/sounds/auth-thankyou.gsm -share/asterisk/sounds/beep.gsm -share/asterisk/sounds/conf-adminmenu.gsm -share/asterisk/sounds/conf-enteringno.gsm -share/asterisk/sounds/conf-errormenu.gsm -share/asterisk/sounds/conf-getchannel.gsm -share/asterisk/sounds/conf-getconfno.gsm -share/asterisk/sounds/conf-getpin.gsm -share/asterisk/sounds/conf-invalid.gsm -share/asterisk/sounds/conf-invalidpin.gsm -share/asterisk/sounds/conf-kicked.gsm -share/asterisk/sounds/conf-locked.gsm -share/asterisk/sounds/conf-lockednow.gsm -share/asterisk/sounds/conf-muted.gsm -share/asterisk/sounds/conf-noempty.gsm -share/asterisk/sounds/conf-onlyperson.gsm -share/asterisk/sounds/conf-unlockednow.gsm -share/asterisk/sounds/conf-unmuted.gsm -share/asterisk/sounds/conf-usermenu.gsm -share/asterisk/sounds/demo-abouttotry.gsm -share/asterisk/sounds/demo-congrats.gsm -share/asterisk/sounds/demo-echodone.gsm -share/asterisk/sounds/demo-echotest.gsm -share/asterisk/sounds/demo-enterkeywords.gsm -share/asterisk/sounds/demo-instruct.gsm -share/asterisk/sounds/demo-moreinfo.gsm -share/asterisk/sounds/demo-nogo.gsm -share/asterisk/sounds/demo-nomatch.gsm -share/asterisk/sounds/demo-thanks.gsm -share/asterisk/sounds/digits/0.gsm -share/asterisk/sounds/digits/1.gsm -share/asterisk/sounds/digits/10.gsm -share/asterisk/sounds/digits/11.gsm -share/asterisk/sounds/digits/12.gsm -share/asterisk/sounds/digits/13.gsm -share/asterisk/sounds/digits/14.gsm -share/asterisk/sounds/digits/15.gsm -share/asterisk/sounds/digits/16.gsm -share/asterisk/sounds/digits/17.gsm -share/asterisk/sounds/digits/18.gsm -share/asterisk/sounds/digits/19.gsm -share/asterisk/sounds/digits/2.gsm -share/asterisk/sounds/digits/20.gsm -share/asterisk/sounds/digits/3.gsm -share/asterisk/sounds/digits/30.gsm -share/asterisk/sounds/digits/4.gsm -share/asterisk/sounds/digits/40.gsm -share/asterisk/sounds/digits/5.gsm -share/asterisk/sounds/digits/50.gsm -share/asterisk/sounds/digits/6.gsm -share/asterisk/sounds/digits/60.gsm -share/asterisk/sounds/digits/7.gsm -share/asterisk/sounds/digits/70.gsm -share/asterisk/sounds/digits/8.gsm -share/asterisk/sounds/digits/80.gsm -share/asterisk/sounds/digits/9.gsm -share/asterisk/sounds/digits/90.gsm -share/asterisk/sounds/digits/a-m.gsm -share/asterisk/sounds/digits/at.gsm -share/asterisk/sounds/digits/day-0.gsm -share/asterisk/sounds/digits/day-1.gsm -share/asterisk/sounds/digits/day-2.gsm -share/asterisk/sounds/digits/day-3.gsm -share/asterisk/sounds/digits/day-4.gsm -share/asterisk/sounds/digits/day-5.gsm -share/asterisk/sounds/digits/day-6.gsm -share/asterisk/sounds/digits/dollars.gsm -share/asterisk/sounds/digits/h-1.gsm -share/asterisk/sounds/digits/h-10.gsm -share/asterisk/sounds/digits/h-11.gsm -share/asterisk/sounds/digits/h-12.gsm -share/asterisk/sounds/digits/h-13.gsm -share/asterisk/sounds/digits/h-14.gsm -share/asterisk/sounds/digits/h-15.gsm -share/asterisk/sounds/digits/h-16.gsm -share/asterisk/sounds/digits/h-17.gsm -share/asterisk/sounds/digits/h-18.gsm -share/asterisk/sounds/digits/h-19.gsm -share/asterisk/sounds/digits/h-2.gsm -share/asterisk/sounds/digits/h-20.gsm -share/asterisk/sounds/digits/h-3.gsm -share/asterisk/sounds/digits/h-30.gsm -share/asterisk/sounds/digits/h-4.gsm -share/asterisk/sounds/digits/h-5.gsm -share/asterisk/sounds/digits/h-6.gsm -share/asterisk/sounds/digits/h-7.gsm -share/asterisk/sounds/digits/h-8.gsm -share/asterisk/sounds/digits/h-9.gsm -share/asterisk/sounds/digits/hundred.gsm -share/asterisk/sounds/digits/million.gsm -share/asterisk/sounds/digits/mon-0.gsm -share/asterisk/sounds/digits/mon-1.gsm -share/asterisk/sounds/digits/mon-10.gsm -share/asterisk/sounds/digits/mon-11.gsm -share/asterisk/sounds/digits/mon-2.gsm -share/asterisk/sounds/digits/mon-3.gsm -share/asterisk/sounds/digits/mon-4.gsm -share/asterisk/sounds/digits/mon-5.gsm -share/asterisk/sounds/digits/mon-6.gsm -share/asterisk/sounds/digits/mon-7.gsm -share/asterisk/sounds/digits/mon-8.gsm -share/asterisk/sounds/digits/mon-9.gsm -share/asterisk/sounds/digits/oclock.gsm -share/asterisk/sounds/digits/oh.gsm -share/asterisk/sounds/digits/p-m.gsm -share/asterisk/sounds/digits/pound.gsm -share/asterisk/sounds/digits/star.gsm -share/asterisk/sounds/digits/thousand.gsm -share/asterisk/sounds/digits/today.gsm -share/asterisk/sounds/digits/tomorrow.gsm -share/asterisk/sounds/digits/yesterday.gsm -share/asterisk/sounds/dir-instr.gsm -share/asterisk/sounds/dir-intro.gsm -share/asterisk/sounds/dir-intro-fn.gsm -share/asterisk/sounds/dir-nomatch.gsm -share/asterisk/sounds/dir-nomore.gsm -share/asterisk/sounds/invalid.gsm -share/asterisk/sounds/letters/a.gsm -share/asterisk/sounds/letters/at.gsm -share/asterisk/sounds/letters/b.gsm -share/asterisk/sounds/letters/c.gsm -share/asterisk/sounds/letters/d.gsm -share/asterisk/sounds/letters/dash.gsm -share/asterisk/sounds/letters/dollar.gsm -share/asterisk/sounds/letters/dot.gsm -share/asterisk/sounds/letters/e.gsm -share/asterisk/sounds/letters/equals.gsm -share/asterisk/sounds/letters/exclaimation-point.gsm -share/asterisk/sounds/letters/f.gsm -share/asterisk/sounds/letters/g.gsm -share/asterisk/sounds/letters/h.gsm -share/asterisk/sounds/letters/i.gsm -share/asterisk/sounds/letters/j.gsm -share/asterisk/sounds/letters/k.gsm -share/asterisk/sounds/letters/l.gsm -share/asterisk/sounds/letters/m.gsm -share/asterisk/sounds/letters/n.gsm -share/asterisk/sounds/letters/o.gsm -share/asterisk/sounds/letters/p.gsm -share/asterisk/sounds/letters/plus.gsm -share/asterisk/sounds/letters/q.gsm -share/asterisk/sounds/letters/r.gsm -share/asterisk/sounds/letters/s.gsm -share/asterisk/sounds/letters/slash.gsm -share/asterisk/sounds/letters/space.gsm -share/asterisk/sounds/letters/t.gsm -share/asterisk/sounds/letters/u.gsm -share/asterisk/sounds/letters/v.gsm -share/asterisk/sounds/letters/w.gsm -share/asterisk/sounds/letters/x.gsm -share/asterisk/sounds/letters/y.gsm -share/asterisk/sounds/letters/z.gsm -share/asterisk/sounds/letters/zed.gsm -share/asterisk/sounds/pbx-invalid.gsm -share/asterisk/sounds/pbx-invalidpark.gsm -share/asterisk/sounds/pbx-transfer.gsm -share/asterisk/sounds/phonetic/9_p.gsm -share/asterisk/sounds/phonetic/a_p.gsm -share/asterisk/sounds/phonetic/b_p.gsm -share/asterisk/sounds/phonetic/c_p.gsm -share/asterisk/sounds/phonetic/d_p.gsm -share/asterisk/sounds/phonetic/e_p.gsm -share/asterisk/sounds/phonetic/f_p.gsm -share/asterisk/sounds/phonetic/g_p.gsm -share/asterisk/sounds/phonetic/h_p.gsm -share/asterisk/sounds/phonetic/i_p.gsm -share/asterisk/sounds/phonetic/j_p.gsm -share/asterisk/sounds/phonetic/k_p.gsm -share/asterisk/sounds/phonetic/l_p.gsm -share/asterisk/sounds/phonetic/m_p.gsm -share/asterisk/sounds/phonetic/n_p.gsm -share/asterisk/sounds/phonetic/o_p.gsm -share/asterisk/sounds/phonetic/p_p.gsm -share/asterisk/sounds/phonetic/q_p.gsm -share/asterisk/sounds/phonetic/r_p.gsm -share/asterisk/sounds/phonetic/s_p.gsm -share/asterisk/sounds/phonetic/t_p.gsm -share/asterisk/sounds/phonetic/u_p.gsm -share/asterisk/sounds/phonetic/v_p.gsm -share/asterisk/sounds/phonetic/w_p.gsm -share/asterisk/sounds/phonetic/x_p.gsm -share/asterisk/sounds/phonetic/y_p.gsm -share/asterisk/sounds/phonetic/z_p.gsm -share/asterisk/sounds/privacy-incorrect.gsm -share/asterisk/sounds/privacy-prompt.gsm -share/asterisk/sounds/privacy-thankyou.gsm -share/asterisk/sounds/privacy-unident.gsm -share/asterisk/sounds/queue-callswaiting.gsm -share/asterisk/sounds/queue-holdtime.gsm -share/asterisk/sounds/queue-less-than.gsm -share/asterisk/sounds/queue-minutes.gsm -share/asterisk/sounds/queue-seconds.gsm -share/asterisk/sounds/queue-thankyou.gsm -share/asterisk/sounds/queue-thereare.gsm -share/asterisk/sounds/queue-youarenext.gsm -share/asterisk/sounds/ss-noservice.gsm -share/asterisk/sounds/transfer.gsm -share/asterisk/sounds/tt-allbusy.gsm -share/asterisk/sounds/tt-monkeys.gsm -share/asterisk/sounds/tt-monkeysintro.gsm -share/asterisk/sounds/tt-somethingwrong.gsm -share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm -share/asterisk/sounds/vm-Cust1.gsm -share/asterisk/sounds/vm-Cust2.gsm -share/asterisk/sounds/vm-Cust3.gsm -share/asterisk/sounds/vm-Cust4.gsm -share/asterisk/sounds/vm-Cust5.gsm -share/asterisk/sounds/vm-Family.gsm -share/asterisk/sounds/vm-Friends.gsm -share/asterisk/sounds/vm-INBOX.gsm -share/asterisk/sounds/vm-Old.gsm -share/asterisk/sounds/vm-Work.gsm -share/asterisk/sounds/vm-advopts.gsm -share/asterisk/sounds/vm-and.gsm -share/asterisk/sounds/vm-calldiffnum.gsm -share/asterisk/sounds/vm-changeto.gsm -share/asterisk/sounds/vm-delete.gsm -share/asterisk/sounds/vm-deleted.gsm -share/asterisk/sounds/vm-dialout.gsm -share/asterisk/sounds/vm-enter-num-to-call.gsm -share/asterisk/sounds/vm-extension.gsm -share/asterisk/sounds/vm-first.gsm -share/asterisk/sounds/vm-for.gsm -share/asterisk/sounds/vm-forwardoptions.gsm -share/asterisk/sounds/vm-from-extension.gsm -share/asterisk/sounds/vm-from-phonenumber.gsm -share/asterisk/sounds/vm-from.gsm -share/asterisk/sounds/vm-goodbye.gsm -share/asterisk/sounds/vm-helpexit.gsm -share/asterisk/sounds/vm-incorrect.gsm -share/asterisk/sounds/vm-incorrect-mailbox.gsm -share/asterisk/sounds/vm-instructions.gsm -share/asterisk/sounds/vm-intro.gsm -share/asterisk/sounds/vm-isonphone.gsm -share/asterisk/sounds/vm-isunavail.gsm -share/asterisk/sounds/vm-last.gsm -share/asterisk/sounds/vm-leavemsg.gsm -share/asterisk/sounds/vm-login.gsm -share/asterisk/sounds/vm-mailboxfull.gsm -share/asterisk/sounds/vm-message.gsm -share/asterisk/sounds/vm-messages.gsm -share/asterisk/sounds/vm-mismatch.gsm -share/asterisk/sounds/vm-msginstruct.gsm -share/asterisk/sounds/vm-msgsaved.gsm -share/asterisk/sounds/vm-newpassword.gsm -share/asterisk/sounds/vm-next.gsm -share/asterisk/sounds/vm-no.gsm -share/asterisk/sounds/vm-nobodyavail.gsm -share/asterisk/sounds/vm-nobox.gsm -share/asterisk/sounds/vm-nomore.gsm -share/asterisk/sounds/vm-nonumber.gsm -share/asterisk/sounds/vm-num-i-have.gsm -share/asterisk/sounds/vm-onefor.gsm -share/asterisk/sounds/vm-options.gsm -share/asterisk/sounds/vm-opts.gsm -share/asterisk/sounds/vm-passchanged.gsm -share/asterisk/sounds/vm-password.gsm -share/asterisk/sounds/vm-press.gsm -share/asterisk/sounds/vm-prev.gsm -share/asterisk/sounds/vm-reachoper.gsm -share/asterisk/sounds/vm-rec-busy.gsm -share/asterisk/sounds/vm-rec-name.gsm -share/asterisk/sounds/vm-rec-unv.gsm -share/asterisk/sounds/vm-received.gsm -share/asterisk/sounds/vm-reenterpassword.gsm -share/asterisk/sounds/vm-repeat.gsm -share/asterisk/sounds/vm-review.gsm -share/asterisk/sounds/vm-saved.gsm -share/asterisk/sounds/vm-savedto.gsm -share/asterisk/sounds/vm-savefolder.gsm -share/asterisk/sounds/vm-savemessage.gsm -share/asterisk/sounds/vm-sorry.gsm -share/asterisk/sounds/vm-star-cancel.gsm -share/asterisk/sounds/vm-starmain.gsm -share/asterisk/sounds/vm-then-pound.gsm -share/asterisk/sounds/vm-theperson.gsm -share/asterisk/sounds/vm-tocallback.gsm -share/asterisk/sounds/vm-tocallnum.gsm -share/asterisk/sounds/vm-tocancel.gsm -share/asterisk/sounds/vm-tocancelmsg.gsm -share/asterisk/sounds/vm-toenternumber.gsm -share/asterisk/sounds/vm-toforward.gsm -share/asterisk/sounds/vm-tohearenv.gsm -share/asterisk/sounds/vm-tomakecall.gsm -share/asterisk/sounds/vm-tooshort.gsm -share/asterisk/sounds/vm-toreply.gsm -share/asterisk/sounds/vm-torerecord.gsm -share/asterisk/sounds/vm-undelete.gsm -share/asterisk/sounds/vm-undeleted.gsm -share/asterisk/sounds/vm-unknown-caller.gsm -share/asterisk/sounds/vm-whichbox.gsm -share/asterisk/sounds/vm-youhave.gsm -share/asterisk/sounds/voicemail -@dirrm share/asterisk/sounds/phonetic -@dirrm share/asterisk/sounds/letters -@dirrm share/asterisk/sounds/digits -@dirrm share/asterisk/sounds -@dirrm share/asterisk/mohmp3 -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/share/asterisk/astdb -@cwd /var -spool/asterisk/vm -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/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 diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile deleted file mode 100644 index 97b6dcea0d10..000000000000 --- a/net/asterisk10/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.0.2 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= 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 - -ONLY_FOR_ARCHS= i386 sparc64 - -BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex -RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 - -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -MAKE_ENV+= WITHOUT_H323=1 -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323:build -PLIST_SUB+= WITH_H323="" -.endif - -.if defined(WITHOUT_ZAPTEL) -MAKE_ENV+= WITHOUT_ZAPTEL=1 -PLIST_SUB+= WITH_ZAPTEL="@comment " -.else -BUILD_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -.endif - -post-install: - @${INSTALL_SCRIPT} ${FILESDIR}/asterisk.sh ${PREFIX}/etc/rc.d - -.include <bsd.port.post.mk> diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo deleted file mode 100644 index 5fa2ddcf1403..000000000000 --- a/net/asterisk10/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (asterisk-1.0.2.tar.gz) = 58b2c912b4e7c1f0438f06eb26c4b369 -SIZE (asterisk-1.0.2.tar.gz) = 9562949 diff --git a/net/asterisk10/files/asterisk.sh b/net/asterisk10/files/asterisk.sh deleted file mode 100644 index deee10c0cbe4..000000000000 --- a/net/asterisk10/files/asterisk.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -name=asterisk -rcvar=`set_rcvar` - -command=/usr/local/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 77acd5fecf7d..000000000000 --- a/net/asterisk10/files/patch-Makefile +++ /dev/null @@ -1,412 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -44,6 +44,15 @@ - PROC=$(shell uname -m) - endif - -+ifeq (${OSARCH},FreeBSD) -+ifeq ($(PROC),sparc64) -+PROC=ultrasparc -+OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi) -+OPTIONS+=$(shell if $(CC) -mcpu=v9 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v9"; fi) -+OPTIONS+=-fomit-frame-pointerendif -+endif -+endif -+ - # Pentium Pro Optimize - #PROC=i686 - -@@ -62,10 +71,10 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the asterisk's code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - - #Include debug symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g #-pg -+#DEBUG=-g #-pg - - # If you are running a radio application, define RADIO_RELAX so that the DTMF - # will be received more reliably -@@ -90,7 +99,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 -@@ -110,23 +119,23 @@ - # Don't use together with -DBUSYDETECT_TONEONLY - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - --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 - - INCLUDE=-Iinclude -I../include --CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY - CFLAGS+=$(OPTIMIZE) - - ifneq ($(PROC),ultrasparc) -@@ -137,11 +146,8 @@ - CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) - - ifeq (${OSARCH},FreeBSD) --OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) --CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) --LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) --INCLUDE+=-I/usr/local/include --CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) -+CFLAGS+=$(PTHREAD_CFLAGS) -+LIBS+=$(PTHREAD_LIBS) - endif # FreeBSD - - ifeq (${OSARCH},NetBSD) -@@ -157,7 +163,10 @@ - #CFLAGS+=-DOLD_DSP_ROUTINES - - CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) --CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPTEL_OPTIMIZATIONS -+endif - - LIBEDIT=editline/libedit.a - -@@ -219,7 +228,7 @@ - SOLINK=-shared -Xlinker -x - endif - --CC=gcc -+CC?=gcc - INSTALL=install - - _all: all -@@ -231,7 +240,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: depend asterisk subdirs -+all: depend asterisk subdirs manpage - - editline/config.h: - cd editline && unset CFLAGS LIBS && ./configure ; \ -@@ -240,13 +249,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 -@@ -268,13 +277,10 @@ - - asterisk.o: asterisk.c build.h - --manpage: asterisk.8.gz -+manpage: asterisk.8 - --asterisk.8.gz: asterisk.sgml -- rm -f asterisk.8 -- docbook2man asterisk.sgml -- mv ./*.8 asterisk.8 -- gzip asterisk.8 -+asterisk.8: asterisk.8.gz -+ gzcat asterisk.8.gz > asterisk.8 - - ifneq ($(strip $(ASTERISKVERSION)),) - build.h: .version -@@ -292,8 +298,8 @@ - exit 1; \ - fi - --asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS) -+ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) -o muted muted.o -@@ -312,28 +318,28 @@ - $(MAKE) -C stdtime clean - - datafiles: all -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits - 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/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; \ -@@ -341,18 +347,18 @@ - done - for x in 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-*; 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 CVS ]; then \ -@@ -364,111 +370,86 @@ - fi - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/ -- install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ - 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) - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm -- rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \ -- mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- else \ -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \ -- fi -- ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- 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.gz $(DESTDIR)$(ASTMANDIR)/man8 -+ ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(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 - 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)/vm . ) -- ( 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 " +-------------------------------------------+" -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/vm . ) -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/voicemail . ) - --install: all datafiles bininstall -+install: all datafiles bininstall samples - - upgrade: all bininstall - - adsi: all -- 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: all datafiles adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ for x in configs/*.sample channels/h323/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - fi ; \ -- install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done -- echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -+ echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \ -+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \ -+ fi - 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 - 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 ; \ -@@ -483,7 +464,7 @@ - @[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) - @[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) - install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk - for x in images/*.gif; do \ - install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \ - done -@@ -503,10 +484,10 @@ - - __rpm: _version - 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 redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \ - sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \ - 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 32efb5d2b101..000000000000 --- a/net/asterisk10/files/patch-agi::Makefile +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Tue Jun 22 20:42:13 2004 -+++ agi/Makefile Tue Oct 5 21:03:40 2004 -@@ -11,15 +11,18 @@ - # 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+= - - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) $(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 diff --git a/net/asterisk10/files/patch-apps::Makefile b/net/asterisk10/files/patch-apps::Makefile deleted file mode 100644 index 00b77dfe2434..000000000000 --- a/net/asterisk10/files/patch-apps::Makefile +++ /dev/null @@ -1,49 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig Sat Sep 25 00:32:56 2004 -+++ apps/Makefile Sun Oct 10 16:20:06 2004 -@@ -40,7 +40,7 @@ - #APPS+=app_rpt.so - - APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) --APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) -+APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) - APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) - - CFLAGS+=-fPIC -@@ -65,12 +65,12 @@ - $(CC) $(SOLINK) -o $@ $< -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 - - app_voicemail.so : app_voicemail.o - ifeq ($(USE_MYSQL_VM_INTERFACE),1) -- $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz -+ $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz - else - ifeq ($(USE_POSTGRES_VM_INTERFACE),1) - $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq -@@ -80,16 +80,16 @@ - 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 $@ $< -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ $< -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) $(CFLAGS) look.c -o look -lncurses - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk10/files/patch-astman::Makefile b/net/asterisk10/files/patch-astman::Makefile deleted file mode 100644 index 2745860cdd36..000000000000 --- a/net/asterisk10/files/patch-astman::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- astman/Makefile.orig Sat Jun 26 22:25:39 2004 -+++ astman/Makefile Thu Oct 14 19:14:22 2004 -@@ -5,16 +5,16 @@ - - OSARCH=$(shell uname -s) - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I/usr/local/include -L/usr/local/lib -+CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib - endif - --TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi) -+TARGET=astman - all: depend $(TARGET) - - install: - if [ "$(TARGET)" != "none" ]; then \ - for x in $(TARGET); do \ -- install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ - done ; \ - fi - diff --git a/net/asterisk10/files/patch-cdr::Makefile b/net/asterisk10/files/patch-cdr::Makefile deleted file mode 100644 index f646d2c9a3dc..000000000000 --- a/net/asterisk10/files/patch-cdr::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Aug 31 19:33:00 2004 -+++ cdr/Makefile Thu Oct 14 19:13:38 2004 -@@ -21,7 +21,7 @@ - OSARCH=$(shell uname -s) - - ifeq (${OSARCH},FreeBSD) --SOLINK+=-L/usr/local/lib -+SOLINK+=-L$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -71,7 +71,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 e82a0299756d..000000000000 --- a/net/asterisk10/files/patch-channels::Makefile +++ /dev/null @@ -1,90 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -57,10 +57,10 @@ - - endif - ifeq (${OSARCH},FreeBSD) --PTLIB=-lpt_FreeBSD_x86_r --H323LIB=-lh323_FreeBSD_x86_r --CHANH323LIB=-pthread --SOLINK+=-L/usr/local/lib -+PTLIB=-lpt_FreeBSD_x86_r_s -+H323LIB=-lh323_FreeBSD_x86_r_s -+CHANH323LIB= -+SOLINK+=-L$(LOCALBASE)/lib - endif - ifeq (${OSARCH},NetBSD) - PTLIB=-lpt_NetBSD_x86_r -@@ -72,8 +72,10 @@ - endif - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so) -+ifndef WITHOUT_H323 -+CHANNEL_LIBS+=chan_h323.so -+endif - - CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations - CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -@@ -84,7 +86,7 @@ - ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") - ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") -+CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include") - CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) - CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") - -@@ -107,7 +109,7 @@ - ZAPDIR=/usr/lib - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so") - - CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) - -@@ -156,6 +158,8 @@ - chan_oss.so: chan_oss.o - $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio - endif -+chan_oss.so: chan_oss.o -+ $(CC) $(SOLINK) -o $@ chan_oss.o - - chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o - ifeq ($(USE_MYSQL_FRIENDS),1) -@@ -175,7 +179,7 @@ - $(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c - - chan_zap.so: chan_zap.o -- $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -ltonezone -+ $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone - - chan_sip.so: chan_sip.o - ifeq ($(USE_SIP_MYSQL_FRIENDS),1) -@@ -199,15 +203,17 @@ - chan_vpb.so: chan_vpb.o - $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl - --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 -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r - -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - - #chan_modem.so : chan_modem.o - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi - - 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 de2ed3978663..000000000000 --- a/net/asterisk10/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c 2004/10/10 13:00:17 1.1 -+++ channels/chan_h323.c 2004/10/10 13:00:39 -@@ -26,7 +26,7 @@ - * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $ - */ - -- -+#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 521d6a46d256..000000000000 --- a/net/asterisk10/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,120 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig -+++ channels/chan_sip.c -@@ -139,7 +139,7 @@ - - static char default_language[MAX_LANGUAGE] = ""; - --static char default_callerid[AST_MAX_EXTENSION] = "asterisk"; -+static char default_callerid[AST_MAX_EXTENSION] = "Unknown"; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; - -@@ -244,6 +244,7 @@ - struct sip_route { - struct sip_route *next; - char hop[0]; -+ int lr; - }; - - struct sip_history { -@@ -4573,6 +4574,10 @@ - /* Make a struct route */ - thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); - if (thishop) { -+ if (strnstr(rr, ";lr", len) != NULL) -+ thishop->lr = 1; -+ else -+ thishop->lr = 0; - strncpy(thishop->hop, rr, len); /* safe */ - thishop->hop[len] = '\0'; - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); -@@ -4596,31 +4601,41 @@ - rr += len+1; - } - } -- /* 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, ">"); -- } else { -- /* No <> - just take the lot */ -- c = contact; len = strlen(contact); -- } -- thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ /* 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) { -- strncpy(thishop->hop, c, len); /* safe */ -- thishop->hop[len] = '\0'; -- 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, ">"); -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; len = strlen(contact); -+ } -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ if (thishop) { -+ strncpy(thishop->hop, c, len); /* safe */ -+ thishop->hop[len] = '\0'; -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - /* Store as new route */ -@@ -7197,7 +7212,11 @@ - /* Get destination right away */ - 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) { -@@ -7225,7 +7244,6 @@ - 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); 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 965a643bb687..000000000000 --- a/net/asterisk10/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c -+++ channels/chan_zap.c -@@ -42,7 +42,9 @@ - #include <sys/signal.h> - #include <errno.h> - #include <stdlib.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <unistd.h> - #include <sys/ioctl.h> - #ifdef __linux__ diff --git a/net/asterisk10/files/patch-channels::h323::Makefile b/net/asterisk10/files/patch-channels::h323::Makefile deleted file mode 100644 index bc34083e2ff3..000000000000 --- a/net/asterisk10/files/patch-channels::h323::Makefile +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/Makefile.orig Tue Aug 31 16:32:11 2004 -+++ channels/h323/Makefile Sun Oct 10 15:25:42 2004 -@@ -53,7 +53,7 @@ - LIBS+=-lpthread - endif - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS += -pthread -+CFLAGS += $(PTHREAD_LIBS) - endif - CFLAGS += -D_REENTRANT -D_GNU_SOURCE - CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS -@@ -74,19 +74,19 @@ - - - ast_h323.o: ast_h323.cpp -- $(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $< -+ $(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $< - - libchanh323.a: ast_h323.o - ar cr libchanh323.a ast_h323.o - - chan_h323.so: -- $(CXX) -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB) - - chan_h323_d.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB) - - chan_h323_s.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB) - clean: - rm -f *.o *.so core.* libchanh323.a - 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 6cfae1ec5d05..000000000000 --- a/net/asterisk10/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig -+++ channels/h323/ast_h323.cpp -@@ -722,7 +722,7 @@ - if (h323debug) { - cout << " -- Sending user input tone (" << tone << ") to remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - H323Connection::SendUserInputTone(tone, duration); - } - -@@ -732,18 +732,20 @@ - if (h323debug) { - cout << " -- Received user input tone (" << tone << ") from remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - } - H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp); - } - - void MyH323Connection::OnUserInputString(const PString &value) - { -+ char val; - if (mode == H323_DTMF_RFC2833) { - if (h323debug) { - cout << " -- Received user input string (" << value << ") from remote." << endl; - } -- on_send_digit(GetCallReference(), value[0]); -+ val = value[0]; -+ on_send_digit(GetCallReference(), &val); - } - } - diff --git a/net/asterisk10/files/patch-codecs::Makefile b/net/asterisk10/files/patch-codecs::Makefile deleted file mode 100644 index de9aff4c34fe..000000000000 --- a/net/asterisk10/files/patch-codecs::Makefile +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Mon Jul 19 18:52:57 2004 -+++ codecs/Makefile Sun Oct 10 15:28:35 2004 -@@ -17,23 +17,23 @@ - # g723.1b) - # - #MODG723=codec_g723_1.so codec_g723_1b.so --MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") --MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") --MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") --MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") -+MODG723=codec_g723_1_dummy.so -+MODG729=codec_g729_dummy.so -+MODSPEEX=codec_speex.so -+MODILBC=codec_ilbc.so - CFLAGS+=-fPIC --CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") -+CFLAGS+=-I$(LOCALBASE)/include - - LIBG723=g723.1/libg723.a - LIBG723B=g723.1b/libg723b.a - LIBGSM=gsm/lib/libgsm.a - LIBGSMT=gsm/lib/libgsm.a - LIBLPC10=lpc10/liblpc10.a --LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib") -+LIBSPEEX=-L$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - LIBILBC=ilbc/libilbc.a - --CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ - codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ - codec_g726.so - -@@ -91,7 +91,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::codec_g723_1_dummy.c b/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c deleted file mode 100644 index 3ce9571013ec..000000000000 --- a/net/asterisk10/files/patch-codecs::codec_g723_1_dummy.c +++ /dev/null @@ -1,314 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g723_1_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g723_1_dummy.c Sun Oct 10 16:07:05 2004 -@@ -0,0 +1,308 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.723.1 (dummy!) -+ * -+ * The G.723.1 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g723_ex.h" -+#include "g723_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator"; -+ -+struct g723_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g723_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g723tolin_new() -+{ -+ struct g723_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog723_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g723_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g723_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g723_ex; -+ return &f; -+} -+ -+static struct ast_frame *g723tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G723_1; -+ f.datalen = sizeof(g723_slin_ex); -+ /* All frames are 30 ms long */ -+ f.samples = 30; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g723_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog723_new() -+{ -+ struct g723_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+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 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ int len = 0; -+ int res; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ res = g723_len(((unsigned char *)f->data + len)[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Invalid data\n"); -+ return -1; -+ } -+ if (res + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 480 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 480); -+ tmp->tail+=480; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += res; -+ } -+ return 0; -+} -+ -+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 480) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G723_1; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 480) { -+ /* Encode a frame of data */ -+ if (cnt + 24 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 24); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 30; -+ cnt += 24; -+ tmp->tail -= 480; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g723_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g723tolin = -+ { "g723tolin_dummy", -+ AST_FORMAT_G723_1, AST_FORMAT_SLINEAR, -+ g723tolin_new, -+ g723tolin_framein, -+ g723tolin_frameout, -+ g723_destroy, -+ g723tolin_sample -+ }; -+ -+static struct ast_translator lintog723 = -+ { "lintog723_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G723_1, -+ lintog723_new, -+ lintog723_framein, -+ lintog723_frameout, -+ g723_destroy, -+ lintog723_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog723); -+ if (!res) -+ res = ast_unregister_translator(&g723tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g723tolin); -+ if (!res) -+ res=ast_register_translator(&lintog723); -+ else -+ ast_unregister_translator(&g723tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk10/files/patch-codecs::codec_g729_dummy.c b/net/asterisk10/files/patch-codecs::codec_g729_dummy.c deleted file mode 100644 index 9fcc7b19ca35..000000000000 --- a/net/asterisk10/files/patch-codecs::codec_g729_dummy.c +++ /dev/null @@ -1,281 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g729_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g729_dummy.c Sun Oct 10 16:07:12 2004 -@@ -0,0 +1,275 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.729 (dummy!) -+ * -+ * The G.729 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g729_ex.h" -+#include "g729_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.729/PCM16 Codec Translator"; -+ -+struct g729_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g729_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g729tolin_new() -+{ -+ struct g729_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog729_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g729_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g729_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g729_ex; -+ return &f; -+} -+ -+static struct ast_frame *g729tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G729A; -+ f.datalen = sizeof(g729_slin_ex); -+ /* All frames are 10 ms long */ -+ f.samples = 10; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g729_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog729_new() -+{ -+ struct g729_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ int len = 0; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ if (10 + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 160 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 160); -+ tmp->tail+=160; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += 10; -+ } -+ return 0; -+} -+ -+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 160) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G729A; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 160) { -+ /* Encode a frame of data */ -+ if (cnt + 10 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 10); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 10; -+ cnt += 10; -+ tmp->tail -= 160; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g729_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g729tolin = -+ { "g729tolin_dummy", -+ AST_FORMAT_G729A, AST_FORMAT_SLINEAR, -+ g729tolin_new, -+ g729tolin_framein, -+ g729tolin_frameout, -+ g729_destroy, -+ g729tolin_sample -+ }; -+ -+static struct ast_translator lintog729 = -+ { "lintog729_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G729A, -+ lintog729_new, -+ lintog729_framein, -+ lintog729_frameout, -+ g729_destroy, -+ lintog729_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog729); -+ if (!res) -+ res = ast_unregister_translator(&g729tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g729tolin); -+ if (!res) -+ res=ast_register_translator(&lintog729); -+ else -+ ast_unregister_translator(&g729tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk10/files/patch-codecs::g729_slin_ex.h b/net/asterisk10/files/patch-codecs::g729_slin_ex.h deleted file mode 100644 index 44e60f2de848..000000000000 --- a/net/asterisk10/files/patch-codecs::g729_slin_ex.h +++ /dev/null @@ -1,20 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/g729_slin_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,14 @@ -+/* -+ * g729_slin_ex.h -- -+ * -+ * 8-bit G.729 data, 10 milliseconds worth at 8 kHz. -+ * -+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static unsigned char g729_slin_ex[] = { -+120,82,175,64,0,250,219,0,7,214 -+}; diff --git a/net/asterisk10/files/patch-codecs::ilbc::Makefile b/net/asterisk10/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 7770e07550a4..000000000000 --- a/net/asterisk10/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Sun Apr 27 21:13:11 2003 -+++ codecs/ilbc/Makefile Fri Jan 30 01:47:34 2004 -@@ -1,4 +1,4 @@ --CFLAGS+= -fPIC -O3 -+CFLAGS+= -fPIC - LIB=libilbc.a - - OBJS= anaFilter.o iCBSearch.o packing.o \ diff --git a/net/asterisk10/files/patch-codecs::slin_g729_ex.h b/net/asterisk10/files/patch-codecs::slin_g729_ex.h deleted file mode 100644 index e1236d2498dc..000000000000 --- a/net/asterisk10/files/patch-codecs::slin_g729_ex.h +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/slin_g729_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,25 @@ -+/* -+ * slin_g729_ex.h -- -+ * -+ * Signed 16-bit audio data, 10 milliseconds worth at 8 kHz. -+ * -+ * Source: g723.example -+ * -+ * Copyright (C) 2001, Linux Support Services, Inc. -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static signed short slin_g729_ex[] = { -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -+}; diff --git a/net/asterisk10/files/patch-db.c b/net/asterisk10/files/patch-db.c deleted file mode 100644 index 6c2bdcd443c8..000000000000 --- a/net/asterisk10/files/patch-db.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jul 9 13:08:09 2004 -+++ db.c Sun Oct 10 15:32:33 2004 -@@ -33,7 +33,7 @@ - #include <asterisk/cli.h> - #include <asterisk/utils.h> - #include <asterisk/lock.h> --#include "db1-ast/include/db.h" -+#include <db.h> - #include "asterisk.h" - #include "astconf.h" - 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-formats::Makefile b/net/asterisk10/files/patch-formats::Makefile deleted file mode 100644 index dacfd7b08303..000000000000 --- a/net/asterisk10/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Tue Nov 4 04:40:09 2003 -+++ formats/Makefile Fri Jan 30 01:47:34 2004 -@@ -18,7 +18,7 @@ - # - # G723 simple frame is depricated - # --#FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - GSMLIB=../codecs/gsm/lib/libgsm.a - -@@ -40,7 +40,7 @@ - $(CC) $(SOLINK) -o $@ $< -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 fb5eb12833dc..000000000000 --- a/net/asterisk10/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,351 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g723_1.c.orig Sun Oct 10 15:59:18 2004 -+++ formats/format_g723_1.c Sun Oct 10 16:05:05 2004 -@@ -0,0 +1,345 @@ -+/* -+ * 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 <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 <stdio.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 */ -+ int fd; /* 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(int fd) -+{ -+ /* 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->fd = fd; -+ 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(int fd, 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->fd = fd; -+ 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(); -+ close(s->fd); -+ 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 = read(s->fd, s->g723, 1)) != 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 = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != 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 = write(fs->fd, f->data, f->datalen)) != 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 ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ 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 (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 && lseek(fs->fd, soffset, SEEK_SET) != soffset) { -+ 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(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 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 = lseek(fs->fd, 0, SEEK_CUR); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 (lseek(fs->fd, offset, SEEK_SET) != offset) { -+ 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 a144d1b0f6bf..000000000000 --- a/net/asterisk10/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Wed Jan 28 23:32:48 2004 -+++ formats/format_g729.c Thu Feb 19 01:03:30 2004 -@@ -45,7 +45,7 @@ - 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 */ - }; - - -@@ -126,11 +126,11 @@ - 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 = read(s->fd, s->g729, 20)) != 20) { -+ if ((res = read(s->fd, s->g729, 10)) != 10) { - if (res) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -174,7 +174,7 @@ - cur = lseek(fs->fd, 0, SEEK_CUR); - max = lseek(fs->fd, 0, SEEK_END); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -202,7 +202,7 @@ - { - off_t offset; - offset = lseek(fs->fd, 0, SEEK_CUR); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() 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 dca6672c389a..000000000000 --- a/net/asterisk10/files/patch-pbx::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig Sun Oct 26 20:50:49 2003 -+++ pbx/Makefile Fri Jan 30 01:47:34 2004 -@@ -16,7 +16,7 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate --PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - -@@ -62,7 +62,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 3377b4aa1c8e..000000000000 --- a/net/asterisk10/files/patch-res::Makefile +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile.orig -+++ res/Makefile -@@ -21,7 +21,10 @@ - - CFLAGS+= - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPATA_MOH -+endif - # - # Work around buggy RedHat 9.0 - # -@@ -34,7 +37,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 - - res_crypto.so: res_crypto.o - $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS) diff --git a/net/asterisk10/files/patch-rtp.c b/net/asterisk10/files/patch-rtp.c deleted file mode 100644 index 06289f357208..000000000000 --- a/net/asterisk10/files/patch-rtp.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Sat Sep 18 16:56:28 2004 -+++ rtp.c Sun Oct 10 15:57:22 2004 -@@ -127,7 +127,7 @@ - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; -@@ -841,8 +841,10 @@ - /* Must be an even port number by RTP spec */ - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - 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)))) - break; 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 d503a8741743..000000000000 --- a/net/asterisk10/pkg-plist +++ /dev/null @@ -1,642 +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_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/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/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/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi -etc/asterisk/h323.conf-dist -@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.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/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_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi -etc/asterisk/res_config_odbc.conf-dist -@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.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/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 -etc/rc.d/asterisk.sh -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/astosp.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/channel_pvt.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/config.h -include/asterisk/config_pvt.h -include/asterisk/crypto.h -include/asterisk/cvsid.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dsp.h -include/asterisk/enum.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/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/options.h -include/asterisk/pbx.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/srv.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/utils.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_controlplayback.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.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_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_intercom.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_qcall.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_record.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_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_striplsd.so -lib/asterisk/modules/app_substring.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 -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_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_manager.so -lib/asterisk/modules/chan_agent.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_modem.so -lib/asterisk/modules/chan_modem_aopen.so -lib/asterisk/modules/chan_modem_bestdata.so -lib/asterisk/modules/chan_modem_i4l.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_g723_1_dummy.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_g729_dummy.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_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/pbx_config.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/pbx_wilcalu.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.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_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/safe_asterisk -share/asterisk/agi-bin/agi-test.agi -share/asterisk/agi-bin/eagi-sphinx-test -share/asterisk/agi-bin/eagi-test -share/asterisk/firmware/iax/iaxy.bin -share/asterisk/images/asterisk-intro.jpg -share/asterisk/keys/freeworlddialup.pub -share/asterisk/keys/iaxtel.pub -share/asterisk/mohmp3/fpm-calm-river.mp3 -share/asterisk/mohmp3/fpm-sunshine.mp3 -share/asterisk/mohmp3/fpm-world-mix.mp3 -share/asterisk/sounds/agent-alreadyon.gsm -share/asterisk/sounds/agent-incorrect.gsm -share/asterisk/sounds/agent-loggedoff.gsm -share/asterisk/sounds/agent-loginok.gsm -share/asterisk/sounds/agent-newlocation.gsm -share/asterisk/sounds/agent-pass.gsm -share/asterisk/sounds/agent-user.gsm -share/asterisk/sounds/auth-incorrect.gsm -share/asterisk/sounds/auth-thankyou.gsm -share/asterisk/sounds/beep.gsm -share/asterisk/sounds/conf-adminmenu.gsm -share/asterisk/sounds/conf-enteringno.gsm -share/asterisk/sounds/conf-errormenu.gsm -share/asterisk/sounds/conf-getchannel.gsm -share/asterisk/sounds/conf-getconfno.gsm -share/asterisk/sounds/conf-getpin.gsm -share/asterisk/sounds/conf-invalid.gsm -share/asterisk/sounds/conf-invalidpin.gsm -share/asterisk/sounds/conf-kicked.gsm -share/asterisk/sounds/conf-locked.gsm -share/asterisk/sounds/conf-lockednow.gsm -share/asterisk/sounds/conf-muted.gsm -share/asterisk/sounds/conf-noempty.gsm -share/asterisk/sounds/conf-onlyperson.gsm -share/asterisk/sounds/conf-unlockednow.gsm -share/asterisk/sounds/conf-unmuted.gsm -share/asterisk/sounds/conf-usermenu.gsm -share/asterisk/sounds/demo-abouttotry.gsm -share/asterisk/sounds/demo-congrats.gsm -share/asterisk/sounds/demo-echodone.gsm -share/asterisk/sounds/demo-echotest.gsm -share/asterisk/sounds/demo-enterkeywords.gsm -share/asterisk/sounds/demo-instruct.gsm -share/asterisk/sounds/demo-moreinfo.gsm -share/asterisk/sounds/demo-nogo.gsm -share/asterisk/sounds/demo-nomatch.gsm -share/asterisk/sounds/demo-thanks.gsm -share/asterisk/sounds/digits/0.gsm -share/asterisk/sounds/digits/1.gsm -share/asterisk/sounds/digits/10.gsm -share/asterisk/sounds/digits/11.gsm -share/asterisk/sounds/digits/12.gsm -share/asterisk/sounds/digits/13.gsm -share/asterisk/sounds/digits/14.gsm -share/asterisk/sounds/digits/15.gsm -share/asterisk/sounds/digits/16.gsm -share/asterisk/sounds/digits/17.gsm -share/asterisk/sounds/digits/18.gsm -share/asterisk/sounds/digits/19.gsm -share/asterisk/sounds/digits/2.gsm -share/asterisk/sounds/digits/20.gsm -share/asterisk/sounds/digits/3.gsm -share/asterisk/sounds/digits/30.gsm -share/asterisk/sounds/digits/4.gsm -share/asterisk/sounds/digits/40.gsm -share/asterisk/sounds/digits/5.gsm -share/asterisk/sounds/digits/50.gsm -share/asterisk/sounds/digits/6.gsm -share/asterisk/sounds/digits/60.gsm -share/asterisk/sounds/digits/7.gsm -share/asterisk/sounds/digits/70.gsm -share/asterisk/sounds/digits/8.gsm -share/asterisk/sounds/digits/80.gsm -share/asterisk/sounds/digits/9.gsm -share/asterisk/sounds/digits/90.gsm -share/asterisk/sounds/digits/a-m.gsm -share/asterisk/sounds/digits/at.gsm -share/asterisk/sounds/digits/day-0.gsm -share/asterisk/sounds/digits/day-1.gsm -share/asterisk/sounds/digits/day-2.gsm -share/asterisk/sounds/digits/day-3.gsm -share/asterisk/sounds/digits/day-4.gsm -share/asterisk/sounds/digits/day-5.gsm -share/asterisk/sounds/digits/day-6.gsm -share/asterisk/sounds/digits/dollars.gsm -share/asterisk/sounds/digits/h-1.gsm -share/asterisk/sounds/digits/h-10.gsm -share/asterisk/sounds/digits/h-11.gsm -share/asterisk/sounds/digits/h-12.gsm -share/asterisk/sounds/digits/h-13.gsm -share/asterisk/sounds/digits/h-14.gsm -share/asterisk/sounds/digits/h-15.gsm -share/asterisk/sounds/digits/h-16.gsm -share/asterisk/sounds/digits/h-17.gsm -share/asterisk/sounds/digits/h-18.gsm -share/asterisk/sounds/digits/h-19.gsm -share/asterisk/sounds/digits/h-2.gsm -share/asterisk/sounds/digits/h-20.gsm -share/asterisk/sounds/digits/h-3.gsm -share/asterisk/sounds/digits/h-30.gsm -share/asterisk/sounds/digits/h-4.gsm -share/asterisk/sounds/digits/h-5.gsm -share/asterisk/sounds/digits/h-6.gsm -share/asterisk/sounds/digits/h-7.gsm -share/asterisk/sounds/digits/h-8.gsm -share/asterisk/sounds/digits/h-9.gsm -share/asterisk/sounds/digits/hundred.gsm -share/asterisk/sounds/digits/million.gsm -share/asterisk/sounds/digits/mon-0.gsm -share/asterisk/sounds/digits/mon-1.gsm -share/asterisk/sounds/digits/mon-10.gsm -share/asterisk/sounds/digits/mon-11.gsm -share/asterisk/sounds/digits/mon-2.gsm -share/asterisk/sounds/digits/mon-3.gsm -share/asterisk/sounds/digits/mon-4.gsm -share/asterisk/sounds/digits/mon-5.gsm -share/asterisk/sounds/digits/mon-6.gsm -share/asterisk/sounds/digits/mon-7.gsm -share/asterisk/sounds/digits/mon-8.gsm -share/asterisk/sounds/digits/mon-9.gsm -share/asterisk/sounds/digits/oclock.gsm -share/asterisk/sounds/digits/oh.gsm -share/asterisk/sounds/digits/p-m.gsm -share/asterisk/sounds/digits/pound.gsm -share/asterisk/sounds/digits/star.gsm -share/asterisk/sounds/digits/thousand.gsm -share/asterisk/sounds/digits/today.gsm -share/asterisk/sounds/digits/tomorrow.gsm -share/asterisk/sounds/digits/yesterday.gsm -share/asterisk/sounds/dir-instr.gsm -share/asterisk/sounds/dir-intro.gsm -share/asterisk/sounds/dir-intro-fn.gsm -share/asterisk/sounds/dir-nomatch.gsm -share/asterisk/sounds/dir-nomore.gsm -share/asterisk/sounds/invalid.gsm -share/asterisk/sounds/letters/a.gsm -share/asterisk/sounds/letters/at.gsm -share/asterisk/sounds/letters/b.gsm -share/asterisk/sounds/letters/c.gsm -share/asterisk/sounds/letters/d.gsm -share/asterisk/sounds/letters/dash.gsm -share/asterisk/sounds/letters/dollar.gsm -share/asterisk/sounds/letters/dot.gsm -share/asterisk/sounds/letters/e.gsm -share/asterisk/sounds/letters/equals.gsm -share/asterisk/sounds/letters/exclaimation-point.gsm -share/asterisk/sounds/letters/f.gsm -share/asterisk/sounds/letters/g.gsm -share/asterisk/sounds/letters/h.gsm -share/asterisk/sounds/letters/i.gsm -share/asterisk/sounds/letters/j.gsm -share/asterisk/sounds/letters/k.gsm -share/asterisk/sounds/letters/l.gsm -share/asterisk/sounds/letters/m.gsm -share/asterisk/sounds/letters/n.gsm -share/asterisk/sounds/letters/o.gsm -share/asterisk/sounds/letters/p.gsm -share/asterisk/sounds/letters/plus.gsm -share/asterisk/sounds/letters/q.gsm -share/asterisk/sounds/letters/r.gsm -share/asterisk/sounds/letters/s.gsm -share/asterisk/sounds/letters/slash.gsm -share/asterisk/sounds/letters/space.gsm -share/asterisk/sounds/letters/t.gsm -share/asterisk/sounds/letters/u.gsm -share/asterisk/sounds/letters/v.gsm -share/asterisk/sounds/letters/w.gsm -share/asterisk/sounds/letters/x.gsm -share/asterisk/sounds/letters/y.gsm -share/asterisk/sounds/letters/z.gsm -share/asterisk/sounds/letters/zed.gsm -share/asterisk/sounds/pbx-invalid.gsm -share/asterisk/sounds/pbx-invalidpark.gsm -share/asterisk/sounds/pbx-transfer.gsm -share/asterisk/sounds/phonetic/9_p.gsm -share/asterisk/sounds/phonetic/a_p.gsm -share/asterisk/sounds/phonetic/b_p.gsm -share/asterisk/sounds/phonetic/c_p.gsm -share/asterisk/sounds/phonetic/d_p.gsm -share/asterisk/sounds/phonetic/e_p.gsm -share/asterisk/sounds/phonetic/f_p.gsm -share/asterisk/sounds/phonetic/g_p.gsm -share/asterisk/sounds/phonetic/h_p.gsm -share/asterisk/sounds/phonetic/i_p.gsm -share/asterisk/sounds/phonetic/j_p.gsm -share/asterisk/sounds/phonetic/k_p.gsm -share/asterisk/sounds/phonetic/l_p.gsm -share/asterisk/sounds/phonetic/m_p.gsm -share/asterisk/sounds/phonetic/n_p.gsm -share/asterisk/sounds/phonetic/o_p.gsm -share/asterisk/sounds/phonetic/p_p.gsm -share/asterisk/sounds/phonetic/q_p.gsm -share/asterisk/sounds/phonetic/r_p.gsm -share/asterisk/sounds/phonetic/s_p.gsm -share/asterisk/sounds/phonetic/t_p.gsm -share/asterisk/sounds/phonetic/u_p.gsm -share/asterisk/sounds/phonetic/v_p.gsm -share/asterisk/sounds/phonetic/w_p.gsm -share/asterisk/sounds/phonetic/x_p.gsm -share/asterisk/sounds/phonetic/y_p.gsm -share/asterisk/sounds/phonetic/z_p.gsm -share/asterisk/sounds/privacy-incorrect.gsm -share/asterisk/sounds/privacy-prompt.gsm -share/asterisk/sounds/privacy-thankyou.gsm -share/asterisk/sounds/privacy-unident.gsm -share/asterisk/sounds/queue-callswaiting.gsm -share/asterisk/sounds/queue-holdtime.gsm -share/asterisk/sounds/queue-less-than.gsm -share/asterisk/sounds/queue-minutes.gsm -share/asterisk/sounds/queue-seconds.gsm -share/asterisk/sounds/queue-thankyou.gsm -share/asterisk/sounds/queue-thereare.gsm -share/asterisk/sounds/queue-youarenext.gsm -share/asterisk/sounds/ss-noservice.gsm -share/asterisk/sounds/transfer.gsm -share/asterisk/sounds/tt-allbusy.gsm -share/asterisk/sounds/tt-monkeys.gsm -share/asterisk/sounds/tt-monkeysintro.gsm -share/asterisk/sounds/tt-somethingwrong.gsm -share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm -share/asterisk/sounds/vm-Cust1.gsm -share/asterisk/sounds/vm-Cust2.gsm -share/asterisk/sounds/vm-Cust3.gsm -share/asterisk/sounds/vm-Cust4.gsm -share/asterisk/sounds/vm-Cust5.gsm -share/asterisk/sounds/vm-Family.gsm -share/asterisk/sounds/vm-Friends.gsm -share/asterisk/sounds/vm-INBOX.gsm -share/asterisk/sounds/vm-Old.gsm -share/asterisk/sounds/vm-Work.gsm -share/asterisk/sounds/vm-advopts.gsm -share/asterisk/sounds/vm-and.gsm -share/asterisk/sounds/vm-calldiffnum.gsm -share/asterisk/sounds/vm-changeto.gsm -share/asterisk/sounds/vm-delete.gsm -share/asterisk/sounds/vm-deleted.gsm -share/asterisk/sounds/vm-dialout.gsm -share/asterisk/sounds/vm-enter-num-to-call.gsm -share/asterisk/sounds/vm-extension.gsm -share/asterisk/sounds/vm-first.gsm -share/asterisk/sounds/vm-for.gsm -share/asterisk/sounds/vm-forwardoptions.gsm -share/asterisk/sounds/vm-from-extension.gsm -share/asterisk/sounds/vm-from-phonenumber.gsm -share/asterisk/sounds/vm-from.gsm -share/asterisk/sounds/vm-goodbye.gsm -share/asterisk/sounds/vm-helpexit.gsm -share/asterisk/sounds/vm-incorrect.gsm -share/asterisk/sounds/vm-incorrect-mailbox.gsm -share/asterisk/sounds/vm-instructions.gsm -share/asterisk/sounds/vm-intro.gsm -share/asterisk/sounds/vm-isonphone.gsm -share/asterisk/sounds/vm-isunavail.gsm -share/asterisk/sounds/vm-last.gsm -share/asterisk/sounds/vm-leavemsg.gsm -share/asterisk/sounds/vm-login.gsm -share/asterisk/sounds/vm-mailboxfull.gsm -share/asterisk/sounds/vm-message.gsm -share/asterisk/sounds/vm-messages.gsm -share/asterisk/sounds/vm-mismatch.gsm -share/asterisk/sounds/vm-msginstruct.gsm -share/asterisk/sounds/vm-msgsaved.gsm -share/asterisk/sounds/vm-newpassword.gsm -share/asterisk/sounds/vm-next.gsm -share/asterisk/sounds/vm-no.gsm -share/asterisk/sounds/vm-nobodyavail.gsm -share/asterisk/sounds/vm-nobox.gsm -share/asterisk/sounds/vm-nomore.gsm -share/asterisk/sounds/vm-nonumber.gsm -share/asterisk/sounds/vm-num-i-have.gsm -share/asterisk/sounds/vm-onefor.gsm -share/asterisk/sounds/vm-options.gsm -share/asterisk/sounds/vm-opts.gsm -share/asterisk/sounds/vm-passchanged.gsm -share/asterisk/sounds/vm-password.gsm -share/asterisk/sounds/vm-press.gsm -share/asterisk/sounds/vm-prev.gsm -share/asterisk/sounds/vm-reachoper.gsm -share/asterisk/sounds/vm-rec-busy.gsm -share/asterisk/sounds/vm-rec-name.gsm -share/asterisk/sounds/vm-rec-unv.gsm -share/asterisk/sounds/vm-received.gsm -share/asterisk/sounds/vm-reenterpassword.gsm -share/asterisk/sounds/vm-repeat.gsm -share/asterisk/sounds/vm-review.gsm -share/asterisk/sounds/vm-saved.gsm -share/asterisk/sounds/vm-savedto.gsm -share/asterisk/sounds/vm-savefolder.gsm -share/asterisk/sounds/vm-savemessage.gsm -share/asterisk/sounds/vm-sorry.gsm -share/asterisk/sounds/vm-star-cancel.gsm -share/asterisk/sounds/vm-starmain.gsm -share/asterisk/sounds/vm-then-pound.gsm -share/asterisk/sounds/vm-theperson.gsm -share/asterisk/sounds/vm-tocallback.gsm -share/asterisk/sounds/vm-tocallnum.gsm -share/asterisk/sounds/vm-tocancel.gsm -share/asterisk/sounds/vm-tocancelmsg.gsm -share/asterisk/sounds/vm-toenternumber.gsm -share/asterisk/sounds/vm-toforward.gsm -share/asterisk/sounds/vm-tohearenv.gsm -share/asterisk/sounds/vm-tomakecall.gsm -share/asterisk/sounds/vm-tooshort.gsm -share/asterisk/sounds/vm-toreply.gsm -share/asterisk/sounds/vm-torerecord.gsm -share/asterisk/sounds/vm-undelete.gsm -share/asterisk/sounds/vm-undeleted.gsm -share/asterisk/sounds/vm-unknown-caller.gsm -share/asterisk/sounds/vm-whichbox.gsm -share/asterisk/sounds/vm-youhave.gsm -share/asterisk/sounds/voicemail -@dirrm share/asterisk/sounds/phonetic -@dirrm share/asterisk/sounds/letters -@dirrm share/asterisk/sounds/digits -@dirrm share/asterisk/sounds -@dirrm share/asterisk/mohmp3 -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/share/asterisk/astdb -@cwd /var -spool/asterisk/vm -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/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 diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile deleted file mode 100644 index 97b6dcea0d10..000000000000 --- a/net/asterisk12/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.0.2 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= 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 - -ONLY_FOR_ARCHS= i386 sparc64 - -BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex -RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 - -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -MAKE_ENV+= WITHOUT_H323=1 -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323:build -PLIST_SUB+= WITH_H323="" -.endif - -.if defined(WITHOUT_ZAPTEL) -MAKE_ENV+= WITHOUT_ZAPTEL=1 -PLIST_SUB+= WITH_ZAPTEL="@comment " -.else -BUILD_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -.endif - -post-install: - @${INSTALL_SCRIPT} ${FILESDIR}/asterisk.sh ${PREFIX}/etc/rc.d - -.include <bsd.port.post.mk> diff --git a/net/asterisk12/distinfo b/net/asterisk12/distinfo deleted file mode 100644 index 5fa2ddcf1403..000000000000 --- a/net/asterisk12/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (asterisk-1.0.2.tar.gz) = 58b2c912b4e7c1f0438f06eb26c4b369 -SIZE (asterisk-1.0.2.tar.gz) = 9562949 diff --git a/net/asterisk12/files/asterisk.sh b/net/asterisk12/files/asterisk.sh deleted file mode 100644 index deee10c0cbe4..000000000000 --- a/net/asterisk12/files/asterisk.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -name=asterisk -rcvar=`set_rcvar` - -command=/usr/local/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 77acd5fecf7d..000000000000 --- a/net/asterisk12/files/patch-Makefile +++ /dev/null @@ -1,412 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -44,6 +44,15 @@ - PROC=$(shell uname -m) - endif - -+ifeq (${OSARCH},FreeBSD) -+ifeq ($(PROC),sparc64) -+PROC=ultrasparc -+OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi) -+OPTIONS+=$(shell if $(CC) -mcpu=v9 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v9"; fi) -+OPTIONS+=-fomit-frame-pointerendif -+endif -+endif -+ - # Pentium Pro Optimize - #PROC=i686 - -@@ -62,10 +71,10 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the asterisk's code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - - #Include debug symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g #-pg -+#DEBUG=-g #-pg - - # If you are running a radio application, define RADIO_RELAX so that the DTMF - # will be received more reliably -@@ -90,7 +99,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 -@@ -110,23 +119,23 @@ - # Don't use together with -DBUSYDETECT_TONEONLY - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - --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 - - INCLUDE=-Iinclude -I../include --CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY - CFLAGS+=$(OPTIMIZE) - - ifneq ($(PROC),ultrasparc) -@@ -137,11 +146,8 @@ - CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) - - ifeq (${OSARCH},FreeBSD) --OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) --CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) --LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) --INCLUDE+=-I/usr/local/include --CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) -+CFLAGS+=$(PTHREAD_CFLAGS) -+LIBS+=$(PTHREAD_LIBS) - endif # FreeBSD - - ifeq (${OSARCH},NetBSD) -@@ -157,7 +163,10 @@ - #CFLAGS+=-DOLD_DSP_ROUTINES - - CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) --CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPTEL_OPTIMIZATIONS -+endif - - LIBEDIT=editline/libedit.a - -@@ -219,7 +228,7 @@ - SOLINK=-shared -Xlinker -x - endif - --CC=gcc -+CC?=gcc - INSTALL=install - - _all: all -@@ -231,7 +240,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: depend asterisk subdirs -+all: depend asterisk subdirs manpage - - editline/config.h: - cd editline && unset CFLAGS LIBS && ./configure ; \ -@@ -240,13 +249,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 -@@ -268,13 +277,10 @@ - - asterisk.o: asterisk.c build.h - --manpage: asterisk.8.gz -+manpage: asterisk.8 - --asterisk.8.gz: asterisk.sgml -- rm -f asterisk.8 -- docbook2man asterisk.sgml -- mv ./*.8 asterisk.8 -- gzip asterisk.8 -+asterisk.8: asterisk.8.gz -+ gzcat asterisk.8.gz > asterisk.8 - - ifneq ($(strip $(ASTERISKVERSION)),) - build.h: .version -@@ -292,8 +298,8 @@ - exit 1; \ - fi - --asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS) -+ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) -o muted muted.o -@@ -312,28 +318,28 @@ - $(MAKE) -C stdtime clean - - datafiles: all -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits - 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/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; \ -@@ -341,18 +347,18 @@ - done - for x in 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-*; 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 CVS ]; then \ -@@ -364,111 +370,86 @@ - fi - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/ -- install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ - 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) - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm -- rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \ -- mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- else \ -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \ -- fi -- ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- 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.gz $(DESTDIR)$(ASTMANDIR)/man8 -+ ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(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 - 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)/vm . ) -- ( 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 " +-------------------------------------------+" -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/vm . ) -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/voicemail . ) - --install: all datafiles bininstall -+install: all datafiles bininstall samples - - upgrade: all bininstall - - adsi: all -- 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: all datafiles adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ for x in configs/*.sample channels/h323/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - fi ; \ -- install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done -- echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -+ echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \ -+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \ -+ fi - 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 - 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 ; \ -@@ -483,7 +464,7 @@ - @[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) - @[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) - install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk - for x in images/*.gif; do \ - install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \ - done -@@ -503,10 +484,10 @@ - - __rpm: _version - 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 redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \ - sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \ - 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 32efb5d2b101..000000000000 --- a/net/asterisk12/files/patch-agi::Makefile +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Tue Jun 22 20:42:13 2004 -+++ agi/Makefile Tue Oct 5 21:03:40 2004 -@@ -11,15 +11,18 @@ - # 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+= - - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) $(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 diff --git a/net/asterisk12/files/patch-apps::Makefile b/net/asterisk12/files/patch-apps::Makefile deleted file mode 100644 index 00b77dfe2434..000000000000 --- a/net/asterisk12/files/patch-apps::Makefile +++ /dev/null @@ -1,49 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig Sat Sep 25 00:32:56 2004 -+++ apps/Makefile Sun Oct 10 16:20:06 2004 -@@ -40,7 +40,7 @@ - #APPS+=app_rpt.so - - APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) --APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) -+APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) - APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) - - CFLAGS+=-fPIC -@@ -65,12 +65,12 @@ - $(CC) $(SOLINK) -o $@ $< -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 - - app_voicemail.so : app_voicemail.o - ifeq ($(USE_MYSQL_VM_INTERFACE),1) -- $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz -+ $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz - else - ifeq ($(USE_POSTGRES_VM_INTERFACE),1) - $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq -@@ -80,16 +80,16 @@ - 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 $@ $< -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ $< -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) $(CFLAGS) look.c -o look -lncurses - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk12/files/patch-astman::Makefile b/net/asterisk12/files/patch-astman::Makefile deleted file mode 100644 index 2745860cdd36..000000000000 --- a/net/asterisk12/files/patch-astman::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- astman/Makefile.orig Sat Jun 26 22:25:39 2004 -+++ astman/Makefile Thu Oct 14 19:14:22 2004 -@@ -5,16 +5,16 @@ - - OSARCH=$(shell uname -s) - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I/usr/local/include -L/usr/local/lib -+CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib - endif - --TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi) -+TARGET=astman - all: depend $(TARGET) - - install: - if [ "$(TARGET)" != "none" ]; then \ - for x in $(TARGET); do \ -- install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ - done ; \ - fi - diff --git a/net/asterisk12/files/patch-cdr::Makefile b/net/asterisk12/files/patch-cdr::Makefile deleted file mode 100644 index f646d2c9a3dc..000000000000 --- a/net/asterisk12/files/patch-cdr::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Aug 31 19:33:00 2004 -+++ cdr/Makefile Thu Oct 14 19:13:38 2004 -@@ -21,7 +21,7 @@ - OSARCH=$(shell uname -s) - - ifeq (${OSARCH},FreeBSD) --SOLINK+=-L/usr/local/lib -+SOLINK+=-L$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -71,7 +71,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 e82a0299756d..000000000000 --- a/net/asterisk12/files/patch-channels::Makefile +++ /dev/null @@ -1,90 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -57,10 +57,10 @@ - - endif - ifeq (${OSARCH},FreeBSD) --PTLIB=-lpt_FreeBSD_x86_r --H323LIB=-lh323_FreeBSD_x86_r --CHANH323LIB=-pthread --SOLINK+=-L/usr/local/lib -+PTLIB=-lpt_FreeBSD_x86_r_s -+H323LIB=-lh323_FreeBSD_x86_r_s -+CHANH323LIB= -+SOLINK+=-L$(LOCALBASE)/lib - endif - ifeq (${OSARCH},NetBSD) - PTLIB=-lpt_NetBSD_x86_r -@@ -72,8 +72,10 @@ - endif - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so) -+ifndef WITHOUT_H323 -+CHANNEL_LIBS+=chan_h323.so -+endif - - CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations - CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -@@ -84,7 +86,7 @@ - ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") - ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") -+CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include") - CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) - CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") - -@@ -107,7 +109,7 @@ - ZAPDIR=/usr/lib - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so") - - CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) - -@@ -156,6 +158,8 @@ - chan_oss.so: chan_oss.o - $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio - endif -+chan_oss.so: chan_oss.o -+ $(CC) $(SOLINK) -o $@ chan_oss.o - - chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o - ifeq ($(USE_MYSQL_FRIENDS),1) -@@ -175,7 +179,7 @@ - $(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c - - chan_zap.so: chan_zap.o -- $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -ltonezone -+ $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone - - chan_sip.so: chan_sip.o - ifeq ($(USE_SIP_MYSQL_FRIENDS),1) -@@ -199,15 +203,17 @@ - chan_vpb.so: chan_vpb.o - $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl - --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 -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r - -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - - #chan_modem.so : chan_modem.o - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi - - 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 de2ed3978663..000000000000 --- a/net/asterisk12/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c 2004/10/10 13:00:17 1.1 -+++ channels/chan_h323.c 2004/10/10 13:00:39 -@@ -26,7 +26,7 @@ - * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $ - */ - -- -+#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 521d6a46d256..000000000000 --- a/net/asterisk12/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,120 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig -+++ channels/chan_sip.c -@@ -139,7 +139,7 @@ - - static char default_language[MAX_LANGUAGE] = ""; - --static char default_callerid[AST_MAX_EXTENSION] = "asterisk"; -+static char default_callerid[AST_MAX_EXTENSION] = "Unknown"; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; - -@@ -244,6 +244,7 @@ - struct sip_route { - struct sip_route *next; - char hop[0]; -+ int lr; - }; - - struct sip_history { -@@ -4573,6 +4574,10 @@ - /* Make a struct route */ - thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); - if (thishop) { -+ if (strnstr(rr, ";lr", len) != NULL) -+ thishop->lr = 1; -+ else -+ thishop->lr = 0; - strncpy(thishop->hop, rr, len); /* safe */ - thishop->hop[len] = '\0'; - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); -@@ -4596,31 +4601,41 @@ - rr += len+1; - } - } -- /* 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, ">"); -- } else { -- /* No <> - just take the lot */ -- c = contact; len = strlen(contact); -- } -- thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ /* 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) { -- strncpy(thishop->hop, c, len); /* safe */ -- thishop->hop[len] = '\0'; -- 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, ">"); -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; len = strlen(contact); -+ } -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ if (thishop) { -+ strncpy(thishop->hop, c, len); /* safe */ -+ thishop->hop[len] = '\0'; -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - /* Store as new route */ -@@ -7197,7 +7212,11 @@ - /* Get destination right away */ - 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) { -@@ -7225,7 +7244,6 @@ - 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); 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 965a643bb687..000000000000 --- a/net/asterisk12/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c -+++ channels/chan_zap.c -@@ -42,7 +42,9 @@ - #include <sys/signal.h> - #include <errno.h> - #include <stdlib.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <unistd.h> - #include <sys/ioctl.h> - #ifdef __linux__ diff --git a/net/asterisk12/files/patch-channels::h323::Makefile b/net/asterisk12/files/patch-channels::h323::Makefile deleted file mode 100644 index bc34083e2ff3..000000000000 --- a/net/asterisk12/files/patch-channels::h323::Makefile +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/Makefile.orig Tue Aug 31 16:32:11 2004 -+++ channels/h323/Makefile Sun Oct 10 15:25:42 2004 -@@ -53,7 +53,7 @@ - LIBS+=-lpthread - endif - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS += -pthread -+CFLAGS += $(PTHREAD_LIBS) - endif - CFLAGS += -D_REENTRANT -D_GNU_SOURCE - CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS -@@ -74,19 +74,19 @@ - - - ast_h323.o: ast_h323.cpp -- $(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $< -+ $(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $< - - libchanh323.a: ast_h323.o - ar cr libchanh323.a ast_h323.o - - chan_h323.so: -- $(CXX) -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB) - - chan_h323_d.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB) - - chan_h323_s.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB) - clean: - rm -f *.o *.so core.* libchanh323.a - 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 6cfae1ec5d05..000000000000 --- a/net/asterisk12/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig -+++ channels/h323/ast_h323.cpp -@@ -722,7 +722,7 @@ - if (h323debug) { - cout << " -- Sending user input tone (" << tone << ") to remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - H323Connection::SendUserInputTone(tone, duration); - } - -@@ -732,18 +732,20 @@ - if (h323debug) { - cout << " -- Received user input tone (" << tone << ") from remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - } - H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp); - } - - void MyH323Connection::OnUserInputString(const PString &value) - { -+ char val; - if (mode == H323_DTMF_RFC2833) { - if (h323debug) { - cout << " -- Received user input string (" << value << ") from remote." << endl; - } -- on_send_digit(GetCallReference(), value[0]); -+ val = value[0]; -+ on_send_digit(GetCallReference(), &val); - } - } - diff --git a/net/asterisk12/files/patch-codecs::Makefile b/net/asterisk12/files/patch-codecs::Makefile deleted file mode 100644 index de9aff4c34fe..000000000000 --- a/net/asterisk12/files/patch-codecs::Makefile +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Mon Jul 19 18:52:57 2004 -+++ codecs/Makefile Sun Oct 10 15:28:35 2004 -@@ -17,23 +17,23 @@ - # g723.1b) - # - #MODG723=codec_g723_1.so codec_g723_1b.so --MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") --MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") --MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") --MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") -+MODG723=codec_g723_1_dummy.so -+MODG729=codec_g729_dummy.so -+MODSPEEX=codec_speex.so -+MODILBC=codec_ilbc.so - CFLAGS+=-fPIC --CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") -+CFLAGS+=-I$(LOCALBASE)/include - - LIBG723=g723.1/libg723.a - LIBG723B=g723.1b/libg723b.a - LIBGSM=gsm/lib/libgsm.a - LIBGSMT=gsm/lib/libgsm.a - LIBLPC10=lpc10/liblpc10.a --LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib") -+LIBSPEEX=-L$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - LIBILBC=ilbc/libilbc.a - --CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ - codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ - codec_g726.so - -@@ -91,7 +91,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::codec_g723_1_dummy.c b/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c deleted file mode 100644 index 3ce9571013ec..000000000000 --- a/net/asterisk12/files/patch-codecs::codec_g723_1_dummy.c +++ /dev/null @@ -1,314 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g723_1_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g723_1_dummy.c Sun Oct 10 16:07:05 2004 -@@ -0,0 +1,308 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.723.1 (dummy!) -+ * -+ * The G.723.1 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g723_ex.h" -+#include "g723_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator"; -+ -+struct g723_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g723_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g723tolin_new() -+{ -+ struct g723_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog723_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g723_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g723_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g723_ex; -+ return &f; -+} -+ -+static struct ast_frame *g723tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G723_1; -+ f.datalen = sizeof(g723_slin_ex); -+ /* All frames are 30 ms long */ -+ f.samples = 30; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g723_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog723_new() -+{ -+ struct g723_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+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 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ int len = 0; -+ int res; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ res = g723_len(((unsigned char *)f->data + len)[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Invalid data\n"); -+ return -1; -+ } -+ if (res + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 480 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 480); -+ tmp->tail+=480; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += res; -+ } -+ return 0; -+} -+ -+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 480) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G723_1; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 480) { -+ /* Encode a frame of data */ -+ if (cnt + 24 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 24); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 30; -+ cnt += 24; -+ tmp->tail -= 480; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g723_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g723tolin = -+ { "g723tolin_dummy", -+ AST_FORMAT_G723_1, AST_FORMAT_SLINEAR, -+ g723tolin_new, -+ g723tolin_framein, -+ g723tolin_frameout, -+ g723_destroy, -+ g723tolin_sample -+ }; -+ -+static struct ast_translator lintog723 = -+ { "lintog723_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G723_1, -+ lintog723_new, -+ lintog723_framein, -+ lintog723_frameout, -+ g723_destroy, -+ lintog723_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog723); -+ if (!res) -+ res = ast_unregister_translator(&g723tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g723tolin); -+ if (!res) -+ res=ast_register_translator(&lintog723); -+ else -+ ast_unregister_translator(&g723tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk12/files/patch-codecs::codec_g729_dummy.c b/net/asterisk12/files/patch-codecs::codec_g729_dummy.c deleted file mode 100644 index 9fcc7b19ca35..000000000000 --- a/net/asterisk12/files/patch-codecs::codec_g729_dummy.c +++ /dev/null @@ -1,281 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g729_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g729_dummy.c Sun Oct 10 16:07:12 2004 -@@ -0,0 +1,275 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.729 (dummy!) -+ * -+ * The G.729 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g729_ex.h" -+#include "g729_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.729/PCM16 Codec Translator"; -+ -+struct g729_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g729_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g729tolin_new() -+{ -+ struct g729_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog729_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g729_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g729_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g729_ex; -+ return &f; -+} -+ -+static struct ast_frame *g729tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G729A; -+ f.datalen = sizeof(g729_slin_ex); -+ /* All frames are 10 ms long */ -+ f.samples = 10; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g729_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog729_new() -+{ -+ struct g729_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ int len = 0; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ if (10 + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 160 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 160); -+ tmp->tail+=160; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += 10; -+ } -+ return 0; -+} -+ -+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 160) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G729A; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 160) { -+ /* Encode a frame of data */ -+ if (cnt + 10 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 10); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 10; -+ cnt += 10; -+ tmp->tail -= 160; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g729_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g729tolin = -+ { "g729tolin_dummy", -+ AST_FORMAT_G729A, AST_FORMAT_SLINEAR, -+ g729tolin_new, -+ g729tolin_framein, -+ g729tolin_frameout, -+ g729_destroy, -+ g729tolin_sample -+ }; -+ -+static struct ast_translator lintog729 = -+ { "lintog729_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G729A, -+ lintog729_new, -+ lintog729_framein, -+ lintog729_frameout, -+ g729_destroy, -+ lintog729_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog729); -+ if (!res) -+ res = ast_unregister_translator(&g729tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g729tolin); -+ if (!res) -+ res=ast_register_translator(&lintog729); -+ else -+ ast_unregister_translator(&g729tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk12/files/patch-codecs::g729_slin_ex.h b/net/asterisk12/files/patch-codecs::g729_slin_ex.h deleted file mode 100644 index 44e60f2de848..000000000000 --- a/net/asterisk12/files/patch-codecs::g729_slin_ex.h +++ /dev/null @@ -1,20 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/g729_slin_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,14 @@ -+/* -+ * g729_slin_ex.h -- -+ * -+ * 8-bit G.729 data, 10 milliseconds worth at 8 kHz. -+ * -+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static unsigned char g729_slin_ex[] = { -+120,82,175,64,0,250,219,0,7,214 -+}; diff --git a/net/asterisk12/files/patch-codecs::ilbc::Makefile b/net/asterisk12/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 7770e07550a4..000000000000 --- a/net/asterisk12/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Sun Apr 27 21:13:11 2003 -+++ codecs/ilbc/Makefile Fri Jan 30 01:47:34 2004 -@@ -1,4 +1,4 @@ --CFLAGS+= -fPIC -O3 -+CFLAGS+= -fPIC - LIB=libilbc.a - - OBJS= anaFilter.o iCBSearch.o packing.o \ diff --git a/net/asterisk12/files/patch-codecs::slin_g729_ex.h b/net/asterisk12/files/patch-codecs::slin_g729_ex.h deleted file mode 100644 index e1236d2498dc..000000000000 --- a/net/asterisk12/files/patch-codecs::slin_g729_ex.h +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/slin_g729_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,25 @@ -+/* -+ * slin_g729_ex.h -- -+ * -+ * Signed 16-bit audio data, 10 milliseconds worth at 8 kHz. -+ * -+ * Source: g723.example -+ * -+ * Copyright (C) 2001, Linux Support Services, Inc. -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static signed short slin_g729_ex[] = { -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -+}; diff --git a/net/asterisk12/files/patch-db.c b/net/asterisk12/files/patch-db.c deleted file mode 100644 index 6c2bdcd443c8..000000000000 --- a/net/asterisk12/files/patch-db.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jul 9 13:08:09 2004 -+++ db.c Sun Oct 10 15:32:33 2004 -@@ -33,7 +33,7 @@ - #include <asterisk/cli.h> - #include <asterisk/utils.h> - #include <asterisk/lock.h> --#include "db1-ast/include/db.h" -+#include <db.h> - #include "asterisk.h" - #include "astconf.h" - 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-formats::Makefile b/net/asterisk12/files/patch-formats::Makefile deleted file mode 100644 index dacfd7b08303..000000000000 --- a/net/asterisk12/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Tue Nov 4 04:40:09 2003 -+++ formats/Makefile Fri Jan 30 01:47:34 2004 -@@ -18,7 +18,7 @@ - # - # G723 simple frame is depricated - # --#FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - GSMLIB=../codecs/gsm/lib/libgsm.a - -@@ -40,7 +40,7 @@ - $(CC) $(SOLINK) -o $@ $< -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 fb5eb12833dc..000000000000 --- a/net/asterisk12/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,351 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g723_1.c.orig Sun Oct 10 15:59:18 2004 -+++ formats/format_g723_1.c Sun Oct 10 16:05:05 2004 -@@ -0,0 +1,345 @@ -+/* -+ * 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 <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 <stdio.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 */ -+ int fd; /* 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(int fd) -+{ -+ /* 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->fd = fd; -+ 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(int fd, 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->fd = fd; -+ 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(); -+ close(s->fd); -+ 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 = read(s->fd, s->g723, 1)) != 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 = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != 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 = write(fs->fd, f->data, f->datalen)) != 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 ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ 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 (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 && lseek(fs->fd, soffset, SEEK_SET) != soffset) { -+ 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(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 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 = lseek(fs->fd, 0, SEEK_CUR); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 (lseek(fs->fd, offset, SEEK_SET) != offset) { -+ 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 a144d1b0f6bf..000000000000 --- a/net/asterisk12/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Wed Jan 28 23:32:48 2004 -+++ formats/format_g729.c Thu Feb 19 01:03:30 2004 -@@ -45,7 +45,7 @@ - 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 */ - }; - - -@@ -126,11 +126,11 @@ - 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 = read(s->fd, s->g729, 20)) != 20) { -+ if ((res = read(s->fd, s->g729, 10)) != 10) { - if (res) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -174,7 +174,7 @@ - cur = lseek(fs->fd, 0, SEEK_CUR); - max = lseek(fs->fd, 0, SEEK_END); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -202,7 +202,7 @@ - { - off_t offset; - offset = lseek(fs->fd, 0, SEEK_CUR); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() 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 dca6672c389a..000000000000 --- a/net/asterisk12/files/patch-pbx::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig Sun Oct 26 20:50:49 2003 -+++ pbx/Makefile Fri Jan 30 01:47:34 2004 -@@ -16,7 +16,7 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate --PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - -@@ -62,7 +62,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 3377b4aa1c8e..000000000000 --- a/net/asterisk12/files/patch-res::Makefile +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile.orig -+++ res/Makefile -@@ -21,7 +21,10 @@ - - CFLAGS+= - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPATA_MOH -+endif - # - # Work around buggy RedHat 9.0 - # -@@ -34,7 +37,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 - - res_crypto.so: res_crypto.o - $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS) diff --git a/net/asterisk12/files/patch-rtp.c b/net/asterisk12/files/patch-rtp.c deleted file mode 100644 index 06289f357208..000000000000 --- a/net/asterisk12/files/patch-rtp.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Sat Sep 18 16:56:28 2004 -+++ rtp.c Sun Oct 10 15:57:22 2004 -@@ -127,7 +127,7 @@ - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; -@@ -841,8 +841,10 @@ - /* Must be an even port number by RTP spec */ - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - 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)))) - break; 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 d503a8741743..000000000000 --- a/net/asterisk12/pkg-plist +++ /dev/null @@ -1,642 +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_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/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/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/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi -etc/asterisk/h323.conf-dist -@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.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/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_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi -etc/asterisk/res_config_odbc.conf-dist -@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.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/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 -etc/rc.d/asterisk.sh -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/astosp.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/channel_pvt.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/config.h -include/asterisk/config_pvt.h -include/asterisk/crypto.h -include/asterisk/cvsid.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dsp.h -include/asterisk/enum.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/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/options.h -include/asterisk/pbx.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/srv.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/utils.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_controlplayback.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.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_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_intercom.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_qcall.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_record.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_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_striplsd.so -lib/asterisk/modules/app_substring.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 -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_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_manager.so -lib/asterisk/modules/chan_agent.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_modem.so -lib/asterisk/modules/chan_modem_aopen.so -lib/asterisk/modules/chan_modem_bestdata.so -lib/asterisk/modules/chan_modem_i4l.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_g723_1_dummy.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_g729_dummy.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_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/pbx_config.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/pbx_wilcalu.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.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_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/safe_asterisk -share/asterisk/agi-bin/agi-test.agi -share/asterisk/agi-bin/eagi-sphinx-test -share/asterisk/agi-bin/eagi-test -share/asterisk/firmware/iax/iaxy.bin -share/asterisk/images/asterisk-intro.jpg -share/asterisk/keys/freeworlddialup.pub -share/asterisk/keys/iaxtel.pub -share/asterisk/mohmp3/fpm-calm-river.mp3 -share/asterisk/mohmp3/fpm-sunshine.mp3 -share/asterisk/mohmp3/fpm-world-mix.mp3 -share/asterisk/sounds/agent-alreadyon.gsm -share/asterisk/sounds/agent-incorrect.gsm -share/asterisk/sounds/agent-loggedoff.gsm -share/asterisk/sounds/agent-loginok.gsm -share/asterisk/sounds/agent-newlocation.gsm -share/asterisk/sounds/agent-pass.gsm -share/asterisk/sounds/agent-user.gsm -share/asterisk/sounds/auth-incorrect.gsm -share/asterisk/sounds/auth-thankyou.gsm -share/asterisk/sounds/beep.gsm -share/asterisk/sounds/conf-adminmenu.gsm -share/asterisk/sounds/conf-enteringno.gsm -share/asterisk/sounds/conf-errormenu.gsm -share/asterisk/sounds/conf-getchannel.gsm -share/asterisk/sounds/conf-getconfno.gsm -share/asterisk/sounds/conf-getpin.gsm -share/asterisk/sounds/conf-invalid.gsm -share/asterisk/sounds/conf-invalidpin.gsm -share/asterisk/sounds/conf-kicked.gsm -share/asterisk/sounds/conf-locked.gsm -share/asterisk/sounds/conf-lockednow.gsm -share/asterisk/sounds/conf-muted.gsm -share/asterisk/sounds/conf-noempty.gsm -share/asterisk/sounds/conf-onlyperson.gsm -share/asterisk/sounds/conf-unlockednow.gsm -share/asterisk/sounds/conf-unmuted.gsm -share/asterisk/sounds/conf-usermenu.gsm -share/asterisk/sounds/demo-abouttotry.gsm -share/asterisk/sounds/demo-congrats.gsm -share/asterisk/sounds/demo-echodone.gsm -share/asterisk/sounds/demo-echotest.gsm -share/asterisk/sounds/demo-enterkeywords.gsm -share/asterisk/sounds/demo-instruct.gsm -share/asterisk/sounds/demo-moreinfo.gsm -share/asterisk/sounds/demo-nogo.gsm -share/asterisk/sounds/demo-nomatch.gsm -share/asterisk/sounds/demo-thanks.gsm -share/asterisk/sounds/digits/0.gsm -share/asterisk/sounds/digits/1.gsm -share/asterisk/sounds/digits/10.gsm -share/asterisk/sounds/digits/11.gsm -share/asterisk/sounds/digits/12.gsm -share/asterisk/sounds/digits/13.gsm -share/asterisk/sounds/digits/14.gsm -share/asterisk/sounds/digits/15.gsm -share/asterisk/sounds/digits/16.gsm -share/asterisk/sounds/digits/17.gsm -share/asterisk/sounds/digits/18.gsm -share/asterisk/sounds/digits/19.gsm -share/asterisk/sounds/digits/2.gsm -share/asterisk/sounds/digits/20.gsm -share/asterisk/sounds/digits/3.gsm -share/asterisk/sounds/digits/30.gsm -share/asterisk/sounds/digits/4.gsm -share/asterisk/sounds/digits/40.gsm -share/asterisk/sounds/digits/5.gsm -share/asterisk/sounds/digits/50.gsm -share/asterisk/sounds/digits/6.gsm -share/asterisk/sounds/digits/60.gsm -share/asterisk/sounds/digits/7.gsm -share/asterisk/sounds/digits/70.gsm -share/asterisk/sounds/digits/8.gsm -share/asterisk/sounds/digits/80.gsm -share/asterisk/sounds/digits/9.gsm -share/asterisk/sounds/digits/90.gsm -share/asterisk/sounds/digits/a-m.gsm -share/asterisk/sounds/digits/at.gsm -share/asterisk/sounds/digits/day-0.gsm -share/asterisk/sounds/digits/day-1.gsm -share/asterisk/sounds/digits/day-2.gsm -share/asterisk/sounds/digits/day-3.gsm -share/asterisk/sounds/digits/day-4.gsm -share/asterisk/sounds/digits/day-5.gsm -share/asterisk/sounds/digits/day-6.gsm -share/asterisk/sounds/digits/dollars.gsm -share/asterisk/sounds/digits/h-1.gsm -share/asterisk/sounds/digits/h-10.gsm -share/asterisk/sounds/digits/h-11.gsm -share/asterisk/sounds/digits/h-12.gsm -share/asterisk/sounds/digits/h-13.gsm -share/asterisk/sounds/digits/h-14.gsm -share/asterisk/sounds/digits/h-15.gsm -share/asterisk/sounds/digits/h-16.gsm -share/asterisk/sounds/digits/h-17.gsm -share/asterisk/sounds/digits/h-18.gsm -share/asterisk/sounds/digits/h-19.gsm -share/asterisk/sounds/digits/h-2.gsm -share/asterisk/sounds/digits/h-20.gsm -share/asterisk/sounds/digits/h-3.gsm -share/asterisk/sounds/digits/h-30.gsm -share/asterisk/sounds/digits/h-4.gsm -share/asterisk/sounds/digits/h-5.gsm -share/asterisk/sounds/digits/h-6.gsm -share/asterisk/sounds/digits/h-7.gsm -share/asterisk/sounds/digits/h-8.gsm -share/asterisk/sounds/digits/h-9.gsm -share/asterisk/sounds/digits/hundred.gsm -share/asterisk/sounds/digits/million.gsm -share/asterisk/sounds/digits/mon-0.gsm -share/asterisk/sounds/digits/mon-1.gsm -share/asterisk/sounds/digits/mon-10.gsm -share/asterisk/sounds/digits/mon-11.gsm -share/asterisk/sounds/digits/mon-2.gsm -share/asterisk/sounds/digits/mon-3.gsm -share/asterisk/sounds/digits/mon-4.gsm -share/asterisk/sounds/digits/mon-5.gsm -share/asterisk/sounds/digits/mon-6.gsm -share/asterisk/sounds/digits/mon-7.gsm -share/asterisk/sounds/digits/mon-8.gsm -share/asterisk/sounds/digits/mon-9.gsm -share/asterisk/sounds/digits/oclock.gsm -share/asterisk/sounds/digits/oh.gsm -share/asterisk/sounds/digits/p-m.gsm -share/asterisk/sounds/digits/pound.gsm -share/asterisk/sounds/digits/star.gsm -share/asterisk/sounds/digits/thousand.gsm -share/asterisk/sounds/digits/today.gsm -share/asterisk/sounds/digits/tomorrow.gsm -share/asterisk/sounds/digits/yesterday.gsm -share/asterisk/sounds/dir-instr.gsm -share/asterisk/sounds/dir-intro.gsm -share/asterisk/sounds/dir-intro-fn.gsm -share/asterisk/sounds/dir-nomatch.gsm -share/asterisk/sounds/dir-nomore.gsm -share/asterisk/sounds/invalid.gsm -share/asterisk/sounds/letters/a.gsm -share/asterisk/sounds/letters/at.gsm -share/asterisk/sounds/letters/b.gsm -share/asterisk/sounds/letters/c.gsm -share/asterisk/sounds/letters/d.gsm -share/asterisk/sounds/letters/dash.gsm -share/asterisk/sounds/letters/dollar.gsm -share/asterisk/sounds/letters/dot.gsm -share/asterisk/sounds/letters/e.gsm -share/asterisk/sounds/letters/equals.gsm -share/asterisk/sounds/letters/exclaimation-point.gsm -share/asterisk/sounds/letters/f.gsm -share/asterisk/sounds/letters/g.gsm -share/asterisk/sounds/letters/h.gsm -share/asterisk/sounds/letters/i.gsm -share/asterisk/sounds/letters/j.gsm -share/asterisk/sounds/letters/k.gsm -share/asterisk/sounds/letters/l.gsm -share/asterisk/sounds/letters/m.gsm -share/asterisk/sounds/letters/n.gsm -share/asterisk/sounds/letters/o.gsm -share/asterisk/sounds/letters/p.gsm -share/asterisk/sounds/letters/plus.gsm -share/asterisk/sounds/letters/q.gsm -share/asterisk/sounds/letters/r.gsm -share/asterisk/sounds/letters/s.gsm -share/asterisk/sounds/letters/slash.gsm -share/asterisk/sounds/letters/space.gsm -share/asterisk/sounds/letters/t.gsm -share/asterisk/sounds/letters/u.gsm -share/asterisk/sounds/letters/v.gsm -share/asterisk/sounds/letters/w.gsm -share/asterisk/sounds/letters/x.gsm -share/asterisk/sounds/letters/y.gsm -share/asterisk/sounds/letters/z.gsm -share/asterisk/sounds/letters/zed.gsm -share/asterisk/sounds/pbx-invalid.gsm -share/asterisk/sounds/pbx-invalidpark.gsm -share/asterisk/sounds/pbx-transfer.gsm -share/asterisk/sounds/phonetic/9_p.gsm -share/asterisk/sounds/phonetic/a_p.gsm -share/asterisk/sounds/phonetic/b_p.gsm -share/asterisk/sounds/phonetic/c_p.gsm -share/asterisk/sounds/phonetic/d_p.gsm -share/asterisk/sounds/phonetic/e_p.gsm -share/asterisk/sounds/phonetic/f_p.gsm -share/asterisk/sounds/phonetic/g_p.gsm -share/asterisk/sounds/phonetic/h_p.gsm -share/asterisk/sounds/phonetic/i_p.gsm -share/asterisk/sounds/phonetic/j_p.gsm -share/asterisk/sounds/phonetic/k_p.gsm -share/asterisk/sounds/phonetic/l_p.gsm -share/asterisk/sounds/phonetic/m_p.gsm -share/asterisk/sounds/phonetic/n_p.gsm -share/asterisk/sounds/phonetic/o_p.gsm -share/asterisk/sounds/phonetic/p_p.gsm -share/asterisk/sounds/phonetic/q_p.gsm -share/asterisk/sounds/phonetic/r_p.gsm -share/asterisk/sounds/phonetic/s_p.gsm -share/asterisk/sounds/phonetic/t_p.gsm -share/asterisk/sounds/phonetic/u_p.gsm -share/asterisk/sounds/phonetic/v_p.gsm -share/asterisk/sounds/phonetic/w_p.gsm -share/asterisk/sounds/phonetic/x_p.gsm -share/asterisk/sounds/phonetic/y_p.gsm -share/asterisk/sounds/phonetic/z_p.gsm -share/asterisk/sounds/privacy-incorrect.gsm -share/asterisk/sounds/privacy-prompt.gsm -share/asterisk/sounds/privacy-thankyou.gsm -share/asterisk/sounds/privacy-unident.gsm -share/asterisk/sounds/queue-callswaiting.gsm -share/asterisk/sounds/queue-holdtime.gsm -share/asterisk/sounds/queue-less-than.gsm -share/asterisk/sounds/queue-minutes.gsm -share/asterisk/sounds/queue-seconds.gsm -share/asterisk/sounds/queue-thankyou.gsm -share/asterisk/sounds/queue-thereare.gsm -share/asterisk/sounds/queue-youarenext.gsm -share/asterisk/sounds/ss-noservice.gsm -share/asterisk/sounds/transfer.gsm -share/asterisk/sounds/tt-allbusy.gsm -share/asterisk/sounds/tt-monkeys.gsm -share/asterisk/sounds/tt-monkeysintro.gsm -share/asterisk/sounds/tt-somethingwrong.gsm -share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm -share/asterisk/sounds/vm-Cust1.gsm -share/asterisk/sounds/vm-Cust2.gsm -share/asterisk/sounds/vm-Cust3.gsm -share/asterisk/sounds/vm-Cust4.gsm -share/asterisk/sounds/vm-Cust5.gsm -share/asterisk/sounds/vm-Family.gsm -share/asterisk/sounds/vm-Friends.gsm -share/asterisk/sounds/vm-INBOX.gsm -share/asterisk/sounds/vm-Old.gsm -share/asterisk/sounds/vm-Work.gsm -share/asterisk/sounds/vm-advopts.gsm -share/asterisk/sounds/vm-and.gsm -share/asterisk/sounds/vm-calldiffnum.gsm -share/asterisk/sounds/vm-changeto.gsm -share/asterisk/sounds/vm-delete.gsm -share/asterisk/sounds/vm-deleted.gsm -share/asterisk/sounds/vm-dialout.gsm -share/asterisk/sounds/vm-enter-num-to-call.gsm -share/asterisk/sounds/vm-extension.gsm -share/asterisk/sounds/vm-first.gsm -share/asterisk/sounds/vm-for.gsm -share/asterisk/sounds/vm-forwardoptions.gsm -share/asterisk/sounds/vm-from-extension.gsm -share/asterisk/sounds/vm-from-phonenumber.gsm -share/asterisk/sounds/vm-from.gsm -share/asterisk/sounds/vm-goodbye.gsm -share/asterisk/sounds/vm-helpexit.gsm -share/asterisk/sounds/vm-incorrect.gsm -share/asterisk/sounds/vm-incorrect-mailbox.gsm -share/asterisk/sounds/vm-instructions.gsm -share/asterisk/sounds/vm-intro.gsm -share/asterisk/sounds/vm-isonphone.gsm -share/asterisk/sounds/vm-isunavail.gsm -share/asterisk/sounds/vm-last.gsm -share/asterisk/sounds/vm-leavemsg.gsm -share/asterisk/sounds/vm-login.gsm -share/asterisk/sounds/vm-mailboxfull.gsm -share/asterisk/sounds/vm-message.gsm -share/asterisk/sounds/vm-messages.gsm -share/asterisk/sounds/vm-mismatch.gsm -share/asterisk/sounds/vm-msginstruct.gsm -share/asterisk/sounds/vm-msgsaved.gsm -share/asterisk/sounds/vm-newpassword.gsm -share/asterisk/sounds/vm-next.gsm -share/asterisk/sounds/vm-no.gsm -share/asterisk/sounds/vm-nobodyavail.gsm -share/asterisk/sounds/vm-nobox.gsm -share/asterisk/sounds/vm-nomore.gsm -share/asterisk/sounds/vm-nonumber.gsm -share/asterisk/sounds/vm-num-i-have.gsm -share/asterisk/sounds/vm-onefor.gsm -share/asterisk/sounds/vm-options.gsm -share/asterisk/sounds/vm-opts.gsm -share/asterisk/sounds/vm-passchanged.gsm -share/asterisk/sounds/vm-password.gsm -share/asterisk/sounds/vm-press.gsm -share/asterisk/sounds/vm-prev.gsm -share/asterisk/sounds/vm-reachoper.gsm -share/asterisk/sounds/vm-rec-busy.gsm -share/asterisk/sounds/vm-rec-name.gsm -share/asterisk/sounds/vm-rec-unv.gsm -share/asterisk/sounds/vm-received.gsm -share/asterisk/sounds/vm-reenterpassword.gsm -share/asterisk/sounds/vm-repeat.gsm -share/asterisk/sounds/vm-review.gsm -share/asterisk/sounds/vm-saved.gsm -share/asterisk/sounds/vm-savedto.gsm -share/asterisk/sounds/vm-savefolder.gsm -share/asterisk/sounds/vm-savemessage.gsm -share/asterisk/sounds/vm-sorry.gsm -share/asterisk/sounds/vm-star-cancel.gsm -share/asterisk/sounds/vm-starmain.gsm -share/asterisk/sounds/vm-then-pound.gsm -share/asterisk/sounds/vm-theperson.gsm -share/asterisk/sounds/vm-tocallback.gsm -share/asterisk/sounds/vm-tocallnum.gsm -share/asterisk/sounds/vm-tocancel.gsm -share/asterisk/sounds/vm-tocancelmsg.gsm -share/asterisk/sounds/vm-toenternumber.gsm -share/asterisk/sounds/vm-toforward.gsm -share/asterisk/sounds/vm-tohearenv.gsm -share/asterisk/sounds/vm-tomakecall.gsm -share/asterisk/sounds/vm-tooshort.gsm -share/asterisk/sounds/vm-toreply.gsm -share/asterisk/sounds/vm-torerecord.gsm -share/asterisk/sounds/vm-undelete.gsm -share/asterisk/sounds/vm-undeleted.gsm -share/asterisk/sounds/vm-unknown-caller.gsm -share/asterisk/sounds/vm-whichbox.gsm -share/asterisk/sounds/vm-youhave.gsm -share/asterisk/sounds/voicemail -@dirrm share/asterisk/sounds/phonetic -@dirrm share/asterisk/sounds/letters -@dirrm share/asterisk/sounds/digits -@dirrm share/asterisk/sounds -@dirrm share/asterisk/mohmp3 -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/share/asterisk/astdb -@cwd /var -spool/asterisk/vm -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/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 diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile deleted file mode 100644 index 97b6dcea0d10..000000000000 --- a/net/asterisk14/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.0.2 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= 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 - -ONLY_FOR_ARCHS= i386 sparc64 - -BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex -RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 - -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -MAKE_ENV+= WITHOUT_H323=1 -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323:build -PLIST_SUB+= WITH_H323="" -.endif - -.if defined(WITHOUT_ZAPTEL) -MAKE_ENV+= WITHOUT_ZAPTEL=1 -PLIST_SUB+= WITH_ZAPTEL="@comment " -.else -BUILD_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -.endif - -post-install: - @${INSTALL_SCRIPT} ${FILESDIR}/asterisk.sh ${PREFIX}/etc/rc.d - -.include <bsd.port.post.mk> diff --git a/net/asterisk14/distinfo b/net/asterisk14/distinfo deleted file mode 100644 index 5fa2ddcf1403..000000000000 --- a/net/asterisk14/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (asterisk-1.0.2.tar.gz) = 58b2c912b4e7c1f0438f06eb26c4b369 -SIZE (asterisk-1.0.2.tar.gz) = 9562949 diff --git a/net/asterisk14/files/asterisk.sh b/net/asterisk14/files/asterisk.sh deleted file mode 100644 index deee10c0cbe4..000000000000 --- a/net/asterisk14/files/asterisk.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -name=asterisk -rcvar=`set_rcvar` - -command=/usr/local/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 77acd5fecf7d..000000000000 --- a/net/asterisk14/files/patch-Makefile +++ /dev/null @@ -1,412 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -44,6 +44,15 @@ - PROC=$(shell uname -m) - endif - -+ifeq (${OSARCH},FreeBSD) -+ifeq ($(PROC),sparc64) -+PROC=ultrasparc -+OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi) -+OPTIONS+=$(shell if $(CC) -mcpu=v9 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v9"; fi) -+OPTIONS+=-fomit-frame-pointerendif -+endif -+endif -+ - # Pentium Pro Optimize - #PROC=i686 - -@@ -62,10 +71,10 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the asterisk's code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - - #Include debug symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g #-pg -+#DEBUG=-g #-pg - - # If you are running a radio application, define RADIO_RELAX so that the DTMF - # will be received more reliably -@@ -90,7 +99,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 -@@ -110,23 +119,23 @@ - # Don't use together with -DBUSYDETECT_TONEONLY - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - --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 - - INCLUDE=-Iinclude -I../include --CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY - CFLAGS+=$(OPTIMIZE) - - ifneq ($(PROC),ultrasparc) -@@ -137,11 +146,8 @@ - CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) - - ifeq (${OSARCH},FreeBSD) --OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) --CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) --LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) --INCLUDE+=-I/usr/local/include --CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) -+CFLAGS+=$(PTHREAD_CFLAGS) -+LIBS+=$(PTHREAD_LIBS) - endif # FreeBSD - - ifeq (${OSARCH},NetBSD) -@@ -157,7 +163,10 @@ - #CFLAGS+=-DOLD_DSP_ROUTINES - - CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) --CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPTEL_OPTIMIZATIONS -+endif - - LIBEDIT=editline/libedit.a - -@@ -219,7 +228,7 @@ - SOLINK=-shared -Xlinker -x - endif - --CC=gcc -+CC?=gcc - INSTALL=install - - _all: all -@@ -231,7 +240,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: depend asterisk subdirs -+all: depend asterisk subdirs manpage - - editline/config.h: - cd editline && unset CFLAGS LIBS && ./configure ; \ -@@ -240,13 +249,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 -@@ -268,13 +277,10 @@ - - asterisk.o: asterisk.c build.h - --manpage: asterisk.8.gz -+manpage: asterisk.8 - --asterisk.8.gz: asterisk.sgml -- rm -f asterisk.8 -- docbook2man asterisk.sgml -- mv ./*.8 asterisk.8 -- gzip asterisk.8 -+asterisk.8: asterisk.8.gz -+ gzcat asterisk.8.gz > asterisk.8 - - ifneq ($(strip $(ASTERISKVERSION)),) - build.h: .version -@@ -292,8 +298,8 @@ - exit 1; \ - fi - --asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS) -+ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) -o muted muted.o -@@ -312,28 +318,28 @@ - $(MAKE) -C stdtime clean - - datafiles: all -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits - 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/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; \ -@@ -341,18 +347,18 @@ - done - for x in 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-*; 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 CVS ]; then \ -@@ -364,111 +370,86 @@ - fi - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/ -- install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ - 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) - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm -- rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \ -- mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- else \ -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \ -- fi -- ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- 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.gz $(DESTDIR)$(ASTMANDIR)/man8 -+ ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(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 - 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)/vm . ) -- ( 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 " +-------------------------------------------+" -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/vm . ) -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/voicemail . ) - --install: all datafiles bininstall -+install: all datafiles bininstall samples - - upgrade: all bininstall - - adsi: all -- 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: all datafiles adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ for x in configs/*.sample channels/h323/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - fi ; \ -- install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done -- echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -+ echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \ -+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \ -+ fi - 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 - 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 ; \ -@@ -483,7 +464,7 @@ - @[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) - @[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) - install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk - for x in images/*.gif; do \ - install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \ - done -@@ -503,10 +484,10 @@ - - __rpm: _version - 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 redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \ - sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \ - 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 32efb5d2b101..000000000000 --- a/net/asterisk14/files/patch-agi::Makefile +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Tue Jun 22 20:42:13 2004 -+++ agi/Makefile Tue Oct 5 21:03:40 2004 -@@ -11,15 +11,18 @@ - # 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+= - - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) $(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 diff --git a/net/asterisk14/files/patch-apps::Makefile b/net/asterisk14/files/patch-apps::Makefile deleted file mode 100644 index 00b77dfe2434..000000000000 --- a/net/asterisk14/files/patch-apps::Makefile +++ /dev/null @@ -1,49 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig Sat Sep 25 00:32:56 2004 -+++ apps/Makefile Sun Oct 10 16:20:06 2004 -@@ -40,7 +40,7 @@ - #APPS+=app_rpt.so - - APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) --APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) -+APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) - APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) - - CFLAGS+=-fPIC -@@ -65,12 +65,12 @@ - $(CC) $(SOLINK) -o $@ $< -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 - - app_voicemail.so : app_voicemail.o - ifeq ($(USE_MYSQL_VM_INTERFACE),1) -- $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz -+ $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz - else - ifeq ($(USE_POSTGRES_VM_INTERFACE),1) - $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq -@@ -80,16 +80,16 @@ - 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 $@ $< -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ $< -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) $(CFLAGS) look.c -o look -lncurses - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk14/files/patch-astman::Makefile b/net/asterisk14/files/patch-astman::Makefile deleted file mode 100644 index 2745860cdd36..000000000000 --- a/net/asterisk14/files/patch-astman::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- astman/Makefile.orig Sat Jun 26 22:25:39 2004 -+++ astman/Makefile Thu Oct 14 19:14:22 2004 -@@ -5,16 +5,16 @@ - - OSARCH=$(shell uname -s) - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I/usr/local/include -L/usr/local/lib -+CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib - endif - --TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi) -+TARGET=astman - all: depend $(TARGET) - - install: - if [ "$(TARGET)" != "none" ]; then \ - for x in $(TARGET); do \ -- install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ - done ; \ - fi - diff --git a/net/asterisk14/files/patch-cdr::Makefile b/net/asterisk14/files/patch-cdr::Makefile deleted file mode 100644 index f646d2c9a3dc..000000000000 --- a/net/asterisk14/files/patch-cdr::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Aug 31 19:33:00 2004 -+++ cdr/Makefile Thu Oct 14 19:13:38 2004 -@@ -21,7 +21,7 @@ - OSARCH=$(shell uname -s) - - ifeq (${OSARCH},FreeBSD) --SOLINK+=-L/usr/local/lib -+SOLINK+=-L$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -71,7 +71,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 e82a0299756d..000000000000 --- a/net/asterisk14/files/patch-channels::Makefile +++ /dev/null @@ -1,90 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -57,10 +57,10 @@ - - endif - ifeq (${OSARCH},FreeBSD) --PTLIB=-lpt_FreeBSD_x86_r --H323LIB=-lh323_FreeBSD_x86_r --CHANH323LIB=-pthread --SOLINK+=-L/usr/local/lib -+PTLIB=-lpt_FreeBSD_x86_r_s -+H323LIB=-lh323_FreeBSD_x86_r_s -+CHANH323LIB= -+SOLINK+=-L$(LOCALBASE)/lib - endif - ifeq (${OSARCH},NetBSD) - PTLIB=-lpt_NetBSD_x86_r -@@ -72,8 +72,10 @@ - endif - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so) -+ifndef WITHOUT_H323 -+CHANNEL_LIBS+=chan_h323.so -+endif - - CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations - CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -@@ -84,7 +86,7 @@ - ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") - ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") -+CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include") - CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) - CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") - -@@ -107,7 +109,7 @@ - ZAPDIR=/usr/lib - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so") - - CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) - -@@ -156,6 +158,8 @@ - chan_oss.so: chan_oss.o - $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio - endif -+chan_oss.so: chan_oss.o -+ $(CC) $(SOLINK) -o $@ chan_oss.o - - chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o - ifeq ($(USE_MYSQL_FRIENDS),1) -@@ -175,7 +179,7 @@ - $(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c - - chan_zap.so: chan_zap.o -- $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -ltonezone -+ $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone - - chan_sip.so: chan_sip.o - ifeq ($(USE_SIP_MYSQL_FRIENDS),1) -@@ -199,15 +203,17 @@ - chan_vpb.so: chan_vpb.o - $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl - --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 -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r - -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - - #chan_modem.so : chan_modem.o - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi - - 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 de2ed3978663..000000000000 --- a/net/asterisk14/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c 2004/10/10 13:00:17 1.1 -+++ channels/chan_h323.c 2004/10/10 13:00:39 -@@ -26,7 +26,7 @@ - * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $ - */ - -- -+#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 521d6a46d256..000000000000 --- a/net/asterisk14/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,120 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig -+++ channels/chan_sip.c -@@ -139,7 +139,7 @@ - - static char default_language[MAX_LANGUAGE] = ""; - --static char default_callerid[AST_MAX_EXTENSION] = "asterisk"; -+static char default_callerid[AST_MAX_EXTENSION] = "Unknown"; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; - -@@ -244,6 +244,7 @@ - struct sip_route { - struct sip_route *next; - char hop[0]; -+ int lr; - }; - - struct sip_history { -@@ -4573,6 +4574,10 @@ - /* Make a struct route */ - thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); - if (thishop) { -+ if (strnstr(rr, ";lr", len) != NULL) -+ thishop->lr = 1; -+ else -+ thishop->lr = 0; - strncpy(thishop->hop, rr, len); /* safe */ - thishop->hop[len] = '\0'; - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); -@@ -4596,31 +4601,41 @@ - rr += len+1; - } - } -- /* 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, ">"); -- } else { -- /* No <> - just take the lot */ -- c = contact; len = strlen(contact); -- } -- thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ /* 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) { -- strncpy(thishop->hop, c, len); /* safe */ -- thishop->hop[len] = '\0'; -- 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, ">"); -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; len = strlen(contact); -+ } -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ if (thishop) { -+ strncpy(thishop->hop, c, len); /* safe */ -+ thishop->hop[len] = '\0'; -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - /* Store as new route */ -@@ -7197,7 +7212,11 @@ - /* Get destination right away */ - 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) { -@@ -7225,7 +7244,6 @@ - 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); 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 965a643bb687..000000000000 --- a/net/asterisk14/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c -+++ channels/chan_zap.c -@@ -42,7 +42,9 @@ - #include <sys/signal.h> - #include <errno.h> - #include <stdlib.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <unistd.h> - #include <sys/ioctl.h> - #ifdef __linux__ diff --git a/net/asterisk14/files/patch-channels::h323::Makefile b/net/asterisk14/files/patch-channels::h323::Makefile deleted file mode 100644 index bc34083e2ff3..000000000000 --- a/net/asterisk14/files/patch-channels::h323::Makefile +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/Makefile.orig Tue Aug 31 16:32:11 2004 -+++ channels/h323/Makefile Sun Oct 10 15:25:42 2004 -@@ -53,7 +53,7 @@ - LIBS+=-lpthread - endif - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS += -pthread -+CFLAGS += $(PTHREAD_LIBS) - endif - CFLAGS += -D_REENTRANT -D_GNU_SOURCE - CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS -@@ -74,19 +74,19 @@ - - - ast_h323.o: ast_h323.cpp -- $(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $< -+ $(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $< - - libchanh323.a: ast_h323.o - ar cr libchanh323.a ast_h323.o - - chan_h323.so: -- $(CXX) -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB) - - chan_h323_d.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB) - - chan_h323_s.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB) - clean: - rm -f *.o *.so core.* libchanh323.a - 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 6cfae1ec5d05..000000000000 --- a/net/asterisk14/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig -+++ channels/h323/ast_h323.cpp -@@ -722,7 +722,7 @@ - if (h323debug) { - cout << " -- Sending user input tone (" << tone << ") to remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - H323Connection::SendUserInputTone(tone, duration); - } - -@@ -732,18 +732,20 @@ - if (h323debug) { - cout << " -- Received user input tone (" << tone << ") from remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - } - H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp); - } - - void MyH323Connection::OnUserInputString(const PString &value) - { -+ char val; - if (mode == H323_DTMF_RFC2833) { - if (h323debug) { - cout << " -- Received user input string (" << value << ") from remote." << endl; - } -- on_send_digit(GetCallReference(), value[0]); -+ val = value[0]; -+ on_send_digit(GetCallReference(), &val); - } - } - diff --git a/net/asterisk14/files/patch-codecs::Makefile b/net/asterisk14/files/patch-codecs::Makefile deleted file mode 100644 index de9aff4c34fe..000000000000 --- a/net/asterisk14/files/patch-codecs::Makefile +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Mon Jul 19 18:52:57 2004 -+++ codecs/Makefile Sun Oct 10 15:28:35 2004 -@@ -17,23 +17,23 @@ - # g723.1b) - # - #MODG723=codec_g723_1.so codec_g723_1b.so --MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") --MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") --MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") --MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") -+MODG723=codec_g723_1_dummy.so -+MODG729=codec_g729_dummy.so -+MODSPEEX=codec_speex.so -+MODILBC=codec_ilbc.so - CFLAGS+=-fPIC --CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") -+CFLAGS+=-I$(LOCALBASE)/include - - LIBG723=g723.1/libg723.a - LIBG723B=g723.1b/libg723b.a - LIBGSM=gsm/lib/libgsm.a - LIBGSMT=gsm/lib/libgsm.a - LIBLPC10=lpc10/liblpc10.a --LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib") -+LIBSPEEX=-L$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - LIBILBC=ilbc/libilbc.a - --CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ - codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ - codec_g726.so - -@@ -91,7 +91,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::codec_g723_1_dummy.c b/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c deleted file mode 100644 index 3ce9571013ec..000000000000 --- a/net/asterisk14/files/patch-codecs::codec_g723_1_dummy.c +++ /dev/null @@ -1,314 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g723_1_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g723_1_dummy.c Sun Oct 10 16:07:05 2004 -@@ -0,0 +1,308 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.723.1 (dummy!) -+ * -+ * The G.723.1 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g723_ex.h" -+#include "g723_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator"; -+ -+struct g723_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g723_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g723tolin_new() -+{ -+ struct g723_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog723_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g723_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g723_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g723_ex; -+ return &f; -+} -+ -+static struct ast_frame *g723tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G723_1; -+ f.datalen = sizeof(g723_slin_ex); -+ /* All frames are 30 ms long */ -+ f.samples = 30; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g723_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog723_new() -+{ -+ struct g723_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+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 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ int len = 0; -+ int res; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ res = g723_len(((unsigned char *)f->data + len)[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Invalid data\n"); -+ return -1; -+ } -+ if (res + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 480 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 480); -+ tmp->tail+=480; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += res; -+ } -+ return 0; -+} -+ -+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 480) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G723_1; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 480) { -+ /* Encode a frame of data */ -+ if (cnt + 24 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 24); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 30; -+ cnt += 24; -+ tmp->tail -= 480; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g723_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g723tolin = -+ { "g723tolin_dummy", -+ AST_FORMAT_G723_1, AST_FORMAT_SLINEAR, -+ g723tolin_new, -+ g723tolin_framein, -+ g723tolin_frameout, -+ g723_destroy, -+ g723tolin_sample -+ }; -+ -+static struct ast_translator lintog723 = -+ { "lintog723_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G723_1, -+ lintog723_new, -+ lintog723_framein, -+ lintog723_frameout, -+ g723_destroy, -+ lintog723_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog723); -+ if (!res) -+ res = ast_unregister_translator(&g723tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g723tolin); -+ if (!res) -+ res=ast_register_translator(&lintog723); -+ else -+ ast_unregister_translator(&g723tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk14/files/patch-codecs::codec_g729_dummy.c b/net/asterisk14/files/patch-codecs::codec_g729_dummy.c deleted file mode 100644 index 9fcc7b19ca35..000000000000 --- a/net/asterisk14/files/patch-codecs::codec_g729_dummy.c +++ /dev/null @@ -1,281 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g729_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g729_dummy.c Sun Oct 10 16:07:12 2004 -@@ -0,0 +1,275 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.729 (dummy!) -+ * -+ * The G.729 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g729_ex.h" -+#include "g729_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.729/PCM16 Codec Translator"; -+ -+struct g729_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g729_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g729tolin_new() -+{ -+ struct g729_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog729_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g729_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g729_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g729_ex; -+ return &f; -+} -+ -+static struct ast_frame *g729tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G729A; -+ f.datalen = sizeof(g729_slin_ex); -+ /* All frames are 10 ms long */ -+ f.samples = 10; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g729_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog729_new() -+{ -+ struct g729_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ int len = 0; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ if (10 + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 160 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 160); -+ tmp->tail+=160; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += 10; -+ } -+ return 0; -+} -+ -+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 160) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G729A; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 160) { -+ /* Encode a frame of data */ -+ if (cnt + 10 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 10); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 10; -+ cnt += 10; -+ tmp->tail -= 160; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g729_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g729tolin = -+ { "g729tolin_dummy", -+ AST_FORMAT_G729A, AST_FORMAT_SLINEAR, -+ g729tolin_new, -+ g729tolin_framein, -+ g729tolin_frameout, -+ g729_destroy, -+ g729tolin_sample -+ }; -+ -+static struct ast_translator lintog729 = -+ { "lintog729_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G729A, -+ lintog729_new, -+ lintog729_framein, -+ lintog729_frameout, -+ g729_destroy, -+ lintog729_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog729); -+ if (!res) -+ res = ast_unregister_translator(&g729tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g729tolin); -+ if (!res) -+ res=ast_register_translator(&lintog729); -+ else -+ ast_unregister_translator(&g729tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk14/files/patch-codecs::g729_slin_ex.h b/net/asterisk14/files/patch-codecs::g729_slin_ex.h deleted file mode 100644 index 44e60f2de848..000000000000 --- a/net/asterisk14/files/patch-codecs::g729_slin_ex.h +++ /dev/null @@ -1,20 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/g729_slin_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,14 @@ -+/* -+ * g729_slin_ex.h -- -+ * -+ * 8-bit G.729 data, 10 milliseconds worth at 8 kHz. -+ * -+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static unsigned char g729_slin_ex[] = { -+120,82,175,64,0,250,219,0,7,214 -+}; diff --git a/net/asterisk14/files/patch-codecs::ilbc::Makefile b/net/asterisk14/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 7770e07550a4..000000000000 --- a/net/asterisk14/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Sun Apr 27 21:13:11 2003 -+++ codecs/ilbc/Makefile Fri Jan 30 01:47:34 2004 -@@ -1,4 +1,4 @@ --CFLAGS+= -fPIC -O3 -+CFLAGS+= -fPIC - LIB=libilbc.a - - OBJS= anaFilter.o iCBSearch.o packing.o \ diff --git a/net/asterisk14/files/patch-codecs::slin_g729_ex.h b/net/asterisk14/files/patch-codecs::slin_g729_ex.h deleted file mode 100644 index e1236d2498dc..000000000000 --- a/net/asterisk14/files/patch-codecs::slin_g729_ex.h +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/slin_g729_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,25 @@ -+/* -+ * slin_g729_ex.h -- -+ * -+ * Signed 16-bit audio data, 10 milliseconds worth at 8 kHz. -+ * -+ * Source: g723.example -+ * -+ * Copyright (C) 2001, Linux Support Services, Inc. -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static signed short slin_g729_ex[] = { -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -+}; diff --git a/net/asterisk14/files/patch-db.c b/net/asterisk14/files/patch-db.c deleted file mode 100644 index 6c2bdcd443c8..000000000000 --- a/net/asterisk14/files/patch-db.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jul 9 13:08:09 2004 -+++ db.c Sun Oct 10 15:32:33 2004 -@@ -33,7 +33,7 @@ - #include <asterisk/cli.h> - #include <asterisk/utils.h> - #include <asterisk/lock.h> --#include "db1-ast/include/db.h" -+#include <db.h> - #include "asterisk.h" - #include "astconf.h" - 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-formats::Makefile b/net/asterisk14/files/patch-formats::Makefile deleted file mode 100644 index dacfd7b08303..000000000000 --- a/net/asterisk14/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Tue Nov 4 04:40:09 2003 -+++ formats/Makefile Fri Jan 30 01:47:34 2004 -@@ -18,7 +18,7 @@ - # - # G723 simple frame is depricated - # --#FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - GSMLIB=../codecs/gsm/lib/libgsm.a - -@@ -40,7 +40,7 @@ - $(CC) $(SOLINK) -o $@ $< -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 fb5eb12833dc..000000000000 --- a/net/asterisk14/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,351 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g723_1.c.orig Sun Oct 10 15:59:18 2004 -+++ formats/format_g723_1.c Sun Oct 10 16:05:05 2004 -@@ -0,0 +1,345 @@ -+/* -+ * 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 <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 <stdio.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 */ -+ int fd; /* 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(int fd) -+{ -+ /* 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->fd = fd; -+ 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(int fd, 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->fd = fd; -+ 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(); -+ close(s->fd); -+ 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 = read(s->fd, s->g723, 1)) != 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 = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != 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 = write(fs->fd, f->data, f->datalen)) != 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 ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ 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 (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 && lseek(fs->fd, soffset, SEEK_SET) != soffset) { -+ 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(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 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 = lseek(fs->fd, 0, SEEK_CUR); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 (lseek(fs->fd, offset, SEEK_SET) != offset) { -+ 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 a144d1b0f6bf..000000000000 --- a/net/asterisk14/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Wed Jan 28 23:32:48 2004 -+++ formats/format_g729.c Thu Feb 19 01:03:30 2004 -@@ -45,7 +45,7 @@ - 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 */ - }; - - -@@ -126,11 +126,11 @@ - 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 = read(s->fd, s->g729, 20)) != 20) { -+ if ((res = read(s->fd, s->g729, 10)) != 10) { - if (res) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -174,7 +174,7 @@ - cur = lseek(fs->fd, 0, SEEK_CUR); - max = lseek(fs->fd, 0, SEEK_END); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -202,7 +202,7 @@ - { - off_t offset; - offset = lseek(fs->fd, 0, SEEK_CUR); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() 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 dca6672c389a..000000000000 --- a/net/asterisk14/files/patch-pbx::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig Sun Oct 26 20:50:49 2003 -+++ pbx/Makefile Fri Jan 30 01:47:34 2004 -@@ -16,7 +16,7 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate --PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - -@@ -62,7 +62,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 3377b4aa1c8e..000000000000 --- a/net/asterisk14/files/patch-res::Makefile +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile.orig -+++ res/Makefile -@@ -21,7 +21,10 @@ - - CFLAGS+= - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPATA_MOH -+endif - # - # Work around buggy RedHat 9.0 - # -@@ -34,7 +37,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 - - res_crypto.so: res_crypto.o - $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS) diff --git a/net/asterisk14/files/patch-rtp.c b/net/asterisk14/files/patch-rtp.c deleted file mode 100644 index 06289f357208..000000000000 --- a/net/asterisk14/files/patch-rtp.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Sat Sep 18 16:56:28 2004 -+++ rtp.c Sun Oct 10 15:57:22 2004 -@@ -127,7 +127,7 @@ - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; -@@ -841,8 +841,10 @@ - /* Must be an even port number by RTP spec */ - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - 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)))) - break; 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 d503a8741743..000000000000 --- a/net/asterisk14/pkg-plist +++ /dev/null @@ -1,642 +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_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/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/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/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi -etc/asterisk/h323.conf-dist -@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.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/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_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi -etc/asterisk/res_config_odbc.conf-dist -@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.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/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 -etc/rc.d/asterisk.sh -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/astosp.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/channel_pvt.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/config.h -include/asterisk/config_pvt.h -include/asterisk/crypto.h -include/asterisk/cvsid.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dsp.h -include/asterisk/enum.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/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/options.h -include/asterisk/pbx.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/srv.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/utils.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_controlplayback.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.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_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_intercom.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_qcall.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_record.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_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_striplsd.so -lib/asterisk/modules/app_substring.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 -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_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_manager.so -lib/asterisk/modules/chan_agent.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_modem.so -lib/asterisk/modules/chan_modem_aopen.so -lib/asterisk/modules/chan_modem_bestdata.so -lib/asterisk/modules/chan_modem_i4l.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_g723_1_dummy.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_g729_dummy.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_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/pbx_config.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/pbx_wilcalu.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.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_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/safe_asterisk -share/asterisk/agi-bin/agi-test.agi -share/asterisk/agi-bin/eagi-sphinx-test -share/asterisk/agi-bin/eagi-test -share/asterisk/firmware/iax/iaxy.bin -share/asterisk/images/asterisk-intro.jpg -share/asterisk/keys/freeworlddialup.pub -share/asterisk/keys/iaxtel.pub -share/asterisk/mohmp3/fpm-calm-river.mp3 -share/asterisk/mohmp3/fpm-sunshine.mp3 -share/asterisk/mohmp3/fpm-world-mix.mp3 -share/asterisk/sounds/agent-alreadyon.gsm -share/asterisk/sounds/agent-incorrect.gsm -share/asterisk/sounds/agent-loggedoff.gsm -share/asterisk/sounds/agent-loginok.gsm -share/asterisk/sounds/agent-newlocation.gsm -share/asterisk/sounds/agent-pass.gsm -share/asterisk/sounds/agent-user.gsm -share/asterisk/sounds/auth-incorrect.gsm -share/asterisk/sounds/auth-thankyou.gsm -share/asterisk/sounds/beep.gsm -share/asterisk/sounds/conf-adminmenu.gsm -share/asterisk/sounds/conf-enteringno.gsm -share/asterisk/sounds/conf-errormenu.gsm -share/asterisk/sounds/conf-getchannel.gsm -share/asterisk/sounds/conf-getconfno.gsm -share/asterisk/sounds/conf-getpin.gsm -share/asterisk/sounds/conf-invalid.gsm -share/asterisk/sounds/conf-invalidpin.gsm -share/asterisk/sounds/conf-kicked.gsm -share/asterisk/sounds/conf-locked.gsm -share/asterisk/sounds/conf-lockednow.gsm -share/asterisk/sounds/conf-muted.gsm -share/asterisk/sounds/conf-noempty.gsm -share/asterisk/sounds/conf-onlyperson.gsm -share/asterisk/sounds/conf-unlockednow.gsm -share/asterisk/sounds/conf-unmuted.gsm -share/asterisk/sounds/conf-usermenu.gsm -share/asterisk/sounds/demo-abouttotry.gsm -share/asterisk/sounds/demo-congrats.gsm -share/asterisk/sounds/demo-echodone.gsm -share/asterisk/sounds/demo-echotest.gsm -share/asterisk/sounds/demo-enterkeywords.gsm -share/asterisk/sounds/demo-instruct.gsm -share/asterisk/sounds/demo-moreinfo.gsm -share/asterisk/sounds/demo-nogo.gsm -share/asterisk/sounds/demo-nomatch.gsm -share/asterisk/sounds/demo-thanks.gsm -share/asterisk/sounds/digits/0.gsm -share/asterisk/sounds/digits/1.gsm -share/asterisk/sounds/digits/10.gsm -share/asterisk/sounds/digits/11.gsm -share/asterisk/sounds/digits/12.gsm -share/asterisk/sounds/digits/13.gsm -share/asterisk/sounds/digits/14.gsm -share/asterisk/sounds/digits/15.gsm -share/asterisk/sounds/digits/16.gsm -share/asterisk/sounds/digits/17.gsm -share/asterisk/sounds/digits/18.gsm -share/asterisk/sounds/digits/19.gsm -share/asterisk/sounds/digits/2.gsm -share/asterisk/sounds/digits/20.gsm -share/asterisk/sounds/digits/3.gsm -share/asterisk/sounds/digits/30.gsm -share/asterisk/sounds/digits/4.gsm -share/asterisk/sounds/digits/40.gsm -share/asterisk/sounds/digits/5.gsm -share/asterisk/sounds/digits/50.gsm -share/asterisk/sounds/digits/6.gsm -share/asterisk/sounds/digits/60.gsm -share/asterisk/sounds/digits/7.gsm -share/asterisk/sounds/digits/70.gsm -share/asterisk/sounds/digits/8.gsm -share/asterisk/sounds/digits/80.gsm -share/asterisk/sounds/digits/9.gsm -share/asterisk/sounds/digits/90.gsm -share/asterisk/sounds/digits/a-m.gsm -share/asterisk/sounds/digits/at.gsm -share/asterisk/sounds/digits/day-0.gsm -share/asterisk/sounds/digits/day-1.gsm -share/asterisk/sounds/digits/day-2.gsm -share/asterisk/sounds/digits/day-3.gsm -share/asterisk/sounds/digits/day-4.gsm -share/asterisk/sounds/digits/day-5.gsm -share/asterisk/sounds/digits/day-6.gsm -share/asterisk/sounds/digits/dollars.gsm -share/asterisk/sounds/digits/h-1.gsm -share/asterisk/sounds/digits/h-10.gsm -share/asterisk/sounds/digits/h-11.gsm -share/asterisk/sounds/digits/h-12.gsm -share/asterisk/sounds/digits/h-13.gsm -share/asterisk/sounds/digits/h-14.gsm -share/asterisk/sounds/digits/h-15.gsm -share/asterisk/sounds/digits/h-16.gsm -share/asterisk/sounds/digits/h-17.gsm -share/asterisk/sounds/digits/h-18.gsm -share/asterisk/sounds/digits/h-19.gsm -share/asterisk/sounds/digits/h-2.gsm -share/asterisk/sounds/digits/h-20.gsm -share/asterisk/sounds/digits/h-3.gsm -share/asterisk/sounds/digits/h-30.gsm -share/asterisk/sounds/digits/h-4.gsm -share/asterisk/sounds/digits/h-5.gsm -share/asterisk/sounds/digits/h-6.gsm -share/asterisk/sounds/digits/h-7.gsm -share/asterisk/sounds/digits/h-8.gsm -share/asterisk/sounds/digits/h-9.gsm -share/asterisk/sounds/digits/hundred.gsm -share/asterisk/sounds/digits/million.gsm -share/asterisk/sounds/digits/mon-0.gsm -share/asterisk/sounds/digits/mon-1.gsm -share/asterisk/sounds/digits/mon-10.gsm -share/asterisk/sounds/digits/mon-11.gsm -share/asterisk/sounds/digits/mon-2.gsm -share/asterisk/sounds/digits/mon-3.gsm -share/asterisk/sounds/digits/mon-4.gsm -share/asterisk/sounds/digits/mon-5.gsm -share/asterisk/sounds/digits/mon-6.gsm -share/asterisk/sounds/digits/mon-7.gsm -share/asterisk/sounds/digits/mon-8.gsm -share/asterisk/sounds/digits/mon-9.gsm -share/asterisk/sounds/digits/oclock.gsm -share/asterisk/sounds/digits/oh.gsm -share/asterisk/sounds/digits/p-m.gsm -share/asterisk/sounds/digits/pound.gsm -share/asterisk/sounds/digits/star.gsm -share/asterisk/sounds/digits/thousand.gsm -share/asterisk/sounds/digits/today.gsm -share/asterisk/sounds/digits/tomorrow.gsm -share/asterisk/sounds/digits/yesterday.gsm -share/asterisk/sounds/dir-instr.gsm -share/asterisk/sounds/dir-intro.gsm -share/asterisk/sounds/dir-intro-fn.gsm -share/asterisk/sounds/dir-nomatch.gsm -share/asterisk/sounds/dir-nomore.gsm -share/asterisk/sounds/invalid.gsm -share/asterisk/sounds/letters/a.gsm -share/asterisk/sounds/letters/at.gsm -share/asterisk/sounds/letters/b.gsm -share/asterisk/sounds/letters/c.gsm -share/asterisk/sounds/letters/d.gsm -share/asterisk/sounds/letters/dash.gsm -share/asterisk/sounds/letters/dollar.gsm -share/asterisk/sounds/letters/dot.gsm -share/asterisk/sounds/letters/e.gsm -share/asterisk/sounds/letters/equals.gsm -share/asterisk/sounds/letters/exclaimation-point.gsm -share/asterisk/sounds/letters/f.gsm -share/asterisk/sounds/letters/g.gsm -share/asterisk/sounds/letters/h.gsm -share/asterisk/sounds/letters/i.gsm -share/asterisk/sounds/letters/j.gsm -share/asterisk/sounds/letters/k.gsm -share/asterisk/sounds/letters/l.gsm -share/asterisk/sounds/letters/m.gsm -share/asterisk/sounds/letters/n.gsm -share/asterisk/sounds/letters/o.gsm -share/asterisk/sounds/letters/p.gsm -share/asterisk/sounds/letters/plus.gsm -share/asterisk/sounds/letters/q.gsm -share/asterisk/sounds/letters/r.gsm -share/asterisk/sounds/letters/s.gsm -share/asterisk/sounds/letters/slash.gsm -share/asterisk/sounds/letters/space.gsm -share/asterisk/sounds/letters/t.gsm -share/asterisk/sounds/letters/u.gsm -share/asterisk/sounds/letters/v.gsm -share/asterisk/sounds/letters/w.gsm -share/asterisk/sounds/letters/x.gsm -share/asterisk/sounds/letters/y.gsm -share/asterisk/sounds/letters/z.gsm -share/asterisk/sounds/letters/zed.gsm -share/asterisk/sounds/pbx-invalid.gsm -share/asterisk/sounds/pbx-invalidpark.gsm -share/asterisk/sounds/pbx-transfer.gsm -share/asterisk/sounds/phonetic/9_p.gsm -share/asterisk/sounds/phonetic/a_p.gsm -share/asterisk/sounds/phonetic/b_p.gsm -share/asterisk/sounds/phonetic/c_p.gsm -share/asterisk/sounds/phonetic/d_p.gsm -share/asterisk/sounds/phonetic/e_p.gsm -share/asterisk/sounds/phonetic/f_p.gsm -share/asterisk/sounds/phonetic/g_p.gsm -share/asterisk/sounds/phonetic/h_p.gsm -share/asterisk/sounds/phonetic/i_p.gsm -share/asterisk/sounds/phonetic/j_p.gsm -share/asterisk/sounds/phonetic/k_p.gsm -share/asterisk/sounds/phonetic/l_p.gsm -share/asterisk/sounds/phonetic/m_p.gsm -share/asterisk/sounds/phonetic/n_p.gsm -share/asterisk/sounds/phonetic/o_p.gsm -share/asterisk/sounds/phonetic/p_p.gsm -share/asterisk/sounds/phonetic/q_p.gsm -share/asterisk/sounds/phonetic/r_p.gsm -share/asterisk/sounds/phonetic/s_p.gsm -share/asterisk/sounds/phonetic/t_p.gsm -share/asterisk/sounds/phonetic/u_p.gsm -share/asterisk/sounds/phonetic/v_p.gsm -share/asterisk/sounds/phonetic/w_p.gsm -share/asterisk/sounds/phonetic/x_p.gsm -share/asterisk/sounds/phonetic/y_p.gsm -share/asterisk/sounds/phonetic/z_p.gsm -share/asterisk/sounds/privacy-incorrect.gsm -share/asterisk/sounds/privacy-prompt.gsm -share/asterisk/sounds/privacy-thankyou.gsm -share/asterisk/sounds/privacy-unident.gsm -share/asterisk/sounds/queue-callswaiting.gsm -share/asterisk/sounds/queue-holdtime.gsm -share/asterisk/sounds/queue-less-than.gsm -share/asterisk/sounds/queue-minutes.gsm -share/asterisk/sounds/queue-seconds.gsm -share/asterisk/sounds/queue-thankyou.gsm -share/asterisk/sounds/queue-thereare.gsm -share/asterisk/sounds/queue-youarenext.gsm -share/asterisk/sounds/ss-noservice.gsm -share/asterisk/sounds/transfer.gsm -share/asterisk/sounds/tt-allbusy.gsm -share/asterisk/sounds/tt-monkeys.gsm -share/asterisk/sounds/tt-monkeysintro.gsm -share/asterisk/sounds/tt-somethingwrong.gsm -share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm -share/asterisk/sounds/vm-Cust1.gsm -share/asterisk/sounds/vm-Cust2.gsm -share/asterisk/sounds/vm-Cust3.gsm -share/asterisk/sounds/vm-Cust4.gsm -share/asterisk/sounds/vm-Cust5.gsm -share/asterisk/sounds/vm-Family.gsm -share/asterisk/sounds/vm-Friends.gsm -share/asterisk/sounds/vm-INBOX.gsm -share/asterisk/sounds/vm-Old.gsm -share/asterisk/sounds/vm-Work.gsm -share/asterisk/sounds/vm-advopts.gsm -share/asterisk/sounds/vm-and.gsm -share/asterisk/sounds/vm-calldiffnum.gsm -share/asterisk/sounds/vm-changeto.gsm -share/asterisk/sounds/vm-delete.gsm -share/asterisk/sounds/vm-deleted.gsm -share/asterisk/sounds/vm-dialout.gsm -share/asterisk/sounds/vm-enter-num-to-call.gsm -share/asterisk/sounds/vm-extension.gsm -share/asterisk/sounds/vm-first.gsm -share/asterisk/sounds/vm-for.gsm -share/asterisk/sounds/vm-forwardoptions.gsm -share/asterisk/sounds/vm-from-extension.gsm -share/asterisk/sounds/vm-from-phonenumber.gsm -share/asterisk/sounds/vm-from.gsm -share/asterisk/sounds/vm-goodbye.gsm -share/asterisk/sounds/vm-helpexit.gsm -share/asterisk/sounds/vm-incorrect.gsm -share/asterisk/sounds/vm-incorrect-mailbox.gsm -share/asterisk/sounds/vm-instructions.gsm -share/asterisk/sounds/vm-intro.gsm -share/asterisk/sounds/vm-isonphone.gsm -share/asterisk/sounds/vm-isunavail.gsm -share/asterisk/sounds/vm-last.gsm -share/asterisk/sounds/vm-leavemsg.gsm -share/asterisk/sounds/vm-login.gsm -share/asterisk/sounds/vm-mailboxfull.gsm -share/asterisk/sounds/vm-message.gsm -share/asterisk/sounds/vm-messages.gsm -share/asterisk/sounds/vm-mismatch.gsm -share/asterisk/sounds/vm-msginstruct.gsm -share/asterisk/sounds/vm-msgsaved.gsm -share/asterisk/sounds/vm-newpassword.gsm -share/asterisk/sounds/vm-next.gsm -share/asterisk/sounds/vm-no.gsm -share/asterisk/sounds/vm-nobodyavail.gsm -share/asterisk/sounds/vm-nobox.gsm -share/asterisk/sounds/vm-nomore.gsm -share/asterisk/sounds/vm-nonumber.gsm -share/asterisk/sounds/vm-num-i-have.gsm -share/asterisk/sounds/vm-onefor.gsm -share/asterisk/sounds/vm-options.gsm -share/asterisk/sounds/vm-opts.gsm -share/asterisk/sounds/vm-passchanged.gsm -share/asterisk/sounds/vm-password.gsm -share/asterisk/sounds/vm-press.gsm -share/asterisk/sounds/vm-prev.gsm -share/asterisk/sounds/vm-reachoper.gsm -share/asterisk/sounds/vm-rec-busy.gsm -share/asterisk/sounds/vm-rec-name.gsm -share/asterisk/sounds/vm-rec-unv.gsm -share/asterisk/sounds/vm-received.gsm -share/asterisk/sounds/vm-reenterpassword.gsm -share/asterisk/sounds/vm-repeat.gsm -share/asterisk/sounds/vm-review.gsm -share/asterisk/sounds/vm-saved.gsm -share/asterisk/sounds/vm-savedto.gsm -share/asterisk/sounds/vm-savefolder.gsm -share/asterisk/sounds/vm-savemessage.gsm -share/asterisk/sounds/vm-sorry.gsm -share/asterisk/sounds/vm-star-cancel.gsm -share/asterisk/sounds/vm-starmain.gsm -share/asterisk/sounds/vm-then-pound.gsm -share/asterisk/sounds/vm-theperson.gsm -share/asterisk/sounds/vm-tocallback.gsm -share/asterisk/sounds/vm-tocallnum.gsm -share/asterisk/sounds/vm-tocancel.gsm -share/asterisk/sounds/vm-tocancelmsg.gsm -share/asterisk/sounds/vm-toenternumber.gsm -share/asterisk/sounds/vm-toforward.gsm -share/asterisk/sounds/vm-tohearenv.gsm -share/asterisk/sounds/vm-tomakecall.gsm -share/asterisk/sounds/vm-tooshort.gsm -share/asterisk/sounds/vm-toreply.gsm -share/asterisk/sounds/vm-torerecord.gsm -share/asterisk/sounds/vm-undelete.gsm -share/asterisk/sounds/vm-undeleted.gsm -share/asterisk/sounds/vm-unknown-caller.gsm -share/asterisk/sounds/vm-whichbox.gsm -share/asterisk/sounds/vm-youhave.gsm -share/asterisk/sounds/voicemail -@dirrm share/asterisk/sounds/phonetic -@dirrm share/asterisk/sounds/letters -@dirrm share/asterisk/sounds/digits -@dirrm share/asterisk/sounds -@dirrm share/asterisk/mohmp3 -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/share/asterisk/astdb -@cwd /var -spool/asterisk/vm -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/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 diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile deleted file mode 100644 index 97b6dcea0d10..000000000000 --- a/net/asterisk16/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# New ports collection makefile for: asterisk -# Date created: 17 October 2003 -# Whom: Maxim Sobolev <sobomax@portaone.com> -# -# $FreeBSD$ -# - -PORTNAME= asterisk -PORTVERSION= 1.0.2 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= 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 - -ONLY_FOR_ARCHS= i386 sparc64 - -BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client -LIB_DEPENDS= speex.3:${PORTSDIR}/audio/speex -RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql40-client - -GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKSRC}/editline -USE_GMAKE= yes -USE_BISON= yes -USE_RC_SUBR= yes -MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - MKDIR="${MKDIR}" \ - PWLIBDIR=${WRKDIRPREFIX}${PORTSDIR}/devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${PORTSDIR}/net/openh323/work/openh323 \ - OSVERSION=${OSVERSION} \ - CXX="${CXX}" - -MAN8= asterisk.8 - -.include <bsd.port.pre.mk> - -.if ${MACHINE_ARCH} != "i386" -WITHOUT_H323= 1 -WITHOUT_ZAPTEL= 1 -.endif - -.if defined(WITHOUT_H323) -MAKE_ENV+= WITHOUT_H323=1 -PLIST_SUB+= WITH_H323="@comment " -.else -BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build \ - ${NONEXISTENT}:${PORTSDIR}/net/openh323:build -PLIST_SUB+= WITH_H323="" -.endif - -.if defined(WITHOUT_ZAPTEL) -MAKE_ENV+= WITHOUT_ZAPTEL=1 -PLIST_SUB+= WITH_ZAPTEL="@comment " -.else -BUILD_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -RUN_DEPENDS+= ${LOCALBASE}/include/zaptel.h:${PORTSDIR}/misc/zaptel -PLIST_SUB+= WITH_ZAPTEL="" -.endif - -post-install: - @${INSTALL_SCRIPT} ${FILESDIR}/asterisk.sh ${PREFIX}/etc/rc.d - -.include <bsd.port.post.mk> diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo deleted file mode 100644 index 5fa2ddcf1403..000000000000 --- a/net/asterisk16/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (asterisk-1.0.2.tar.gz) = 58b2c912b4e7c1f0438f06eb26c4b369 -SIZE (asterisk-1.0.2.tar.gz) = 9562949 diff --git a/net/asterisk16/files/asterisk.sh b/net/asterisk16/files/asterisk.sh deleted file mode 100644 index deee10c0cbe4..000000000000 --- a/net/asterisk16/files/asterisk.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# PROVIDE asterisk -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable asterisk: -# -# asterisk_enable="YES" -# - -. /etc/rc.subr - -name=asterisk -rcvar=`set_rcvar` - -command=/usr/local/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 77acd5fecf7d..000000000000 --- a/net/asterisk16/files/patch-Makefile +++ /dev/null @@ -1,412 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -44,6 +44,15 @@ - PROC=$(shell uname -m) - endif - -+ifeq (${OSARCH},FreeBSD) -+ifeq ($(PROC),sparc64) -+PROC=ultrasparc -+OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi) -+OPTIONS+=$(shell if $(CC) -mcpu=v9 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v9"; fi) -+OPTIONS+=-fomit-frame-pointerendif -+endif -+endif -+ - # Pentium Pro Optimize - #PROC=i686 - -@@ -62,10 +71,10 @@ - #K6OPT = -DK6OPT - - #Tell gcc to optimize the asterisk's code --OPTIMIZE+=-O6 -+#OPTIMIZE+=-O6 - - #Include debug symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g #-pg -+#DEBUG=-g #-pg - - # If you are running a radio application, define RADIO_RELAX so that the DTMF - # will be received more reliably -@@ -90,7 +99,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 -@@ -110,23 +119,23 @@ - # Don't use together with -DBUSYDETECT_TONEONLY - BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE - --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 - - INCLUDE=-Iinclude -I../include --CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY - CFLAGS+=$(OPTIMIZE) - - ifneq ($(PROC),ultrasparc) -@@ -137,11 +146,8 @@ - CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) - - ifeq (${OSARCH},FreeBSD) --OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) --CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) --LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) --INCLUDE+=-I/usr/local/include --CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) -+CFLAGS+=$(PTHREAD_CFLAGS) -+LIBS+=$(PTHREAD_LIBS) - endif # FreeBSD - - ifeq (${OSARCH},NetBSD) -@@ -157,7 +163,10 @@ - #CFLAGS+=-DOLD_DSP_ROUTINES - - CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) --CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPTEL_OPTIMIZATIONS -+endif - - LIBEDIT=editline/libedit.a - -@@ -219,7 +228,7 @@ - SOLINK=-shared -Xlinker -x - endif - --CC=gcc -+CC?=gcc - INSTALL=install - - _all: all -@@ -231,7 +240,7 @@ - @echo " + $(MAKE) install +" - @echo " +-------------------------------------------+" - --all: depend asterisk subdirs -+all: depend asterisk subdirs manpage - - editline/config.h: - cd editline && unset CFLAGS LIBS && ./configure ; \ -@@ -240,13 +249,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 -@@ -268,13 +277,10 @@ - - asterisk.o: asterisk.c build.h - --manpage: asterisk.8.gz -+manpage: asterisk.8 - --asterisk.8.gz: asterisk.sgml -- rm -f asterisk.8 -- docbook2man asterisk.sgml -- mv ./*.8 asterisk.8 -- gzip asterisk.8 -+asterisk.8: asterisk.8.gz -+ gzcat asterisk.8.gz > asterisk.8 - - ifneq ($(strip $(ASTERISKVERSION)),) - build.h: .version -@@ -292,8 +298,8 @@ - exit 1; \ - fi - --asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+asterisk: editline/libedit.a stdtime/libtime.a $(OBJS) -+ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) stdtime/libtime.a $(LIBS) - - muted: muted.o - $(CC) -o muted muted.o -@@ -312,28 +318,28 @@ - $(MAKE) -C stdtime clean - - datafiles: all -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits - 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/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; \ -@@ -341,18 +347,18 @@ - done - for x in 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-*; 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 CVS ]; then \ -@@ -364,111 +370,86 @@ - fi - - bininstall: all -- mkdir -p $(DESTDIR)$(MODULES_DIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- mkdir -p $(DESTDIR)$(ASTBINDIR) -- mkdir -p $(DESTDIR)$(ASTSBINDIR) -- mkdir -p $(DESTDIR)$(ASTVARRUNDIR) -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp -- install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/ -- install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ -+ $(MKDIR) $(DESTDIR)$(MODULES_DIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR) -+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR) -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail -+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp -+ $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ - if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ -- install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ -+ $(BSD_INSTALL_SCRIPT) contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\ - 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) - rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm -- rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail -- if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \ -- mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- else \ -- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \ -- rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \ -- fi -- ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds -- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv -- 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.gz $(DESTDIR)$(ASTMANDIR)/man8 -+ ln -sf $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm -+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds -+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv -+ $(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 - 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)/vm . ) -- ( 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 " +-------------------------------------------+" -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/vm . ) -+ ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -sf $(ASTSPOOLDIR)/voicemail . ) - --install: all datafiles bininstall -+install: all datafiles bininstall samples - - upgrade: all bininstall - - adsi: all -- 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: all datafiles adsi -- mkdir -p $(DESTDIR)$(ASTETCDIR) -- for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) -+ for x in configs/*.sample channels/h323/*.sample; do \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\ -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ -+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - fi ; \ -- install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ - done -- echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -- echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf -+ echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist -+ if ! [ -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \ -+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTETCDIR)/asterisk.conf-dist $(DESTDIR)$(ASTETCDIR)/asterisk.conf; \ -+ fi - 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 - 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 ; \ -@@ -483,7 +464,7 @@ - @[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) - @[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) - install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi -- mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk -+ $(MKDIR) $(DESTDIR)$(HTTPDIR)/html/_asterisk - for x in images/*.gif; do \ - install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \ - done -@@ -503,10 +484,10 @@ - - __rpm: _version - 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 redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \ - sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \ - 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 32efb5d2b101..000000000000 --- a/net/asterisk16/files/patch-agi::Makefile +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- agi/Makefile.orig Tue Jun 22 20:42:13 2004 -+++ agi/Makefile Tue Oct 5 21:03:40 2004 -@@ -11,15 +11,18 @@ - # 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+= - - all: depend $(AGIS) - - install: all -- mkdir -p $(DESTDIR)$(AGI_DIR) -- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done -+ $(MKDIR) $(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 diff --git a/net/asterisk16/files/patch-apps::Makefile b/net/asterisk16/files/patch-apps::Makefile deleted file mode 100644 index 00b77dfe2434..000000000000 --- a/net/asterisk16/files/patch-apps::Makefile +++ /dev/null @@ -1,49 +0,0 @@ - -$FreeBSD$ - ---- apps/Makefile.orig Sat Sep 25 00:32:56 2004 -+++ apps/Makefile Sun Oct 10 16:20:06 2004 -@@ -40,7 +40,7 @@ - #APPS+=app_rpt.so - - APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) --APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) -+APPS+=$(shell if [ -f $(LOCALBASE)/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) - APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) - - CFLAGS+=-fPIC -@@ -65,12 +65,12 @@ - $(CC) $(SOLINK) -o $@ $< -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 - - app_voicemail.so : app_voicemail.o - ifeq ($(USE_MYSQL_VM_INTERFACE),1) -- $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L/usr/lib/mysql -lmysqlclient -lz -+ $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -L$(LOCALBASE)/lib/mysql -lmysqlclient -lz - else - ifeq ($(USE_POSTGRES_VM_INTERFACE),1) - $(CC) $(SOLINK) -o $@ $(MLFLAGS) $< -lpq -@@ -80,16 +80,16 @@ - 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 $@ $< -L/usr/local/pgsql/lib -lpq -+ $(CC) $(SOLINK) -o $@ $< -L$(LOCALBASE)/lib -lpq - - app_sql_odbc.so: app_sql_odbc.o - $(CC) $(SOLINK) -o $@ $< -lodbc - - look: look.c -- $(CC) -pipe -O6 -g look.c -o look -lncurses -+ $(CC) $(CFLAGS) look.c -o look -lncurses - - ifneq ($(wildcard .depend),) - include .depend diff --git a/net/asterisk16/files/patch-astman::Makefile b/net/asterisk16/files/patch-astman::Makefile deleted file mode 100644 index 2745860cdd36..000000000000 --- a/net/asterisk16/files/patch-astman::Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -$FreeBSD$ - ---- astman/Makefile.orig Sat Jun 26 22:25:39 2004 -+++ astman/Makefile Thu Oct 14 19:14:22 2004 -@@ -5,16 +5,16 @@ - - OSARCH=$(shell uname -s) - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS+=-I/usr/local/include -L/usr/local/lib -+CFLAGS+=-I$(LOCALBASE)/include -L$(LOCALBASE)/lib - endif - --TARGET=$(shell if [ -f /usr/include/newt.h ]; then echo "astman"; else if [ -f /usr/local/include/newt.h ]; then echo "astman"; else echo "none" ; fi ; fi) -+TARGET=astman - all: depend $(TARGET) - - install: - if [ "$(TARGET)" != "none" ]; then \ - for x in $(TARGET); do \ -- install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ -+ $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ - done ; \ - fi - diff --git a/net/asterisk16/files/patch-cdr::Makefile b/net/asterisk16/files/patch-cdr::Makefile deleted file mode 100644 index f646d2c9a3dc..000000000000 --- a/net/asterisk16/files/patch-cdr::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Aug 31 19:33:00 2004 -+++ cdr/Makefile Thu Oct 14 19:13:38 2004 -@@ -21,7 +21,7 @@ - OSARCH=$(shell uname -s) - - ifeq (${OSARCH},FreeBSD) --SOLINK+=-L/usr/local/lib -+SOLINK+=-L$(LOCALBASE)/lib - endif - - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -71,7 +71,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 e82a0299756d..000000000000 --- a/net/asterisk16/files/patch-channels::Makefile +++ /dev/null @@ -1,90 +0,0 @@ - -$FreeBSD$ - ---- channels/Makefile.orig -+++ channels/Makefile -@@ -57,10 +57,10 @@ - - endif - ifeq (${OSARCH},FreeBSD) --PTLIB=-lpt_FreeBSD_x86_r --H323LIB=-lh323_FreeBSD_x86_r --CHANH323LIB=-pthread --SOLINK+=-L/usr/local/lib -+PTLIB=-lpt_FreeBSD_x86_r_s -+H323LIB=-lh323_FreeBSD_x86_r_s -+CHANH323LIB= -+SOLINK+=-L$(LOCALBASE)/lib - endif - ifeq (${OSARCH},NetBSD) - PTLIB=-lpt_NetBSD_x86_r -@@ -72,8 +72,10 @@ - endif - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/ixjuser.h ] && echo chan_phone.so) -+ifndef WITHOUT_H323 -+CHANNEL_LIBS+=chan_h323.so -+endif - - CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations - CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -@@ -84,7 +86,7 @@ - ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") - ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") -+CFLAGS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "-DIAX_TRUNKING -I$(LOCALBASE)/include") - CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) - CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") - -@@ -107,7 +109,7 @@ - ZAPDIR=/usr/lib - - CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+CHANNEL_LIBS+=$(shell [ -f $(LOCALBASE)/include/zaptel.h ] && echo "chan_zap.so") - - CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) - -@@ -156,6 +158,8 @@ - chan_oss.so: chan_oss.o - $(CC) $(SOLINK) -o $@ chan_oss.o -lossaudio - endif -+chan_oss.so: chan_oss.o -+ $(CC) $(SOLINK) -o $@ chan_oss.o - - chan_iax2.so: chan_iax2.o iax2-parser.o iax2-provision.o - ifeq ($(USE_MYSQL_FRIENDS),1) -@@ -175,7 +179,7 @@ - $(CC) -c $(CFLAGS) -o chan_zap.o chan_zap.c - - chan_zap.so: chan_zap.o -- $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -ltonezone -+ $(CC) $(SOLINK) -o $@ $< $(ZAPPRI) $(ZAPR2) -L$(LOCALBASE)/lib -ltonezone - - chan_sip.so: chan_sip.o - ifeq ($(USE_SIP_MYSQL_FRIENDS),1) -@@ -199,15 +203,17 @@ - chan_vpb.so: chan_vpb.o - $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl - --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 -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -lcrypto -lssl -L$(LOCALBASE)/lib -lexpat -llber -lldap -lldap_r - -+h323/ast_h323.o: -+ $(MAKE) -C h323 ast_h323.o - - #chan_modem.so : chan_modem.o - # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< - - install: all -- for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ for x in $(CHANNEL_LIBS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - if ! [ -f chan_iax.so ]; then rm -f $(DESTDIR)$(MODULES_DIR)/chan_iax.so ; fi - - 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 de2ed3978663..000000000000 --- a/net/asterisk16/files/patch-channels::chan_h323.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_h323.c 2004/10/10 13:00:17 1.1 -+++ channels/chan_h323.c 2004/10/10 13:00:39 -@@ -26,7 +26,7 @@ - * Version Info: $Id: patch-channels::chan_h323.c,v 1.3.2.3 2004/10/14 14:30:13 sobomax Exp $ - */ - -- -+#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 521d6a46d256..000000000000 --- a/net/asterisk16/files/patch-channels::chan_sip.c +++ /dev/null @@ -1,120 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_sip.c.orig -+++ channels/chan_sip.c -@@ -139,7 +139,7 @@ - - static char default_language[MAX_LANGUAGE] = ""; - --static char default_callerid[AST_MAX_EXTENSION] = "asterisk"; -+static char default_callerid[AST_MAX_EXTENSION] = "Unknown"; - - static char default_fromdomain[AST_MAX_EXTENSION] = ""; - -@@ -244,6 +244,7 @@ - struct sip_route { - struct sip_route *next; - char hop[0]; -+ int lr; - }; - - struct sip_history { -@@ -4573,6 +4574,10 @@ - /* Make a struct route */ - thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); - if (thishop) { -+ if (strnstr(rr, ";lr", len) != NULL) -+ thishop->lr = 1; -+ else -+ thishop->lr = 0; - strncpy(thishop->hop, rr, len); /* safe */ - thishop->hop[len] = '\0'; - ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop); -@@ -4596,31 +4601,41 @@ - rr += len+1; - } - } -- /* 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, ">"); -- } else { -- /* No <> - just take the lot */ -- c = contact; len = strlen(contact); -- } -- thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ /* 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) { -- strncpy(thishop->hop, c, len); /* safe */ -- thishop->hop[len] = '\0'; -- 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, ">"); -+ } else { -+ /* No <> - just take the lot */ -+ c = contact; len = strlen(contact); -+ } -+ thishop = (struct sip_route *)malloc(sizeof(struct sip_route)+len+1); -+ if (thishop) { -+ strncpy(thishop->hop, c, len); /* safe */ -+ thishop->hop[len] = '\0'; -+ thishop->next = NULL; -+ /* Goes at the end */ -+ if (tail) -+ tail->next = thishop; -+ else -+ head = thishop; -+ } - } - } - /* Store as new route */ -@@ -7197,7 +7212,11 @@ - /* Get destination right away */ - 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) { -@@ -7225,7 +7244,6 @@ - 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); 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 965a643bb687..000000000000 --- a/net/asterisk16/files/patch-channels::chan_zap.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- channels/chan_zap.c -+++ channels/chan_zap.c -@@ -42,7 +42,9 @@ - #include <sys/signal.h> - #include <errno.h> - #include <stdlib.h> -+#ifndef __FreeBSD__ - #include <stdint.h> -+#endif - #include <unistd.h> - #include <sys/ioctl.h> - #ifdef __linux__ diff --git a/net/asterisk16/files/patch-channels::h323::Makefile b/net/asterisk16/files/patch-channels::h323::Makefile deleted file mode 100644 index bc34083e2ff3..000000000000 --- a/net/asterisk16/files/patch-channels::h323::Makefile +++ /dev/null @@ -1,38 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/Makefile.orig Tue Aug 31 16:32:11 2004 -+++ channels/h323/Makefile Sun Oct 10 15:25:42 2004 -@@ -53,7 +53,7 @@ - LIBS+=-lpthread - endif - ifeq ($(findstring BSD,${OSARCH}),BSD) --CFLAGS += -pthread -+CFLAGS += $(PTHREAD_LIBS) - endif - CFLAGS += -D_REENTRANT -D_GNU_SOURCE - CFLAGS += -DP_HAS_SEMAPHORES -DP_SSL -DP_PTHREADS -@@ -74,19 +74,19 @@ - - - ast_h323.o: ast_h323.cpp -- $(CXX) -g -c -fno-rtti -o $@ $(CFLAGS) $< -+ $(CXX) $(CXXFLAGS) -c -fno-rtti -o $@ $(CFLAGS) $< - - libchanh323.a: ast_h323.o - ar cr libchanh323.a ast_h323.o - - chan_h323.so: -- $(CXX) -g -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r -L$(OPENH323DIR)/lib -lh323_linux_x86_r -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r -L/usr/lib $(CHANH323LIB) - - chan_h323_d.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_d -L$(OPENH323DIR)/lib -lh323_linux_x86_d -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_d -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_d -L/usr/lib $(CHANH323LIB) - - chan_h323_s.so: chan_h323.o ast_h323.o -- $(CXX) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_linux_x86_r_s -L$(OPENH323DIR)/lib -lh323_linux_x86_r_s -L/usr/lib $(CHANH323LIB) -+ $(CXX) $(CXXFLAGS) -shared -Xlinker -x -o chan_h323.so chan_h323.o ast_h323.o -L$(PWLIBDIR)/lib -lpt_FreeBSD_x86_r_s -L$(OPENH323DIR)/lib -lh323_FreeBSD_x86_r_s -L/usr/lib $(CHANH323LIB) - clean: - rm -f *.o *.so core.* libchanh323.a - 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 6cfae1ec5d05..000000000000 --- a/net/asterisk16/files/patch-channels::h323::ast_h323.cpp +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- channels/h323/ast_h323.cpp.orig -+++ channels/h323/ast_h323.cpp -@@ -722,7 +722,7 @@ - if (h323debug) { - cout << " -- Sending user input tone (" << tone << ") to remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - H323Connection::SendUserInputTone(tone, duration); - } - -@@ -732,18 +732,20 @@ - if (h323debug) { - cout << " -- Received user input tone (" << tone << ") from remote" << endl; - } -- on_send_digit(GetCallReference(), tone); -+ on_send_digit(GetCallReference(), &tone); - } - H323Connection::OnUserInputTone(tone, duration, logicalChannel, rtpTimestamp); - } - - void MyH323Connection::OnUserInputString(const PString &value) - { -+ char val; - if (mode == H323_DTMF_RFC2833) { - if (h323debug) { - cout << " -- Received user input string (" << value << ") from remote." << endl; - } -- on_send_digit(GetCallReference(), value[0]); -+ val = value[0]; -+ on_send_digit(GetCallReference(), &val); - } - } - diff --git a/net/asterisk16/files/patch-codecs::Makefile b/net/asterisk16/files/patch-codecs::Makefile deleted file mode 100644 index de9aff4c34fe..000000000000 --- a/net/asterisk16/files/patch-codecs::Makefile +++ /dev/null @@ -1,45 +0,0 @@ - -$FreeBSD$ - ---- codecs/Makefile.orig Mon Jul 19 18:52:57 2004 -+++ codecs/Makefile Sun Oct 10 15:28:35 2004 -@@ -17,23 +17,23 @@ - # g723.1b) - # - #MODG723=codec_g723_1.so codec_g723_1b.so --MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") --MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") --MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") --MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") -+MODG723=codec_g723_1_dummy.so -+MODG729=codec_g729_dummy.so -+MODSPEEX=codec_speex.so -+MODILBC=codec_ilbc.so - CFLAGS+=-fPIC --CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") -+CFLAGS+=-I$(LOCALBASE)/include - - LIBG723=g723.1/libg723.a - LIBG723B=g723.1b/libg723b.a - LIBGSM=gsm/lib/libgsm.a - LIBGSMT=gsm/lib/libgsm.a - LIBLPC10=lpc10/liblpc10.a --LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib") -+LIBSPEEX=-L$(LOCALBASE)/lib - LIBSPEEX+=-lspeex -lm - LIBILBC=ilbc/libilbc.a - --CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ -+CODECS+=$(MODG723) $(MODG729) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \ - codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \ - codec_g726.so - -@@ -91,7 +91,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::codec_g723_1_dummy.c b/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c deleted file mode 100644 index 3ce9571013ec..000000000000 --- a/net/asterisk16/files/patch-codecs::codec_g723_1_dummy.c +++ /dev/null @@ -1,314 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g723_1_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g723_1_dummy.c Sun Oct 10 16:07:05 2004 -@@ -0,0 +1,308 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.723.1 (dummy!) -+ * -+ * The G.723.1 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#define TYPE_HIGH 0x0 -+#define TYPE_LOW 0x1 -+#define TYPE_SILENCE 0x2 -+#define TYPE_DONTSEND 0x3 -+#define TYPE_MASK 0x3 -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g723_ex.h" -+#include "g723_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.723.1/PCM16 Codec Translator"; -+ -+struct g723_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g723_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g723tolin_new() -+{ -+ struct g723_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog723_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g723_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g723_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g723_ex; -+ return &f; -+} -+ -+static struct ast_frame *g723tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G723_1; -+ f.datalen = sizeof(g723_slin_ex); -+ /* All frames are 30 ms long */ -+ f.samples = 30; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g723_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog723_new() -+{ -+ struct g723_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g723_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g723tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+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 frame (%d)\n", buf & TYPE_MASK); -+ } -+ return -1; -+} -+ -+static int g723tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g723_decoder_pvt *tmp = (struct g723_decoder_pvt *)pvt; -+ int len = 0; -+ int res; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ res = g723_len(((unsigned char *)f->data + len)[0]); -+ if (res < 0) { -+ ast_log(LOG_WARNING, "Invalid data\n"); -+ return -1; -+ } -+ if (res + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 480 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 480); -+ tmp->tail+=480; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += res; -+ } -+ return 0; -+} -+ -+static int lintog723_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog723_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g723_encoder_pvt *tmp = (struct g723_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 480) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G723_1; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 480) { -+ /* Encode a frame of data */ -+ if (cnt + 24 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 24); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 30; -+ cnt += 24; -+ tmp->tail -= 480; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 480, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g723_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g723tolin = -+ { "g723tolin_dummy", -+ AST_FORMAT_G723_1, AST_FORMAT_SLINEAR, -+ g723tolin_new, -+ g723tolin_framein, -+ g723tolin_frameout, -+ g723_destroy, -+ g723tolin_sample -+ }; -+ -+static struct ast_translator lintog723 = -+ { "lintog723_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G723_1, -+ lintog723_new, -+ lintog723_framein, -+ lintog723_frameout, -+ g723_destroy, -+ lintog723_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog723); -+ if (!res) -+ res = ast_unregister_translator(&g723tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g723tolin); -+ if (!res) -+ res=ast_register_translator(&lintog723); -+ else -+ ast_unregister_translator(&g723tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk16/files/patch-codecs::codec_g729_dummy.c b/net/asterisk16/files/patch-codecs::codec_g729_dummy.c deleted file mode 100644 index 9fcc7b19ca35..000000000000 --- a/net/asterisk16/files/patch-codecs::codec_g729_dummy.c +++ /dev/null @@ -1,281 +0,0 @@ - -$FreeBSD$ - ---- codecs/codec_g729_dummy.c.orig Sun Oct 10 16:05:56 2004 -+++ codecs/codec_g729_dummy.c Sun Oct 10 16:07:12 2004 -@@ -0,0 +1,275 @@ -+/* -+ * Asterisk -- A telephony toolkit for Linux. -+ * -+ * Translate between signed linear and G.729 (dummy!) -+ * -+ * The G.729 code is not included in the Asterisk distribution because -+ * it is covered with patents, and in spite of statements to the contrary, -+ * the "technology" is extremely expensive to license. -+ * -+ * Copyright (C) 1999, Mark Spencer -+ * -+ * Mark Spencer <markster@linux-support.net> -+ * -+ * This program is free software, distributed under the terms of -+ * the GNU General Public License -+ */ -+ -+#include <sys/types.h> -+#include <asterisk/translate.h> -+#include <asterisk/module.h> -+#include <asterisk/logger.h> -+#include <asterisk/channel.h> -+#include <pthread.h> -+#include <fcntl.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <netinet/in.h> -+#include <string.h> -+#include <stdio.h> -+ -+/* Sample frame data */ -+#include "slin_g729_ex.h" -+#include "g729_slin_ex.h" -+ -+AST_MUTEX_DEFINE_STATIC(localuser_lock); -+static int localusecnt=0; -+ -+static char *tdesc = "Dummy G.729/PCM16 Codec Translator"; -+ -+struct g729_encoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Buffer for our outgoing frame */ -+ char outbuf[8000]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+struct g729_decoder_pvt { -+ struct ast_frame f; -+ /* Space to build offset */ -+ char offset[AST_FRIENDLY_OFFSET]; -+ /* Enough to store a full second */ -+ short buf[8000]; -+ int tail; -+}; -+ -+static struct ast_translator_pvt *g729tolin_new() -+{ -+ struct g729_decoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_decoder_pvt)); -+ if (tmp) { -+ tmp->tail = 0; -+ localusecnt++; -+ ast_update_use_count(); -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *lintog729_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_SLINEAR; -+ f.datalen = sizeof(slin_g729_ex); -+ /* Assume 8000 Hz */ -+ f.samples = sizeof(slin_g729_ex)/16; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = slin_g729_ex; -+ return &f; -+} -+ -+static struct ast_frame *g729tolin_sample() -+{ -+ static struct ast_frame f; -+ f.frametype = AST_FRAME_VOICE; -+ f.subclass = AST_FORMAT_G729A; -+ f.datalen = sizeof(g729_slin_ex); -+ /* All frames are 10 ms long */ -+ f.samples = 10; -+ f.mallocd = 0; -+ f.offset = 0; -+ f.src = __PRETTY_FUNCTION__; -+ f.data = g729_slin_ex; -+ return &f; -+} -+ -+static struct ast_translator_pvt *lintog729_new() -+{ -+ struct g729_encoder_pvt *tmp; -+ tmp = malloc(sizeof(struct g729_encoder_pvt)); -+ if (tmp) { -+ localusecnt++; -+ ast_update_use_count(); -+ tmp->tail = 0; -+ } -+ return (struct ast_translator_pvt *)tmp; -+} -+ -+static struct ast_frame *g729tolin_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ if (!tmp->tail) -+ return NULL; -+ /* Signed linear is no particular frame size, so just send whatever -+ we have in the buffer in one lump sum */ -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_SLINEAR; -+ tmp->f.datalen = tmp->tail * 2; -+ /* Assume 8000 Hz */ -+ tmp->f.samples = tmp->tail / 8; -+ tmp->f.mallocd = 0; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.data = tmp->buf; -+ /* Reset tail pointer */ -+ tmp->tail = 0; -+ -+ return &tmp->f; -+} -+ -+static int g729tolin_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ struct g729_decoder_pvt *tmp = (struct g729_decoder_pvt *)pvt; -+ int len = 0; -+ while(len < f->datalen) { -+ /* Assuming there's space left, decode into the current buffer at -+ the tail location */ -+ if (10 + len > f->datalen) { -+ ast_log(LOG_WARNING, "Measured length exceeds frame length\n"); -+ return -1; -+ } -+ if (tmp->tail + 160 < sizeof(tmp->buf)/2) { -+ memset(tmp->buf + tmp->tail, 0, 160); -+ tmp->tail+=160; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ len += 10; -+ } -+ return 0; -+} -+ -+static int lintog729_framein(struct ast_translator_pvt *pvt, struct ast_frame *f) -+{ -+ /* Just add the frames to our stream */ -+ /* XXX We should look at how old the rest of our stream is, and if it -+ is too old, then we should overwrite it entirely, otherwise we can -+ get artifacts of earlier talk that do not belong */ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ if (tmp->tail + f->datalen/2 < sizeof(tmp->buf) / 2) { -+ memcpy(&tmp->buf[tmp->tail], f->data, f->datalen); -+ tmp->tail += f->datalen/2; -+ } else { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return -1; -+ } -+ return 0; -+} -+ -+static struct ast_frame *lintog729_frameout(struct ast_translator_pvt *pvt) -+{ -+ struct g729_encoder_pvt *tmp = (struct g729_encoder_pvt *)pvt; -+ int cnt=0; -+ /* We can't work on anything less than a frame in size */ -+ if (tmp->tail < 160) -+ return NULL; -+ tmp->f.frametype = AST_FRAME_VOICE; -+ tmp->f.subclass = AST_FORMAT_G729A; -+ tmp->f.offset = AST_FRIENDLY_OFFSET; -+ tmp->f.src = __PRETTY_FUNCTION__; -+ tmp->f.samples = 0; -+ tmp->f.mallocd = 0; -+ while(tmp->tail >= 160) { -+ /* Encode a frame of data */ -+ if (cnt + 10 >= sizeof(tmp->outbuf)) { -+ ast_log(LOG_WARNING, "Out of buffer space\n"); -+ return NULL; -+ } -+ memset(tmp->outbuf + cnt, 0, 10); -+ /* Assume 8000 Hz */ -+ tmp->f.samples += 10; -+ cnt += 10; -+ tmp->tail -= 160; -+ /* Move the data at the end of the buffer to the front */ -+ if (tmp->tail) -+ memmove(tmp->buf, tmp->buf + 160, tmp->tail * 2); -+ } -+ tmp->f.datalen = cnt; -+ tmp->f.data = tmp->outbuf; -+ return &tmp->f; -+} -+ -+static void g729_destroy(struct ast_translator_pvt *pvt) -+{ -+ free(pvt); -+ localusecnt--; -+ ast_update_use_count(); -+} -+ -+static struct ast_translator g729tolin = -+ { "g729tolin_dummy", -+ AST_FORMAT_G729A, AST_FORMAT_SLINEAR, -+ g729tolin_new, -+ g729tolin_framein, -+ g729tolin_frameout, -+ g729_destroy, -+ g729tolin_sample -+ }; -+ -+static struct ast_translator lintog729 = -+ { "lintog729_dummy", -+ AST_FORMAT_SLINEAR, AST_FORMAT_G729A, -+ lintog729_new, -+ lintog729_framein, -+ lintog729_frameout, -+ g729_destroy, -+ lintog729_sample -+ }; -+ -+int unload_module(void) -+{ -+ int res; -+ ast_mutex_lock(&localuser_lock); -+ res = ast_unregister_translator(&lintog729); -+ if (!res) -+ res = ast_unregister_translator(&g729tolin); -+ if (localusecnt) -+ res = -1; -+ ast_mutex_unlock(&localuser_lock); -+ return res; -+} -+ -+int load_module(void) -+{ -+ int res; -+ res=ast_register_translator(&g729tolin); -+ if (!res) -+ res=ast_register_translator(&lintog729); -+ else -+ ast_unregister_translator(&g729tolin); -+ return res; -+} -+ -+char *description(void) -+{ -+ return tdesc; -+} -+ -+int usecount(void) -+{ -+ int res; -+ STANDARD_USECOUNT(res); -+ return res; -+} -+ -+char *key() -+{ -+ return ASTERISK_GPL_KEY; -+} diff --git a/net/asterisk16/files/patch-codecs::g729_slin_ex.h b/net/asterisk16/files/patch-codecs::g729_slin_ex.h deleted file mode 100644 index 44e60f2de848..000000000000 --- a/net/asterisk16/files/patch-codecs::g729_slin_ex.h +++ /dev/null @@ -1,20 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/g729_slin_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,14 @@ -+/* -+ * g729_slin_ex.h -- -+ * -+ * 8-bit G.729 data, 10 milliseconds worth at 8 kHz. -+ * -+ * Copyright (C) 2004, Maxim Sobolev <sobomax@FreeBSD.org> -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static unsigned char g729_slin_ex[] = { -+120,82,175,64,0,250,219,0,7,214 -+}; diff --git a/net/asterisk16/files/patch-codecs::ilbc::Makefile b/net/asterisk16/files/patch-codecs::ilbc::Makefile deleted file mode 100644 index 7770e07550a4..000000000000 --- a/net/asterisk16/files/patch-codecs::ilbc::Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- codecs/ilbc/Makefile.orig Sun Apr 27 21:13:11 2003 -+++ codecs/ilbc/Makefile Fri Jan 30 01:47:34 2004 -@@ -1,4 +1,4 @@ --CFLAGS+= -fPIC -O3 -+CFLAGS+= -fPIC - LIB=libilbc.a - - OBJS= anaFilter.o iCBSearch.o packing.o \ diff --git a/net/asterisk16/files/patch-codecs::slin_g729_ex.h b/net/asterisk16/files/patch-codecs::slin_g729_ex.h deleted file mode 100644 index e1236d2498dc..000000000000 --- a/net/asterisk16/files/patch-codecs::slin_g729_ex.h +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- /dev/null Fri Jan 30 01:52:11 2004 -+++ codecs/slin_g729_ex.h Fri Jan 30 01:57:59 2004 -@@ -0,0 +1,25 @@ -+/* -+ * slin_g729_ex.h -- -+ * -+ * Signed 16-bit audio data, 10 milliseconds worth at 8 kHz. -+ * -+ * Source: g723.example -+ * -+ * Copyright (C) 2001, Linux Support Services, Inc. -+ * -+ * Distributed under the terms of the GNU General Public License -+ * -+ */ -+ -+static signed short slin_g729_ex[] = { -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, -+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 -+}; diff --git a/net/asterisk16/files/patch-db.c b/net/asterisk16/files/patch-db.c deleted file mode 100644 index 6c2bdcd443c8..000000000000 --- a/net/asterisk16/files/patch-db.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- db.c.orig Fri Jul 9 13:08:09 2004 -+++ db.c Sun Oct 10 15:32:33 2004 -@@ -33,7 +33,7 @@ - #include <asterisk/cli.h> - #include <asterisk/utils.h> - #include <asterisk/lock.h> --#include "db1-ast/include/db.h" -+#include <db.h> - #include "asterisk.h" - #include "astconf.h" - 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-formats::Makefile b/net/asterisk16/files/patch-formats::Makefile deleted file mode 100644 index dacfd7b08303..000000000000 --- a/net/asterisk16/files/patch-formats::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- formats/Makefile.orig Tue Nov 4 04:40:09 2003 -+++ formats/Makefile Fri Jan 30 01:47:34 2004 -@@ -18,7 +18,7 @@ - # - # G723 simple frame is depricated - # --#FORMAT_LIBS+=format_g723.so -+FORMAT_LIBS+=format_g723_1.so - - GSMLIB=../codecs/gsm/lib/libgsm.a - -@@ -40,7 +40,7 @@ - $(CC) $(SOLINK) -o $@ $< -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 fb5eb12833dc..000000000000 --- a/net/asterisk16/files/patch-formats::format_g723_1.c +++ /dev/null @@ -1,351 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g723_1.c.orig Sun Oct 10 15:59:18 2004 -+++ formats/format_g723_1.c Sun Oct 10 16:05:05 2004 -@@ -0,0 +1,345 @@ -+/* -+ * 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 <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 <stdio.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 */ -+ int fd; /* 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(int fd) -+{ -+ /* 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->fd = fd; -+ 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(int fd, 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->fd = fd; -+ 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(); -+ close(s->fd); -+ 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 = read(s->fd, s->g723, 1)) != 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 = read(s->fd, s->g723 + 1, s->fr.datalen - 1)) != 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 = write(fs->fd, f->data, f->datalen)) != 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 ((moffset = lseek(fs->fd, 0, SEEK_END)) == -1) { -+ ast_log(LOG_WARNING, "Can't seek stream to an end!\n"); -+ return -1; -+ } -+ 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 (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %lli!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 && lseek(fs->fd, soffset, SEEK_SET) != soffset) { -+ 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(fs->fd, lseek(fs->fd, 0, SEEK_CUR)) < 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 = lseek(fs->fd, 0, SEEK_CUR); -+ rval = 0; -+ for (coffset = 0; coffset < offset; coffset += res) { -+ if (lseek(fs->fd, coffset, SEEK_SET) != coffset) { -+ ast_log(LOG_WARNING, "Can't seek to offset %llu!\n", coffset); -+ return -1; -+ } -+ if (read(fs->fd, &c, 1) != 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 (lseek(fs->fd, offset, SEEK_SET) != offset) { -+ 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 a144d1b0f6bf..000000000000 --- a/net/asterisk16/files/patch-formats::format_g729.c +++ /dev/null @@ -1,47 +0,0 @@ - -$FreeBSD$ - ---- formats/format_g729.c.orig Wed Jan 28 23:32:48 2004 -+++ formats/format_g729.c Thu Feb 19 01:03:30 2004 -@@ -45,7 +45,7 @@ - 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 */ - }; - - -@@ -126,11 +126,11 @@ - 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 = read(s->fd, s->g729, 20)) != 20) { -+ if ((res = read(s->fd, s->g729, 10)) != 10) { - if (res) - ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno)); - return NULL; -@@ -174,7 +174,7 @@ - cur = lseek(fs->fd, 0, SEEK_CUR); - max = lseek(fs->fd, 0, SEEK_END); - -- bytes = 20 * (sample_offset / 160); -+ bytes = 10 * (sample_offset / 80); - if (whence == SEEK_SET) - offset = bytes; - else if (whence == SEEK_CUR || whence == SEEK_FORCECUR) -@@ -202,7 +202,7 @@ - { - off_t offset; - offset = lseek(fs->fd, 0, SEEK_CUR); -- return (offset/20)*160; -+ return (offset/10)*80; - } - - int load_module() 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 dca6672c389a..000000000000 --- a/net/asterisk16/files/patch-pbx::Makefile +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- pbx/Makefile.orig Sun Oct 26 20:50:49 2003 -+++ pbx/Makefile Fri Jan 30 01:47:34 2004 -@@ -16,7 +16,7 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate --PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+#PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - -@@ -62,7 +62,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 3377b4aa1c8e..000000000000 --- a/net/asterisk16/files/patch-res::Makefile +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- res/Makefile.orig -+++ res/Makefile -@@ -21,7 +21,10 @@ - - CFLAGS+= - CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+CFLAGS+=-I$(LOCALBASE)/include -+ifndef WITHOUT_ZAPTEL -+CFLAGS+=-DZAPATA_MOH -+endif - # - # Work around buggy RedHat 9.0 - # -@@ -34,7 +37,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 - - res_crypto.so: res_crypto.o - $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS) diff --git a/net/asterisk16/files/patch-rtp.c b/net/asterisk16/files/patch-rtp.c deleted file mode 100644 index 06289f357208..000000000000 --- a/net/asterisk16/files/patch-rtp.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- rtp.c.orig Sat Sep 18 16:56:28 2004 -+++ rtp.c Sun Oct 10 15:57:22 2004 -@@ -127,7 +127,7 @@ - { - switch(buf & TYPE_MASK) { - case TYPE_DONTSEND: -- return 0; -+ return 2; - break; - case TYPE_SILENCE: - return 4; -@@ -841,8 +841,10 @@ - /* Must be an even port number by RTP spec */ - rtp->us.sin_port = htons(x); - rtp->us.sin_addr = addr; -- if (rtp->rtcp) -+ if (rtp->rtcp) { - rtp->rtcp->us.sin_port = htons(x + 1); -+ rtp->rtcp->us.sin_addr = addr; -+ } - 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)))) - break; 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 d503a8741743..000000000000 --- a/net/asterisk16/pkg-plist +++ /dev/null @@ -1,642 +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_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/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/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/h323.conf %D/etc/asterisk/h323.conf-dist; then rm -f %D/etc/asterisk/h323.conf; fi -etc/asterisk/h323.conf-dist -@exec [ -f %B/h323.conf ] || cp %B/%f %B/h323.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/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_config_odbc.conf %D/etc/asterisk/res_config_odbc.conf-dist; then rm -f %D/etc/asterisk/res_config_odbc.conf; fi -etc/asterisk/res_config_odbc.conf-dist -@exec [ -f %B/res_config_odbc.conf ] || cp %B/%f %B/res_config_odbc.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/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 -etc/rc.d/asterisk.sh -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/astosp.h -include/asterisk/callerid.h -include/asterisk/causes.h -include/asterisk/cdr.h -include/asterisk/channel.h -include/asterisk/channel_pvt.h -include/asterisk/chanvars.h -include/asterisk/cli.h -include/asterisk/config.h -include/asterisk/config_pvt.h -include/asterisk/crypto.h -include/asterisk/cvsid.h -include/asterisk/dlfcn-compat.h -include/asterisk/dns.h -include/asterisk/dsp.h -include/asterisk/enum.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/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/options.h -include/asterisk/pbx.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/srv.h -include/asterisk/tdd.h -include/asterisk/term.h -include/asterisk/translate.h -include/asterisk/ulaw.h -include/asterisk/utils.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_controlplayback.so -lib/asterisk/modules/app_cut.so -lib/asterisk/modules/app_db.so -lib/asterisk/modules/app_dial.so -lib/asterisk/modules/app_directory.so -lib/asterisk/modules/app_disa.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_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_intercom.so -lib/asterisk/modules/app_lookupblacklist.so -lib/asterisk/modules/app_lookupcidname.so -lib/asterisk/modules/app_macro.so -%%WITH_ZAPTEL%%lib/asterisk/modules/app_meetme.so -lib/asterisk/modules/app_milliwatt.so -lib/asterisk/modules/app_mp3.so -lib/asterisk/modules/app_nbscat.so -lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_playback.so -lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_qcall.so -lib/asterisk/modules/app_queue.so -lib/asterisk/modules/app_random.so -lib/asterisk/modules/app_read.so -lib/asterisk/modules/app_record.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_sms.so -lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_striplsd.so -lib/asterisk/modules/app_substring.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 -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_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_manager.so -lib/asterisk/modules/chan_agent.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_modem.so -lib/asterisk/modules/chan_modem_aopen.so -lib/asterisk/modules/chan_modem_bestdata.so -lib/asterisk/modules/chan_modem_i4l.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_g723_1_dummy.so -lib/asterisk/modules/codec_g726.so -lib/asterisk/modules/codec_g729_dummy.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_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/pbx_config.so -lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/pbx_wilcalu.so -lib/asterisk/modules/res_adsi.so -lib/asterisk/modules/res_agi.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_musiconhold.so -sbin/asterisk -sbin/astgenkey -sbin/astman -sbin/safe_asterisk -share/asterisk/agi-bin/agi-test.agi -share/asterisk/agi-bin/eagi-sphinx-test -share/asterisk/agi-bin/eagi-test -share/asterisk/firmware/iax/iaxy.bin -share/asterisk/images/asterisk-intro.jpg -share/asterisk/keys/freeworlddialup.pub -share/asterisk/keys/iaxtel.pub -share/asterisk/mohmp3/fpm-calm-river.mp3 -share/asterisk/mohmp3/fpm-sunshine.mp3 -share/asterisk/mohmp3/fpm-world-mix.mp3 -share/asterisk/sounds/agent-alreadyon.gsm -share/asterisk/sounds/agent-incorrect.gsm -share/asterisk/sounds/agent-loggedoff.gsm -share/asterisk/sounds/agent-loginok.gsm -share/asterisk/sounds/agent-newlocation.gsm -share/asterisk/sounds/agent-pass.gsm -share/asterisk/sounds/agent-user.gsm -share/asterisk/sounds/auth-incorrect.gsm -share/asterisk/sounds/auth-thankyou.gsm -share/asterisk/sounds/beep.gsm -share/asterisk/sounds/conf-adminmenu.gsm -share/asterisk/sounds/conf-enteringno.gsm -share/asterisk/sounds/conf-errormenu.gsm -share/asterisk/sounds/conf-getchannel.gsm -share/asterisk/sounds/conf-getconfno.gsm -share/asterisk/sounds/conf-getpin.gsm -share/asterisk/sounds/conf-invalid.gsm -share/asterisk/sounds/conf-invalidpin.gsm -share/asterisk/sounds/conf-kicked.gsm -share/asterisk/sounds/conf-locked.gsm -share/asterisk/sounds/conf-lockednow.gsm -share/asterisk/sounds/conf-muted.gsm -share/asterisk/sounds/conf-noempty.gsm -share/asterisk/sounds/conf-onlyperson.gsm -share/asterisk/sounds/conf-unlockednow.gsm -share/asterisk/sounds/conf-unmuted.gsm -share/asterisk/sounds/conf-usermenu.gsm -share/asterisk/sounds/demo-abouttotry.gsm -share/asterisk/sounds/demo-congrats.gsm -share/asterisk/sounds/demo-echodone.gsm -share/asterisk/sounds/demo-echotest.gsm -share/asterisk/sounds/demo-enterkeywords.gsm -share/asterisk/sounds/demo-instruct.gsm -share/asterisk/sounds/demo-moreinfo.gsm -share/asterisk/sounds/demo-nogo.gsm -share/asterisk/sounds/demo-nomatch.gsm -share/asterisk/sounds/demo-thanks.gsm -share/asterisk/sounds/digits/0.gsm -share/asterisk/sounds/digits/1.gsm -share/asterisk/sounds/digits/10.gsm -share/asterisk/sounds/digits/11.gsm -share/asterisk/sounds/digits/12.gsm -share/asterisk/sounds/digits/13.gsm -share/asterisk/sounds/digits/14.gsm -share/asterisk/sounds/digits/15.gsm -share/asterisk/sounds/digits/16.gsm -share/asterisk/sounds/digits/17.gsm -share/asterisk/sounds/digits/18.gsm -share/asterisk/sounds/digits/19.gsm -share/asterisk/sounds/digits/2.gsm -share/asterisk/sounds/digits/20.gsm -share/asterisk/sounds/digits/3.gsm -share/asterisk/sounds/digits/30.gsm -share/asterisk/sounds/digits/4.gsm -share/asterisk/sounds/digits/40.gsm -share/asterisk/sounds/digits/5.gsm -share/asterisk/sounds/digits/50.gsm -share/asterisk/sounds/digits/6.gsm -share/asterisk/sounds/digits/60.gsm -share/asterisk/sounds/digits/7.gsm -share/asterisk/sounds/digits/70.gsm -share/asterisk/sounds/digits/8.gsm -share/asterisk/sounds/digits/80.gsm -share/asterisk/sounds/digits/9.gsm -share/asterisk/sounds/digits/90.gsm -share/asterisk/sounds/digits/a-m.gsm -share/asterisk/sounds/digits/at.gsm -share/asterisk/sounds/digits/day-0.gsm -share/asterisk/sounds/digits/day-1.gsm -share/asterisk/sounds/digits/day-2.gsm -share/asterisk/sounds/digits/day-3.gsm -share/asterisk/sounds/digits/day-4.gsm -share/asterisk/sounds/digits/day-5.gsm -share/asterisk/sounds/digits/day-6.gsm -share/asterisk/sounds/digits/dollars.gsm -share/asterisk/sounds/digits/h-1.gsm -share/asterisk/sounds/digits/h-10.gsm -share/asterisk/sounds/digits/h-11.gsm -share/asterisk/sounds/digits/h-12.gsm -share/asterisk/sounds/digits/h-13.gsm -share/asterisk/sounds/digits/h-14.gsm -share/asterisk/sounds/digits/h-15.gsm -share/asterisk/sounds/digits/h-16.gsm -share/asterisk/sounds/digits/h-17.gsm -share/asterisk/sounds/digits/h-18.gsm -share/asterisk/sounds/digits/h-19.gsm -share/asterisk/sounds/digits/h-2.gsm -share/asterisk/sounds/digits/h-20.gsm -share/asterisk/sounds/digits/h-3.gsm -share/asterisk/sounds/digits/h-30.gsm -share/asterisk/sounds/digits/h-4.gsm -share/asterisk/sounds/digits/h-5.gsm -share/asterisk/sounds/digits/h-6.gsm -share/asterisk/sounds/digits/h-7.gsm -share/asterisk/sounds/digits/h-8.gsm -share/asterisk/sounds/digits/h-9.gsm -share/asterisk/sounds/digits/hundred.gsm -share/asterisk/sounds/digits/million.gsm -share/asterisk/sounds/digits/mon-0.gsm -share/asterisk/sounds/digits/mon-1.gsm -share/asterisk/sounds/digits/mon-10.gsm -share/asterisk/sounds/digits/mon-11.gsm -share/asterisk/sounds/digits/mon-2.gsm -share/asterisk/sounds/digits/mon-3.gsm -share/asterisk/sounds/digits/mon-4.gsm -share/asterisk/sounds/digits/mon-5.gsm -share/asterisk/sounds/digits/mon-6.gsm -share/asterisk/sounds/digits/mon-7.gsm -share/asterisk/sounds/digits/mon-8.gsm -share/asterisk/sounds/digits/mon-9.gsm -share/asterisk/sounds/digits/oclock.gsm -share/asterisk/sounds/digits/oh.gsm -share/asterisk/sounds/digits/p-m.gsm -share/asterisk/sounds/digits/pound.gsm -share/asterisk/sounds/digits/star.gsm -share/asterisk/sounds/digits/thousand.gsm -share/asterisk/sounds/digits/today.gsm -share/asterisk/sounds/digits/tomorrow.gsm -share/asterisk/sounds/digits/yesterday.gsm -share/asterisk/sounds/dir-instr.gsm -share/asterisk/sounds/dir-intro.gsm -share/asterisk/sounds/dir-intro-fn.gsm -share/asterisk/sounds/dir-nomatch.gsm -share/asterisk/sounds/dir-nomore.gsm -share/asterisk/sounds/invalid.gsm -share/asterisk/sounds/letters/a.gsm -share/asterisk/sounds/letters/at.gsm -share/asterisk/sounds/letters/b.gsm -share/asterisk/sounds/letters/c.gsm -share/asterisk/sounds/letters/d.gsm -share/asterisk/sounds/letters/dash.gsm -share/asterisk/sounds/letters/dollar.gsm -share/asterisk/sounds/letters/dot.gsm -share/asterisk/sounds/letters/e.gsm -share/asterisk/sounds/letters/equals.gsm -share/asterisk/sounds/letters/exclaimation-point.gsm -share/asterisk/sounds/letters/f.gsm -share/asterisk/sounds/letters/g.gsm -share/asterisk/sounds/letters/h.gsm -share/asterisk/sounds/letters/i.gsm -share/asterisk/sounds/letters/j.gsm -share/asterisk/sounds/letters/k.gsm -share/asterisk/sounds/letters/l.gsm -share/asterisk/sounds/letters/m.gsm -share/asterisk/sounds/letters/n.gsm -share/asterisk/sounds/letters/o.gsm -share/asterisk/sounds/letters/p.gsm -share/asterisk/sounds/letters/plus.gsm -share/asterisk/sounds/letters/q.gsm -share/asterisk/sounds/letters/r.gsm -share/asterisk/sounds/letters/s.gsm -share/asterisk/sounds/letters/slash.gsm -share/asterisk/sounds/letters/space.gsm -share/asterisk/sounds/letters/t.gsm -share/asterisk/sounds/letters/u.gsm -share/asterisk/sounds/letters/v.gsm -share/asterisk/sounds/letters/w.gsm -share/asterisk/sounds/letters/x.gsm -share/asterisk/sounds/letters/y.gsm -share/asterisk/sounds/letters/z.gsm -share/asterisk/sounds/letters/zed.gsm -share/asterisk/sounds/pbx-invalid.gsm -share/asterisk/sounds/pbx-invalidpark.gsm -share/asterisk/sounds/pbx-transfer.gsm -share/asterisk/sounds/phonetic/9_p.gsm -share/asterisk/sounds/phonetic/a_p.gsm -share/asterisk/sounds/phonetic/b_p.gsm -share/asterisk/sounds/phonetic/c_p.gsm -share/asterisk/sounds/phonetic/d_p.gsm -share/asterisk/sounds/phonetic/e_p.gsm -share/asterisk/sounds/phonetic/f_p.gsm -share/asterisk/sounds/phonetic/g_p.gsm -share/asterisk/sounds/phonetic/h_p.gsm -share/asterisk/sounds/phonetic/i_p.gsm -share/asterisk/sounds/phonetic/j_p.gsm -share/asterisk/sounds/phonetic/k_p.gsm -share/asterisk/sounds/phonetic/l_p.gsm -share/asterisk/sounds/phonetic/m_p.gsm -share/asterisk/sounds/phonetic/n_p.gsm -share/asterisk/sounds/phonetic/o_p.gsm -share/asterisk/sounds/phonetic/p_p.gsm -share/asterisk/sounds/phonetic/q_p.gsm -share/asterisk/sounds/phonetic/r_p.gsm -share/asterisk/sounds/phonetic/s_p.gsm -share/asterisk/sounds/phonetic/t_p.gsm -share/asterisk/sounds/phonetic/u_p.gsm -share/asterisk/sounds/phonetic/v_p.gsm -share/asterisk/sounds/phonetic/w_p.gsm -share/asterisk/sounds/phonetic/x_p.gsm -share/asterisk/sounds/phonetic/y_p.gsm -share/asterisk/sounds/phonetic/z_p.gsm -share/asterisk/sounds/privacy-incorrect.gsm -share/asterisk/sounds/privacy-prompt.gsm -share/asterisk/sounds/privacy-thankyou.gsm -share/asterisk/sounds/privacy-unident.gsm -share/asterisk/sounds/queue-callswaiting.gsm -share/asterisk/sounds/queue-holdtime.gsm -share/asterisk/sounds/queue-less-than.gsm -share/asterisk/sounds/queue-minutes.gsm -share/asterisk/sounds/queue-seconds.gsm -share/asterisk/sounds/queue-thankyou.gsm -share/asterisk/sounds/queue-thereare.gsm -share/asterisk/sounds/queue-youarenext.gsm -share/asterisk/sounds/ss-noservice.gsm -share/asterisk/sounds/transfer.gsm -share/asterisk/sounds/tt-allbusy.gsm -share/asterisk/sounds/tt-monkeys.gsm -share/asterisk/sounds/tt-monkeysintro.gsm -share/asterisk/sounds/tt-somethingwrong.gsm -share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm -share/asterisk/sounds/vm-Cust1.gsm -share/asterisk/sounds/vm-Cust2.gsm -share/asterisk/sounds/vm-Cust3.gsm -share/asterisk/sounds/vm-Cust4.gsm -share/asterisk/sounds/vm-Cust5.gsm -share/asterisk/sounds/vm-Family.gsm -share/asterisk/sounds/vm-Friends.gsm -share/asterisk/sounds/vm-INBOX.gsm -share/asterisk/sounds/vm-Old.gsm -share/asterisk/sounds/vm-Work.gsm -share/asterisk/sounds/vm-advopts.gsm -share/asterisk/sounds/vm-and.gsm -share/asterisk/sounds/vm-calldiffnum.gsm -share/asterisk/sounds/vm-changeto.gsm -share/asterisk/sounds/vm-delete.gsm -share/asterisk/sounds/vm-deleted.gsm -share/asterisk/sounds/vm-dialout.gsm -share/asterisk/sounds/vm-enter-num-to-call.gsm -share/asterisk/sounds/vm-extension.gsm -share/asterisk/sounds/vm-first.gsm -share/asterisk/sounds/vm-for.gsm -share/asterisk/sounds/vm-forwardoptions.gsm -share/asterisk/sounds/vm-from-extension.gsm -share/asterisk/sounds/vm-from-phonenumber.gsm -share/asterisk/sounds/vm-from.gsm -share/asterisk/sounds/vm-goodbye.gsm -share/asterisk/sounds/vm-helpexit.gsm -share/asterisk/sounds/vm-incorrect.gsm -share/asterisk/sounds/vm-incorrect-mailbox.gsm -share/asterisk/sounds/vm-instructions.gsm -share/asterisk/sounds/vm-intro.gsm -share/asterisk/sounds/vm-isonphone.gsm -share/asterisk/sounds/vm-isunavail.gsm -share/asterisk/sounds/vm-last.gsm -share/asterisk/sounds/vm-leavemsg.gsm -share/asterisk/sounds/vm-login.gsm -share/asterisk/sounds/vm-mailboxfull.gsm -share/asterisk/sounds/vm-message.gsm -share/asterisk/sounds/vm-messages.gsm -share/asterisk/sounds/vm-mismatch.gsm -share/asterisk/sounds/vm-msginstruct.gsm -share/asterisk/sounds/vm-msgsaved.gsm -share/asterisk/sounds/vm-newpassword.gsm -share/asterisk/sounds/vm-next.gsm -share/asterisk/sounds/vm-no.gsm -share/asterisk/sounds/vm-nobodyavail.gsm -share/asterisk/sounds/vm-nobox.gsm -share/asterisk/sounds/vm-nomore.gsm -share/asterisk/sounds/vm-nonumber.gsm -share/asterisk/sounds/vm-num-i-have.gsm -share/asterisk/sounds/vm-onefor.gsm -share/asterisk/sounds/vm-options.gsm -share/asterisk/sounds/vm-opts.gsm -share/asterisk/sounds/vm-passchanged.gsm -share/asterisk/sounds/vm-password.gsm -share/asterisk/sounds/vm-press.gsm -share/asterisk/sounds/vm-prev.gsm -share/asterisk/sounds/vm-reachoper.gsm -share/asterisk/sounds/vm-rec-busy.gsm -share/asterisk/sounds/vm-rec-name.gsm -share/asterisk/sounds/vm-rec-unv.gsm -share/asterisk/sounds/vm-received.gsm -share/asterisk/sounds/vm-reenterpassword.gsm -share/asterisk/sounds/vm-repeat.gsm -share/asterisk/sounds/vm-review.gsm -share/asterisk/sounds/vm-saved.gsm -share/asterisk/sounds/vm-savedto.gsm -share/asterisk/sounds/vm-savefolder.gsm -share/asterisk/sounds/vm-savemessage.gsm -share/asterisk/sounds/vm-sorry.gsm -share/asterisk/sounds/vm-star-cancel.gsm -share/asterisk/sounds/vm-starmain.gsm -share/asterisk/sounds/vm-then-pound.gsm -share/asterisk/sounds/vm-theperson.gsm -share/asterisk/sounds/vm-tocallback.gsm -share/asterisk/sounds/vm-tocallnum.gsm -share/asterisk/sounds/vm-tocancel.gsm -share/asterisk/sounds/vm-tocancelmsg.gsm -share/asterisk/sounds/vm-toenternumber.gsm -share/asterisk/sounds/vm-toforward.gsm -share/asterisk/sounds/vm-tohearenv.gsm -share/asterisk/sounds/vm-tomakecall.gsm -share/asterisk/sounds/vm-tooshort.gsm -share/asterisk/sounds/vm-toreply.gsm -share/asterisk/sounds/vm-torerecord.gsm -share/asterisk/sounds/vm-undelete.gsm -share/asterisk/sounds/vm-undeleted.gsm -share/asterisk/sounds/vm-unknown-caller.gsm -share/asterisk/sounds/vm-whichbox.gsm -share/asterisk/sounds/vm-youhave.gsm -share/asterisk/sounds/voicemail -@dirrm share/asterisk/sounds/phonetic -@dirrm share/asterisk/sounds/letters -@dirrm share/asterisk/sounds/digits -@dirrm share/asterisk/sounds -@dirrm share/asterisk/mohmp3 -@dirrm share/asterisk/keys -@dirrm share/asterisk/images -@dirrm share/asterisk/firmware/iax -@dirrm share/asterisk/firmware -@dirrm share/asterisk/agi-bin -@dirrm share/asterisk -@dirrm lib/asterisk/modules -@dirrm lib/asterisk -@dirrm include/asterisk -@dirrm etc/asterisk -@unexec rm -f %D/share/asterisk/astdb -@cwd /var -spool/asterisk/vm -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/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 diff --git a/net/callgen323/Makefile b/net/callgen323/Makefile deleted file mode 100644 index 34d69d3bbc98..000000000000 --- a/net/callgen323/Makefile +++ /dev/null @@ -1,40 +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 -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:configure - -NOCLEANDEPENDS= yes -USE_GMAKE= yes -WRKSRC= ${WRKDIR}/callgen323 -MAKE_ENV= PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/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 a0c2d4c59253..000000000000 --- a/net/callgen323/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (callgen323_1.2.6.tar.gz) = 1428f738e3ad43e5c57aa99e132065dc -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 a7885d00227f..000000000000 --- a/net/citrix_xenapp/Makefile +++ /dev/null @@ -1,84 +0,0 @@ -# New ports collection makefile for: Citrix(R) ICA(R) Client -# Date created: 20 Sep 1998 -# Whom: msmith -# -# $FreeBSD$ -# - -PORTNAME= citrix_ica -PORTVERSION= 8.00 -PORTREVISION= 3 -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/libXaw.so.6:${PORTSDIR}/x11/linux-XFree86-libs - -ONLY_FOR_ARCHS= i386 -RESTRICTED= "License prohibits redistribution" -IS_INTERACTIVE= "Noisy license agreement ignores stdin" - -NO_WRKSUBDIR= yes -NO_BUILD= yes -USE_LINUX= 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 - -.include <bsd.port.post.mk> diff --git a/net/citrix_xenapp/distinfo b/net/citrix_xenapp/distinfo deleted file mode 100644 index a32a0bf3a8ce..000000000000 --- a/net/citrix_xenapp/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (citrix_ica-linuxx86-8.00.tar.gz) = c6622eed6ac9666bac578dccfcb81cee -SIZE (citrix_ica-linuxx86-8.00.tar.gz) = 1564536 diff --git a/net/citrix_xenapp/files/patch-linuxx86::hinst b/net/citrix_xenapp/files/patch-linuxx86::hinst deleted file mode 100644 index 0fb29d945518..000000000000 --- a/net/citrix_xenapp/files/patch-linuxx86::hinst +++ /dev/null @@ -1,168 +0,0 @@ ---- linuxx86/hinst.orig Fri May 7 14:44:44 2004 -+++ linuxx86/hinst Fri Jun 4 17:44:53 2004 -@@ -75,7 +75,7 @@ - fi - - # Install in here by default. --DefaultInstallDir=/usr/lib/ICAClient -+DefaultInstallDir=/usr/local/ICAClient - - # Default CDROM mount point - DefaultCDSourceDir=/cdrom -@@ -2091,7 +2091,7 @@ - - # rm -f $m_filename $mf_filename $o_filename $of_filename - -- /bin/true -+ /usr/bin/true - } - - ############################################################################### -@@ -2142,10 +2142,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 -@@ -2218,36 +2242,29 @@ - - netscape_integrate() - { -- $ECHO_CMD $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) - $ECHO_CMD $integrate_netscape3 - found_netscape -- else -+ ;; -+ *) - echo_no_nl $integrate_netscape2 - getyesno $INSTALLER_NO -- if [ "$ANSWER" = "$INSTALLER_YES" ] -- then -+ if [ "$ANSWER" = "$INSTALLER_YES" ]; then - found_netscape - else - $ECHO_CMD $integrate_netscape6 - fi -- fi -- fi -+ ;; -+ esac -+ fi - - # Create utility script files in install root. - create_wfica_script -@@ -2878,55 +2895,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" -- 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" - ################################################################################ - # -@@ -3151,6 +3119,8 @@ - wfcmgr_ja_NAME='Citrix ICA クライアント' - - 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 8b4d8a4ecdb4..000000000000 --- a/net/citrix_xenapp/pkg-plist +++ /dev/null @@ -1,136 +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/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/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/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile deleted file mode 100644 index 6b5b5baa743c..000000000000 --- a/net/courier-authlib-ldap/Makefile +++ /dev/null @@ -1,133 +0,0 @@ -# New ports collection makefile for: courier-authdaemon -# Date created: 19 Dec 2004 -# Whom: Oliver Lehmann -# -# $FreeBSD$ -# - -PORTNAME= courier-authlib -PORTVERSION= 0.51 -CATEGORIES= mail -MASTER_SITES= http://www.courier-mta.org/beta/courier-authlib/ - -MAINTAINER= oliver@FreeBSD.org -COMMENT= Authentication library used by courier ports - -USE_BZIP2= yes -USE_REINPLACE= yes -USE_PERL5= yes -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_RC_SUBR= yes -USE_LIBTOOL_VER=15 -USE_LIBLTDL= yes - -# -# options available: -# -# WITHOUT_PAM: Don't build in PAM support -# WITH_VPOPMAIL: Build in vpopmail support -# WITH_MYSQL: Build in mysql support -# WITH_POSTGRESQL: Build in postgresql support -# WITH_LDAP: Build in ldap support with openldap -# WITH_GDBM: Use gdbm files instead of bdb -# - -VPOPMAILDIR?= ${LOCALBASE}/vpopmail - -CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - CXXFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LIBS="${LDFLAGS} -L${LOCALBASE}/lib" - -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --without-authshadow \ - --enable-unicode \ - --enable-ltdl-install=no - -.if defined(WITH_GDBM) -LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm -CONFIGURE_ARGS+= --with-db=gdbm -.else -CONFIGURE_ARGS+= --with-db=db -.endif - -.if !defined(WITH_VPOPMAIL) -CONFIGURE_ARGS+=--without-authvchkpw -PLIST_SUB+= VPOPMAILFLAG="@comment " -.else -CONFIGURE_ARGS+=--with-authvchkpw -BUILD_DEPENDS+= ${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail -PLIST_SUB+= VPOPMAILFLAG="" -.endif - -.if defined(WITH_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-authldap -PLIST_SUB+= LDAPFLAG="" -.else -CONFIGURE_ARGS+=--without-authldap -PLIST_SUB+= LDAPFLAG="@comment " -.endif - -.if !defined(WITH_MYSQL) -CONFIGURE_ARGS+=--without-authmysql -PLIST_SUB+= MYSQLFLAG="@comment " -.else -USE_MYSQL= YES -PLIST_SUB+= MYSQLFLAG="" -CONFIGURE_ARGS+=--with-authmysql \ - --with-mysql-libs=${LOCALBASE}/lib/mysql \ - --with-mysql-includes=${LOCALBASE}/include/mysql -.endif - -.if !defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+=--without-authpgsql -PLIST_SUB+= PGSQLFLAG="@comment " -.else -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} -PLIST_SUB+= PGSQLFLAG="" -.endif - -.if !defined(WITHOUT_PAM) -CONFIGURE_ARGS+=--with-authpam -PLIST_SUB+= PAMFLAG="" -.else -CONFIGURE_ARGS+=--without-authpam -PLIST_SUB+= PAMFLAG="@comment " -.endif - -.include <bsd.port.pre.mk> - -RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - -MAN1= courierlogger.1 - -MAN3= authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \ - auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3 - -MAN8= makeuserdb.8 userdb.8 userdbpw.8 - -EXTRA_DOCS= README INSTALL AUTHORS ChangeLog - -post-patch: - @${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \ - ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in \ - ${WRKSRC}/liblog/Makefile.in ${WRKSRC}/userdb/Makefile.in - -post-install: - ${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/courier-authdaemond.sh > ${WRKDIR}/courier-authdaemond.sh - ${INSTALL_SCRIPT} ${WRKDIR}/courier-authdaemond.sh ${PREFIX}/etc/rc.d/courier-authdaemond.sh - cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - ) - -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for a in ${EXTRA_DOCS} - ${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR} -.endfor -.endif - -.include <bsd.port.post.mk> diff --git a/net/courier-authlib-ldap/distinfo b/net/courier-authlib-ldap/distinfo deleted file mode 100644 index 7146db0d7dff..000000000000 --- a/net/courier-authlib-ldap/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (courier-authlib-0.51.tar.bz2) = 89cb2db63b3f6d402e435331e391ef80 -SIZE(courier-authlib-0.51.tar.bz2) = 1964171 diff --git a/net/courier-authlib-ldap/files/courier-authdaemond.sh b/net/courier-authlib-ldap/files/courier-authdaemond.sh deleted file mode 100644 index b4af4c0b40fd..000000000000 --- a/net/courier-authlib-ldap/files/courier-authdaemond.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# An rc.subr-style startup script for courier-authdaemond service. - -# PROVIDE: courier_authdaemond -# REQUIRE: LOGIN -# KEYWORD: FreeBSD shutdown - -# Define these courier_authdaemond_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/courier_authdaemond -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE - -courier_authdaemond_enable=${courier_authdaemond_enable-"NO"} - -. %%RC_SUBR%% - -name="courier_authdaemond" -rcvar=`set_rcvar` -command="%%PREFIX%%/sbin/authdaemond" - -start_cmd="authdaemond_cmd start" -stop_cmd="authdaemond_cmd stop" -restart_cmd="authdaemond_cmd stop && authdaemond_cmd start" - -load_rc_config $name - -authdaemond_cmd () { - case $1 in - start) - echo "Starting ${name}." - ${command} start - ;; - stop) - echo "Stopping ${name}." - ${command} stop - ;; - esac -} - -run_rc_command "$1" - diff --git a/net/courier-authlib-ldap/files/patch-Makefile.in b/net/courier-authlib-ldap/files/patch-Makefile.in deleted file mode 100644 index 03046540f679..000000000000 --- a/net/courier-authlib-ldap/files/patch-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig Sat Dec 18 17:25:16 2004 -+++ Makefile.in Sat Dec 18 17:27:50 2004 -@@ -992,8 +992,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ -- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \ -+ echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ -+ %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man3dir)/$$inst"; \ - done - uninstall-man3: - @$(NORMAL_UNINSTALL) diff --git a/net/courier-authlib-ldap/files/patch-ldap b/net/courier-authlib-ldap/files/patch-ldap deleted file mode 100644 index 1cae12242d67..000000000000 --- a/net/courier-authlib-ldap/files/patch-ldap +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig Wed Mar 3 05:54:13 2004 -+++ configure Tue Mar 16 19:36:40 2004 -@@ -1268,6 +1268,10 @@ - { (exit 1); exit 1; }; } - fi - -+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include" -+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include" -+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS" -+ - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/net/courier-authlib-ldap/files/patch-liblog::Makefile.in b/net/courier-authlib-ldap/files/patch-liblog::Makefile.in deleted file mode 100644 index 301ba9c2efba..000000000000 --- a/net/courier-authlib-ldap/files/patch-liblog::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- liblog/Makefile.in.orig Sat Dec 18 18:31:57 2004 -+++ liblog/Makefile.in Sat Dec 18 18:32:18 2004 -@@ -346,8 +346,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ -+ echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ -+ %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done - uninstall-man1: - @$(NORMAL_UNINSTALL) diff --git a/net/courier-authlib-ldap/files/patch-mysql b/net/courier-authlib-ldap/files/patch-mysql deleted file mode 100644 index 17f6042e3a47..000000000000 --- a/net/courier-authlib-ldap/files/patch-mysql +++ /dev/null @@ -1,182 +0,0 @@ ---- configure.orig Sat Dec 18 17:28:54 2004 -+++ configure Sat Dec 18 17:30:51 2004 -@@ -23821,9 +23821,9 @@ - if test "$doauthmysql" = "" - then - LIBS="$MYSQL_LIBS $LIBS" -- echo "$as_me:$LINENO: checking for mysql_connect" >&5 --echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6 --if test "${ac_cv_func_mysql_connect+set}" = set; then -+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5 -+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6 -+if test "${ac_cv_func_mysql_real_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -23832,12 +23832,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect. -+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define mysql_connect innocuous_mysql_connect -+#define mysql_real_connect innocuous_mysql_real_connect - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char mysql_connect (); below. -+ which can conflict with char mysql_real_connect (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -23847,7 +23847,7 @@ - # include <assert.h> - #endif - --#undef mysql_connect -+#undef mysql_real_connect - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -23856,14 +23856,14 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char mysql_connect (); -+char mysql_real_connect (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect) -+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect) - choke me - #else --char (*f) () = mysql_connect; -+char (*f) () = mysql_real_connect; - #endif - #ifdef __cplusplus - } -@@ -23872,7 +23872,7 @@ - int - main () - { --return f != mysql_connect; -+return f != mysql_real_connect; - ; - return 0; - } -@@ -23899,19 +23899,19 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_func_mysql_connect=yes -+ ac_cv_func_mysql_real_connect=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func_mysql_connect=no -+ac_cv_func_mysql_real_connect=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5 --echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6 --if test $ac_cv_func_mysql_connect = yes; then -+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5 -+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6 -+if test $ac_cv_func_mysql_real_connect = yes; then - doauthmysql="yes" - - fi -@@ -24021,9 +24021,9 @@ - else - saveLIBS="$LIBS" - LIBS="$MYSQL_LIBS $LIBS" -- echo "$as_me:$LINENO: checking for mysql_connect" >&5 --echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6 --if test "${ac_cv_func_mysql_connect+set}" = set; then -+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5 -+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6 -+if test "${ac_cv_func_mysql_real_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - cat >conftest.$ac_ext <<_ACEOF -@@ -24032,12 +24032,12 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect. -+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect. - For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define mysql_connect innocuous_mysql_connect -+#define mysql_real_connect innocuous_mysql_real_connect - - /* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char mysql_connect (); below. -+ which can conflict with char mysql_real_connect (); below. - Prefer <limits.h> to <assert.h> if __STDC__ is defined, since - <limits.h> exists even on freestanding compilers. */ - -@@ -24047,7 +24047,7 @@ - # include <assert.h> - #endif - --#undef mysql_connect -+#undef mysql_real_connect - - /* Override any gcc2 internal prototype to avoid an error. */ - #ifdef __cplusplus -@@ -24056,14 +24056,14 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char mysql_connect (); -+char mysql_real_connect (); - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect) -+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect) - choke me - #else --char (*f) () = mysql_connect; -+char (*f) () = mysql_real_connect; - #endif - #ifdef __cplusplus - } -@@ -24072,7 +24072,7 @@ - int - main () - { --return f != mysql_connect; -+return f != mysql_real_connect; - ; - return 0; - } -@@ -24099,19 +24099,19 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_func_mysql_connect=yes -+ ac_cv_func_mysql_real_connect=yes - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_func_mysql_connect=no -+ac_cv_func_mysql_real_connect=no - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5 --echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6 --if test $ac_cv_func_mysql_connect = yes; then -+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5 -+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6 -+if test $ac_cv_func_mysql_real_connect = yes; then - LIBAUTHMYSQL="libauthmysql.la" - HAVE_AUTHMYSQL=1 - else diff --git a/net/courier-authlib-ldap/files/patch-userdb::Makefile.in b/net/courier-authlib-ldap/files/patch-userdb::Makefile.in deleted file mode 100644 index c4c62ce68aa3..000000000000 --- a/net/courier-authlib-ldap/files/patch-userdb::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- userdb/Makefile.in.orig Sat Dec 18 18:33:08 2004 -+++ userdb/Makefile.in Sat Dec 18 18:34:09 2004 -@@ -378,8 +378,8 @@ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ -- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ -- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ -+ echo " %%INSTALL_MAN%% '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ -+ %%INSTALL_MAN%% "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ - done - uninstall-man8: - @$(NORMAL_UNINSTALL) diff --git a/net/courier-authlib-ldap/pkg-descr b/net/courier-authlib-ldap/pkg-descr deleted file mode 100644 index 1b44b9f42019..000000000000 --- a/net/courier-authlib-ldap/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -The Courier Authentication Library is a generic authentication API that -encapsulates the process of validating account passwords. In addition to -reading the traditional account passwords from /etc/passwd, the account -information can alternatively be obtained from an LDAP directory; a MySQL -or a PostgreSQL database; or a GDBM or a DB file. - -WWW: http://www.courier-mta.org/authlib/ diff --git a/net/courier-authlib-ldap/pkg-plist b/net/courier-authlib-ldap/pkg-plist deleted file mode 100644 index 196430c46515..000000000000 --- a/net/courier-authlib-ldap/pkg-plist +++ /dev/null @@ -1,58 +0,0 @@ -bin/courierauthconfig -etc/rc.d/courier-authdaemond.sh -%%MYSQLFLAG%%etc/authlib/authmysqlrc.dist -%%PGSQLFLAG%%etc/authlib/authpgsqlrc.dist -%%LDAPFLAG%%etc/authlib/authldaprc.dist -etc/authlib/authdaemonrc.dist -include/courier_auth_config.h -include/courierauth.h -include/courierauthsasl.h -include/courierauthsaslclient.h -include/courierauthdebug.h -lib/courier-authlib/libcourierauth.so.0 -lib/courier-authlib/libcourierauth.so -lib/courier-authlib/libcourierauth.a -lib/courier-authlib/libcourierauthsasl.so.0 -lib/courier-authlib/libcourierauthsasl.so -lib/courier-authlib/libcourierauthsasl.a -lib/courier-authlib/libcourierauthsaslclient.so.0 -lib/courier-authlib/libcourierauthsaslclient.so -lib/courier-authlib/libcourierauthsaslclient.a -lib/courier-authlib/libcourierauthcommon.so.0 -lib/courier-authlib/libcourierauthcommon.so -lib/courier-authlib/libcourierauthcommon.a -lib/courier-authlib/libauthcustom.so.0 -lib/courier-authlib/libauthcustom.so -lib/courier-authlib/libauthuserdb.so.0 -lib/courier-authlib/libauthuserdb.so -%%PAMFLAG%%lib/courier-authlib/libauthpam.so.0 -%%PAMFLAG%%lib/courier-authlib/libauthpam.so -%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0 -%%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so -%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so.0 -%%PGSQLFLAG%%lib/courier-authlib/libauthpgsql.so -%%LDAPFLAG%%lib/courier-authlib/libauthldap.so.0 -%%LDAPFLAG%%lib/courier-authlib/libauthldap.so -%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so.0 -%%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so -libexec/courier-authlib/authsystem.passwd -libexec/courier-authlib/authdaemond -libexec/courier-authlib/makedatprog -sbin/authtest -sbin/authdaemond -sbin/authenumerate -sbin/courierlogger -sbin/makeuserdb -sbin/userdb -sbin/userdb-test-cram-md5 -sbin/userdbpw -sbin/vchkpw2userdb -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/var/authdaemon 2>/dev/null || true -@unexec rmdir %D/var 2>/dev/null || true -@dirrm etc/authlib -@unexec rmdir %D/libexec/authlib 2>/dev/null || true diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile deleted file mode 100644 index 0a3b656f8f82..000000000000 --- a/net/ekiga/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# Ports collection Makefile for: gnomemeeting -# Date created: 24/07/2001 -# Whom: roger@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= gnomemeeting -PORTVERSION= 0.98.5 -PORTREVISION= 4 -CATEGORIES= net gnome -MASTER_SITES= ftp://ftp.gnome.org/pub/GNOME/sources/gnomemeeting/0.98/ \ - # http://www.gnomemeeting.org/downloads/0.98.0/sources/ - -MAINTAINER= ports@FreeBSD.org -COMMENT= GNOME H323 Video Conferencing program, similar to NetMeeting - -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build - -BROKEN= "Does not build" -EXPIRATION_DATE=2005-02-18 -DEPRECATED= ${BROKEN} - -# 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_OPENLDAP= yes -USE_BISON= yes -# Clear configure target so we stop getting binaries prefixed with i386-portbld-freebsd46 -CONFIGURE_TARGET= -GNU_CONFIGURE= YES -CONFIGURE_ENV= OSTYPE=${OPSYS} \ - LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib" \ - PTLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323 \ - SDL_CONFIG=${LOCALBASE}/bin/sdl11-config \ - CPPFLAGS="-I${LOCALBASE}/include" - -CONFIGURE_ARGS= --with-ptlib-includes=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib/include/ptlib \ - --with-ptlib-libs=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib/work/pwlib/lib \ - --with-openh323-includes=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/include \ - --with-openh323-libs=${WRKDIRPREFIX}${.CURDIR}/../openh323/work/openh323/lib \ - --with-ldap-includes=${LOCALBASE}/include \ - --with-openldap-libs=${LOCALBASE}/lib - -MAN1= gnomemeeting.1 -.include <bsd.port.mk> diff --git a/net/ekiga/distinfo b/net/ekiga/distinfo deleted file mode 100644 index 23959edbe677..000000000000 --- a/net/ekiga/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (gnomemeeting-0.98.5.tar.bz2) = fa11d5f3e6adb924f91aaa92099b6269 -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/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 914786a58cba..000000000000 --- a/net/ekiga/pkg-plist +++ /dev/null @@ -1,59 +0,0 @@ -share/gnome/pixmaps/gnomemeeting-logo-icon.png -share/gnome/pixmaps/gnomemeeting-logo.png -share/gnome/pixmaps/gnomemeeting-splash.png -bin/gnomemeeting -bin/gnomemeeting-config-tool -libdata/bonobo/servers/gnomemeeting.server -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 -share/gnome/sounds/gnomemeeting/gnomemeeting.wav -etc/sound/events/gnomemeeting.soundlist -share/gnome/gnomemeeting/xdap/ils_nm_reg.xml -share/gnome/gnomemeeting/xdap/ils_nm_unreg.xml -share/gnome/gnomemeeting/xdap/ils_nm_mod.xml -share/gnome/applications/gnomemeeting.desktop -@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnomemeeting.schemas > /dev/null || /usr/bin/true -etc/gconf/schemas/gnomemeeting.schemas -@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnomemeeting.schemas > /dev/null || /usr/bin/true -@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 825e46d31617..000000000000 --- a/net/freeradius2/Makefile +++ /dev/null @@ -1,139 +0,0 @@ -# New ports collection makefile for: freeradius -# Date created: May 9 2002 -# Whom: Brian Somers <brian@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= freeradius -PORTVERSION= 1.0.1 -CATEGORIES= net -MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \ - ftp://ftp.Awfulhak.org/pub/radius/ - -MAINTAINER= andy@fud.org.nz -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= yes -USE_LIBLTDL= yes -USE_GMAKE= yes -USE_PERL5= yes -USE_OPENSSL= yes -USE_LIBTOOL_VER=13 -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 --without-rlm_krb5 - -PLIST_SUB= PORTVERSION=${PORTVERSION} - -OPTIONS= 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> - -.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) -POSTGRESQL_PORT?= databases/postgresql7 -LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} -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="" - -.if ${ARCH} == "amd64" -CONFIGURE_ARGS+= --with-pic -.endif - -INSTALLS_SHLIB= yes - -MAN1= radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \ - radzap.1 -MAN5= acct_users.5 clients.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_unix.5 users.5 -MAN8= radiusd.8 radrelay.8 radwatch.8 rlm_ippool_tool.8 - -DICTS= dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \ - dictionary.alcatel dictionary.alteon dictionary.altiga \ - dictionary.aptis dictionary.ascend dictionary.bay \ - dictionary.bristol dictionary.cisco dictionary.cisco.bbsm \ - dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \ - dictionary.colubris dictionary.columbia_university \ - dictionary.compat dictionary.erx dictionary.foundry \ - dictionary.freeradius dictionary.gandalf dictionary.juniper \ - dictionary.karlnet dictionary.livingston dictionary.merit \ - dictionary.microsoft dictionary.mikrotik dictionary.navini \ - dictionary.nomadix dictionary.propel dictionary.quintum \ - dictionary.redback dictionary.shasta dictionary.shiva \ - dictionary.sonicwall dictionary.trapeze dictionary.tunnel \ - dictionary.unix dictionary.usr dictionary.valemount \ - dictionary.versanet - -post-patch: - @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \ - < ${FILESDIR}/radiusd.sh > ${WRKDIR}/radiusd.sh - -post-install: - @${MKDIR} ${PREFIX}/etc/raddb ${DATADIR} -.for dict in ${DICTS} - ${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict} -.endfor - ${INSTALL_SCRIPT} ${WRKDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh - -.include <bsd.port.post.mk> diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo deleted file mode 100644 index 9ac114c9bf67..000000000000 --- a/net/freeradius2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (freeradius-1.0.1.tar.gz) = abc30cb71367f859ceed4de6477cd59f -SIZE (freeradius-1.0.1.tar.gz) = 2237745 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 52667f1d81e7..000000000000 --- a/net/freeradius2/files/patch-doc::Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- doc/Makefile.orig Tue Dec 24 16:49:34 2002 -+++ doc/Makefile Wed Dec 3 13:56:45 2003 -@@ -20,12 +20,14 @@ - @rm -f include/*~ *~ - - 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 i in $(DOCS) rlm_*; do \ -- $(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius-$(RADIUSD_VERSION); \ -+ $(INSTALL) -m 644 $$i $(R)$(datadir)/doc/freeradius; \ - 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-x99_rlm.c b/net/freeradius2/files/patch-x99_rlm.c deleted file mode 100644 index 70fecf4393d8..000000000000 --- a/net/freeradius2/files/patch-x99_rlm.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/modules/rlm_x99_token/x99_rlm.c.orig Wed Aug 18 10:52:56 2004 -+++ src/modules/rlm_x99_token/x99_rlm.c Wed Aug 18 10:53:43 2004 -@@ -544,8 +544,6 @@ - "auth: bad state for [%s]: expired", username); - return RLM_MODULE_REJECT; - } --good_state: -- /* State is good! */ - - } else { - /* This should only happen if the authorize code didn't run. */ -@@ -555,6 +553,9 @@ - return RLM_MODULE_FAIL; - } - } /* if (!fast_sync) */ -+ -+good_state: -+ /* State is good! */ - - /* Get the time of the last authentication. */ - if (x99_get_last_auth(inst->syncdir, username, &last_auth) != 0) { diff --git a/net/freeradius2/files/radiusd.sh b/net/freeradius2/files/radiusd.sh deleted file mode 100644 index ea3a152bfd47..000000000000 --- a/net/freeradius2/files/radiusd.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# PROVIDE radiusd -# REQUIRE: NETWORKING SERVERS -# BEFORE: DAEMON -# KEYWORD: FreeBSD 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 748b23f282bd..000000000000 --- a/net/freeradius2/pkg-plist +++ /dev/null @@ -1,436 +0,0 @@ -@unexec %D/etc/rc.d/radiusd.sh forcestop 2>/dev/null || true -bin/radclient -bin/radeapclient -bin/radlast -bin/radrelay -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 -etc/raddb/attrs -etc/raddb/clients -etc/raddb/clients.conf -etc/raddb/dictionary -%%EXPM%%etc/raddb/example.pl -etc/raddb/experimental.conf -etc/raddb/eap.conf -etc/raddb/hints -etc/raddb/huntgroups -etc/raddb/ldap.attrmap -etc/raddb/mssql.conf -etc/raddb/naslist -etc/raddb/naspasswd -etc/raddb/oraclesql.conf -etc/raddb/postgresql.conf -etc/raddb/preproxy_users -etc/raddb/proxy.conf -etc/raddb/radiusd.conf -etc/raddb/realms -etc/raddb/snmp.conf -etc/raddb/sql.conf -etc/raddb/users -etc/raddb/x99.conf -etc/raddb/x99passwd.sample -etc/rc.d/radiusd.sh -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 -%%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_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 -%%EXPM%%lib/rlm_perl-%%PORTVERSION%%.la -%%EXPM%%lib/rlm_perl-%%PORTVERSION%%.so -%%EXPM%%lib/rlm_perl.a -%%EXPM%%lib/rlm_perl.la -%%EXPM%%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 -%%EXPM%%lib/rlm_sqlcounter-%%PORTVERSION%%.la -%%EXPM%%lib/rlm_sqlcounter-%%PORTVERSION%%.so -%%EXPM%%lib/rlm_sqlcounter.a -%%EXPM%%lib/rlm_sqlcounter.la -%%EXPM%%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 -%%TOKEN%%lib/rlm_x99_token-%%PORTVERSION%%.la -%%TOKEN%%lib/rlm_x99_token-%%PORTVERSION%%.so -%%TOKEN%%lib/rlm_x99_token.a -%%TOKEN%%lib/rlm_x99_token.la -%%TOKEN%%lib/rlm_x99_token.so -sbin/check-radiusd-config -sbin/checkrad -sbin/radiusd -sbin/radwatch -sbin/rc.radiusd -%%PORTDOCS%%%%DOCSDIR%%/Autz-Type -%%PORTDOCS%%%%DOCSDIR%%/DIFFS -%%PORTDOCS%%%%DOCSDIR%%/MACOSX -%%PORTDOCS%%%%DOCSDIR%%/OS2 -%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAP.schema -%%PORTDOCS%%%%DOCSDIR%%/RADIUS-LDAPv3.schema -%%PORTDOCS%%%%DOCSDIR%%/RADIUS-SQL.schema -%%PORTDOCS%%%%DOCSDIR%%/README -%%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%%/module_interface -%%PORTDOCS%%%%DOCSDIR%%/performance-testing -%%PORTDOCS%%%%DOCSDIR%%/processing_users_file -%%PORTDOCS%%%%DOCSDIR%%/proxy -%%PORTDOCS%%%%DOCSDIR%%/radrelay -%%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_pam -%%PORTDOCS%%%%DOCSDIR%%/rlm_passwd -%%PORTDOCS%%%%DOCSDIR%%/rlm_python -%%PORTDOCS%%%%DOCSDIR%%/rlm_sim_triplets -%%PORTDOCS%%%%DOCSDIR%%/rlm_sql -%%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter -%%PORTDOCS%%%%DOCSDIR%%/rlm_x99_token -%%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.alcatel -%%DATADIR%%/dictionary.alteon -%%DATADIR%%/dictionary.altiga -%%DATADIR%%/dictionary.aptis -%%DATADIR%%/dictionary.ascend -%%DATADIR%%/dictionary.bay -%%DATADIR%%/dictionary.bintec -%%DATADIR%%/dictionary.bristol -%%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.erx -%%DATADIR%%/dictionary.extreme -%%DATADIR%%/dictionary.foundry -%%DATADIR%%/dictionary.freeradius -%%DATADIR%%/dictionary.gandalf -%%DATADIR%%/dictionary.itk -%%DATADIR%%/dictionary.juniper -%%DATADIR%%/dictionary.karlnet -%%DATADIR%%/dictionary.livingston -%%DATADIR%%/dictionary.merit -%%DATADIR%%/dictionary.microsoft -%%DATADIR%%/dictionary.mikrotik -%%DATADIR%%/dictionary.navini -%%DATADIR%%/dictionary.netscreen -%%DATADIR%%/dictionary.nokia -%%DATADIR%%/dictionary.nomadix -%%DATADIR%%/dictionary.propel -%%DATADIR%%/dictionary.quintum -%%DATADIR%%/dictionary.redback -%%DATADIR%%/dictionary.redcreek -%%DATADIR%%/dictionary.shasta -%%DATADIR%%/dictionary.shiva -%%DATADIR%%/dictionary.sonicwall -%%DATADIR%%/dictionary.springtide -%%DATADIR%%/dictionary.telebit -%%DATADIR%%/dictionary.trapeze -%%DATADIR%%/dictionary.tunnel -%%DATADIR%%/dictionary.unix -%%DATADIR%%/dictionary.usr -%%DATADIR%%/dictionary.valemount -%%DATADIR%%/dictionary.versanet -%%DATADIR%%/dictionary.wispr -%%DATADIR%%/dictionary.xedia -@dirrm %%DATADIR%% -%%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 -@unexec rm -fr /var/log/raddb -@exec mkdir -p /var/run/radiusd -@unexec rm -fr /var/run/radiusd -@unexec 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 ee735aa98d5d..000000000000 --- a/net/gnome-netstatus/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# New ports collection makefile for: gnomenetstatus -# Date Created: 05 December 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= gnomenetstatus -PORTVERSION= 2.8.0 -PORTREVISION= 2 -CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.8 -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 -USE_BZIP2= yes -GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 -USE_GMAKE= yes -USE_LIBTOOL_VER=15 -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 1ad8a9f94236..000000000000 --- a/net/gnome-netstatus/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (gnome2/gnome-netstatus-2.8.0.tar.bz2) = fadc8a26ff7142e1372740d2edc435b1 -SIZE (gnome2/gnome-netstatus-2.8.0.tar.bz2) = 492599 diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c deleted file mode 100644 index 1ffae4384ecb..000000000000 --- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/netstatus-iface.c.orig Mon Mar 22 17:49:17 2004 -+++ src/netstatus-iface.c Mon Mar 22 17:50:12 2004 -@@ -32,6 +32,8 @@ - - #include <libgnome/gnome-i18n.h> - -+#include <sys/types.h> -+#include <sys/socket.h> - #include <sys/ioctl.h> - #ifdef HAVE_SYS_SOCKIO_H - #include <sys/sockio.h> -@@ -39,6 +41,7 @@ - #include <sys/param.h> - #include <net/if.h> - #include <net/if_arp.h> -+#include <netinet/in.h> - #include <arpa/inet.h> - #include <errno.h> - #include <unistd.h> 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 a13a23161769..000000000000 --- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c +++ /dev/null @@ -1,207 +0,0 @@ ---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:19:31 2004 -+++ src/netstatus-sysdeps.c Tue Sep 21 00:27:19 2004 -@@ -35,6 +35,16 @@ - #include <glib.h> - #include <libgnome/gnome-i18n.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/ioctl.h> -+#include <net/if.h> -+#include <net/if_var.h> -+#include <dev/an/if_aironet_ieee.h> -+#include <dev/wi/if_wavelan_ieee.h> -+#endif -+ - static inline gboolean - parse_stats (char *buf, - int prx_idx, -@@ -384,6 +394,163 @@ - } - } - -+static inline gboolean -+wireless_getval (const char *iface, -+ gpointer req, -+ unsigned long req_type, -+ char **error) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ memset (&ifr, 0, sizeof (ifr)); -+ -+ strlcpy (ifr.ifr_name, iface, sizeof (ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t) req; -+ -+ s = socket (AF_INET, SOCK_DGRAM, 0); -+ -+ if (s == -1) { -+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); -+ return FALSE; -+ } -+ -+ if (ioctl (s, req_type, &ifr) == -1) { -+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); -+ close (s); -+ return FALSE; -+ } -+ -+ close (s); -+ return TRUE; -+} -+ -+static inline char* -+get_an_data (const char *iface, -+ int *signal_strength) -+{ -+ struct an_req areq; -+ struct an_ltv_status *sts; -+#ifdef AN_RID_RSSI_MAP -+ struct an_ltv_rssi_map an_rssimap; -+#endif -+ int level; -+ char *error = NULL; -+ gboolean rssimap_valid = FALSE; -+ -+#ifdef AN_RID_RSSI_MAP -+ an_rssimap.an_len = sizeof (an_rssimap); -+ an_rssimap.an_type = AN_RID_RSSI_MAP; -+ rssimap_valid = wireless_getval (iface, (gpointer) &an_rssimap, SIOCGAIRONET, &error); -+#endif -+ -+ areq.an_len = sizeof (areq); -+ areq.an_type = AN_RID_STATUS; -+ -+ if (!wireless_getval (iface, (gpointer) &areq, SIOCGAIRONET, &error)) -+ return error; -+ -+ sts = (struct an_ltv_status *)&areq; -+#ifdef AN_RID_RSSI_MAP -+ if (rssimap_valid) -+ level = (int) (an_rssimap.an_entries[sts->an_normalized_strength].an_rss_pct); -+ else -+ level = (int) (sts->an_normalized_strength); -+#else -+ level = (int) (sts->an_normalized_rssi); -+#endif -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+static inline char* -+get_wi_data (const char *iface, -+ int *signal_strength) -+{ -+ struct wi_req wreq; -+ int level; -+ char *error = NULL; -+ -+ memset (&wreq, 0, sizeof (wreq)); -+ -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_COMMS_QUALITY; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ -+ level = (int) (wreq.wi_val[1]); -+ -+#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time (NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero ((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } else { -+ signal_strength = cached; -+ } -+ } -+#endif -+ -+ memcpy (signal_strength, &level, sizeof (signal_strength)); -+ -+ return error; -+} -+ -+char * -+netstatus_sysdeps_read_iface_wireless_details (const char *iface, -+ gboolean *is_wireless, -+ int *signal_strength) -+{ -+ char *error_message = NULL; -+ -+ g_return_val_if_fail (iface != NULL, NULL); -+ g_return_val_if_fail (is_wireless != NULL, NULL); -+ g_return_val_if_fail (signal_strength != NULL, NULL); -+ -+ if (is_wireless) -+ *is_wireless = FALSE; -+ if (signal_strength) -+ *signal_strength = 0; -+ -+ if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && -+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4)) -+ return error_message; -+ -+ if (g_strncasecmp (iface, "an", 2) == 0) { -+ error_message = get_an_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ else { -+ error_message = get_wi_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ -+ return error_message; -+} -+ - char * - netstatus_sysdeps_read_iface_statistics (const char *iface, - gulong *in_packets, -@@ -485,23 +652,6 @@ - g_strfreev (argv); - - return error_message; --} -- --char * --netstatus_sysdeps_read_iface_wireless_details (const char *iface, -- gboolean *is_wireless, -- int *signal_strength) --{ -- g_return_val_if_fail (iface != NULL, NULL); -- g_return_val_if_fail (is_wireless != NULL, NULL); -- g_return_val_if_fail (signal_strength_wireless != NULL, NULL); -- -- if (is_wireless) -- *is_wireless = FALSE; -- if (signal_strength) -- *signal_strength = 0; -- -- return NULL; - } - - #endif /* !defined(__FreeBSD__) */ 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 b4258eef7f23..000000000000 --- a/net/gnome-netstatus/pkg-plist +++ /dev/null @@ -1,191 +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/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png -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/figures/gnome-netstatus-disconn.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-error.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-idle.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-rx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-tx.png -share/gnome/help/gnome-netstatus/es/figures/gnome-netstatus-txrx.png -share/gnome/help/gnome-netstatus/es/gnome-netstatus.xml -share/gnome/help/gnome-netstatus/es/legal.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/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-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/eu/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/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/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/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/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/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/figures -@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/figures -@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 fd1c3489b785..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$ -# - -PORTNAME= gnomenettool -PORTVERSION= 1.0.0 -PORTREVISION= 1 -PORTEPOCH= 1 -CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.0 -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 libgnomeui -USE_GMAKE= yes -USE_LIBTOOL_VER=15 -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 68ada1f9d863..000000000000 --- a/net/gnome-nettool/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (gnome2/gnome-nettool-1.0.0.tar.bz2) = a3261bd247960ba066b965c5a9a662e1 -SIZE (gnome2/gnome-nettool-1.0.0.tar.bz2) = 515045 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 0891475e90ff..000000000000 --- a/net/gnome-nettool/files/patch-src_info.c +++ /dev/null @@ -1,246 +0,0 @@ ---- src/info.c.orig Mon Jun 14 06:52:59 2004 -+++ src/info.c Sun Oct 31 23:35:06 2004 -@@ -37,6 +37,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" -@@ -57,6 +62,7 @@ - { 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 }, -@@ -97,9 +103,42 @@ - { - 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); -@@ -187,17 +226,26 @@ - 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)); -@@ -206,21 +254,61 @@ - else - return FALSE; - /*text = gtk_entry_get_text (GTK_ENTRY (info->nic));*/ -- -+ - #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) { - /* -@@ -248,7 +336,9 @@ - } - - g_io_channel_unref (io); --#endif /* defined(__linux__) */ -+#if defined(__FreeBSD__) -+ close (pipe_out); -+#endif /* defined(__FreeBSD__) */ - - return TRUE; - } -@@ -382,8 +472,16 @@ - 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) { -@@ -429,7 +527,9 @@ - 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; -@@ -460,6 +560,45 @@ - (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_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 51f11e3f1e96..000000000000 --- a/net/gnome-nettool/files/patch-src_nettool.c +++ /dev/null @@ -1,39 +0,0 @@ ---- src/nettool.c.orig Wed Dec 22 07:07:36 2004 -+++ src/nettool.c Mon Dec 27 21:22:28 2004 -@@ -21,6 +21,7 @@ - #include <gnome.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <signal.h> - #include <errno.h> - #include <sys/wait.h> -@@ -361,6 +362,10 @@ - len, NULL); - } - -+ g_free (text); -+ -+ return TRUE; -+ - } else if (status == G_IO_STATUS_AGAIN) { - char buf[1]; - -@@ -372,12 +377,14 @@ - } - 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 0c8111ade4bf..000000000000 --- a/net/gnome-nettool/files/patch-src_utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/utils.c.orig Sun Jul 4 20:11:49 2004 -+++ src/utils.c Sun Jul 4 20:12:14 2004 -@@ -240,7 +240,7 @@ - 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 a61ce1a0947e..000000000000 --- a/net/gnome-nettool/pkg-plist +++ /dev/null @@ -1,64 +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/eu/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/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/mn/LC_MESSAGES/gnome-nettool.mo -share/locale/ms/LC_MESSAGES/gnome-nettool.mo -share/locale/nb/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/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/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/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/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile deleted file mode 100644 index 19d47230ffc3..000000000000 --- a/net/gnomeicu/gnomeicu/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# Ports collection Makefile for: GnomeICU -# Date created: 03/16/1999 -# Whom: nectar@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= gnomeicu2 -PORTVERSION= 0.99.5 -PORTREVISION= 2 -CATEGORIES= net gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= gnomeicu -DISTNAME= gnomeicu-${PORTVERSION} - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GNOME2 ICQ client - -LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm - -USE_BZIP2= yes -USE_X_PREFIX= yes -INSTALLS_OMF= yes -USE_GNOME= gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2 -USE_GMAKE= yes -USE_LIBTOOL_VER=13 -USE_REINPLACE= yes - -GCONF_SCHEMAS= gnomeicu.schemas - -.if defined(WITH_DANTE) -LIB_DEPENDS+= socks.1:${PORTSDIR}/net/dante -SOCKSFLAGS= -Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \ - -Dgetpeername=Rgetpeername -Daccept=Raccept \ - -Drresvport=Rrresvport -Dbindresvport=Rbindresvport \ - -Dgethostbyname=Rgethostbyname \ - -Dgethostbyname2=Rgethostbyname2 -Dsendto=Rsendto \ - -Drecvfrom=Rrecvfrom -Drecvfrom=Rrecvfrom -Dwrite=Rwrite \ - -Dwritev=Rwritev -Dsend=Rsend -Dsendmsg=Rsendmsg \ - -Dread=Rread -Dreadv=Rreadv -Drecv=Rrecv -Drecvmsg=Rrecvmsg -SOCKSLIBS= -lsocks -.elif defined(WITH_SOCKS5) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5 -SOCKSFLAGS= -DSOCKS -include ${LOCALBASE}/include/socks.h -SOCKSLIBS= -lsocks5 -.endif - -CONFIGURE_ARGS= --with-statusmenu -CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \ - CFLAGS="${CFLAGS}" - -.ifndef(WITHOUT_GTKSPELL) -LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell2 -CONFIGURE_ARGS+=--enable-gtkspell -.else -CONFIGURE_ARGS+=--disable-gtkspell -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \ - ${WRKSRC}/src/gnomeicu.c - -.include <bsd.port.mk> diff --git a/net/gnomeicu/gnomeicu/distinfo b/net/gnomeicu/gnomeicu/distinfo deleted file mode 100644 index 4121cb36ef7c..000000000000 --- a/net/gnomeicu/gnomeicu/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (gnomeicu-0.99.5.tar.bz2) = 59ff902171a14ad37896f6661ddedb7a -SIZE (gnomeicu-0.99.5.tar.bz2) = 2102452 diff --git a/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c b/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c deleted file mode 100644 index 3df66fcf8c50..000000000000 --- a/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- src/icu_db.c.orig Sat Jun 22 22:11:46 2002 -+++ src/icu_db.c Wed Sep 11 11:45:05 2002 -@@ -27,7 +27,11 @@ - - #include <fcntl.h> - #include <errno.h> -+#if defined(HAVE_STDLIB_H) -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif - #include <stdio.h> - #include <string.h> - #include <sys/param.h> diff --git a/net/gnomeicu/gnomeicu/files/patch-src_history.c b/net/gnomeicu/gnomeicu/files/patch-src_history.c deleted file mode 100644 index b529bd13bda2..000000000000 --- a/net/gnomeicu/gnomeicu/files/patch-src_history.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/history.c.orig Mon Nov 29 20:48:25 2004 -+++ src/history.c Mon Nov 29 20:21:37 2004 -@@ -214,6 +214,11 @@ - char direction; - time_t time; - -+ if (! (ptr+4)) { -+ g_free (hp->buffer); -+ g_free (hp); -+ return FALSE; -+ } - /* read header info */ - sscanf (ptr+4, "%c %d", &direction, (int *)&time); - diff --git a/net/gnomeicu/gnomeicu/files/patch-src_userserver.c b/net/gnomeicu/gnomeicu/files/patch-src_userserver.c deleted file mode 100644 index 23e5ed601943..000000000000 --- a/net/gnomeicu/gnomeicu/files/patch-src_userserver.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/userserver.c.orig Fri Apr 2 15:20:45 2004 -+++ src/userserver.c Fri Apr 2 15:20:54 2004 -@@ -6,12 +6,12 @@ - ***************************/ - - #include <errno.h> -+#include <sys/types.h> - #include <netinet/in.h> - #include <pwd.h> - #include <stdio.h> - #include <stdlib.h> - #include <string.h> --#include <sys/types.h> - #include <sys/socket.h> - #include <sys/stat.h> - #include <sys/un.h> diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7login.c b/net/gnomeicu/gnomeicu/files/patch-src_v7login.c deleted file mode 100644 index cea1c7fbe447..000000000000 --- a/net/gnomeicu/gnomeicu/files/patch-src_v7login.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/v7login.c.orig Fri Apr 2 15:25:21 2004 -+++ src/v7login.c Fri Apr 2 15:25:57 2004 -@@ -18,6 +18,7 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <netdb.h> - #include <unistd.h> - #include <fcntl.h> diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c b/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c deleted file mode 100644 index e235da7be9c0..000000000000 --- a/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/v7newuser.c.orig Fri Apr 2 15:26:51 2004 -+++ src/v7newuser.c Fri Apr 2 15:27:04 2004 -@@ -19,6 +19,7 @@ - #include <string.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <netdb.h> - #include <unistd.h> - #include <fcntl.h> diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c b/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c deleted file mode 100644 index 43a64d9961cd..000000000000 --- a/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/v7recv.c.orig Fri Apr 2 15:27:50 2004 -+++ src/v7recv.c Fri Apr 2 15:28:03 2004 -@@ -27,6 +27,7 @@ - #include <stdlib.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> - #include <netdb.h> - #include <unistd.h> - #include <fcntl.h> diff --git a/net/gnomeicu/gnomeicu/pkg-descr b/net/gnomeicu/gnomeicu/pkg-descr deleted file mode 100644 index df8c0c64984b..000000000000 --- a/net/gnomeicu/gnomeicu/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ - GnomeICU (previously GtkICQ) is an Internet based communications - program which makes use of ICQ protocol. GnomeICU also makes use of - Gnome2, a growingly popular desktop environment. GnomeICU is released - under the GNU Public License, and is available free of charge. - -WWW: http://gnomeicu.sourceforge.net - -Jacques Vidrine <nectar@FreeBSD.ORG> diff --git a/net/gnomeicu/gnomeicu/pkg-plist b/net/gnomeicu/gnomeicu/pkg-plist deleted file mode 100644 index dd2ccb12d5d4..000000000000 --- a/net/gnomeicu/gnomeicu/pkg-plist +++ /dev/null @@ -1,298 +0,0 @@ -bin/gnomeicu -bin/gnomeicu-client -etc/sound/events/GnomeICU.soundlist -share/gnome/applications/GnomeICU.desktop -share/gnome/gnomeicu/emoticons/AIM/angel.xpm -share/gnome/gnomeicu/emoticons/AIM/bigsmile.xpm -share/gnome/gnomeicu/emoticons/AIM/crossedlips.xpm -share/gnome/gnomeicu/emoticons/AIM/cry.xpm -share/gnome/gnomeicu/emoticons/AIM/embarrassed.xpm -share/gnome/gnomeicu/emoticons/AIM/emoticon-data -share/gnome/gnomeicu/emoticons/AIM/kiss.xpm -share/gnome/gnomeicu/emoticons/AIM/sad.xpm -share/gnome/gnomeicu/emoticons/AIM/scream.xpm -share/gnome/gnomeicu/emoticons/AIM/smile.xpm -share/gnome/gnomeicu/emoticons/AIM/smile8.xpm -share/gnome/gnomeicu/emoticons/AIM/think.xpm -share/gnome/gnomeicu/emoticons/AIM/tongue.xpm -share/gnome/gnomeicu/emoticons/AIM/wink.xpm -share/gnome/gnomeicu/emoticons/Always/Annoyed.bmp -share/gnome/gnomeicu/emoticons/Always/Disgusted.bmp -share/gnome/gnomeicu/emoticons/Always/Drooling.bmp -share/gnome/gnomeicu/emoticons/Always/Giggling.bmp -share/gnome/gnomeicu/emoticons/Always/Jokingly.bmp -share/gnome/gnomeicu/emoticons/Always/Shocked.bmp -share/gnome/gnomeicu/emoticons/Always/Surprised-F.bmp -share/gnome/gnomeicu/emoticons/Always/Surprised-M.bmp -share/gnome/gnomeicu/emoticons/Always/Whining.bmp -share/gnome/gnomeicu/emoticons/Always/asl.gif -share/gnome/gnomeicu/emoticons/Always/bat.gif -share/gnome/gnomeicu/emoticons/Always/beer.gif -share/gnome/gnomeicu/emoticons/Always/boy.gif -share/gnome/gnomeicu/emoticons/Always/broken_heart.gif -share/gnome/gnomeicu/emoticons/Always/cake.gif -share/gnome/gnomeicu/emoticons/Always/camera.gif -share/gnome/gnomeicu/emoticons/Always/cat.gif -share/gnome/gnomeicu/emoticons/Always/clock.gif -share/gnome/gnomeicu/emoticons/Always/coffee.gif -share/gnome/gnomeicu/emoticons/Always/cuffs.gif -share/gnome/gnomeicu/emoticons/Always/dog.gif -share/gnome/gnomeicu/emoticons/Always/dude_hug.gif -share/gnome/gnomeicu/emoticons/Always/emoticon-data -share/gnome/gnomeicu/emoticons/Always/envelope.gif -share/gnome/gnomeicu/emoticons/Always/film.gif -share/gnome/gnomeicu/emoticons/Always/girl.gif -share/gnome/gnomeicu/emoticons/Always/girl_hug.gif -share/gnome/gnomeicu/emoticons/Always/heart.gif -share/gnome/gnomeicu/emoticons/Always/martini.gif -share/gnome/gnomeicu/emoticons/Always/messenger.gif -share/gnome/gnomeicu/emoticons/Always/moon.gif -share/gnome/gnomeicu/emoticons/Always/musical_note.gif -share/gnome/gnomeicu/emoticons/Always/phone.gif -share/gnome/gnomeicu/emoticons/Always/present.gif -share/gnome/gnomeicu/emoticons/Always/rainbow.gif -share/gnome/gnomeicu/emoticons/Always/rose.gif -share/gnome/gnomeicu/emoticons/Always/star.gif -share/gnome/gnomeicu/emoticons/Always/sun.gif -share/gnome/gnomeicu/emoticons/Always/thumbs_down.gif -share/gnome/gnomeicu/emoticons/Always/thumbs_up.gif -share/gnome/gnomeicu/emoticons/Always/wilted_rose.gif -share/gnome/gnomeicu/emoticons/Default/bigsmile.png -share/gnome/gnomeicu/emoticons/Default/cry.png -share/gnome/gnomeicu/emoticons/Default/emoticon-data -share/gnome/gnomeicu/emoticons/Default/glasses.png -share/gnome/gnomeicu/emoticons/Default/sad.png -share/gnome/gnomeicu/emoticons/Default/scream.png -share/gnome/gnomeicu/emoticons/Default/smile.png -share/gnome/gnomeicu/emoticons/Default/smile2.png -share/gnome/gnomeicu/emoticons/Default/smile8.png -share/gnome/gnomeicu/emoticons/Default/straight.png -share/gnome/gnomeicu/emoticons/Default/tongue.png -share/gnome/gnomeicu/emoticons/Default/unsure.png -share/gnome/gnomeicu/emoticons/Default/wink.png -share/gnome/gnomeicu/emoticons/MSN/angel.png -share/gnome/gnomeicu/emoticons/MSN/angry.png -share/gnome/gnomeicu/emoticons/MSN/bigsmile.png -share/gnome/gnomeicu/emoticons/MSN/confused.png -share/gnome/gnomeicu/emoticons/MSN/cry.png -share/gnome/gnomeicu/emoticons/MSN/devil.png -share/gnome/gnomeicu/emoticons/MSN/embarassed.png -share/gnome/gnomeicu/emoticons/MSN/emoticon-data -share/gnome/gnomeicu/emoticons/MSN/kiss.png -share/gnome/gnomeicu/emoticons/MSN/light.gif -share/gnome/gnomeicu/emoticons/MSN/sad.png -share/gnome/gnomeicu/emoticons/MSN/shocked.png -share/gnome/gnomeicu/emoticons/MSN/smile.png -share/gnome/gnomeicu/emoticons/MSN/smile8.png -share/gnome/gnomeicu/emoticons/MSN/straight.png -share/gnome/gnomeicu/emoticons/MSN/tongue.png -share/gnome/gnomeicu/emoticons/MSN/wink.png -share/gnome/gnomeicu/emoticons/Yahoo/alien.gif -share/gnome/gnomeicu/emoticons/Yahoo/angel.gif -share/gnome/gnomeicu/emoticons/Yahoo/angry.gif -share/gnome/gnomeicu/emoticons/Yahoo/bigsmile.gif -share/gnome/gnomeicu/emoticons/Yahoo/blush.gif -share/gnome/gnomeicu/emoticons/Yahoo/clown.gif -share/gnome/gnomeicu/emoticons/Yahoo/cow.gif -share/gnome/gnomeicu/emoticons/Yahoo/cowboy.gif -share/gnome/gnomeicu/emoticons/Yahoo/devil.gif -share/gnome/gnomeicu/emoticons/Yahoo/emoticon-data -share/gnome/gnomeicu/emoticons/Yahoo/flag.gif -share/gnome/gnomeicu/emoticons/Yahoo/green.gif -share/gnome/gnomeicu/emoticons/Yahoo/hrmph.gif -share/gnome/gnomeicu/emoticons/Yahoo/ignore.gif -share/gnome/gnomeicu/emoticons/Yahoo/kiss.gif -share/gnome/gnomeicu/emoticons/Yahoo/light.gif -share/gnome/gnomeicu/emoticons/Yahoo/monkey.gif -share/gnome/gnomeicu/emoticons/Yahoo/nerd.gif -share/gnome/gnomeicu/emoticons/Yahoo/pig.gif -share/gnome/gnomeicu/emoticons/Yahoo/pumpkin.gif -share/gnome/gnomeicu/emoticons/Yahoo/quiet.gif -share/gnome/gnomeicu/emoticons/Yahoo/rofl.gif -share/gnome/gnomeicu/emoticons/Yahoo/rose.gif -share/gnome/gnomeicu/emoticons/Yahoo/sad.gif -share/gnome/gnomeicu/emoticons/Yahoo/shocked.gif -share/gnome/gnomeicu/emoticons/Yahoo/skull.gif -share/gnome/gnomeicu/emoticons/Yahoo/sleep.gif -share/gnome/gnomeicu/emoticons/Yahoo/smile.gif -share/gnome/gnomeicu/emoticons/Yahoo/smile8.gif -share/gnome/gnomeicu/emoticons/Yahoo/stop.gif -share/gnome/gnomeicu/emoticons/Yahoo/straight.gif -share/gnome/gnomeicu/emoticons/Yahoo/tongue.gif -share/gnome/gnomeicu/emoticons/Yahoo/wail.gif -share/gnome/gnomeicu/emoticons/Yahoo/wink.gif -share/gnome/gnomeicu/emoticons/Yahoo/wonder.gif -share/gnome/gnomeicu/glade/addcontact.glade -share/gnome/gnomeicu/glade/auth.glade -share/gnome/gnomeicu/glade/auto_respond.glade -share/gnome/gnomeicu/glade/grpmgr.glade -share/gnome/gnomeicu/glade/history.glade -share/gnome/gnomeicu/glade/main.glade -share/gnome/gnomeicu/glade/message.glade -share/gnome/gnomeicu/glade/prefs.glade -share/gnome/gnomeicu/glade/user_info.glade -share/gnome/gnomeicu/glade/welcome.glade -share/gnome/gnomeicu/icons/Default/gnomeicu-animation.gif -share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png -share/gnome/gnomeicu/icons/Default/gnomeicu-away.png -share/gnome/gnomeicu/icons/Default/gnomeicu-birthday.png -share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png -share/gnome/gnomeicu/icons/Default/gnomeicu-cancel.png -share/gnome/gnomeicu/icons/Default/gnomeicu-chat.png -share/gnome/gnomeicu/icons/Default/gnomeicu-contact.png -share/gnome/gnomeicu/icons/Default/gnomeicu-dnd.png -share/gnome/gnomeicu/icons/Default/gnomeicu-ffc.png -share/gnome/gnomeicu/icons/Default/gnomeicu-file.png -share/gnome/gnomeicu/icons/Default/gnomeicu-group.png -share/gnome/gnomeicu/icons/Default/gnomeicu-hist.png -share/gnome/gnomeicu/icons/Default/gnomeicu-info -share/gnome/gnomeicu/icons/Default/gnomeicu-info.png -share/gnome/gnomeicu/icons/Default/gnomeicu-inv.png -share/gnome/gnomeicu/icons/Default/gnomeicu-message.png -share/gnome/gnomeicu/icons/Default/gnomeicu-na.png -share/gnome/gnomeicu/icons/Default/gnomeicu-occ.png -share/gnome/gnomeicu/icons/Default/gnomeicu-offline.png -share/gnome/gnomeicu/icons/Default/gnomeicu-ok.png -share/gnome/gnomeicu/icons/Default/gnomeicu-online.png -share/gnome/gnomeicu/icons/Default/gnomeicu-rename.png -share/gnome/gnomeicu/icons/Default/gnomeicu-still.png -share/gnome/gnomeicu/icons/Default/gnomeicu-url.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-animation.gif -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-auth.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-away.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-cancel.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-chat.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-contact.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-dnd.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-ffc.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-file.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-hist.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-info -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-info.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-inv.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-message.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-na.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-occ.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-offline.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-ok.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-online.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-rename.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-still.png -share/gnome/gnomeicu/icons/Eyeballs/gnomeicu-url.png -share/gnome/gnomeicu/icons/Gradients/gnomeicu-animation.gif -share/gnome/gnomeicu/icons/Gradients/gnomeicu-away.png -share/gnome/gnomeicu/icons/Gradients/gnomeicu-dnd.png -share/gnome/gnomeicu/icons/Gradients/gnomeicu-ffc.png -share/gnome/gnomeicu/icons/Gradients/gnomeicu-info -share/gnome/gnomeicu/icons/Gradients/gnomeicu-inv.png -share/gnome/gnomeicu/icons/Gradients/gnomeicu-na.png -share/gnome/gnomeicu/icons/Gradients/gnomeicu-occ.png -share/gnome/gnomeicu/icons/Gradients/gnomeicu-offline.png -share/gnome/gnomeicu/icons/Gradients/gnomeicu-online.png -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-away.png -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-dnd.png -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-ffc.png -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-info -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-inv.png -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-na.png -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-occ.png -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-offline.png -share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png -share/gnome/gnomeicu/prefs_icon_gnomeicu.png -share/gnome/gnomeicu/prefs_icon_icq.png -share/gnome/help/gnomeicu/C/figures/addcontactdruid.png -share/gnome/help/gnomeicu/C/figures/mainwindow.png -share/gnome/help/gnomeicu/C/figures/messagedialog.png -share/gnome/help/gnomeicu/C/figures/notificationicon.png -share/gnome/help/gnomeicu/C/figures/prefdialog.png -share/gnome/help/gnomeicu/C/figures/sendcontactlist.png -share/gnome/help/gnomeicu/C/figures/sendfile.png -share/gnome/help/gnomeicu/C/figures/sendurl.png -share/gnome/help/gnomeicu/C/figures/userinfo.png -share/gnome/help/gnomeicu/C/gnomeicu.xml -share/gnome/help/gnomeicu/uk/figures/addcontactdruid.png -share/gnome/help/gnomeicu/uk/figures/mainwindow.png -share/gnome/help/gnomeicu/uk/figures/messagedialog.png -share/gnome/help/gnomeicu/uk/figures/notificationicon.png -share/gnome/help/gnomeicu/uk/figures/prefdialog.png -share/gnome/help/gnomeicu/uk/figures/sendcontactlist.png -share/gnome/help/gnomeicu/uk/figures/sendfile.png -share/gnome/help/gnomeicu/uk/figures/sendurl.png -share/gnome/help/gnomeicu/uk/figures/userinfo.png -share/gnome/help/gnomeicu/uk/gnomeicu.xml -share/gnome/omf/gnomeicu/gnomeicu-C.omf -share/gnome/omf/gnomeicu/gnomeicu-uk.omf -share/gnome/pixmaps/gnome-gnomeicu.png -share/gnome/sounds/gnomeicu/Auth.wav -share/gnome/sounds/gnomeicu/File.wav -share/gnome/sounds/gnomeicu/Online.wav -share/gnome/sounds/gnomeicu/URL.wav -share/gnome/sounds/gnomeicu/contlist.wav -share/gnome/sounds/gnomeicu/message.wav -share/locale/am/LC_MESSAGES/gnomeicu.mo -share/locale/az/LC_MESSAGES/gnomeicu.mo -share/locale/be/LC_MESSAGES/gnomeicu.mo -share/locale/bg/LC_MESSAGES/gnomeicu.mo -share/locale/ca/LC_MESSAGES/gnomeicu.mo -share/locale/cs/LC_MESSAGES/gnomeicu.mo -share/locale/da/LC_MESSAGES/gnomeicu.mo -share/locale/de/LC_MESSAGES/gnomeicu.mo -share/locale/el/LC_MESSAGES/gnomeicu.mo -share/locale/en_CA/LC_MESSAGES/gnomeicu.mo -share/locale/en_GB/LC_MESSAGES/gnomeicu.mo -share/locale/es/LC_MESSAGES/gnomeicu.mo -share/locale/eu/LC_MESSAGES/gnomeicu.mo -share/locale/fi/LC_MESSAGES/gnomeicu.mo -share/locale/fr/LC_MESSAGES/gnomeicu.mo -share/locale/ga/LC_MESSAGES/gnomeicu.mo -share/locale/gl/LC_MESSAGES/gnomeicu.mo -share/locale/he/LC_MESSAGES/gnomeicu.mo -share/locale/hr/LC_MESSAGES/gnomeicu.mo -share/locale/hu/LC_MESSAGES/gnomeicu.mo -share/locale/it/LC_MESSAGES/gnomeicu.mo -share/locale/ja/LC_MESSAGES/gnomeicu.mo -share/locale/ko/LC_MESSAGES/gnomeicu.mo -share/locale/lt/LC_MESSAGES/gnomeicu.mo -share/locale/lv/LC_MESSAGES/gnomeicu.mo -share/locale/mk/LC_MESSAGES/gnomeicu.mo -share/locale/ml/LC_MESSAGES/gnomeicu.mo -share/locale/ms/LC_MESSAGES/gnomeicu.mo -share/locale/nl/LC_MESSAGES/gnomeicu.mo -share/locale/nn/LC_MESSAGES/gnomeicu.mo -share/locale/no/LC_MESSAGES/gnomeicu.mo -share/locale/pl/LC_MESSAGES/gnomeicu.mo -share/locale/pt/LC_MESSAGES/gnomeicu.mo -share/locale/pt_BR/LC_MESSAGES/gnomeicu.mo -share/locale/ro/LC_MESSAGES/gnomeicu.mo -share/locale/ru/LC_MESSAGES/gnomeicu.mo -share/locale/sk/LC_MESSAGES/gnomeicu.mo -share/locale/sl/LC_MESSAGES/gnomeicu.mo -share/locale/sr/LC_MESSAGES/gnomeicu.mo -share/locale/sr@Latn/LC_MESSAGES/gnomeicu.mo -share/locale/sv/LC_MESSAGES/gnomeicu.mo -share/locale/th/LC_MESSAGES/gnomeicu.mo -share/locale/tr/LC_MESSAGES/gnomeicu.mo -share/locale/uk/LC_MESSAGES/gnomeicu.mo -share/locale/vi/LC_MESSAGES/gnomeicu.mo -share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo -share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo -@dirrm share/gnome/sounds/gnomeicu -@dirrm share/gnome/omf/gnomeicu -@dirrm share/gnome/help/gnomeicu/uk/figures -@dirrm share/gnome/help/gnomeicu/uk -@dirrm share/gnome/help/gnomeicu/C/figures -@dirrm share/gnome/help/gnomeicu/C -@dirrm share/gnome/help/gnomeicu -@dirrm share/gnome/gnomeicu/icons/reDubbed -@dirrm share/gnome/gnomeicu/icons/Gradients -@dirrm share/gnome/gnomeicu/icons/Eyeballs -@dirrm share/gnome/gnomeicu/icons/Default -@dirrm share/gnome/gnomeicu/icons -@dirrm share/gnome/gnomeicu/glade -@dirrm share/gnome/gnomeicu/emoticons/Yahoo -@dirrm share/gnome/gnomeicu/emoticons/MSN -@dirrm share/gnome/gnomeicu/emoticons/Default -@dirrm share/gnome/gnomeicu/emoticons/Always -@dirrm share/gnome/gnomeicu/emoticons/AIM -@dirrm share/gnome/gnomeicu/emoticons -@dirrm share/gnome/gnomeicu diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile deleted file mode 100644 index d4af76e59ba9..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.29 -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 e6e40fdddca2..000000000000 --- a/net/haproxy-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (haproxy-1.1.29.tar.gz) = ff904e632fe8f5c6ebfdeba8000f678d -SIZE (haproxy-1.1.29.tar.gz) = 102557 diff --git a/net/haproxy-devel/files/haproxy.sh b/net/haproxy-devel/files/haproxy.sh deleted file mode 100644 index 3b633d089d7b..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: FreeBSD 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 0b2abc040363..000000000000 --- a/net/haproxy-devel/pkg-plist +++ /dev/null @@ -1,7 +0,0 @@ -sbin/haproxy -etc/rc.d/haproxy.sh -%%PORTDOCS%%%%DOCSDIR%%/haproxy-en.txt -%%PORTDOCS%%%%DOCSDIR%%/haproxy-fr.txt -%%PORTDOCS%%%%EXAMPLESDIR%%/haproxy.cfg -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% diff --git a/net/hping/Makefile b/net/hping/Makefile deleted file mode 100644 index 182fd071ae95..000000000000 --- a/net/hping/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# New ports collection makefile for: hping -# Date Created: 5 Oct 2000 -# Whom: Roman Shterenzon <roman@xpert.com> -# -# $FreeBSD$ -# - -PORTNAME= hping -PORTVERSION= 2.0.0r3 -PORTEPOCH= 1 -CATEGORIES= security net -MASTER_SITES= http://www.hping.org/ -DISTNAME= hping2.0.0-rc3 - -MAINTAINER= ecu@ipv42.net -COMMENT= Network auditing tool - -WRKSRC= ${WRKDIR}/hping2-rc3 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --force-libpcap -USE_GMAKE= yes - -PLIST_FILES= sbin/hping -PORTDOCS= AS-BACKDOOR HPING2-HOWTO.txt HPING2-IS-OPEN \ - MORE-FUN-WITH-IPID SPOOFED_SCAN.txt APD.txt - -MAN8= hping.8 - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${PREFIX}/sbin/hping - ${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 ${PREFIX}/man/man8/hping.8 -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${DOCSDIR}/ -.endfor -.endif - -.include <bsd.port.mk> diff --git a/net/hping/distinfo b/net/hping/distinfo deleted file mode 100644 index 4af755068086..000000000000 --- a/net/hping/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (hping2.0.0-rc3.tar.gz) = 029bf240f2e0545b664b2f8b9118d9e8 -SIZE (hping2.0.0-rc3.tar.gz) = 124573 diff --git a/net/hping/files/patch-Makefile.in b/net/hping/files/patch-Makefile.in deleted file mode 100644 index da0dfa76aff1..000000000000 --- a/net/hping/files/patch-Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.in.orig Mon May 3 11:29:39 2004 -+++ Makefile.in Wed May 19 11:23:43 2004 -@@ -6,10 +6,10 @@ - # $date: Sun Jul 25 17:56:15 MET DST 1999$ - # $rev: 3$ - --CC= gcc -+CC?= gcc - AR=/usr/bin/ar - RANLIB=/usr/bin/ranlib --CCOPT= -O2 -Wall @PCAP_INCLUDE@ -+CCOPT= -Wall @CFLAGS@ @PCAP_INCLUDE@ - DEBUG= -g - #uncomment the following if you need libpcap based build under linux - #(not raccomanded) -@@ -43,7 +43,7 @@ - $(RANLIB) $@ - - hping2: byteorder.h $(OBJ) -- $(CC) -o hping2 $(CCOPT) $(DEBUG) $(OBJ) $(PCAP) @SOLARISLIB@ -+ $(CC) -o hping2 $(CCOPT) $(OBJ) $(PCAP) @SOLARISLIB@ - @echo - ./hping2 -v - @echo "use \`make strip' to strip hping2 binary" -@@ -53,7 +53,7 @@ - ./configure - - .c.o: -- $(CC) -c $(CCOPT) $(DEBUG) $(COMPILE_TIME) $< -+ $(CC) -c $(CCOPT) $(COMPILE_TIME) $< - - clean: - rm -rf hping2 *.o *.a diff --git a/net/hping/files/patch-bytesex.h b/net/hping/files/patch-bytesex.h deleted file mode 100644 index 65ecdcd74020..000000000000 --- a/net/hping/files/patch-bytesex.h +++ /dev/null @@ -1,18 +0,0 @@ - -$FreeBSD$ - ---- bytesex.h.orig Tue Sep 14 15:22:45 2004 -+++ bytesex.h Tue Sep 14 15:21:50 2004 -@@ -8,10 +8,12 @@ - #define ARS_BYTESEX_H - - #if defined(__i386__) \ -+ || defined(__ia64__) \ - || defined(__alpha__) \ - || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) - #define BYTE_ORDER_LITTLE_ENDIAN - #elif defined(__mc68000__) \ -+ || defined (__amd64__) \ - || defined (__sparc__) \ - || defined (__sparc) \ - || defined (__PPC__) \ diff --git a/net/hping/files/patch-configure b/net/hping/files/patch-configure deleted file mode 100644 index b7dda57f7370..000000000000 --- a/net/hping/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Fri Sep 14 22:04:25 2001 -+++ configure Fri Sep 14 22:05:02 2001 -@@ -99,6 +99,7 @@ - -e "s^@PCAP_INCLUDE@^$PCAP_INCLUDE^g" \ - -e "s^@MANPATH@^$INSTALL_MANPATH^g" \ - -e "s^@SOLARISLIB@^$SOLARISLIB^g" \ -+ -e "s^@CFLAGS@^$CFLAGS^g" \ - <Makefile.in > Makefile - - # diff --git a/net/hping/pkg-descr b/net/hping/pkg-descr deleted file mode 100644 index d62dcd7dddbf..000000000000 --- a/net/hping/pkg-descr +++ /dev/null @@ -1,23 +0,0 @@ -hping is a command-line oriented TCP/IP packet assembler/analyzer. -The interface is inspired to the ping(8) unix command, but hping isn't -only able to send ICMP echo requests. It supports TCP, UDP, ICMP and -RAW-IP protocols, has a traceroute mode, the ability to send files -between a covered channel, and many other features. -While hping was mainly used as a security tool in the past, it can be -used in many ways by people that don't care about security to test -networks and hosts. A subset of the stuff you can do using hping: - - - Test firewall rules - - [spoofed] port scanning - - Test net performance using different protocols, - packet size, TOS (type of service) and fragmentation. - - Path MTU discovery - - Files transfering even between really fascist firewall rules. - - Traceroute like under different protocols. - - Firewalk like usage. - - Remote OS fingerprint. - - TCP/IP stack auditing. - -WWW: http://www.hping.org/ - --- Nicolas Jombart <ecu@ipv42.net> 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 b1bff9932c7c..000000000000 --- a/net/imm/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (imm.source.tar.Z) = bf2713e5dca81daaecbc0bbcaf7af667 -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 4b52a17c9736..000000000000 --- a/net/isc-dhcp30-client/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -MAINTAINER= cyrille.lefevre@laposte.net -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 e7626329f2ca..000000000000 --- a/net/isc-dhcp30-relay/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -MAINTAINER= cyrille.lefevre@laposte.net -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 c33041add4ec..000000000000 --- a/net/isc-dhcp30-server/Makefile +++ /dev/null @@ -1,335 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 7 Mar 1996 -# Whom: se -# -# $FreeBSD$ -# - -PORTNAME= dhcp -PORTVERSION= 3.0.1.r14 -PORTREVISION= 6 -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= cyrille.lefevre@laposte.net -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_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 (requires by TLS)" 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/ -PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch -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 - -# 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.2pl3, 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 -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-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 -.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 - -# 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 ${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 e42d8e2eb341..000000000000 --- a/net/isc-dhcp30-server/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (dhcp-3.0.1rc14.tar.gz) = a68074d9ebdeb355c293d9b3645b3c2c -SIZE (dhcp-3.0.1rc14.tar.gz) = 842712 -MD5 (dhcp-3.0.1rc14-ldap-patch) = 38fde70e0f27758da2be70ce46c17f8b -SIZE (dhcp-3.0.1rc14-ldap-patch) = 152494 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/isc-dhcpd.sh.sample b/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample deleted file mode 100644 index b2669ddc8b8a..000000000000 --- a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample +++ /dev/null @@ -1,669 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcpd -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# 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? - -# 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_rootdir=${dhcpd_rootdir:-/var/db/${name}} # directory to run in - -# 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; 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 ! ( type mount_devfs ) > /dev/null 2>&1; then - warn "dhcpd_devfs_enable disabled" \ - "-- not available" - dhcpd_devfs_enable=NO - fi - else - dhcpd_devfs_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 - 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} - 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_confdir=${dhcpd_rootdir}${dhcpd_confdir} - _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 () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_devdir}/_ ${_dhcpd_confdir} - # XXX /_ hack! so, .../dev is root owned. - if checkyesno dhcpd_devfs_enable; then - safe_mount ${_dhcpd_devdir} - else - safe_copy ${dhcpd_devdir} ${_dhcpd_devdir} - fi - safe_copy ${dhcpd_conffile} ${_dhcpd_conffile} - 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} - if checkyesno dhcpd_devfs_enable; then - safe_umount ${_dhcpd_devdir} - safe_rmdir ${_dhcpd_devdir}/_ # XXX /_ hack! - else - safe_remove ${_dhcpd_devdir} - fi - safe_rmdir ${_dhcpd_confdir} ${_dhcpd_rootdir} - 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_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 3c72b5520efe..000000000000 --- a/net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcrelay -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# 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 27cef99162df..000000000000 --- a/net/isc-dhcp30-server/files/patch-client::dhclient.c +++ /dev/null @@ -1,545 +0,0 @@ ---- client/dhclient.c.orig Sat Apr 26 23:51:39 2003 -+++ client/dhclient.c Wed Mar 3 16:21:02 2004 -@@ -47,6 +47,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 cur_time; - TIME default_lease_time = 43200; /* 12 hours... */ - TIME max_lease_time = 86400; /* 24 hours... */ -@@ -82,8 +89,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)); - -@@ -184,6 +194,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 (); -@@ -197,6 +210,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; -@@ -225,7 +251,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); -@@ -385,6 +420,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) -@@ -427,8 +472,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 - } - } - } -@@ -486,9 +536,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]"); - } -@@ -876,6 +926,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); -@@ -890,6 +949,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) { -@@ -1352,6 +1417,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; - -@@ -1457,6 +1527,9 @@ - struct client_lease *loop; - struct client_lease *lp; - -+ if (client -> interface -> linkstate == NOLINK) -+ return; -+ - loop = lp = client -> active; - - log_info ("No DHCPOFFERS received."); -@@ -1489,6 +1562,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 { -@@ -1496,6 +1573,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; -@@ -1541,6 +1623,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); -@@ -1681,6 +1769,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), -@@ -1702,6 +1802,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); - } -@@ -2597,6 +2707,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); -@@ -2783,8 +2900,10 @@ - case S_STOPPED: - break; - } -+#ifndef ENABLE_POLLING_MODE - client -> state = S_INIT; - state_reboot (client); -+#endif - } - } - } -@@ -3010,7 +3129,9 @@ - break; - - case server_awaken: -+#ifndef ENABLE_POLLING_MODE - state_reboot (client); -+#endif - break; - } - } -@@ -3147,3 +3268,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 acfee5854413..000000000000 --- a/net/isc-dhcp30-server/files/patch-dhcpctl::Makefile.dist +++ /dev/null @@ -1,79 +0,0 @@ ---- dhcpctl/Makefile.dist.orig Mon Apr 28 16:31:57 2003 -+++ dhcpctl/Makefile.dist Mon Apr 28 16:24:20 2003 -@@ -17,11 +17,11 @@ - # http://www.isc.org for more information. - # - --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 -@@ -29,10 +29,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) -@@ -43,8 +40,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; \ -@@ -64,16 +60,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) test.o svtest cltest.o cltest -+ -rm -f $(OBJ) cltest.o cltest - - realclean: clean - -rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES) -@@ -82,7 +74,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; \ -@@ -95,12 +87,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 84e6ea55f98c..000000000000 --- a/net/isc-dhcp30-server/pkg-message +++ /dev/null @@ -1,46 +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" # uses devfs if available? - dhcpd_rootdir="/var/db/dhcpd" # directory to run in - dhcpd_flags="-early_chroot" # needs full root - - WARNING: -early_chroot requires a jail(8) like environment to works. - -**** 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 4b52a17c9736..000000000000 --- a/net/isc-dhcp31-client/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -MAINTAINER= cyrille.lefevre@laposte.net -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 e7626329f2ca..000000000000 --- a/net/isc-dhcp31-relay/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -MAINTAINER= cyrille.lefevre@laposte.net -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 c33041add4ec..000000000000 --- a/net/isc-dhcp31-server/Makefile +++ /dev/null @@ -1,335 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 7 Mar 1996 -# Whom: se -# -# $FreeBSD$ -# - -PORTNAME= dhcp -PORTVERSION= 3.0.1.r14 -PORTREVISION= 6 -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= cyrille.lefevre@laposte.net -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_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 (requires by TLS)" 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/ -PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch -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 - -# 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.2pl3, 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 -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-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 -.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 - -# 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 ${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 e42d8e2eb341..000000000000 --- a/net/isc-dhcp31-server/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (dhcp-3.0.1rc14.tar.gz) = a68074d9ebdeb355c293d9b3645b3c2c -SIZE (dhcp-3.0.1rc14.tar.gz) = 842712 -MD5 (dhcp-3.0.1rc14-ldap-patch) = 38fde70e0f27758da2be70ce46c17f8b -SIZE (dhcp-3.0.1rc14-ldap-patch) = 152494 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/isc-dhcpd.sh.sample b/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample deleted file mode 100644 index b2669ddc8b8a..000000000000 --- a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample +++ /dev/null @@ -1,669 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcpd -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# 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? - -# 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_rootdir=${dhcpd_rootdir:-/var/db/${name}} # directory to run in - -# 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; 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 ! ( type mount_devfs ) > /dev/null 2>&1; then - warn "dhcpd_devfs_enable disabled" \ - "-- not available" - dhcpd_devfs_enable=NO - fi - else - dhcpd_devfs_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 - 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} - 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_confdir=${dhcpd_rootdir}${dhcpd_confdir} - _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 () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_devdir}/_ ${_dhcpd_confdir} - # XXX /_ hack! so, .../dev is root owned. - if checkyesno dhcpd_devfs_enable; then - safe_mount ${_dhcpd_devdir} - else - safe_copy ${dhcpd_devdir} ${_dhcpd_devdir} - fi - safe_copy ${dhcpd_conffile} ${_dhcpd_conffile} - 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} - if checkyesno dhcpd_devfs_enable; then - safe_umount ${_dhcpd_devdir} - safe_rmdir ${_dhcpd_devdir}/_ # XXX /_ hack! - else - safe_remove ${_dhcpd_devdir} - fi - safe_rmdir ${_dhcpd_confdir} ${_dhcpd_rootdir} - 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_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 3c72b5520efe..000000000000 --- a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcrelay -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# 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 27cef99162df..000000000000 --- a/net/isc-dhcp31-server/files/patch-client::dhclient.c +++ /dev/null @@ -1,545 +0,0 @@ ---- client/dhclient.c.orig Sat Apr 26 23:51:39 2003 -+++ client/dhclient.c Wed Mar 3 16:21:02 2004 -@@ -47,6 +47,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 cur_time; - TIME default_lease_time = 43200; /* 12 hours... */ - TIME max_lease_time = 86400; /* 24 hours... */ -@@ -82,8 +89,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)); - -@@ -184,6 +194,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 (); -@@ -197,6 +210,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; -@@ -225,7 +251,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); -@@ -385,6 +420,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) -@@ -427,8 +472,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 - } - } - } -@@ -486,9 +536,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]"); - } -@@ -876,6 +926,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); -@@ -890,6 +949,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) { -@@ -1352,6 +1417,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; - -@@ -1457,6 +1527,9 @@ - struct client_lease *loop; - struct client_lease *lp; - -+ if (client -> interface -> linkstate == NOLINK) -+ return; -+ - loop = lp = client -> active; - - log_info ("No DHCPOFFERS received."); -@@ -1489,6 +1562,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 { -@@ -1496,6 +1573,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; -@@ -1541,6 +1623,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); -@@ -1681,6 +1769,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), -@@ -1702,6 +1802,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); - } -@@ -2597,6 +2707,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); -@@ -2783,8 +2900,10 @@ - case S_STOPPED: - break; - } -+#ifndef ENABLE_POLLING_MODE - client -> state = S_INIT; - state_reboot (client); -+#endif - } - } - } -@@ -3010,7 +3129,9 @@ - break; - - case server_awaken: -+#ifndef ENABLE_POLLING_MODE - state_reboot (client); -+#endif - break; - } - } -@@ -3147,3 +3268,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 acfee5854413..000000000000 --- a/net/isc-dhcp31-server/files/patch-dhcpctl::Makefile.dist +++ /dev/null @@ -1,79 +0,0 @@ ---- dhcpctl/Makefile.dist.orig Mon Apr 28 16:31:57 2003 -+++ dhcpctl/Makefile.dist Mon Apr 28 16:24:20 2003 -@@ -17,11 +17,11 @@ - # http://www.isc.org for more information. - # - --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 -@@ -29,10 +29,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) -@@ -43,8 +40,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; \ -@@ -64,16 +60,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) test.o svtest cltest.o cltest -+ -rm -f $(OBJ) cltest.o cltest - - realclean: clean - -rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES) -@@ -82,7 +74,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; \ -@@ -95,12 +87,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 84e6ea55f98c..000000000000 --- a/net/isc-dhcp31-server/pkg-message +++ /dev/null @@ -1,46 +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" # uses devfs if available? - dhcpd_rootdir="/var/db/dhcpd" # directory to run in - dhcpd_flags="-early_chroot" # needs full root - - WARNING: -early_chroot requires a jail(8) like environment to works. - -**** 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 4b52a17c9736..000000000000 --- a/net/isc-dhcp40-client/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -MAINTAINER= cyrille.lefevre@laposte.net -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 e7626329f2ca..000000000000 --- a/net/isc-dhcp40-relay/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 28 April 2003 -# Whom: cyrille.lefevre@laposte.net -# -# $FreeBSD$ -# - -MAINTAINER= cyrille.lefevre@laposte.net -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 c33041add4ec..000000000000 --- a/net/isc-dhcp40-server/Makefile +++ /dev/null @@ -1,335 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: dhcp -# Date created: 7 Mar 1996 -# Whom: se -# -# $FreeBSD$ -# - -PORTNAME= dhcp -PORTVERSION= 3.0.1.r14 -PORTREVISION= 6 -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= cyrille.lefevre@laposte.net -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_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 (requires by TLS)" 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/ -PATCHFILES= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}-ldap-patch -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 - -# 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.2pl3, 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 -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-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 -.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 - -# 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 ${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 e42d8e2eb341..000000000000 --- a/net/isc-dhcp40-server/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (dhcp-3.0.1rc14.tar.gz) = a68074d9ebdeb355c293d9b3645b3c2c -SIZE (dhcp-3.0.1rc14.tar.gz) = 842712 -MD5 (dhcp-3.0.1rc14-ldap-patch) = 38fde70e0f27758da2be70ce46c17f8b -SIZE (dhcp-3.0.1rc14-ldap-patch) = 152494 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/isc-dhcpd.sh.sample b/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample deleted file mode 100644 index b2669ddc8b8a..000000000000 --- a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample +++ /dev/null @@ -1,669 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcpd -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# 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? - -# 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_rootdir=${dhcpd_rootdir:-/var/db/${name}} # directory to run in - -# 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; 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 ! ( type mount_devfs ) > /dev/null 2>&1; then - warn "dhcpd_devfs_enable disabled" \ - "-- not available" - dhcpd_devfs_enable=NO - fi - else - dhcpd_devfs_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 - 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} - 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_confdir=${dhcpd_rootdir}${dhcpd_confdir} - _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 () -{ - if checkyesno paranoia && checkyesno dhcpd_chroot_enable; then - safe_mkdir ${_dhcpd_rootdir} ${_dhcpd_devdir}/_ ${_dhcpd_confdir} - # XXX /_ hack! so, .../dev is root owned. - if checkyesno dhcpd_devfs_enable; then - safe_mount ${_dhcpd_devdir} - else - safe_copy ${dhcpd_devdir} ${_dhcpd_devdir} - fi - safe_copy ${dhcpd_conffile} ${_dhcpd_conffile} - 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} - if checkyesno dhcpd_devfs_enable; then - safe_umount ${_dhcpd_devdir} - safe_rmdir ${_dhcpd_devdir}/_ # XXX /_ hack! - else - safe_remove ${_dhcpd_devdir} - fi - safe_rmdir ${_dhcpd_confdir} ${_dhcpd_rootdir} - 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_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 3c72b5520efe..000000000000 --- a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/sh -# -# $FreeBSD$ -# -# PROVIDE: dhcrelay -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# 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 27cef99162df..000000000000 --- a/net/isc-dhcp40-server/files/patch-client::dhclient.c +++ /dev/null @@ -1,545 +0,0 @@ ---- client/dhclient.c.orig Sat Apr 26 23:51:39 2003 -+++ client/dhclient.c Wed Mar 3 16:21:02 2004 -@@ -47,6 +47,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 cur_time; - TIME default_lease_time = 43200; /* 12 hours... */ - TIME max_lease_time = 86400; /* 24 hours... */ -@@ -82,8 +89,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)); - -@@ -184,6 +194,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 (); -@@ -197,6 +210,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; -@@ -225,7 +251,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); -@@ -385,6 +420,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) -@@ -427,8 +472,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 - } - } - } -@@ -486,9 +536,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]"); - } -@@ -876,6 +926,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); -@@ -890,6 +949,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) { -@@ -1352,6 +1417,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; - -@@ -1457,6 +1527,9 @@ - struct client_lease *loop; - struct client_lease *lp; - -+ if (client -> interface -> linkstate == NOLINK) -+ return; -+ - loop = lp = client -> active; - - log_info ("No DHCPOFFERS received."); -@@ -1489,6 +1562,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 { -@@ -1496,6 +1573,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; -@@ -1541,6 +1623,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); -@@ -1681,6 +1769,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), -@@ -1702,6 +1802,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); - } -@@ -2597,6 +2707,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); -@@ -2783,8 +2900,10 @@ - case S_STOPPED: - break; - } -+#ifndef ENABLE_POLLING_MODE - client -> state = S_INIT; - state_reboot (client); -+#endif - } - } - } -@@ -3010,7 +3129,9 @@ - break; - - case server_awaken: -+#ifndef ENABLE_POLLING_MODE - state_reboot (client); -+#endif - break; - } - } -@@ -3147,3 +3268,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 acfee5854413..000000000000 --- a/net/isc-dhcp40-server/files/patch-dhcpctl::Makefile.dist +++ /dev/null @@ -1,79 +0,0 @@ ---- dhcpctl/Makefile.dist.orig Mon Apr 28 16:31:57 2003 -+++ dhcpctl/Makefile.dist Mon Apr 28 16:24:20 2003 -@@ -17,11 +17,11 @@ - # http://www.isc.org for more information. - # - --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 -@@ -29,10 +29,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) -@@ -43,8 +40,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; \ -@@ -64,16 +60,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) test.o svtest cltest.o cltest -+ -rm -f $(OBJ) cltest.o cltest - - realclean: clean - -rm -f libdhcpctl.a *~ $(CATMANPAGES) $(SEDMANPAGES) -@@ -82,7 +74,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; \ -@@ -95,12 +87,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 84e6ea55f98c..000000000000 --- a/net/isc-dhcp40-server/pkg-message +++ /dev/null @@ -1,46 +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" # uses devfs if available? - dhcpd_rootdir="/var/db/dhcpd" # directory to run in - dhcpd_flags="-early_chroot" # needs full root - - WARNING: -early_chroot requires a jail(8) like environment to works. - -**** 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 dbe045d25289..000000000000 --- a/net/kdenetwork4/Makefile +++ /dev/null @@ -1,63 +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}/devel/libidn \ - slp:${PORTSDIR}/net/openslp -RUN_DEPENDS= ${QT_PREFIX}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls - -CONFLICTS= kopete-[0-9]* - -USE_KDELIBS_VER=3 -PREFIX= ${KDE_PREFIX} - -USE_PERL5= yes -USE_BZIP2= yes -USE_GMAKE= yes -USE_REINPLACE= yes -_NO_KDE_CLOSURE=yes - -GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -DO_NOT_COMPILE+=lanbrowsing - -.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: -.if ${OSVERSION} < 500028 - @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|g' \ - ${WRKSRC}/kopete/protocols/gadu/libgadu/libgadu-config.h.in -.endif - @${REINPLACE_CMD} \ - -E -e '/^SUBDIRS/s/lisa//g' \ - ${WRKSRC}/doc/Makefile.in - @${REINPLACE_CMD} -e 's|/bin/bash|${SH}|' \ - ${WRKSRC}/kopete/plugins/latex/kopete_latexconvert.sh - -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 2bf8d86d050b..000000000000 --- a/net/kdenetwork4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (KDE/kdenetwork-3.3.2.tar.bz2) = 652a5703b8dc937c4009e002dc3035f3 -SIZE (KDE/kdenetwork-3.3.2.tar.bz2) = 6959207 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 0ba28512ef50..000000000000 --- a/net/kdenetwork4/pkg-plist +++ /dev/null @@ -1,2285 +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/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-pluginloader2-kconf_update -lib/kde3/fileshare_propsdlgplugin.la -lib/kde3/fileshare_propsdlgplugin.so -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so -lib/kde3/kcm_kopete_accountconfig.la -lib/kde3/kcm_kopete_accountconfig.so -lib/kde3/kcm_kopete_alias.la -lib/kde3/kcm_kopete_alias.so -lib/kde3/kcm_kopete_appearanceconfig.la -lib/kde3/kcm_kopete_appearanceconfig.so -lib/kde3/kcm_kopete_autoreplace.la -lib/kde3/kcm_kopete_autoreplace.so -lib/kde3/kcm_kopete_behaviorconfig.la -lib/kde3/kcm_kopete_behaviorconfig.so -lib/kde3/kcm_kopete_cryptography.la -lib/kde3/kcm_kopete_cryptography.so -lib/kde3/kcm_kopete_highlight.la -lib/kde3/kcm_kopete_highlight.so -lib/kde3/kcm_kopete_history.la -lib/kde3/kcm_kopete_history.so -lib/kde3/kcm_kopete_latex.la -lib/kde3/kcm_kopete_latex.so -lib/kde3/kcm_kopete_msn.la -lib/kde3/kcm_kopete_msn.so -lib/kde3/kcm_kopete_nowlistening.la -lib/kde3/kcm_kopete_nowlistening.so -lib/kde3/kcm_kopete_texteffect.la -lib/kde3/kcm_kopete_texteffect.so -lib/kde3/kcm_kopete_translator.la -lib/kde3/kcm_kopete_translator.so -lib/kde3/kcm_kopete_webpresence.la -lib/kde3/kcm_kopete_webpresence.so -lib/kde3/kcm_krfb.la -lib/kde3/kcm_krfb.so -lib/kde3/kcm_ktalkd.la -lib/kde3/kcm_ktalkd.so -lib/kde3/kded_kinetd.la -lib/kde3/kded_kinetd.so -lib/kde3/kdict_panelapplet.la -lib/kde3/kdict_panelapplet.so -lib/kde3/khtml_kget.la -lib/kde3/khtml_kget.so -lib/kde3/knewsticker_panelapplet.la -lib/kde3/knewsticker_panelapplet.so -lib/kde3/kopete_aim.la -lib/kde3/kopete_aim.so -lib/kde3/kopete_alias.la -lib/kde3/kopete_alias.so -lib/kde3/kopete_autoreplace.la -lib/kde3/kopete_autoreplace.so -lib/kde3/kopete_chatwindow.la -lib/kde3/kopete_chatwindow.so -lib/kde3/kopete_connectionstatus.la -lib/kde3/kopete_connectionstatus.so -lib/kde3/kopete_contactnotes.la -lib/kde3/kopete_contactnotes.so -lib/kde3/kopete_cryptography.la -lib/kde3/kopete_cryptography.so -lib/kde3/kopete_gadu.la -lib/kde3/kopete_gadu.so -lib/kde3/kopete_highlight.la -lib/kde3/kopete_highlight.so -lib/kde3/kopete_history.la -lib/kde3/kopete_history.so -lib/kde3/kopete_icq.la -lib/kde3/kopete_icq.so -lib/kde3/kopete_irc.la -lib/kde3/kopete_irc.so -lib/kde3/kopete_jabber.la -lib/kde3/kopete_jabber.so -lib/kde3/kopete_latex.la -lib/kde3/kopete_latex.so -lib/kde3/kopete_msn.la -lib/kde3/kopete_msn.so -lib/kde3/kopete_netmeeting.la -lib/kde3/kopete_netmeeting.so -lib/kde3/kopete_nowlistening.la -lib/kde3/kopete_nowlistening.so -lib/kde3/kopete_sms.la -lib/kde3/kopete_sms.so -lib/kde3/kopete_texteffect.la -lib/kde3/kopete_texteffect.so -lib/kde3/kopete_translator.la -lib/kde3/kopete_translator.so -lib/kde3/kopete_webpresence.la -lib/kde3/kopete_webpresence.so -lib/kde3/kopete_yahoo.la -lib/kde3/kopete_yahoo.so -lib/kde3/kpf_panelapplet.la -lib/kde3/kpf_panelapplet.so -lib/kde3/kpfpropertiesdialog.la -lib/kde3/kpfpropertiesdialog.so -lib/kde3/ksirc.la -lib/kde3/ksirc.so -lib/kde3/libkcm_kcmsambaconf.la -lib/kde3/libkcm_kcmsambaconf.so -lib/kde3/libkntsrcfilepropsdlg.la -lib/kde3/libkntsrcfilepropsdlg.so -lib/kde3/libkrichtexteditpart.la -lib/kde3/libkrichtexteditpart.so -lib/libkdeinit_ksirc.la -lib/libkdeinit_ksirc.so -lib/libkopete.la -lib/libkopete.so -lib/libkopete.so.1 -lib/libkopete_msn_shared.la -lib/libkopete_msn_shared.so -lib/libkopete_msn_shared.so.0 -lib/libkopete_oscar.la -lib/libkopete_oscar.so -lib/libkopete_oscar.so.1 -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-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-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/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/dock.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_delete.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_paste.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_pause.png -share/apps/kget/icons/crystalsvg/22x22/actions/tool_preferences.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/kget/sounds/added.wav -share/apps/kget/sounds/finished.wav -share/apps/kget/sounds/finishedall.wav -share/apps/kget/sounds/started.wav -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/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/msn_protocol.png -share/apps/kopete/icons/crystalsvg/128x128/apps/sms_protocol.png -share/apps/kopete/icons/crystalsvg/128x128/apps/yahoo_protocol.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/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_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/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/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteaway.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/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/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteaway.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/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/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/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/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/apps/aim_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/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/aim_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/icq_protocol.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/yahoo_protocol.png -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/emoticons/Boxed/angry.png -share/apps/kopete/pics/emoticons/Boxed/bigsmile.png -share/apps/kopete/pics/emoticons/Boxed/confused.png -share/apps/kopete/pics/emoticons/Boxed/cry.png -share/apps/kopete/pics/emoticons/Boxed/emoticons.xml -share/apps/kopete/pics/emoticons/Boxed/oh.png -share/apps/kopete/pics/emoticons/Boxed/sad.png -share/apps/kopete/pics/emoticons/Boxed/shade.png -share/apps/kopete/pics/emoticons/Boxed/smile.png -share/apps/kopete/pics/emoticons/Boxed/tongue.png -share/apps/kopete/pics/emoticons/Boxed/wink.png -share/apps/kopete/pics/emoticons/Default/angry.png -share/apps/kopete/pics/emoticons/Default/bat.png -share/apps/kopete/pics/emoticons/Default/beer.png -share/apps/kopete/pics/emoticons/Default/biggrin.png -share/apps/kopete/pics/emoticons/Default/cake.png -share/apps/kopete/pics/emoticons/Default/camera.png -share/apps/kopete/pics/emoticons/Default/cat.png -share/apps/kopete/pics/emoticons/Default/clock.png -share/apps/kopete/pics/emoticons/Default/cocktail.png -share/apps/kopete/pics/emoticons/Default/confused.png -share/apps/kopete/pics/emoticons/Default/cry.png -share/apps/kopete/pics/emoticons/Default/cup.png -share/apps/kopete/pics/emoticons/Default/dog.png -share/apps/kopete/pics/emoticons/Default/email.png -share/apps/kopete/pics/emoticons/Default/embarassed.png -share/apps/kopete/pics/emoticons/Default/emoticons.xml -share/apps/kopete/pics/emoticons/Default/film.png -share/apps/kopete/pics/emoticons/Default/kiss.png -share/apps/kopete/pics/emoticons/Default/lightbulb.png -share/apps/kopete/pics/emoticons/Default/love.png -share/apps/kopete/pics/emoticons/Default/note.png -share/apps/kopete/pics/emoticons/Default/oh.png -share/apps/kopete/pics/emoticons/Default/omg.png -share/apps/kopete/pics/emoticons/Default/phone.png -share/apps/kopete/pics/emoticons/Default/present.png -share/apps/kopete/pics/emoticons/Default/rose.png -share/apps/kopete/pics/emoticons/Default/sad.png -share/apps/kopete/pics/emoticons/Default/shade.png -share/apps/kopete/pics/emoticons/Default/sleep.png -share/apps/kopete/pics/emoticons/Default/smile.png -share/apps/kopete/pics/emoticons/Default/star.png -share/apps/kopete/pics/emoticons/Default/teeth.png -share/apps/kopete/pics/emoticons/Default/thumbs_down.png -share/apps/kopete/pics/emoticons/Default/thumbs_up.png -share/apps/kopete/pics/emoticons/Default/tongue.png -share/apps/kopete/pics/emoticons/Default/unhappy.png -share/apps/kopete/pics/emoticons/Default/unlove.png -share/apps/kopete/pics/emoticons/Default/wilted_rose.png -share/apps/kopete/pics/emoticons/Default/wink.png -share/apps/kopete/pics/emoticons/KMess-Blue/angry.png -share/apps/kopete/pics/emoticons/KMess-Blue/confused.png -share/apps/kopete/pics/emoticons/KMess-Blue/cry.png -share/apps/kopete/pics/emoticons/KMess-Blue/embarassed.png -share/apps/kopete/pics/emoticons/KMess-Blue/emoticons.xml -share/apps/kopete/pics/emoticons/KMess-Blue/omg.png -share/apps/kopete/pics/emoticons/KMess-Blue/sad.png -share/apps/kopete/pics/emoticons/KMess-Blue/shade.png -share/apps/kopete/pics/emoticons/KMess-Blue/smile.png -share/apps/kopete/pics/emoticons/KMess-Blue/teeth.png -share/apps/kopete/pics/emoticons/KMess-Blue/tongue.png -share/apps/kopete/pics/emoticons/KMess-Blue/wink.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/angel.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/angry.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/confused.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/cry.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/devil.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/embarrassed.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/emoticons.xml -share/apps/kopete/pics/emoticons/KMess-Cartoon/omg.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/sad.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/shade.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/smile.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/teeth.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/tongue.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/ugly.png -share/apps/kopete/pics/emoticons/KMess-Cartoon/wink.png -share/apps/kopete/pics/emoticons/KMess-Violet/angry.png -share/apps/kopete/pics/emoticons/KMess-Violet/confused.png -share/apps/kopete/pics/emoticons/KMess-Violet/cry.png -share/apps/kopete/pics/emoticons/KMess-Violet/embarassed.png -share/apps/kopete/pics/emoticons/KMess-Violet/emoticons.xml -share/apps/kopete/pics/emoticons/KMess-Violet/omg.png -share/apps/kopete/pics/emoticons/KMess-Violet/sad.png -share/apps/kopete/pics/emoticons/KMess-Violet/shade.png -share/apps/kopete/pics/emoticons/KMess-Violet/smile.png -share/apps/kopete/pics/emoticons/KMess-Violet/teeth.png -share/apps/kopete/pics/emoticons/KMess-Violet/tongue.png -share/apps/kopete/pics/emoticons/KMess-Violet/wink.png -share/apps/kopete/pics/emoticons/KMess/angel.png -share/apps/kopete/pics/emoticons/KMess/angry.png -share/apps/kopete/pics/emoticons/KMess/bat.png -share/apps/kopete/pics/emoticons/KMess/beer.png -share/apps/kopete/pics/emoticons/KMess/boy.png -share/apps/kopete/pics/emoticons/KMess/cake.png -share/apps/kopete/pics/emoticons/KMess/camera.png -share/apps/kopete/pics/emoticons/KMess/cat.png -share/apps/kopete/pics/emoticons/KMess/clock.png -share/apps/kopete/pics/emoticons/KMess/cocktail.png -share/apps/kopete/pics/emoticons/KMess/confused.png -share/apps/kopete/pics/emoticons/KMess/cry.png -share/apps/kopete/pics/emoticons/KMess/cup.png -share/apps/kopete/pics/emoticons/KMess/devil.png -share/apps/kopete/pics/emoticons/KMess/dog.png -share/apps/kopete/pics/emoticons/KMess/dude_hug.png -share/apps/kopete/pics/emoticons/KMess/email.png -share/apps/kopete/pics/emoticons/KMess/embarassed.png -share/apps/kopete/pics/emoticons/KMess/emoticons.xml -share/apps/kopete/pics/emoticons/KMess/film.png -share/apps/kopete/pics/emoticons/KMess/girl.png -share/apps/kopete/pics/emoticons/KMess/girl_hug.png -share/apps/kopete/pics/emoticons/KMess/kiss.png -share/apps/kopete/pics/emoticons/KMess/lightbulb.png -share/apps/kopete/pics/emoticons/KMess/love.png -share/apps/kopete/pics/emoticons/KMess/messenger.png -share/apps/kopete/pics/emoticons/KMess/note.png -share/apps/kopete/pics/emoticons/KMess/omg.png -share/apps/kopete/pics/emoticons/KMess/phone.png -share/apps/kopete/pics/emoticons/KMess/present.png -share/apps/kopete/pics/emoticons/KMess/rose.png -share/apps/kopete/pics/emoticons/KMess/sad.png -share/apps/kopete/pics/emoticons/KMess/shade.png -share/apps/kopete/pics/emoticons/KMess/smile.png -share/apps/kopete/pics/emoticons/KMess/star.png -share/apps/kopete/pics/emoticons/KMess/teeth.png -share/apps/kopete/pics/emoticons/KMess/thumbs_down.png -share/apps/kopete/pics/emoticons/KMess/thumbs_up.png -share/apps/kopete/pics/emoticons/KMess/tongue.png -share/apps/kopete/pics/emoticons/KMess/unlove.png -share/apps/kopete/pics/emoticons/KMess/wilted_rose.png -share/apps/kopete/pics/emoticons/KMess/wink.png -share/apps/kopete/pics/emoticons/Plain/biggrin.png -share/apps/kopete/pics/emoticons/Plain/confused.png -share/apps/kopete/pics/emoticons/Plain/cry.png -share/apps/kopete/pics/emoticons/Plain/emoticons.xml -share/apps/kopete/pics/emoticons/Plain/oh.png -share/apps/kopete/pics/emoticons/Plain/pig.png -share/apps/kopete/pics/emoticons/Plain/smile.png -share/apps/kopete/pics/emoticons/Plain/sunglasses.png -share/apps/kopete/pics/emoticons/Plain/tongue.png -share/apps/kopete/pics/emoticons/Plain/unhappy.png -share/apps/kopete/pics/emoticons/Plain/wink.png -share/apps/kopete/pics/emoticons/RedOnes/angel.png -share/apps/kopete/pics/emoticons/RedOnes/biggrin.png -share/apps/kopete/pics/emoticons/RedOnes/confused.png -share/apps/kopete/pics/emoticons/RedOnes/cry.png -share/apps/kopete/pics/emoticons/RedOnes/emoticons.xml -share/apps/kopete/pics/emoticons/RedOnes/oh.png -share/apps/kopete/pics/emoticons/RedOnes/smile.png -share/apps/kopete/pics/emoticons/RedOnes/sunglasses.png -share/apps/kopete/pics/emoticons/RedOnes/tongue.png -share/apps/kopete/pics/emoticons/RedOnes/unhappy.png -share/apps/kopete/pics/emoticons/RedOnes/wink.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/angry.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/big_smile.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/confused.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/cool.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/emoticons.xml -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/lol.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/ooooh.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/sad.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/smile.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/tongue_out.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-16/wink.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/angry.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/big_smile.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/confused.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/cool.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/emoticons.xml -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/lol.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/ooooh.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/sad.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/smile.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/tongue_out.png -share/apps/kopete/pics/emoticons/Yazoo-Smileys-22/wink.png -share/apps/kopete/pics/emoticons/ccmathteam.com/biggrin.png -share/apps/kopete/pics/emoticons/ccmathteam.com/confused.png -share/apps/kopete/pics/emoticons/ccmathteam.com/cry.png -share/apps/kopete/pics/emoticons/ccmathteam.com/devil.png -share/apps/kopete/pics/emoticons/ccmathteam.com/emoticons.xml -share/apps/kopete/pics/emoticons/ccmathteam.com/oh.png -share/apps/kopete/pics/emoticons/ccmathteam.com/smile.png -share/apps/kopete/pics/emoticons/ccmathteam.com/sunglasses.png -share/apps/kopete/pics/emoticons/ccmathteam.com/tongue.png -share/apps/kopete/pics/emoticons/ccmathteam.com/unhappy.png -share/apps/kopete/pics/emoticons/ccmathteam.com/wink.png -share/apps/kopete/pics/emoticons/greggman.com/biggrin.png -share/apps/kopete/pics/emoticons/greggman.com/confused.png -share/apps/kopete/pics/emoticons/greggman.com/emoticons.xml -share/apps/kopete/pics/emoticons/greggman.com/kiss.png -share/apps/kopete/pics/emoticons/greggman.com/oh.png -share/apps/kopete/pics/emoticons/greggman.com/smile.png -share/apps/kopete/pics/emoticons/greggman.com/sunglasses.png -share/apps/kopete/pics/emoticons/greggman.com/tongue.png -share/apps/kopete/pics/emoticons/greggman.com/unhappy.png -share/apps/kopete/pics/emoticons/greggman.com/vampire.png -share/apps/kopete/pics/emoticons/greggman.com/wink.png -share/apps/kopete/pics/emoticons/phpBB/biggrin.png -share/apps/kopete/pics/emoticons/phpBB/confused.png -share/apps/kopete/pics/emoticons/phpBB/cry.png -share/apps/kopete/pics/emoticons/phpBB/devil.png -share/apps/kopete/pics/emoticons/phpBB/emoticons.xml -share/apps/kopete/pics/emoticons/phpBB/oh.png -share/apps/kopete/pics/emoticons/phpBB/smile.png -share/apps/kopete/pics/emoticons/phpBB/sunglasses.png -share/apps/kopete/pics/emoticons/phpBB/tongue.png -share/apps/kopete/pics/emoticons/phpBB/unhappy.png -share/apps/kopete/pics/emoticons/phpBB/wink.png -share/apps/kopete/pics/emoticons/tweakers.net/biggrin.png -share/apps/kopete/pics/emoticons/tweakers.net/cry.png -share/apps/kopete/pics/emoticons/tweakers.net/emoticons.xml -share/apps/kopete/pics/emoticons/tweakers.net/oh.png -share/apps/kopete/pics/emoticons/tweakers.net/sleep.png -share/apps/kopete/pics/emoticons/tweakers.net/smile.png -share/apps/kopete/pics/emoticons/tweakers.net/tongue.png -share/apps/kopete/pics/emoticons/tweakers.net/unhappy.png -share/apps/kopete/pics/emoticons/tweakers.net/wink.png -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.xsl -share/apps/kopete/styles/MSN.xsl -share/apps/kopete/styles/Minimal.xsl -share/apps/kopete/styles/XChat.xsl -share/apps/kopete/styles/data/iChat-Trans/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/blue/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/blue/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/blue/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/blue/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/blue/From/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/blue/From/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/blue/From/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/blue/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/blue/To/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/blue/To/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/blue/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/clear/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/clear/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/clear/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/clear/From/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/clear/From/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/clear/From/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/clear/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/clear/To/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/clear/To/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/clear/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/graphite/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/graphite/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/graphite/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/graphite/From/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/graphite/From/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/graphite/From/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/graphite/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/graphite/To/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/graphite/To/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/graphite/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/green/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/green/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/green/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/green/From/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/green/From/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/green/From/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/green/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/green/To/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/green/To/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/green/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/orange/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/orange/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/orange/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/orange/From/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/orange/From/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/orange/From/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/orange/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/orange/To/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/orange/To/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/orange/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/pink/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/pink/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/pink/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/pink/From/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/pink/From/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/pink/From/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/pink/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/pink/To/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/pink/To/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/pink/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/purple/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/purple/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/purple/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/purple/From/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/purple/From/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/purple/From/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/purple/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/purple/To/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/purple/To/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/purple/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/yellow/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/yellow/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/yellow/CVS/Tag -share/apps/kopete/styles/data/iChat-Trans/yellow/From/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/yellow/From/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/yellow/From/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/yellow/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat-Trans/yellow/To/CVS/Repository -share/apps/kopete/styles/data/iChat-Trans/yellow/To/CVS/Root -share/apps/kopete/styles/data/iChat-Trans/yellow/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/CVS/Repository -share/apps/kopete/styles/data/iChat/CVS/Root -share/apps/kopete/styles/data/iChat/CVS/Tag -share/apps/kopete/styles/data/iChat/blue/CVS/Entries -share/apps/kopete/styles/data/iChat/blue/CVS/Repository -share/apps/kopete/styles/data/iChat/blue/CVS/Root -share/apps/kopete/styles/data/iChat/blue/CVS/Tag -share/apps/kopete/styles/data/iChat/blue/From/CVS/Entries -share/apps/kopete/styles/data/iChat/blue/From/CVS/Repository -share/apps/kopete/styles/data/iChat/blue/From/CVS/Root -share/apps/kopete/styles/data/iChat/blue/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/blue/To/CVS/Repository -share/apps/kopete/styles/data/iChat/blue/To/CVS/Root -share/apps/kopete/styles/data/iChat/blue/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/clear/CVS/Repository -share/apps/kopete/styles/data/iChat/clear/CVS/Root -share/apps/kopete/styles/data/iChat/clear/CVS/Tag -share/apps/kopete/styles/data/iChat/clear/From/CVS/Entries -share/apps/kopete/styles/data/iChat/clear/From/CVS/Repository -share/apps/kopete/styles/data/iChat/clear/From/CVS/Root -share/apps/kopete/styles/data/iChat/clear/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/clear/To/CVS/Repository -share/apps/kopete/styles/data/iChat/clear/To/CVS/Root -share/apps/kopete/styles/data/iChat/clear/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/graphite/CVS/Repository -share/apps/kopete/styles/data/iChat/graphite/CVS/Root -share/apps/kopete/styles/data/iChat/graphite/CVS/Tag -share/apps/kopete/styles/data/iChat/graphite/From/CVS/Entries -share/apps/kopete/styles/data/iChat/graphite/From/CVS/Repository -share/apps/kopete/styles/data/iChat/graphite/From/CVS/Root -share/apps/kopete/styles/data/iChat/graphite/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/graphite/To/CVS/Repository -share/apps/kopete/styles/data/iChat/graphite/To/CVS/Root -share/apps/kopete/styles/data/iChat/graphite/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/green/CVS/Repository -share/apps/kopete/styles/data/iChat/green/CVS/Root -share/apps/kopete/styles/data/iChat/green/CVS/Tag -share/apps/kopete/styles/data/iChat/green/From/CVS/Entries -share/apps/kopete/styles/data/iChat/green/From/CVS/Repository -share/apps/kopete/styles/data/iChat/green/From/CVS/Root -share/apps/kopete/styles/data/iChat/green/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/green/To/CVS/Repository -share/apps/kopete/styles/data/iChat/green/To/CVS/Root -share/apps/kopete/styles/data/iChat/green/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/orange/CVS/Repository -share/apps/kopete/styles/data/iChat/orange/CVS/Root -share/apps/kopete/styles/data/iChat/orange/CVS/Tag -share/apps/kopete/styles/data/iChat/orange/From/CVS/Entries -share/apps/kopete/styles/data/iChat/orange/From/CVS/Repository -share/apps/kopete/styles/data/iChat/orange/From/CVS/Root -share/apps/kopete/styles/data/iChat/orange/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/orange/To/CVS/Repository -share/apps/kopete/styles/data/iChat/orange/To/CVS/Root -share/apps/kopete/styles/data/iChat/orange/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/pink/CVS/Repository -share/apps/kopete/styles/data/iChat/pink/CVS/Root -share/apps/kopete/styles/data/iChat/pink/CVS/Tag -share/apps/kopete/styles/data/iChat/pink/From/CVS/Entries -share/apps/kopete/styles/data/iChat/pink/From/CVS/Repository -share/apps/kopete/styles/data/iChat/pink/From/CVS/Root -share/apps/kopete/styles/data/iChat/pink/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/pink/To/CVS/Repository -share/apps/kopete/styles/data/iChat/pink/To/CVS/Root -share/apps/kopete/styles/data/iChat/pink/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/purple/CVS/Repository -share/apps/kopete/styles/data/iChat/purple/CVS/Root -share/apps/kopete/styles/data/iChat/purple/CVS/Tag -share/apps/kopete/styles/data/iChat/purple/From/CVS/Entries -share/apps/kopete/styles/data/iChat/purple/From/CVS/Repository -share/apps/kopete/styles/data/iChat/purple/From/CVS/Root -share/apps/kopete/styles/data/iChat/purple/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/purple/To/CVS/Repository -share/apps/kopete/styles/data/iChat/purple/To/CVS/Root -share/apps/kopete/styles/data/iChat/purple/To/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/yellow/CVS/Repository -share/apps/kopete/styles/data/iChat/yellow/CVS/Root -share/apps/kopete/styles/data/iChat/yellow/CVS/Tag -share/apps/kopete/styles/data/iChat/yellow/From/CVS/Entries -share/apps/kopete/styles/data/iChat/yellow/From/CVS/Repository -share/apps/kopete/styles/data/iChat/yellow/From/CVS/Root -share/apps/kopete/styles/data/iChat/yellow/From/CVS/Tag -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/CVS/Entries -share/apps/kopete/styles/data/iChat/yellow/To/CVS/Repository -share/apps/kopete/styles/data/iChat/yellow/To/CVS/Root -share/apps/kopete/styles/data/iChat/yellow/To/CVS/Tag -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/webpresencedefault.xsl -share/apps/kopete/webpresence/wpimages.xsl -share/apps/kopete_contactnotes/contactnotesui.rc -share/apps/kopete_cryptography/cryptographychatui.rc -share/apps/kopete_cryptography/cryptographyui.rc -share/apps/kopete_history/historychatui.rc -share/apps/kopete_history/historyui.rc -share/apps/kopete_msn/msnchatui.rc -share/apps/kopete_netmeeting/netmeetingchatui.rc -share/apps/kopete_translator/translatorchatui.rc -share/apps/kopete_translator/translatorui.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/Avades -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/Cybercomm -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/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/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/16x16/apps/ksirc.png -share/apps/ksirc/icons/crystalsvg/22x22/actions/info.png -share/apps/ksirc/icons/crystalsvg/22x22/actions/ksirc_dock.png -share/apps/ksirc/icons/crystalsvg/32x32/apps/ksirc.png -share/apps/ksirc/icons/crystalsvg/48x48/apps/ksirc.png -share/apps/ksirc/icons/crystalsvg/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/config.kcfg/historyconfig.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/kdenetwork-apidocs/common -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/cr22-action-tool_delay.png -share/doc/HTML/en/kget/cr22-action-tool_delete.png -share/doc/HTML/en/kget/cr22-action-tool_disconnect.png -share/doc/HTML/en/kget/cr22-action-tool_drop_target.png -share/doc/HTML/en/kget/cr22-action-tool_expert.png -share/doc/HTML/en/kget/cr22-action-tool_logwindow.png -share/doc/HTML/en/kget/cr22-action-tool_offline_mode_off.png -share/doc/HTML/en/kget/cr22-action-tool_offline_mode_on.png -share/doc/HTML/en/kget/cr22-action-tool_paste.png -share/doc/HTML/en/kget/cr22-action-tool_pause.png -share/doc/HTML/en/kget/cr22-action-tool_queue.png -share/doc/HTML/en/kget/cr22-action-tool_restart.png -share/doc/HTML/en/kget/cr22-action-tool_resume.png -share/doc/HTML/en/kget/cr22-action-tool_shutdown.png -share/doc/HTML/en/kget/cr22-action-tool_timer.png -share/doc/HTML/en/kget/cr22-action-tool_uselastdir.png -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/kdict.png -share/icons/crystalsvg/128x128/apps/kopete.png -share/icons/crystalsvg/128x128/apps/kppp.png -share/icons/crystalsvg/128x128/apps/ktalkd.png -share/icons/crystalsvg/16x16/apps/kdict.png -share/icons/crystalsvg/16x16/apps/knewsticker.png -share/icons/crystalsvg/16x16/apps/kopete.png -share/icons/crystalsvg/16x16/apps/kpf.png -share/icons/crystalsvg/16x16/apps/kppp.png -share/icons/crystalsvg/16x16/apps/ksirc.png -share/icons/crystalsvg/16x16/apps/ktalkd.png -share/icons/crystalsvg/16x16/mimetypes/kopete_emoticons.png -share/icons/crystalsvg/22x22/actions/khtml_kget.png -share/icons/crystalsvg/22x22/apps/kopete.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/mimetypes/kopete_emoticons.png -share/icons/crystalsvg/32x32/apps/kdict.png -share/icons/crystalsvg/32x32/apps/knewsticker.png -share/icons/crystalsvg/32x32/apps/kopete.png -share/icons/crystalsvg/32x32/apps/kpf.png -share/icons/crystalsvg/32x32/apps/kppp.png -share/icons/crystalsvg/32x32/apps/krdc.png -share/icons/crystalsvg/32x32/apps/krfb.png -share/icons/crystalsvg/32x32/apps/ksirc.png -share/icons/crystalsvg/32x32/apps/ktalkd.png -share/icons/crystalsvg/48x48/apps/kdict.png -share/icons/crystalsvg/48x48/apps/kget.png -share/icons/crystalsvg/48x48/apps/knewsticker.png -share/icons/crystalsvg/48x48/apps/kopete.png -share/icons/crystalsvg/48x48/apps/kpf.png -share/icons/crystalsvg/48x48/apps/kppp.png -share/icons/crystalsvg/48x48/apps/krdc.png -share/icons/crystalsvg/48x48/apps/krfb.png -share/icons/crystalsvg/48x48/apps/ksirc.png -share/icons/crystalsvg/48x48/apps/ktalkd.png -share/icons/crystalsvg/48x48/mimetypes/kget_list.png -share/icons/crystalsvg/64x64/apps/kdict.png -share/icons/crystalsvg/64x64/apps/kopete.png -share/icons/crystalsvg/64x64/apps/kppp.png -share/icons/crystalsvg/64x64/apps/ksirc.png -share/icons/hicolor/16x16/apps/kcmsambaconf.png -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/fileshare_propsdlgplugin.desktop -share/services/irc.protocol -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_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/kinetd.desktop -share/services/kinetd_krfb.desktop -share/services/kinetd_krfb_httpd.desktop -share/services/kntsrcfilepropsdlg.desktop -share/services/kopete_accountconfig.desktop -share/services/kopete_aim.desktop -share/services/kopete_alias.desktop -share/services/kopete_appearanceconfig.desktop -share/services/kopete_autoreplace.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_highlight.desktop -share/services/kopete_history.desktop -share/services/kopete_icq.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_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/servicetypes/kinetdmodule.desktop -share/servicetypes/kopeteplugin.desktop -share/servicetypes/kopeteprotocol.desktop -share/servicetypes/kopeteui.desktop -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/libkopete/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/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 -@dirrm share/doc/HTML/en/kdenetwork-apidocs -@dirrm share/doc/HTML/en/kcontrol/lanbrowser -@dirrm share/doc/HTML/en/kcontrol/kcmtalkd -@dirrm share/apps/ksirc/pics/emoticons -@dirrm share/apps/ksirc/pics -@dirrm share/apps/ksirc/icons/crystalsvg/64x64/apps -@dirrm share/apps/ksirc/icons/crystalsvg/64x64 -@dirrm share/apps/ksirc/icons/crystalsvg/48x48/apps -@dirrm share/apps/ksirc/icons/crystalsvg/48x48 -@dirrm share/apps/ksirc/icons/crystalsvg/32x32/apps -@dirrm share/apps/ksirc/icons/crystalsvg/32x32 -@dirrm share/apps/ksirc/icons/crystalsvg/22x22/actions -@dirrm share/apps/ksirc/icons/crystalsvg/22x22 -@dirrm share/apps/ksirc/icons/crystalsvg/16x16/apps -@dirrm share/apps/ksirc/icons/crystalsvg/16x16 -@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_translator -@dirrm share/apps/kopete_netmeeting -@dirrm share/apps/kopete_msn -@dirrm share/apps/kopete_history -@dirrm share/apps/kopete_cryptography -@dirrm share/apps/kopete_contactnotes -@dirrm share/apps/kopete/webpresence -@dirrm share/apps/kopete/styles/data/iChat/yellow/To/CVS -@dirrm share/apps/kopete/styles/data/iChat/yellow/To -@dirrm share/apps/kopete/styles/data/iChat/yellow/From/CVS -@dirrm share/apps/kopete/styles/data/iChat/yellow/From -@dirrm share/apps/kopete/styles/data/iChat/yellow/CVS -@dirrm share/apps/kopete/styles/data/iChat/yellow -@dirrm share/apps/kopete/styles/data/iChat/purple/To/CVS -@dirrm share/apps/kopete/styles/data/iChat/purple/To -@dirrm share/apps/kopete/styles/data/iChat/purple/From/CVS -@dirrm share/apps/kopete/styles/data/iChat/purple/From -@dirrm share/apps/kopete/styles/data/iChat/purple/CVS -@dirrm share/apps/kopete/styles/data/iChat/purple -@dirrm share/apps/kopete/styles/data/iChat/pink/To/CVS -@dirrm share/apps/kopete/styles/data/iChat/pink/To -@dirrm share/apps/kopete/styles/data/iChat/pink/From/CVS -@dirrm share/apps/kopete/styles/data/iChat/pink/From -@dirrm share/apps/kopete/styles/data/iChat/pink/CVS -@dirrm share/apps/kopete/styles/data/iChat/pink -@dirrm share/apps/kopete/styles/data/iChat/orange/To/CVS -@dirrm share/apps/kopete/styles/data/iChat/orange/To -@dirrm share/apps/kopete/styles/data/iChat/orange/From/CVS -@dirrm share/apps/kopete/styles/data/iChat/orange/From -@dirrm share/apps/kopete/styles/data/iChat/orange/CVS -@dirrm share/apps/kopete/styles/data/iChat/orange -@dirrm share/apps/kopete/styles/data/iChat/green/To/CVS -@dirrm share/apps/kopete/styles/data/iChat/green/To -@dirrm share/apps/kopete/styles/data/iChat/green/From/CVS -@dirrm share/apps/kopete/styles/data/iChat/green/From -@dirrm share/apps/kopete/styles/data/iChat/green/CVS -@dirrm share/apps/kopete/styles/data/iChat/green -@dirrm share/apps/kopete/styles/data/iChat/graphite/To/CVS -@dirrm share/apps/kopete/styles/data/iChat/graphite/To -@dirrm share/apps/kopete/styles/data/iChat/graphite/From/CVS -@dirrm share/apps/kopete/styles/data/iChat/graphite/From -@dirrm share/apps/kopete/styles/data/iChat/graphite/CVS -@dirrm share/apps/kopete/styles/data/iChat/graphite -@dirrm share/apps/kopete/styles/data/iChat/clear/To/CVS -@dirrm share/apps/kopete/styles/data/iChat/clear/To -@dirrm share/apps/kopete/styles/data/iChat/clear/From/CVS -@dirrm share/apps/kopete/styles/data/iChat/clear/From -@dirrm share/apps/kopete/styles/data/iChat/clear/CVS -@dirrm share/apps/kopete/styles/data/iChat/clear -@dirrm share/apps/kopete/styles/data/iChat/blue/To/CVS -@dirrm share/apps/kopete/styles/data/iChat/blue/To -@dirrm share/apps/kopete/styles/data/iChat/blue/From/CVS -@dirrm share/apps/kopete/styles/data/iChat/blue/From -@dirrm share/apps/kopete/styles/data/iChat/blue/CVS -@dirrm share/apps/kopete/styles/data/iChat/blue -@dirrm share/apps/kopete/styles/data/iChat/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/To/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/From/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/To/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/From/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/To/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/From/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/To/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/From/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/To/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/From/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/green -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/To/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/From/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/To/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/From/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/To/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/From/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue -@dirrm share/apps/kopete/styles/data/iChat-Trans/CVS -@dirrm share/apps/kopete/styles/data/iChat-Trans -@dirrm share/apps/kopete/styles/data/iChat -@dirrm share/apps/kopete/styles/data -@dirrm share/apps/kopete/styles -@dirrm share/apps/kopete/pics/emoticons/tweakers.net -@dirrm share/apps/kopete/pics/emoticons/phpBB -@dirrm share/apps/kopete/pics/emoticons/greggman.com -@dirrm share/apps/kopete/pics/emoticons/ccmathteam.com -@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-22 -@dirrm share/apps/kopete/pics/emoticons/Yazoo-Smileys-16 -@dirrm share/apps/kopete/pics/emoticons/RedOnes -@dirrm share/apps/kopete/pics/emoticons/Plain -@dirrm share/apps/kopete/pics/emoticons/KMess-Violet -@dirrm share/apps/kopete/pics/emoticons/KMess-Cartoon -@dirrm share/apps/kopete/pics/emoticons/KMess-Blue -@dirrm share/apps/kopete/pics/emoticons/KMess -@dirrm share/apps/kopete/pics/emoticons/Default -@dirrm share/apps/kopete/pics/emoticons/Boxed -@dirrm share/apps/kopete/pics/emoticons -@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/64x64/apps -@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/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/sounds -@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 diff --git a/net/libnet10/Makefile b/net/libnet10/Makefile deleted file mode 100644 index 1e2c60b510bb..000000000000 --- a/net/libnet10/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# Ports collection makefile for: libnet -# Date created: Sun Feb 3, 1999 -# Whom: shipley@dis.org -# -# $FreeBSD$ -# - -PORTNAME= libnet -PORTVERSION= 1.0.2a -PORTEPOCH= 1 -CATEGORIES= net -MASTER_SITES= http://www.packetfactory.net/libnet/dist/ - -MAINTAINER= shipley@dis.org -COMMENT= A C library for creating IP packets - -CONFLICTS= libnet-devel-1.1.* - -USE_AUTOCONF_VER= 213 - -WRKSRC= ${WRKDIR}/Libnet-${PORTVERSION} -MAN3= libnet.3 - -post-install: - ${INSTALL_MAN} ${WRKSRC}/doc/libnet.3 ${PREFIX}/man/man3 -.if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/libnet - @${MKDIR} ${PREFIX}/share/doc/libnet/examples - @${MKDIR} ${PREFIX}/share/doc/libnet/ancillary -.for i in CHANGELOG CHANGELOG-NEWFUNCTIONS COPYING README TODO-1.0 TODO-1.1 - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/libnet -.endfor -.for i in README.asn.1 README.bpf README.legacy-applications README.libnet-config README.linux README.rawsockets - ${INSTALL_DATA} ${WRKSRC}/doc/Ancillary/${i} ${PREFIX}/share/doc/libnet/ancillary -.endfor -.for i in libnet-example-1.c libnet-example-2.c libnet-example-3.c libnet-example-4.c - ${INSTALL_DATA} ${WRKSRC}/example/${i} ${PREFIX}/share/doc/libnet/examples -.endfor -.endif - -.include <bsd.port.mk> diff --git a/net/libnet10/distinfo b/net/libnet10/distinfo deleted file mode 100644 index 9b65812d77a9..000000000000 --- a/net/libnet10/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (libnet-1.0.2a.tar.gz) = ddf53f0f484184390e8c2a1bd0853667 -SIZE (libnet-1.0.2a.tar.gz) = 140191 diff --git a/net/libnet10/files/patch-aa b/net/libnet10/files/patch-aa deleted file mode 100644 index 57137897cbc7..000000000000 --- a/net/libnet10/files/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.in.orig Wed Jan 17 12:59:30 2001 -+++ configure.in Mon Jul 2 19:18:50 2001 -@@ -50,10 +50,10 @@ - dnl Use these compiler flags if we have gcc. - dnl - if test $ac_cv_prog_gcc = yes; then --dnl if test -z $CFLAGS; then -- CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall' -- CFLAGS="$CCOPTS" --dnl fi -+ if test -z "$CFLAGS"; then -+ CCOPTS='-O2 -funroll-loops -fomit-frame-pointer -Wall' -+ CFLAGS="$CCOPTS" -+ fi - fi - - dnl -@@ -163,8 +163,9 @@ - LIB_PREFIX="$prefix/lib/aout" - INC_PREFIX="$prefix/include/" - BIN_PREFIX="$prefix/bin/" -- AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \ --required to spoof ethernet frames) -+dnl etherspoof lkm is horrible and only necesary on < RELENG_4 -+dnl AC_MSG_RESULT(Note: support/bpf-lkm/etherspoof contains the lkm source \ -+dnl required to spoof ethernet frames) - ln -sf FreeBSD support/bpf-lkm/etherspoof - ;; - diff --git a/net/libnet10/files/patch-ab b/net/libnet10/files/patch-ab deleted file mode 100644 index 9106f9921b2a..000000000000 --- a/net/libnet10/files/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig Mon Feb 5 09:51:41 2001 -+++ Makefile.in Mon Jul 2 19:41:27 2001 -@@ -96,7 +96,7 @@ - $(ENSUREDIR) $(DESTDIR)$(LIB_PREFIX) 755 - $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX)$(LIBNET) 755 - $(ENSUREDIR) $(DESTDIR)$(INC_PREFIX) 755 -- $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755 -+# $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755 - $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755 - $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX) - rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a -@@ -108,7 +108,7 @@ - $(INSTALL_DATA) $(INCLUDE-M) $(DESTDIR)$(INC_PREFIX)$(LIBNET) - $(INSTALL_DATA) $(INCLUDE-A) $(DESTDIR)$(INC_PREFIX)$(LIBNET) - $(INSTALL_DATA) $(INCLUDE-O) $(DESTDIR)$(INC_PREFIX)$(LIBNET) -- $(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX) -+# $(INSTALL_DATA) $(MAN) $(DESTDIR)$(MAN_PREFIX) - $(INSTALL_DATA) $(CONFIG) $(DESTDIR)$(BIN_PREFIX) - - diff --git a/net/libnet10/files/patch-ac b/net/libnet10/files/patch-ac deleted file mode 100644 index f46b75aa79ca..000000000000 --- a/net/libnet10/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- include/libnet/libnet-functions.h.orig Fri Jun 7 00:31:29 2002 -+++ include/libnet/libnet-functions.h Fri Jun 7 00:31:41 2002 -@@ -74,7 +74,7 @@ - int, /* severity */ - char *, /* error message */ - ... /* varargs */ -- ); -+ ) __printflike(2, 3); - - - /* diff --git a/net/libnet10/files/patch-include::libnet.h b/net/libnet10/files/patch-include::libnet.h deleted file mode 100644 index e33a86fa3ecc..000000000000 --- a/net/libnet10/files/patch-include::libnet.h +++ /dev/null @@ -1,15 +0,0 @@ ---- include/libnet.h.orig Fri Jul 18 15:11:05 2003 -+++ include/libnet.h Fri Jul 18 15:12:16 2003 -@@ -84,9 +84,9 @@ - #define LIBNET_VERSION "1.0.2a" - - #if (!LIBNET_LIL_ENDIAN && !LIBNET_BIG_ENDIAN) --#error "byte order has not been specified, you'll --need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the --documentation regarding the libnet-config script." -+#error "byte order has not been specified, you'll" -+"need to #define either LIBNET_LIL_ENDIAN or LIBNET_BIG_ENDIAN. See the" -+"documentation regarding the libnet-config script." - #endif - - #endif /* __LIBNET_H */ diff --git a/net/libnet10/pkg-descr b/net/libnet10/pkg-descr deleted file mode 100644 index 8d5811f3c0fe..000000000000 --- a/net/libnet10/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -Libnet A C library for portable packet creation - -domains of sockets and protocols. - -A C library for portable packet creation - -Included are also simple example test programs - -Libnet is a collection of routines to help with the construction -and handling of network packets. It provides a portable framework -for low-level network packet writing and handling. - -Libnet features portable packet creation interfaces at the IP layer -and link layer, as well as a host of supplementary and complementary -functionality. - -WWW: http://www.packetfactory.net/projects/libnet/ diff --git a/net/libnet10/pkg-plist b/net/libnet10/pkg-plist deleted file mode 100644 index 212baac7b536..000000000000 --- a/net/libnet10/pkg-plist +++ /dev/null @@ -1,30 +0,0 @@ -bin/libnet-config -include/libnet.h -include/libnet/libnet-asn1.h -include/libnet/libnet-functions.h -include/libnet/libnet-headers.h -include/libnet/libnet-macros.h -include/libnet/libnet-ospf.h -include/libnet/libnet-structures.h -lib/libnet.a -lib/libpwrite.a -share/doc/libnet/CHANGELOG -share/doc/libnet/CHANGELOG-NEWFUNCTIONS -share/doc/libnet/COPYING -share/doc/libnet/README -share/doc/libnet/TODO-1.0 -share/doc/libnet/TODO-1.1 -share/doc/libnet/examples/libnet-example-1.c -share/doc/libnet/examples/libnet-example-2.c -share/doc/libnet/examples/libnet-example-3.c -share/doc/libnet/examples/libnet-example-4.c -share/doc/libnet/ancillary/README.asn.1 -share/doc/libnet/ancillary/README.bpf -share/doc/libnet/ancillary/README.legacy-applications -share/doc/libnet/ancillary/README.libnet-config -share/doc/libnet/ancillary/README.linux -share/doc/libnet/ancillary/README.rawsockets -@dirrm share/doc/libnet/ancillary -@dirrm share/doc/libnet/examples -@dirrm share/doc/libnet -@dirrm include/libnet diff --git a/net/linneighborhood/Makefile b/net/linneighborhood/Makefile deleted file mode 100644 index a8e09b242318..000000000000 --- a/net/linneighborhood/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: LinNeighborhood -# Date created: 2003/04/06 -# Whom: Heiner <h.eichmann@gmx.de> -# -# $FreeBSD$ -# - -PORTNAME= LinNeighborhood -PORTVERSION= 0.6.5 -PORTREVISION= 5 -CATEGORIES= sysutils -MASTER_SITES= http://www.bnro.de/~schmidjo/download/ - -MAINTAINER= barner@gmx.de -COMMENT= GTK+ gui for browsing and mounting SMB filesystems - -RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba - -GNU_CONFIGURE= yes -USE_GMAKE= yes -USE_GNOME= gtk12 -USE_REINPLACE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"\ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"\ - CC="${CC} -I${LOCALBASE}/include" -# ^ -# this was done intentionaly in order to make `configure' pick up libintl.h - -.include <bsd.port.pre.mk> - -post-patch: - ${CP} ${FILESDIR}/mntent* ${WRKSRC}/src - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure - -post-install: - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/net/linneighborhood/distinfo b/net/linneighborhood/distinfo deleted file mode 100644 index 9c04b9486722..000000000000 --- a/net/linneighborhood/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (LinNeighborhood-0.6.5.tar.gz) = 5e50c9cef403164aca22be9ade0a7dbf -SIZE (LinNeighborhood-0.6.5.tar.gz) = 399003 diff --git a/net/linneighborhood/files/mntent.h b/net/linneighborhood/files/mntent.h deleted file mode 100644 index 1e37778b2178..000000000000 --- a/net/linneighborhood/files/mntent.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifdef HAVE_MNTENT_H -#include <mntent.h> -#else - -#ifndef mntent_h_ -#define mntent_h_ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/param.h> -#include <sys/ucred.h> -#include <sys/mount.h> - -#define MOUNTED "mounted" -#define MNTTYPE_NFS "nfs" - -//#define MOPTSLEN (256 - (MNAMELEN * 2 + MFSNAMELEN + 2 * sizeof(int))) - -struct mntent { - char *mnt_fsname; /* file system name */ - char *mnt_dir; /* file system path prefix */ - char *mnt_type; /* dbg, efs, nfs */ - char *mnt_opts; /* ro, hide, etc. */ - int mnt_freq; /* dump frequency, in days */ - int mnt_passno; /* pass number on parallel fsck */ -}; - -FILE * setmntent(char * filep, char * type); -struct mntent *getmntent(FILE * filep); -//char * hasmntopt(struct mntent * mnt, char * opt); -int endmntent(FILE * filep); - -#endif /* mntent_h_ */ -#endif /* not HAVE_MNTENT_H */ diff --git a/net/linneighborhood/files/mntent_compat.c b/net/linneighborhood/files/mntent_compat.c deleted file mode 100644 index 9112983e61e6..000000000000 --- a/net/linneighborhood/files/mntent_compat.c +++ /dev/null @@ -1,88 +0,0 @@ -#include "mntent.h" -#include <sys/param.h> -//#include <sys/ucred.h> -#include <sys/mount.h> -#include <fstab.h> - -struct statfs *getmntent_mntbufp; -int getmntent_mntcount = 0; -int getmntent_mntpos = 0; -char mntent_global_opts[256]; -struct mntent mntent_global_mntent; - -FILE * setmntent(char * filep, char * type) -{ - getmntent_mntpos = 0; - getmntent_mntcount = getmntinfo(&getmntent_mntbufp, MNT_WAIT); - return (FILE *)1; // dummy -} - -void getmntent_addopt(char ** c, const char * s) -{ - int i = strlen(s); - *(*c)++ = ','; - strcpy(*c, s); - *c += i; -} - -struct mntent *getmntent(FILE * filep) -{ - char *c = mntent_global_opts+2; - struct fstab *fst; - if (getmntent_mntpos >= getmntent_mntcount) - return 0; - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_RDONLY) strcpy(mntent_global_opts, "ro"); - else strcpy(mntent_global_opts, "rw"); - - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_SYNCHRONOUS) getmntent_addopt(&c, "sync"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOEXEC) getmntent_addopt(&c, "noexec"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOSUID) getmntent_addopt(&c, "nosuid"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NODEV) getmntent_addopt(&c, "nodev"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_UNION) getmntent_addopt(&c, "union"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_ASYNC) getmntent_addopt(&c, "async"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOATIME) getmntent_addopt(&c, "noatime"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOCLUSTERR) getmntent_addopt(&c, "noclusterr"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOCLUSTERW) getmntent_addopt(&c, "noclusterw"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_NOSYMFOLLOW) getmntent_addopt(&c, "nosymfollow"); - if (getmntent_mntbufp[getmntent_mntpos].f_flags & MNT_SUIDDIR) getmntent_addopt(&c, "suiddir"); - - mntent_global_mntent.mnt_fsname = getmntent_mntbufp[getmntent_mntpos].f_mntfromname; - mntent_global_mntent.mnt_dir = getmntent_mntbufp[getmntent_mntpos].f_mntonname; - mntent_global_mntent.mnt_type = getmntent_mntbufp[getmntent_mntpos].f_fstypename; - mntent_global_mntent.mnt_opts = mntent_global_opts; - if ((fst = getfsspec(getmntent_mntbufp[getmntent_mntpos].f_mntfromname))) - { - mntent_global_mntent.mnt_freq = fst->fs_freq; - mntent_global_mntent.mnt_passno = fst->fs_passno; - } - else if ((fst = getfsfile(getmntent_mntbufp[getmntent_mntpos].f_mntonname))) - { - mntent_global_mntent.mnt_freq = fst->fs_freq; - mntent_global_mntent.mnt_passno = fst->fs_passno; - } - else if (strcmp(getmntent_mntbufp[getmntent_mntpos].f_fstypename, "ufs") == 0) - { - if (strcmp(getmntent_mntbufp[getmntent_mntpos].f_mntonname, "/") == 0) - { - mntent_global_mntent.mnt_freq = 1; - mntent_global_mntent.mnt_passno = 1; - } - else - { - mntent_global_mntent.mnt_freq = 2; - mntent_global_mntent.mnt_passno = 2; - } - } - else - { - mntent_global_mntent.mnt_freq = 0; - mntent_global_mntent.mnt_passno = 0; - } - ++getmntent_mntpos; - return & mntent_global_mntent; -} - -int endmntent(FILE * filep) -{ - return 0; -} diff --git a/net/linneighborhood/files/patch-Makefile.in b/net/linneighborhood/files/patch-Makefile.in deleted file mode 100644 index fc87984de367..000000000000 --- a/net/linneighborhood/files/patch-Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- src/Makefile.in.orig Sun Jun 9 09:58:47 2002 -+++ src/Makefile.in Thu Feb 13 09:05:55 2003 -@@ -88,14 +88,14 @@ - localedir = @localedir@ - - bin_PROGRAMS = LinNeighborhood --LinNeighborhood_SOURCES = browsewrap.c data.c filesystem.c gtk_dialog.c gtk_gui.c gtk_mountdlg.c gtk_sharewindow.c gtk_tree.c guiwrap.c io.c libsmb.c lmhosts.c main.c preferences.c smbbrowse.c smbmount.c utility.c -+LinNeighborhood_SOURCES = browsewrap.c data.c filesystem.c gtk_dialog.c gtk_gui.c gtk_mountdlg.c gtk_sharewindow.c gtk_tree.c guiwrap.c io.c libsmb.c lmhosts.c main.c preferences.c smbbrowse.c smbmount.c utility.c mntent_compat.c - --noinst_HEADERS = browsewrap.h data.h define.h filesystem.h gtk_dialog.h gtk_gui.h gtk_mountdlg.h gtk_sharewindow.h gtk_tree.h guiwrap.h io.h libsmb.h preferences.h samba.h smbif.h utility.h -+noinst_HEADERS = browsewrap.h data.h define.h filesystem.h gtk_dialog.h gtk_gui.h gtk_mountdlg.h gtk_sharewindow.h gtk_tree.h guiwrap.h io.h libsmb.h preferences.h samba.h smbif.h utility.h mntent.h - - - LinNeighborhood_LDADD = @GTK_LIBS@ - INCLUDES = @GTK_CFLAGS@ -DLIBDIR=\"$(libdir)\" -DDATADIR=\"$(datadir)\" --LIBS = @GTK_LIBS@ -lpthread -+LIBS = @GTK_LIBS@ -lutil - - EXTRA_DIST = picture - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -110,7 +110,7 @@ - LinNeighborhood_OBJECTS = browsewrap.o data.o filesystem.o gtk_dialog.o \ - gtk_gui.o gtk_mountdlg.o gtk_sharewindow.o gtk_tree.o guiwrap.o io.o \ - libsmb.o lmhosts.o main.o preferences.o smbbrowse.o smbmount.o \ --utility.o -+utility.o mntent_compat.o - LinNeighborhood_DEPENDENCIES = - LinNeighborhood_LDFLAGS = - CFLAGS = @CFLAGS@ diff --git a/net/linneighborhood/files/patch-data.c b/net/linneighborhood/files/patch-data.c deleted file mode 100644 index 7138363dbe20..000000000000 --- a/net/linneighborhood/files/patch-data.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/data.c.orig Thu Apr 10 21:59:12 2003 -+++ src/data.c Thu Apr 10 22:45:59 2003 -@@ -171,6 +171,9 @@ - { - if ( mount ) - { -+ char *c = strchr(mount->machine, '@'); // remove user name from smb name -+ if (c) -+ memmove(mount->machine, c+1, strlen(c)+1); - if ( mount_list_search_by_mountpoint(mount->mountpoint) == NULL ) - { - mountlist = g_slist_append(mountlist, mount); diff --git a/net/linneighborhood/files/patch-gtk_dialog.c b/net/linneighborhood/files/patch-gtk_dialog.c deleted file mode 100644 index 357795ad7b26..000000000000 --- a/net/linneighborhood/files/patch-gtk_dialog.c +++ /dev/null @@ -1,55 +0,0 @@ ---- src/gtk_dialog.c.orig Sun Apr 6 13:07:13 2003 -+++ src/gtk_dialog.c Sun Apr 6 13:10:50 2003 -@@ -2039,34 +2039,34 @@ - gtk_widget_show(button); - - frame = gtk_frame_new(_(" smbmount version ")); -- gtk_container_border_width(GTK_CONTAINER(frame), 3); -- gtk_box_pack_start(GTK_BOX(frame_vbox), frame, FALSE, TRUE, 0); -- gtk_widget_show(frame); -+// gtk_container_border_width(GTK_CONTAINER(frame), 3); -+// gtk_box_pack_start(GTK_BOX(frame_vbox), frame, FALSE, TRUE, 0); -+// gtk_widget_show(frame); - - frame_vbox = gtk_vbox_new(FALSE, 0); -- gtk_container_border_width(GTK_CONTAINER(frame_vbox), 5); -- gtk_container_add(GTK_CONTAINER(frame), frame_vbox); -- gtk_widget_show(frame_vbox); -+// gtk_container_border_width(GTK_CONTAINER(frame_vbox), 5); -+// gtk_container_add(GTK_CONTAINER(frame), frame_vbox); -+// gtk_widget_show(frame_vbox); - - smbmount_204_radio = gtk_radio_button_new_with_label(NULL, _("version <= 2.0.4")); -- if ( globals.linux_version < LINUX_2_2 ) -- gtk_widget_set_sensitive(smbmount_204_radio, FALSE); -- gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_204_radio, FALSE, TRUE, 0); -- gtk_widget_show(smbmount_204_radio); -+// if ( globals.linux_version < LINUX_2_2 ) -+// gtk_widget_set_sensitive(smbmount_204_radio, FALSE); -+// gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_204_radio, FALSE, TRUE, 0); -+// gtk_widget_show(smbmount_204_radio); - - smbmount_205_radio = gtk_radio_button_new_with_label( - gtk_radio_button_group(GTK_RADIO_BUTTON(smbmount_204_radio)), _("version = 2.0.5")); -- if ( globals.linux_version < LINUX_2_2 ) -- gtk_widget_set_sensitive(smbmount_205_radio, FALSE); -- gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_205_radio, FALSE, TRUE, 0); -- gtk_widget_show(smbmount_205_radio); -+// if ( globals.linux_version < LINUX_2_2 ) -+// gtk_widget_set_sensitive(smbmount_205_radio, FALSE); -+// gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_205_radio, FALSE, TRUE, 0); -+// gtk_widget_show(smbmount_205_radio); - - smbmount_206_radio = gtk_radio_button_new_with_label( - gtk_radio_button_group(GTK_RADIO_BUTTON(smbmount_205_radio)), _("version >= 2.0.6")); -- if ( globals.linux_version < LINUX_2_2 ) -- gtk_widget_set_sensitive(smbmount_206_radio, FALSE); -- gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_206_radio, FALSE, TRUE, 0); -- gtk_widget_show(smbmount_206_radio); -+// if ( globals.linux_version < LINUX_2_2 ) -+// gtk_widget_set_sensitive(smbmount_206_radio, FALSE); -+// gtk_box_pack_start(GTK_BOX(frame_vbox), smbmount_206_radio, FALSE, TRUE, 0); -+// gtk_widget_show(smbmount_206_radio); - - switch ( pref.v.smbmount_version ) - { diff --git a/net/linneighborhood/files/patch-gtk_mountdlg.c b/net/linneighborhood/files/patch-gtk_mountdlg.c deleted file mode 100644 index 39a88713af63..000000000000 --- a/net/linneighborhood/files/patch-gtk_mountdlg.c +++ /dev/null @@ -1,103 +0,0 @@ ---- src/gtk_mountdlg.c.orig Wed Apr 9 19:51:41 2003 -+++ src/gtk_mountdlg.c Wed Apr 9 20:18:14 2003 -@@ -726,65 +726,65 @@ - - /*root password */ - frame = gtk_frame_new(_("Mount as Root")); -- gtk_box_pack_start(GTK_BOX (GTK_DIALOG (mount_dlg)->vbox), frame, TRUE, TRUE, 5); -- gtk_widget_show(frame); -+// gtk_box_pack_start(GTK_BOX (GTK_DIALOG (mount_dlg)->vbox), frame, TRUE, TRUE, 5); -+// gtk_widget_show(frame); - - vbox=gtk_vbox_new(FALSE,0); -- gtk_container_border_width(GTK_CONTAINER(vbox), 3); -- gtk_container_add(GTK_CONTAINER(frame),vbox); -- gtk_widget_show(vbox); -+// gtk_container_border_width(GTK_CONTAINER(vbox), 3); -+// gtk_container_add(GTK_CONTAINER(frame),vbox); -+// gtk_widget_show(vbox); - - hbox=gtk_hbox_new(FALSE,0); - /* gtk_box_pack_start(GTK_BOX (GTK_DIALOG (mount_dlg)->vbox), - hbox, TRUE, TRUE, 5); - gtk_container_border_width(GTK_CONTAINER(hbox), 3); - gtk_container_add(GTK_CONTAINER(frame),hbox); */ -- gtk_box_pack_start(GTK_BOX (vbox),hbox, TRUE, TRUE, 0); -- gtk_widget_show(hbox); -+// gtk_box_pack_start(GTK_BOX (vbox),hbox, TRUE, TRUE, 0); -+// gtk_widget_show(hbox); - - sumountcheckbox = gtk_check_button_new_with_label(_("OK")); - /* gtk_widget_set_usize(sumountcheckbox,120,-1); */ -- if (geteuid()==0) /*No root password if you are root*/ -- gtk_widget_set_sensitive(sumountcheckbox,FALSE); -- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sumountcheckbox),cachesupwd & sumount); -- gtk_box_pack_start (GTK_BOX (hbox), sumountcheckbox, FALSE, TRUE, 0); -- gtk_widget_show (sumountcheckbox); -+// if (geteuid()==0) /*No root password if you are root*/ -+// gtk_widget_set_sensitive(sumountcheckbox,FALSE); -+// gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sumountcheckbox),cachesupwd & sumount); -+// gtk_box_pack_start (GTK_BOX (hbox), sumountcheckbox, FALSE, TRUE, 0); -+// gtk_widget_show (sumountcheckbox); - - label=gtk_label_new(_("Password:")); -- gtk_box_pack_start(GTK_BOX (hbox),label, FALSE, TRUE, 0); -+// gtk_box_pack_start(GTK_BOX (hbox),label, FALSE, TRUE, 0); - /* gtk_widget_set_usize(label,100,-1); */ -- gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_LEFT); -- gtk_widget_show(label); -+// gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_LEFT); -+// gtk_widget_show(label); - - supasswdentry= gtk_entry_new_with_max_length(MASTER_LEN); -- gtk_entry_set_visibility(GTK_ENTRY(supasswdentry), 0); -+// gtk_entry_set_visibility(GTK_ENTRY(supasswdentry), 0); - -- if (sumount && cachesupwd) -- gtk_entry_set_text (GTK_ENTRY (supasswdentry), supasswd); -- else -- gtk_entry_set_text (GTK_ENTRY (supasswdentry), ""); -+// if (sumount && cachesupwd) -+// gtk_entry_set_text (GTK_ENTRY (supasswdentry), supasswd); -+// else -+// gtk_entry_set_text (GTK_ENTRY (supasswdentry), ""); - -- gtk_widget_set_sensitive(supasswdentry,sumount&cachesupwd); -- gtk_signal_connect_object(GTK_OBJECT(supasswdentry), "key_press_event", -- GTK_SIGNAL_FUNC(smb_mount_key_press_callback), NULL); -- gtk_box_pack_start (GTK_BOX (hbox), supasswdentry, TRUE, TRUE, 5); -- gtk_widget_show (supasswdentry); -- gtk_signal_connect (GTK_OBJECT(sumountcheckbox), "toggled", -- GTK_SIGNAL_FUNC(supwentry_toggle_sensitive),supasswdentry); -+// gtk_widget_set_sensitive(supasswdentry,sumount&cachesupwd); -+// gtk_signal_connect_object(GTK_OBJECT(supasswdentry), "key_press_event", -+// GTK_SIGNAL_FUNC(smb_mount_key_press_callback), NULL); -+// gtk_box_pack_start (GTK_BOX (hbox), supasswdentry, TRUE, TRUE, 5); -+// gtk_widget_show (supasswdentry); -+// gtk_signal_connect (GTK_OBJECT(sumountcheckbox), "toggled", -+// GTK_SIGNAL_FUNC(supwentry_toggle_sensitive),supasswdentry); - - hbox=gtk_hbox_new(FALSE,0); -- gtk_box_pack_start(GTK_BOX (vbox),hbox, TRUE, TRUE, 0); -- gtk_widget_show(hbox); -+// gtk_box_pack_start(GTK_BOX (vbox),hbox, TRUE, TRUE, 0); -+// gtk_widget_show(hbox); - - sucachepwdcheckbox = gtk_check_button_new_with_label(_("Cache Root Password")); - - /* gtk_widget_set_usize(sumountcheckbox,120,-1); */ -- if (geteuid()==0) -- gtk_widget_set_sensitive(sumountcheckbox,FALSE); -- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sucachepwdcheckbox),cachesupwd &sumount); -- gtk_widget_set_sensitive(sucachepwdcheckbox,sumount); -- gtk_box_pack_start (GTK_BOX (hbox), sucachepwdcheckbox, FALSE, TRUE, 0); -- gtk_widget_show (sucachepwdcheckbox); -+// if (geteuid()==0) -+// gtk_widget_set_sensitive(sumountcheckbox,FALSE); -+// gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sucachepwdcheckbox),cachesupwd &sumount); -+// gtk_widget_set_sensitive(sucachepwdcheckbox,sumount); -+// gtk_box_pack_start (GTK_BOX (hbox), sucachepwdcheckbox, FALSE, TRUE, 0); -+// gtk_widget_show (sucachepwdcheckbox); - - /*-action_area*/ - mount_button = gtk_button_new_with_label(_("Mount")); diff --git a/net/linneighborhood/files/patch-gtk_tree.c b/net/linneighborhood/files/patch-gtk_tree.c deleted file mode 100644 index f0f78a24942c..000000000000 --- a/net/linneighborhood/files/patch-gtk_tree.c +++ /dev/null @@ -1,19 +0,0 @@ ---- src/gtk_tree.c.orig Wed Apr 9 20:32:53 2003 -+++ src/gtk_tree.c Wed Apr 9 20:48:24 2003 -@@ -2011,7 +2011,7 @@ - if ( GTK_IS_TREE_ITEM(item) ) - { - box = GTK_BIN(item)->child; -- -+ if (!box) return itemtype; - step_list = GTK_BOX(box)->children->next; /* type entry */ - child = step_list->data; - label = GTK_LABEL(child->widget); -@@ -2033,7 +2033,6 @@ - static unsigned int tree_item_count (GtkTreeItem *item) - { - unsigned int ireturn; -- - if ( item != NULL ) - { - if ( item->subtree ) diff --git a/net/linneighborhood/files/patch-io.c b/net/linneighborhood/files/patch-io.c deleted file mode 100644 index 6bc1993370ec..000000000000 --- a/net/linneighborhood/files/patch-io.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/io.c.orig Fri Apr 11 16:58:15 2003 -+++ src/io.c Fri Apr 11 17:03:11 2003 -@@ -130,12 +130,12 @@ - /* save only 'not root' mounts -> plain password */ - if ( (mount != NULL) && (mount->type != mem_mount_root) ) - { -- string_ncopy(str, pref.v.smbmount_exe, MAXMACHNAMEL+MAXSHRNAMEL+PATH_LEN+19); -+ *str = 0; - temp = str; -- temp += strlen(str); - merge_mount(&temp, mount, MAXMACHNAMEL+MAXSHRNAMEL+PATH_LEN+19 - strlen(str), 1); - string_ncat(str, "\n", MAXMACHNAMEL+MAXSHRNAMEL+PATH_LEN+19); -- fwrite(str, 1, strlen(str), fd); -+ if (*temp == ' ') ++temp; -+ fwrite(temp, 1, strlen(temp), fd); - } - } - } diff --git a/net/linneighborhood/files/patch-lmhosts.c b/net/linneighborhood/files/patch-lmhosts.c deleted file mode 100644 index 9fad8a3005b6..000000000000 --- a/net/linneighborhood/files/patch-lmhosts.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lmhosts.c.orig Thu Feb 13 08:48:40 2003 -+++ src/lmhosts.c Thu Feb 13 08:49:05 2003 -@@ -31,6 +31,7 @@ - #include <stdlib.h> - #include <string.h> - #include <ctype.h> -+#include <sys/types.h> - #include <netinet/in.h> - #include <sys/socket.h> - #include <arpa/inet.h> diff --git a/net/linneighborhood/files/patch-preferences.c b/net/linneighborhood/files/patch-preferences.c deleted file mode 100644 index 3addda166a3d..000000000000 --- a/net/linneighborhood/files/patch-preferences.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/preferences.c.orig Sun Jun 9 09:58:43 2002 -+++ src/preferences.c Sun Apr 6 13:03:32 2003 -@@ -29,6 +29,8 @@ - #include "data.h" - #include "utility.h" - #include "samba.h" -+#include <sys/types.h> -+#include <netinet/in.h> - - - #define LVERSION(major,minor,patch) (((((major)<<8)+(minor))<<8)+(patch)) -@@ -359,8 +361,8 @@ - strcpy(pref->v.filemanager_exe, "xterm -e mc $MOUNTPOINT"); - strcpy(pref->v.smbclient_exe, "smbclient"); - strcpy(pref->v.nmblookup_exe, "nmblookup"); -- strcpy(pref->v.smbmount_exe, "smbmount"); -- strcpy(pref->v.smbumount_exe, "smbumount"); -+ strcpy(pref->v.smbmount_exe, "mount_smbfs"); -+ strcpy(pref->v.smbumount_exe, "umount"); - pref->v.smbclient_arg[0] = 0; - pref->v.nmblookup_arg[0] = 0; - pref->v.smbmount_arg[0] = 0; diff --git a/net/linneighborhood/files/patch-smbbrowse.c b/net/linneighborhood/files/patch-smbbrowse.c deleted file mode 100644 index fd2f35d1fdfc..000000000000 --- a/net/linneighborhood/files/patch-smbbrowse.c +++ /dev/null @@ -1,78 +0,0 @@ ---- src/smbbrowse.c.orig Sun Jun 9 09:58:43 2002 -+++ src/smbbrowse.c Thu Apr 10 15:39:19 2003 -@@ -716,8 +716,8 @@ - browsedat->browse_state=search_head; - browsedat->lasttab=0; - if (*user==0){ -- strcpy(browsedat->userpasswdstr,"-U%"); -- strcpy(browsedat->userdummystr,"-U%"); -+ strcpy(browsedat->userpasswdstr,"-N"); -+ strcpy(browsedat->userdummystr,"-N"); - } - else - { -@@ -829,6 +829,12 @@ - dup2(browsedat->fd[1],STDOUT_FILENO); - - cArg[argcount++] = "nmblookup"; -+ cArg[argcount++] = "-S"; -+ cArg[argcount++] = "-d1"; -+ for ( loop = 0; loop < add_argcount; loop++ ) -+ { -+ cArg[argcount++] = cAddArg[loop]; -+ } - if ( *wins_name ) - { - cArg[argcount++] = "-U"; -@@ -841,12 +847,6 @@ - cArg[argcount++] = "-M"; - cArg[argcount++] = group_name; - } -- cArg[argcount++] = "-S"; -- cArg[argcount++] = "-d1"; -- for ( loop = 0; loop < add_argcount; loop++ ) -- { -- cArg[argcount++] = cAddArg[loop]; -- } - cArg[argcount++] = NULL; - - execvp(pref_get_nmblookup_exe(), cArg); -@@ -870,15 +870,16 @@ - } - else - { -- if (*wins_name) -- sprintf(logstr,"GetSMBGroups:%s -U %s -R %s -S -d1",pref_get_nmblookup_exe(),wins_name,group_type); -- else -- sprintf(logstr,"GetSMBGroups:%s -M %s -S -d1",pref_get_nmblookup_exe(),group_name); -+ sprintf(logstr,"GetSMBGroups:%s -S -d1",pref_get_nmblookup_exe()); - for ( loop = 0; loop < add_argcount; loop++ ) - { - string_ncat(logstr, " ", MAXLOGSTRLEN); - string_ncat(logstr, cAddArg[loop], MAXLOGSTRLEN); - } -+ if (*wins_name) -+ sprintf(logstr+strlen(logstr)," -U %s -R %s",wins_name,group_type); -+ else -+ sprintf(logstr+strlen(logstr)," -M %s",group_name); - gui_log_window_insert_string(logstr,1); - close(browsedat->fd[1]); - browsedat->group_master.group_name[MAXGROUPNAMEL]=0; -@@ -1028,7 +1029,7 @@ - } - browsedat=g_malloc(sizeof(HBROWSE_STRUCT)); - if (*user==0) -- strcpy(commandstr,"-U%"); -+ strcpy(commandstr,"-N"); - else - sprintf(commandstr,"-U%s%%%s",user,passwd); - -@@ -1274,7 +1275,7 @@ - } - - if (*user==0) -- strcpy(commandstr,"-U%"); -+ strcpy(commandstr,"-N"); - else - sprintf(commandstr,"-U%s%%%s",user,passwd); - argv[++argnr]="smbclient"; diff --git a/net/linneighborhood/files/patch-smbmount.c b/net/linneighborhood/files/patch-smbmount.c deleted file mode 100644 index 7d28983c406a..000000000000 --- a/net/linneighborhood/files/patch-smbmount.c +++ /dev/null @@ -1,483 +0,0 @@ ---- src/smbmount.c.orig Sun Jun 9 09:58:43 2002 -+++ src/smbmount.c Fri Apr 11 16:55:26 2003 -@@ -16,6 +16,9 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include <sys/param.h> -+#include <errno.h> -+#include <poll.h> - #include <string.h> - #include <stdio.h> - #include <stdlib.h> -@@ -70,6 +73,9 @@ - } UMOUNT_STRUCT; - static GSList *umountlist = NULL; - -+void split_arguments(char * arguments, char * argv[], int * argnr, GSList ** strlist); -+char * storeInBuffer(const char * s, GSList ** strlist); -+void execvp_with_password(const char * path, char * const argv[], const char * passwd, GSList * strlist); - - char suprompt[] = "Passw"; - -@@ -322,6 +328,7 @@ - int pipe2_nok,pipe3_nok=1; - int sumount,argnr=-1,passw_lf; - char commandstr[MAXMNTCOMMANDL],commandstr1[MAXMNTCOMMANDL]; -+ char num1[10], num2[10], num3[10], num4[10], tmp[MAXMNTCOMMANDL]; - char opt_group[MAXMNTCOMMANDL]; - char dummysmbpasswd[64]; - /*#ifdef LINUX2_0 */ -@@ -345,6 +352,7 @@ - sumount=(supasswd!=NULL); - passw_lf=(*smbpasswd==0) && !linux2_0; /*smbmount 2.0.3 always waits for password, - even if called with -Uuser% or -N if server is in user level security*/ -+ passw_lf=1; - if (sumount|| passw_lf) - if (pipe(fdstdin)) - { -@@ -418,96 +426,53 @@ - else - { - /* no sumount */ -- if(linux2_0) - { -- argv[++argnr]="smbmount"; -- argv[++argnr]=servicename; -- argv[++argnr]=mount_point; -- argv[++argnr]="-c"; -- argv[++argnr]=clientname; -- argv[++argnr]="-I"; -- argv[++argnr]=ipaddr; -- if (*group_name) -+ // bugfix: mount command might consist of more than one word (example: sudo mount_smbfs) -+ split_arguments(pref_get_smbmount_exe(), argv, &argnr, &strlist); - { -- argv[++argnr]="-D"; -- argv[++argnr]=group_name; -- } -- argv[++argnr]="-U"; -- argv[++argnr]=smbuser; -- argv[++argnr]="-f";sprintf(filemodestr,"%d",filemode); -- argv[++argnr]=filemodestr; -- argv[++argnr]="-d";sprintf(dirmodestr,"%d",dirmode); -- argv[++argnr]=dirmodestr; -- argv[++argnr]="-u";sprintf(uidstr,"%d",uid); -- argv[++argnr]=uidstr; -- argv[++argnr]="-g";sprintf(gidstr,"%d",gid); -- argv[++argnr]=gidstr; -- if (*smbpasswd==0) -- argv[++argnr]="-n"; -- else -- { -- argv[++argnr]="-P"; -- argv[++argnr]=smbpasswd; -- } -- argv[++argnr]=NULL; -- } -- else -- { -- /* linux 2.2/2.4 */ -- argv[++argnr]=pref_get_smbmount_exe(); -- argv[++argnr]=servicename; -- if (pref.v.smbmount_version>SMBMOUNT_204) argv[++argnr]=mount_point; -- if (pref.v.smbmount_version<SMBMOUNT_206) -- { -- /* 2.04/2.05 */ -+ sprintf(num1,"%d", filemode); -+ sprintf(num2,"%d", dirmode); -+ sprintf(num3,"%d", uid); -+ sprintf(num4,"%d", gid); -+ strcpy(commandstr1, "//"); -+ if (strlen(smbuser)) -+ { -+ strcat(commandstr1, smbuser); -+ strcat(commandstr1, "@"); -+ } -+ if (strlen(servicename) > 2) -+ strcat(commandstr1, servicename+2); -+ argv[++argnr]="-f"; -+ argv[++argnr]=num1; -+ argv[++argnr]="-d"; -+ argv[++argnr]=num2; -+ argv[++argnr]="-u"; -+ argv[++argnr]=num3; -+ argv[++argnr]="-g"; -+ argv[++argnr]=num4; - argv[++argnr]="-I"; -- argv[++argnr]=ipaddr; -+ strcpy(tmp, ipaddr); -+ argv[++argnr]=tmp; - if (*group_name) - { - argv[++argnr]="-W"; -- argv[++argnr]=group_name; -- } -- sprintf(userpasswd,"-U%s%%%s",smbuser,smbpasswd); -- argv[++argnr]=userpasswd; -- argv[++argnr]="-d0"; -- if (pref.v.smbmount_version <SMBMOUNT_205) -- { -- argv[++argnr]="-c"; -- argv[++argnr]=commandstr; -- sprintf(commandstr,"mount %s -f %d -d %d -u %d -g %d", -- /*escape_str_smbmnt(*/mount_point/*,&strlist)*/,filemode,dirmode,uid,gid); -- } -- if ( !is_empty_string(pref.v.smbmount_arg) ) -- { -- } -- } -- else /*>=SMBMOUNT_206*/ -- { -- argv[++argnr]="-o"; -- argv[++argnr]=commandstr; -- sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0", -- smbuser,smbpasswd,filemode,dirmode,uid,gid,ipaddr); -- if (*group_name) -- { -- strcat(commandstr,",workgroup="); -- strcat(commandstr,escape_str(group_name,&strlist)); -+ argv[++argnr]= escape_str(group_name,&strlist); - } - if ( (port >= 0) && (port < 65536) ) - { -- string_ncat(commandstr, ",port=", MAXMNTCOMMANDL); -- string_ncat(commandstr, port_str, MAXMNTCOMMANDL); -+ strcat(tmp, ":"); -+ strcat(tmp, port_str); - } - if ( !is_empty_string(pref.v.smbmount_arg) ) - { -- if ( pref.v.smbmount_arg[0] != ',' ) -- string_ncat(commandstr, ",", MAXMNTCOMMANDL); -- string_ncat(commandstr, escape_str(pref.v.smbmount_arg,&strlist), MAXMNTCOMMANDL); -+ split_arguments(pref.v.smbmount_arg, argv, &argnr, &strlist); - } - } -+ argv[++argnr]=commandstr1; -+ argv[++argnr]=mount_point; - argv[++argnr]=NULL; - } - } -- slist_free_with_data(&strlist); - mountdat=g_malloc(sizeof(MOUNT_STRUCT)); - if((pipe2_nok=pipe(fdstdout))|| (pipe3_nok=pipe(fdstderr))|| - (mountdat->childpid =fork())== -1) -@@ -521,7 +486,6 @@ - g_print(_("smbmount pipe,fork error\n")); - return; - } -- - if (!mountdat->childpid) - { - close(fdstdout[0]); -@@ -536,7 +500,7 @@ - if (sumount) - execvp("su",argv); - else -- execvp(pref_get_smbmount_exe(),argv); -+ execvp_with_password(argv[0], argv, smbpasswd, strlist); - write(STDERR_FILENO,notfound,sizeof(notfound)-1); - _exit(0); - } -@@ -547,9 +511,9 @@ - else - { - i=0; -- while(argv[i+1]) -+ while(argv[i]) - { -- mountdat->arglist[i]=g_strdup(argv[i+1]); -+ mountdat->arglist[i]=g_strdup(argv[i]); - i++; - } - mountdat->arglist[i]=NULL; -@@ -611,46 +575,9 @@ - } - else - { -- if(linux2_0) -- { -- if (*smbpasswd!=0) argv[argnr-1]=dummysmbpasswd; -- } -- else -- { -- if (pref.v.smbmount_version<SMBMOUNT_206) -- sprintf(userpasswd,"-U%s%%%s",smbuser,dummysmbpasswd); -- else -- { -- sprintf(commandstr,"username=%s%%%s,fmask=%d,dmask=%d,uid=%d,gid=%d,ip=%s,debug=0", -- smbuser,dummysmbpasswd,filemode,dirmode,uid,gid,ipaddr); -- if (*group_name){ -- strcat(commandstr,",workgroup="); -- strcat(commandstr,group_name); -- } -- if ( (port >= 0) && (port < 65536) ) -- { -- string_ncat(commandstr, ",port=", MAXMNTCOMMANDL); -- string_ncat(commandstr, port_str, MAXMNTCOMMANDL); -- } -- if ( !is_empty_string(pref.v.smbmount_arg) ) -- { -- if ( pref.v.smbmount_arg[0] != ',' ) -- string_ncat(commandstr, ",", MAXMNTCOMMANDL); -- string_ncat(commandstr, escape_str(pref.v.smbmount_arg,&strlist), MAXMNTCOMMANDL); -- } -- } -- if (passw_lf) -- { -- usleep(50000); -- close(fdstdin[0]); -- if (!waitpid(mountdat->childpid,NULL,WNOHANG)) -- write(fdstdin[1], "\n",1); -+ log_execvp_str(argv[0],argv); - close(fdstdin[1]); - } -- } -- -- log_execvp_str(pref_get_smbmount_exe(),argv); -- } - mountlist=g_slist_append(mountlist,mountdat); - mountdat->linepos=0; mountdat->linepos2=0; - mountdat->linenum=0; -@@ -901,17 +828,13 @@ - } - else - { -- argv[0]=smb ? "smbumount":"umount"; -- argv[1]=mount_point; -+ // bugfix: mount command might consist of more than one word (example: sudo mount_smbfs) -+ int argnr = -1; -+ split_arguments(pref_get_smbumount_exe(), argv, &argnr, &strlist); - if ( !is_empty_string(pref.v.smbumount_arg) ) -- { -- argv[2] = pref.v.smbumount_arg; -- argv[3] = NULL; -- } -- else -- { -- argv[2]=NULL; -- } -+ split_arguments(pref.v.smbumount_arg, argv, &argnr, &strlist); -+ argv[++argnr]=mount_point; -+ argv[++argnr] = NULL; - } - if((pipe2_nok=pipe(fdstdout))|| (pipe3_nok=pipe(fdstderr))|| - (childpid =fork())== -1) -@@ -938,7 +861,7 @@ - execvp("su",argv); - } - else -- execvp(smb ? pref_get_smbumount_exe():"umount",argv); -+ execvp_with_password(argv[0], argv, "", strlist); - write(STDERR_FILENO,notfound,sizeof(notfound)-1); - _exit(0); - } -@@ -958,7 +881,7 @@ - gui_log_window_insert_string("*",0); - } - else -- log_execvp_str(smb ? pref_get_smbumount_exe():"umount",argv); -+ log_execvp_str(argv[0], argv); - mountdat=g_malloc(sizeof(UMOUNT_STRUCT)); - umountlist=g_slist_append(umountlist,mountdat); - mountdat->childpid=childpid; -@@ -1015,6 +938,198 @@ - slist_free_with_data(&umountlist); - } - -+void split_arguments(char * arguments, char * argv[], int * argnr, GSList ** strlist) -+{ -+ char * c = argv[++*argnr] = storeInBuffer(arguments, strlist); -+ while(c = strchr(c, ' ')) -+ { -+ char *d = c+1; -+ while(*d && *d == ' ') -+ d++; -+ *c = 0; -+ c = d; -+ if (!*c) -+ break; -+ argv[++*argnr] = storeInBuffer(c, strlist); -+ } -+} -+ -+char * storeInBuffer(const char * s, GSList ** strlist) -+{ -+ int n; -+ char * ss; -+ -+ if (*s==0) return 0; -+ n = strlen(s); -+ ss=g_malloc(n+1); -+ strcpy(ss, s); -+ *strlist=g_slist_append(*strlist,ss); -+ return ss; -+} -+ -+ -+// this looks like a global variable. But each forked execvp_with_password -+// process has one copy of it. So it as a process local varible storing the -+// process ID of the forked child process, which actaully execs mount_smbfs -+int _childPid = 0; -+ -+// called, if the child proces is killed. Kills its child process as well -+void stopMountSignalHandler (int sig) -+{ -+ kill(_childPid, SIGINT); -+ waitpid(_childPid, 0, WUNTRACED); -+ _exit(0); -+} -+ -+// replaces execvp to call mount_smbfs. If mount smbfs asks for a password, it is provided. -+// This can not be sent to stdin, because BSD gets the password directly from the terminal. -+// Therfore another process with a pseudo terminal is created. -+void execvp_with_password(const char * path, char * const argv[], const char * passwd, GSList *strlist) -+{ -+ int master, i; -+ char terminal[MAXPATHLEN] = ""; -+ char * pw = NULL; -+ int slave; -+ char password[1024], result[1024]; -+ char * passwordText = "password:"; -+ int passwordTextLen = strlen(passwordText); -+ char * resp_pos = result; -+ int fdstderr[2]; -+ -+ // create a pipe to the child process for stderr. For stdout the pseudo terminal is used -+ if(pipe(fdstderr)) -+ { -+ fdstderr[0] = 0; -+ fdstderr[1] = 0; -+ } -+ -+ // create the child process and the pseudo terminal -+ _childPid = forkpty(&master, terminal, NULL, NULL); -+ -+ if (_childPid < 0) -+ { -+ if (errno == ENOENT) -+ printf("Error: Out of ptys\n"); -+ else -+ printf(result, "Error: Forkpty\n"); -+ _exit(1); -+ } -+ else if (_childPid == 0) -+ { -+ // prepare stderr pipe -+ if (fdstderr[0]) -+ { -+ close(fdstderr[0]); -+ dup2(fdstderr[1], STDERR_FILENO); -+ } -+ -+ // prepare the pseudo terminal -+ close(master); -+ slave = open(terminal, O_RDWR); -+ if (slave < 0) -+ { -+ printf("open() failed: %s", strerror(errno)); -+ kill(_childPid, SIGINT); -+ waitpid(_childPid, 0, WUNTRACED); -+ _exit(1); -+ } - -+ // launch application (mount_smbfs) -+ execvp(path, argv); -+ printf("error: %d (%s)\n", errno, strerror(errno)); -+ } -+ else -+ { -+ // prepare the stderr pipe -+ if (fdstderr[1]) -+ close(fdstderr[1]); - -+ // install the SIGIN (ctrl-c) handler -+ if (signal(SIGINT, stopMountSignalHandler) == SIG_ERR) -+ printf("error: can not install SIGINT handler\n"); -+ errno = 0; -+ *resp_pos = 0; -+ -+ // main loop: wait for childs response -+ while (!errno) -+ { -+ // prepare a poll, wich waits for output from the pseudo terminal and from stderr -+ int pollnum = 1; -+ struct pollfd polldat[2]; -+ polldat[0].fd = master; -+ polldat[0].events = POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI; -+ if (fdstderr[0]) -+ { -+ pollnum = 2; -+ polldat[1].fd = fdstderr[0]; -+ polldat[1].events = POLLIN | POLLRDNORM | POLLRDBAND | POLLPRI; -+ } -+ -+ // sleep until the child terminates or sends something -+ if (poll(polldat, pollnum, 1000) < 0) -+ break; - -+ // response from childs stderr? -+ if (pollnum == 2 && polldat[1].revents) -+ { -+ // read response and send it to this process' stderr. It is connected -+ // with another pipe with the main process! -+ char s[1024]; -+ int i = read(fdstderr[0], s, 1024); -+ if (errno) -+ break; -+ if (i > 0) -+ { -+ s[i] = 0; -+ write(STDERR_FILENO, s, i); -+ } -+ } -+ -+ // response from childs stdout? -+ if (polldat[0].revents) -+ { -+ // read response and send it to this process' stdout. It is connected -+ // with another pipe with the main process. If the string 'password' -+ // was send, provide the password -+ char c; -+ if (read(master, &c, 1) <= 0 || errno) -+ break; -+ if (resp_pos - result < sizeof(result)) -+ *resp_pos++ = c; -+ *resp_pos = 0; -+ if (c == '\n') -+ { -+ printf("%s", result); -+ resp_pos = result; -+ } -+ *resp_pos = 0; -+ if (resp_pos - result >= passwordTextLen && !strcasecmp(resp_pos-passwordTextLen, passwordText)) -+ { -+ // prepare the password and send it through the pseudo terminal -+ strcpy(password, passwd); -+ strcat(password, "\n"); -+ resp_pos = result; -+ *resp_pos = 0; -+ write(master, password, strlen(password)); -+ } -+ } -+ // if the child is dead, end main loop -+ if (waitpid(_childPid,NULL,WNOHANG)) -+ break; -+ } -+ -+ // if there is unsend response, send it to the main process -+ printf("%s", result); -+ -+ // free resources -+ if (fdstderr[0]) -+ close(fdstderr[0]); -+ close(master); -+ slist_free_with_data(&strlist); -+ -+ // get childs return code to avoid zombies -+ waitpid(_childPid, 0, WUNTRACED); -+ _exit(0); -+ } -+ _exit(-1); // can not be reached -+} diff --git a/net/linneighborhood/files/patch-utility.c b/net/linneighborhood/files/patch-utility.c deleted file mode 100644 index 8ce3d9582a6b..000000000000 --- a/net/linneighborhood/files/patch-utility.c +++ /dev/null @@ -1,22 +0,0 @@ ---- src/utility.c.orig Sun Jun 9 09:58:43 2002 -+++ src/utility.c Thu Feb 13 09:56:06 2003 -@@ -16,6 +16,7 @@ - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include <sys/types.h> - #include <netinet/in.h> - #include <arpa/inet.h> - #include <stdio.h> -@@ -421,9 +422,9 @@ - unsigned char path_exist (char *path) - { - DIR *dir; -- - dir = opendir(path); -- closedir(dir); -+ if (dir) -+ closedir(dir); - return ( dir != NULL ) ? 1 : 0; - } - diff --git a/net/linneighborhood/pkg-descr b/net/linneighborhood/pkg-descr deleted file mode 100644 index 085bd06e29c0..000000000000 --- a/net/linneighborhood/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -LinNeighborhood is a Xwindow graphical port of Network Neighborhood, -running over Samba utilities and the smbfs. - -It permits to browse an SMB (CIFS) network consisting of Samba, -Windows (WfWg, 95, 98, NT) and probably (not tested) OS/2, LanManager -for DOS and others. It also offers an interface to mount the found shares. - -WWW: http://www.bnro.de/~schmidjo/index.html - --- -h.eichmann@gmx.de diff --git a/net/linneighborhood/pkg-message b/net/linneighborhood/pkg-message deleted file mode 100644 index e42459682b08..000000000000 --- a/net/linneighborhood/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -To mount shares with LinNeighborhood, there are the following possibilities: - - run it as root. (not recommended) - - give LinNeighborhood the suid flag (not recommended) - - give mount_smbfs and umount the suid flag (very bad!) - - install and configure sudo correctly and replace mount_smbfs and umount - in the preferences by "sudo mount_smbfs" and "sudo umount" (recommended). - Make sure, that all sudo rules concerning mount and umount have the - NOPASSWD flag. Otherwise two password questions might occur (one - from sudo and one from mount_smbfs) which will definitely go wrong. diff --git a/net/linneighborhood/pkg-plist b/net/linneighborhood/pkg-plist deleted file mode 100644 index affe370998a6..000000000000 --- a/net/linneighborhood/pkg-plist +++ /dev/null @@ -1,14 +0,0 @@ -bin/LinNeighborhood -share/locale/de/LC_MESSAGES/LinNeighborhood.mo -share/locale/sv/LC_MESSAGES/LinNeighborhood.mo -share/locale/ja/LC_MESSAGES/LinNeighborhood.mo -share/locale/fr/LC_MESSAGES/LinNeighborhood.mo -share/locale/ru/LC_MESSAGES/LinNeighborhood.mo -share/locale/es/LC_MESSAGES/LinNeighborhood.mo -share/locale/pt_BR/LC_MESSAGES/LinNeighborhood.mo -share/locale/tr/LC_MESSAGES/LinNeighborhood.mo -share/locale/pl/LC_MESSAGES/LinNeighborhood.mo -share/locale/it/LC_MESSAGES/LinNeighborhood.mo -share/locale/zh_TW/LC_MESSAGES/LinNeighborhood.mo -share/icons/LinNeighborhood.xpm -@dirrm share/icons diff --git a/net/mcl/Makefile b/net/mcl/Makefile deleted file mode 100644 index c6075624bce5..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@noc.ntua.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 d66d0a1a90d0..000000000000 --- a/net/mcl/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (mcl_v2.99.1.tgz) = d4a5c0c384d45dfa6c2a3dcbdcb3a81e -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 f2b8c2b2975e..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/usr/include/g++ -I/usr/include/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 233632048d57..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/usr/local/lib -+ # added -I/usr/local/include for libgdome header files -+ ADD_INCLUDES = -I/usr/local/include/ -I/usr/local/include/glib-2.0/ -I/usr/local/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/mldonkey-core-devel/Makefile b/net/mldonkey-core-devel/Makefile deleted file mode 100644 index 1581942a353d..000000000000 --- a/net/mldonkey-core-devel/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# New ports collection makefile for: mldonkey core -# Date created: Sun Jun 15 19:49:31 UTC 2003 -# Whom: Holger Lamm <holger@e-gitt.net> and Mario S F Ferreira <lioux@FreeBSD.org> -# -# $FreeBSD$ -# - -# build only the CORE -WITHOUT_GUI= yes - -COMMENT= Client 'core' for the MLDonkey peer-to-peer network - -MASTERDIR= ${.CURDIR}/../mldonkey - -.include "${MASTERDIR}/Makefile" diff --git a/net/mldonkey-devel/Makefile b/net/mldonkey-devel/Makefile deleted file mode 100644 index 34ee52c102c3..000000000000 --- a/net/mldonkey-devel/Makefile +++ /dev/null @@ -1,107 +0,0 @@ -# New ports collection makefile for: mldonkey -# Date created: 21 August 2002 -# Whom: Holger Lamm <holger@e-gitt.net> -# -# $FreeBSD$ -# - -PORTNAME= mldonkey -PORTVERSION= 2.5.23 -CATEGORIES+= net -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${DOWNLOADVERSION} - -PATCH_SITES= http://www.schraegerpunkt.de/ -PATCHFILES= mldonkey-${DOWNLOADVERSION}-${PORTVERSION:C/.+\.//}.patch.gz - -MAINTAINER?= holger@e-gitt.net -COMMENT?= A OCAML client for multiple peer-to-peer networks - -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \ - autoconf213:${PORTSDIR}/devel/autoconf213 - -DOWNLOADVERSION=2.5.22 - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-pthread --enable-ocamlver=3 -WRKSRC= ${WRKDIR}/${PORTNAME}-${DOWNLOADVERSION} -USE_GMAKE= yes -ALL_TARGET= depend opt - -.if defined(WITHOUT_GUI) -.if defined(WITHOUT_CORE) -.error "Cool, you defined both WITHOUT_GUI and WITHOUT_CORE. I think I'll do nothing." -.endif -# have no 'without-' flag -CONFIGURE_ARGS+=--disable-gui -PLIST_SUB+= CORE="" GUI="@comment " GUICORE="@comment " -PKGNAMESUFFIX= -core -.else -PLIST_SUB+= GUI="" -BUILD_DEPENDS+= lablgtk:${PORTSDIR}/x11-toolkits/ocaml-lablgtk \ - ${LOCALBASE}/lib/ocaml/jabbr.cma:${PORTSDIR}/net/ocaml-jabbr -# we don't need lablgtk as RUN dependency, but we need gtk+glib -USE_GNOME= gtk12 -.if defined(WITHOUT_CORE) -PKGNAMESUFFIX= -gui -PLIST_SUB+= CORE="@comment " GUICORE="@comment " -.else -PLIST_SUB+= CORE="" GUICORE="" -.endif -.endif - -DOCFILES= Authors.txt Bugs.txt ChangeLog Developers.txt FAQ.html \ - Install.txt Readme.txt Todo.txt ed2k_links.txt - -.include <bsd.port.pre.mk> - -pre-everything:: -.if !defined(WITHOUT_GUI) && !defined(WITHOUT_CORE) - @${ECHO_MSG} "You can disable the GUI by defining WITHOUT_GUI." - @${ECHO_MSG} "You can disable the CORE by defining WITHOUT_CORE." -.endif - -pre-configure: - @cd ${WRKSRC}/config && ${AUTOCONF} - -post-patch: - @${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${FILESDIR}/wrapper.sh > \ - ${WRKDIR}/wrapper.sh - -do-install: -.ifndef(WITHOUT_CORE) - @${INSTALL_PROGRAM} ${WRKSRC}/mlnet ${PREFIX}/bin/mlnet-real - @${INSTALL_SCRIPT} ${FILESDIR}/kill_mldonkey ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh ${PREFIX}/bin/mlnet -.endif -.ifndef(WITHOUT_GUI) - @${INSTALL_PROGRAM} ${WRKSRC}/mlchat ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mlgui ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mlim ${PREFIX}/bin -.endif -.ifndef(WITHOUT_CORE && WITHOUT_GUI) - @${INSTALL_SCRIPT} ${WRKSRC}/distrib/mldonkey_previewer ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mlguistarter ${PREFIX}/bin - @${INSTALL_PROGRAM} ${WRKSRC}/mlnet+gui ${PREFIX}/bin -.endif -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in ${DOCFILES} - @${INSTALL_DATA} ${WRKSRC}/distrib/${file} ${DOCSDIR} -.endfor -.endif - -post-install: - @${CAT} ${PKGMESSAGE} - -install-user: extract -.if !defined(LANG) - @${ECHO_MSG} "Please call as: make install-user LANG=<lang>" - @${ECHO_MSG} "with <lang> one of en,de,fr,fr.noaccents,sp !" -.else - @${CP} ${WRKSRC}/distrib/i18n/gui_messages.ini.${LANG}\ - ${HOME}/.mldonkey_gui_messages.ini -.endif - -.include <bsd.port.post.mk> diff --git a/net/mldonkey-devel/distinfo b/net/mldonkey-devel/distinfo deleted file mode 100644 index 5561d6c3ebf4..000000000000 --- a/net/mldonkey-devel/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (mldonkey-2.5.22.tar.gz) = 958ffb63dbcfcb0f6e48788774dfbb42 -SIZE (mldonkey-2.5.22.tar.gz) = 3474104 -MD5 (mldonkey-2.5.22-23.patch.gz) = 091c77f0dd29be7443ac62e99cc41dc0 -SIZE (mldonkey-2.5.22-23.patch.gz) = 88210 diff --git a/net/mldonkey-devel/files/kill_mldonkey b/net/mldonkey-devel/files/kill_mldonkey deleted file mode 100644 index 17a7de100aad..000000000000 --- a/net/mldonkey-devel/files/kill_mldonkey +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (c) 2003 -# Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# Holger Lamm <holger@e-gitt.net> -# 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. -# - -#!/bin/sh - -# -# Add Username and password here -# like this: -# -HTTPUSER="you" -HTTPPASS="yourpassword" - -# Add location and port of mldonkey core -HTTPURL="127.0.0.1:4080" - -# internal configuration -HTTP_COMMAND="/usr/bin/fetch" -HTTP_COMMAND_ARGS="-1 -q -s" - -if [ -n "${HTTPUSER}" -a -n "${HTTPPASS}" ] -then - export HTTP_AUTH=basic:*:${HTTPUSER}:${HTTPPASS} -fi - -${HTTP_COMMAND} ${HTTP_COMMAND_ARGS} "http://${HTTPURL}/submit?q=kill" - diff --git a/net/mldonkey-devel/files/patch-Makefile b/net/mldonkey-devel/files/patch-Makefile deleted file mode 100644 index 3d2a0e606df0..000000000000 --- a/net/mldonkey-devel/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig Wed Sep 8 22:54:44 2004 -+++ Makefile Wed Sep 8 22:54:54 2004 -@@ -258,7 +258,7 @@ - all: Makefile config/Makefile.config $(TARGET_TYPE) - - config/configure: config/configure.in -- cd config; autoconf -+ cd config; autoconf213 - - ifeq ("$(MYCONFIG_ARGS_DEFINED)" , "yes") - diff --git a/net/mldonkey-devel/files/wrapper.sh b/net/mldonkey-devel/files/wrapper.sh deleted file mode 100644 index c25fd62bc133..000000000000 --- a/net/mldonkey-devel/files/wrapper.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -PREFIX="%%PREFIX%%/bin" -PROGRAM="${0}" -DIRNAME=${HOME}/.mldonkey - -if [ ! -d ${DIRNAME} ] -then - mkdir -p ${DIRNAME} -fi - -echo " ${*} " | grep " \-createdironly " || -{ - cd ${DIRNAME} && - echo Running under ${DIRNAME} && - exec ${PREFIX}/${PROGRAM##*/}-real "${@}" || - echo PROBLEM. Cannot create directory ${DIRNAME}, make sure you have the proper permissions to create it and try again -} diff --git a/net/mldonkey-devel/pkg-descr b/net/mldonkey-devel/pkg-descr deleted file mode 100644 index 0506b1d6be6d..000000000000 --- a/net/mldonkey-devel/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -mldonkey is a OCAML/GTK client for a number of -peer-to-peer networks. - -It is separated into a core with telnet and web interfaces, and -a GTK GUI. - -The following protocols are supported: -- eDonkey (http://www.edonkey2000.com/) -- Overnet (http://www.overnet.com/) -- Bittorrent (http://bitconjurer.org/BitTorrent/) -- Gnutella (http://www.gnutella.org/) -- Gnutella2 (http://www.shareaza.com/) -- Soulseek (http://www.slsk.org/) -- Direct-Connect (http://www.neo-modus.com/) -- Opennap (http://opennap.sourceforge.net/) - -WWW: http://www.nongnu.org/mldonkey/ diff --git a/net/mldonkey-devel/pkg-message b/net/mldonkey-devel/pkg-message deleted file mode 100644 index 9ec1ee80b84c..000000000000 --- a/net/mldonkey-devel/pkg-message +++ /dev/null @@ -1,27 +0,0 @@ - ATTENTIONATTENTION: - -- If you want to know how to use mldonkey, read "INSTALL" or - "FAQ.html" in the port docs (/usr/local/share/doc/mldonkey) - -- It is not a bad idea to install mplayer. You will be able - to preview half-downloaded files (if you have the beginning). - -- You can import the downloads you started with eDonkey - (try "import /home/directory/path/.edonkey2000-core" - on the console), but you can NOT go back! - -- If this is the first time you install mldonkey, - please go to the mldonkey-gui ports dir as a user and enter: - - make install-user - - this will set up your user config. - -- You have to enable the different protocols on the client - console. Go to the (mldonkey-) console, and try the commands - 'set enable_<protocol> true' (try 'voo' for reference). - -+------------------------------------------------------------+ -|- For upgraders: The names of the binaries have changed. | -| Core and GUI are called "mlnet" and "mlgui", respectively.| -+------------------------------------------------------------+ diff --git a/net/mldonkey-devel/pkg-plist b/net/mldonkey-devel/pkg-plist deleted file mode 100644 index 46567757a145..000000000000 --- a/net/mldonkey-devel/pkg-plist +++ /dev/null @@ -1,19 +0,0 @@ -%%CORE%%bin/kill_mldonkey -%%CORE%%bin/mlnet -%%CORE%%bin/mlnet-real -%%GUICORE%%bin/mlguistarter -%%GUICORE%%bin/mldonkey_previewer -%%GUICORE%%bin/mlnet+gui -%%GUI%%bin/mlchat -%%GUI%%bin/mlgui -%%GUI%%bin/mlim -%%PORTDOCS%%share/doc/mldonkey/Authors.txt -%%PORTDOCS%%share/doc/mldonkey/Bugs.txt -%%PORTDOCS%%share/doc/mldonkey/ChangeLog -%%PORTDOCS%%share/doc/mldonkey/Developers.txt -%%PORTDOCS%%share/doc/mldonkey/FAQ.html -%%PORTDOCS%%share/doc/mldonkey/Install.txt -%%PORTDOCS%%share/doc/mldonkey/Readme.txt -%%PORTDOCS%%share/doc/mldonkey/Todo.txt -%%PORTDOCS%%share/doc/mldonkey/ed2k_links.txt -%%PORTDOCS%%@dirrm share/doc/mldonkey diff --git a/net/mldonkey-gui-devel/Makefile b/net/mldonkey-gui-devel/Makefile deleted file mode 100644 index 975bbebf93c3..000000000000 --- a/net/mldonkey-gui-devel/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: mldonkey -# Date created: 19 December 2002 -# Whom: Holger Lamm <holger@e-gitt.net> -# -# $FreeBSD$ -# - -# build only the GUI -WITHOUT_CORE= yes -# unbreak index build with a common variable -.undef WITHOUT_GUI - -COMMENT= A OCAML/GTK GUI for the MLdonkey peer-to-peer network client - -MASTERDIR= ${.CURDIR}/../mldonkey - -.include "${MASTERDIR}/Makefile" diff --git a/net/mldonkey-gui-devel/mldonkey-gui/Makefile b/net/mldonkey-gui-devel/mldonkey-gui/Makefile deleted file mode 100644 index 975bbebf93c3..000000000000 --- a/net/mldonkey-gui-devel/mldonkey-gui/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: mldonkey -# Date created: 19 December 2002 -# Whom: Holger Lamm <holger@e-gitt.net> -# -# $FreeBSD$ -# - -# build only the GUI -WITHOUT_CORE= yes -# unbreak index build with a common variable -.undef WITHOUT_GUI - -COMMENT= A OCAML/GTK GUI for the MLdonkey peer-to-peer network client - -MASTERDIR= ${.CURDIR}/../mldonkey - -.include "${MASTERDIR}/Makefile" diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile deleted file mode 100644 index 880e5925a8c7..000000000000 --- a/net/mpich2/Makefile +++ /dev/null @@ -1,193 +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.5.2 -CATEGORIES= net parallel -MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/ -DIST_SUBDIR= mpich - -MAINTAINER= dbader@ece.unm.edu -COMMENT= Message Passing Interface (MPI) Library - -PATCH_SITES= ftp://ftp.mcs.anl.gov/pub/mpi/patch/${PORTVERSION:R}/ -PATCHFILES= 8713 8697 - -CONFIGURE_ARGS= -cflags="${CFLAGS}" -prefix=${PREFIX}/mpich - -.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) -CONFIGURE_ARGS+= --without-java -PLIST_SUB+= JAVA="@comment " -.else -RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13 -BUILD_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper \ - ${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13 -PLIST_SUB+= JAVA="" -.endif - -HAS_CONFIGURE= yes - -.include <bsd.port.pre.mk> - -# To disable ssh client support, build with WITHOUT_SSH set. -# Use ssh instead of rsh -.if !defined(WITHOUT_SSH) -.if ${OSVERSION} >= 400016 && exists(/usr/bin/ssh) -CONFIGURE_ARGS+= -rsh="/usr/bin/ssh" -.elif defined(WITH_SSH) || exists(${LOCALBASE}/bin/ssh) -RUN_DEPENDS+= ssh:${PORTSDIR}/security/ssh -CONFIGURE_ARGS+= -rsh="${LOCALBASE}/bin/ssh" -.endif -.endif - -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 -INSTALL_TARGET= install - -.include <bsd.port.post.mk> diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo deleted file mode 100644 index 5b45cdd55427..000000000000 --- a/net/mpich2/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (mpich/mpich-1.2.5.2.tar.gz) = 9a7524c220eeb3f080069308bab9f487 -SIZE (mpich/mpich-1.2.5.2.tar.gz) = 12383519 -MD5 (mpich/8713) = 6039d7d76cd775c124148a8c7b631410 -SIZE (mpich/8713) = 87123 -MD5 (mpich/8697) = c8eab96712270242808b9f5b5cdecf9e -SIZE (mpich/8697) = 286 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 38e9ad8aae3d..000000000000 --- a/net/mpich2/pkg-plist +++ /dev/null @@ -1,562 +0,0 @@ -mpich/bin/clog2alog -mpich/bin/clog2slog -mpich/bin/clog_print -mpich/bin/logviewer -mpich/bin/mpereconfig -mpich/bin/mpereconfig.dat -mpich/bin/mpereconfig.in -mpich/bin/mpiCC -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 -mpich/bin/serv_p4 -mpich/bin/slog_print -mpich/bin/tarch -mpich/bin/tdevice -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 -mpich/etc/mpichconf.h.dat -mpich/etc/mpichlib.conf -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 -mpich/man/mandesc -mpich/sbin/chkserv -mpich/sbin/chp4_servs -mpich/sbin/cleanipcs -mpich/sbin/mpiuninstall -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 -%%JAVA%%mpich/share/jumpshot-3/README -%%JAVA%%mpich/share/jumpshot-3/README.slog -%%JAVA%%mpich/share/jumpshot-3/TourStepByStep.txt -%%JAVA%%mpich/share/jumpshot-3/UserGuide.txt -%%JAVA%%mpich/share/jumpshot-3/bin/jumpshot -%%JAVA%%mpich/share/jumpshot-3/bin/slog_print -%%JAVA%%mpich/share/jumpshot-3/doc/TourStepByStep.pdf -%%JAVA%%mpich/share/jumpshot-3/doc/html/TourStepByStep.css -%%JAVA%%mpich/share/jumpshot-3/doc/html/TourStepByStep.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/WARNINGS -%%JAVA%%mpich/share/jumpshot-3/doc/html/crossref.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/footnode.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/images.aux -%%JAVA%%mpich/share/jumpshot-3/doc/html/images.log -%%JAVA%%mpich/share/jumpshot-3/doc/html/images.pl -%%JAVA%%mpich/share/jumpshot-3/doc/html/images.tex -%%JAVA%%mpich/share/jumpshot-3/doc/html/img1.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img10.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img11.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img12.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img13.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img2.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img3.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img4.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img5.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img6.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img7.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img8.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/img9.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/index.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/internals.pl -%%JAVA%%mpich/share/jumpshot-3/doc/html/labels.pl -%%JAVA%%mpich/share/jumpshot-3/doc/html/next.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/next_g.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/node1.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/node2.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/node3.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/node4.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/node5.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/node6.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/node7.html -%%JAVA%%mpich/share/jumpshot-3/doc/html/prev.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/prev_g.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/up.gif -%%JAVA%%mpich/share/jumpshot-3/doc/html/up_g.gif -%%JAVA%%mpich/share/jumpshot-3/doc/jumpshot.def -%%JAVA%%mpich/share/jumpshot-3/etc/jumpshot.conf -%%JAVA%%mpich/share/jumpshot-3/lib/images.jar -%%JAVA%%mpich/share/jumpshot-3/lib/jumpshot.jar -%%JAVA%%mpich/share/jumpshot-3/lib/preview.jar -%%JAVA%%mpich/share/jumpshot-3/lib/slog.jar -%%JAVA%%mpich/share/jumpshot-3/lib/slog_print.class -%%JAVA%%mpich/share/jumpshot-3/lib/slog_print_remote.class -%%JAVA%%mpich/share/jumpshot-3/lib/statsviewer.jar -%%JAVA%%mpich/share/jumpshot-3/logfiles/sample.slog -%%JAVA%%mpich/share/jumpshot-3/logfiles/sppm.stats.0301 -%%JAVA%%mpich/share/jumpshot-3/logfiles/sppm_ic2a.slog -%%JAVA%%mpich/share/jumpshot-3/logfiles/stats0204.txt -%%JAVA%%mpich/share/jumpshot-3/logfiles/stats3.txt -%%JAVA%%mpich/share/jumpshot-3/logfiles/thread1.stats -%%JAVA%%mpich/share/jumpshot-3/sbin/exejar -%%JAVA%%mpich/share/jumpshot-3/share/jumpshot.colors -%%JAVA%%@dirrm mpich/share/jumpshot-3/share -%%JAVA%%@dirrm mpich/share/jumpshot-3/sbin -%%JAVA%%@dirrm mpich/share/jumpshot-3/logfiles -%%JAVA%%@dirrm mpich/share/jumpshot-3/lib -%%JAVA%%@dirrm mpich/share/jumpshot-3/etc -%%JAVA%%@dirrm mpich/share/jumpshot-3/doc/html -%%JAVA%%@dirrm mpich/share/jumpshot-3/doc -%%JAVA%%@dirrm mpich/share/jumpshot-3/bin -%%JAVA%%@dirrm mpich/share/jumpshot-3 -mpich/share/machines.freebsd -mpich/share/machines.sample -%%TK%%mpich/share/upshot/bin/upshot -%%TK%%mpich/share/upshot/bitmaps/2x2 -%%TK%%mpich/share/upshot/bitmaps/black -%%TK%%mpich/share/upshot/bitmaps/boxes -%%TK%%mpich/share/upshot/bitmaps/dimple3 -%%TK%%mpich/share/upshot/bitmaps/dllines3 -%%TK%%mpich/share/upshot/bitmaps/dllines4 -%%TK%%mpich/share/upshot/bitmaps/drlines3 -%%TK%%mpich/share/upshot/bitmaps/drlines4 -%%TK%%mpich/share/upshot/bitmaps/gray -%%TK%%mpich/share/upshot/bitmaps/gray2 -%%TK%%mpich/share/upshot/bitmaps/gray3 -%%TK%%mpich/share/upshot/bitmaps/hlines2 -%%TK%%mpich/share/upshot/bitmaps/hlines3 -%%TK%%mpich/share/upshot/bitmaps/hlines4 -%%TK%%mpich/share/upshot/bitmaps/light_gray -%%TK%%mpich/share/upshot/bitmaps/vlines2 -%%TK%%mpich/share/upshot/bitmaps/vlines3 -%%TK%%mpich/share/upshot/bitmaps/vlines4 -%%TK%%mpich/share/upshot/bitmaps/white -%%TK%%mpich/share/upshot/logfiles/fft.trf -%%TK%%mpich/share/upshot/logfiles/sam_hyp.16.log -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 -@dirrm mpich/www/www4 -@dirrm mpich/www/www3 -@dirrm mpich/www/www1 -@dirrm mpich/www -%%TK%%@dirrm mpich/share/upshot/sbin -%%TK%%@dirrm mpich/share/upshot/logfiles -%%TK%%@dirrm mpich/share/upshot/bitmaps -%%TK%%@dirrm mpich/share/upshot/bin -%%TK%%@dirrm mpich/share/upshot -@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 -@dirrm mpich/lib/shared -@dirrm mpich/lib -@dirrm mpich/include/mpi2c++ -@dirrm mpich/include -@dirrm mpich/examples/MPI-2-C++ -@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 eefe4f0b4652..000000000000 --- a/net/ns2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# New ports collection makefile for: ns-2 -# Date created: 26 April 1999 -# Whom: obonilla -# -# $FreeBSD$ -# - -PORTNAME= ns -PORTVERSION= 2.27 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://www.isi.edu/nsnam/dist/ -DISTNAME= ns-src-2.27 - -MAINTAINER= ports@FreeBSD.org -COMMENT= The UCB/LBNL Network Simulator Version 2 - -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-2.27 - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl-ver=8.4 --with-tk-ver=8.4 - -ALL_TARGET= - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500000 -BROKEN= "Does not compile on alpha 4.x" -.endif - -.if ${ARCH} == "sparc64" -BROKEN= "Does not compile on sparc64" -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1 - ${MKDIR} ${PREFIX}/share/examples/ns2 - ${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${PREFIX}/share/examples/ns2 - -.include <bsd.port.post.mk> diff --git a/net/ns2/distinfo b/net/ns2/distinfo deleted file mode 100644 index eeaad4beaa7a..000000000000 --- a/net/ns2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (ns-src-2.27.tar.gz) = db3a16e450f66a5e4dd881349ccc5dd7 -SIZE (ns-src-2.27.tar.gz) = 44642525 diff --git a/net/ns2/files/patch-Makefile.in b/net/ns2/files/patch-Makefile.in deleted file mode 100644 index ed8faecfd51c..000000000000 --- a/net/ns2/files/patch-Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.in.orig Thu Mar 11 00:22:57 2004 -+++ Makefile.in Thu Mar 11 00:26:46 2004 -@@ -60,14 +60,15 @@ - DEFINE = -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DNS_DIFFUSION -DSMAC_NO_SYNC -DCPP_NAMESPACE=@CPP_NAMESPACE@ -DUSE_SINGLE_ADDRESS_SPACE -Drng_test - - INCLUDES = \ -- -I. @V_INCLUDE_X11@ \ -- @V_INCLUDES@ \ -+ -I. \ - -I./tcp -I./sctp -I./common -I./link -I./queue \ - -I./adc -I./apps -I./mac -I./mobile -I./trace \ - -I./routing -I./tools -I./classifier -I./mcast \ - -I./diffusion3/lib/main -I./diffusion3/lib \ - -I./diffusion3/lib/nr -I./diffusion3/ns \ -- -I./diffusion3/filter_core -I./asim/ -I./qs -+ -I./diffusion3/filter_core -I./asim/ -I./qs \ -+ @V_INCLUDE_X11@ \ -+ @V_INCLUDES@ - - - LIB = \ diff --git a/net/ns2/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in b/net/ns2/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in deleted file mode 100644 index a009fcc0b70f..000000000000 --- a/net/ns2/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig Mon May 24 08:09:36 2004 -+++ indep-utils/cmu-scen-gen/setdest/Makefile.in Mon May 24 08:10:46 2004 -@@ -37,7 +37,7 @@ - MKDEP = ../../../conf/mkdep - - # when including files from ns, we need to take care STL_NAMESPACE --DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@ -+DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@ - CFLAGS = @V_CCOPT@ - LDFLAGS = @V_STATIC@ - LIBS = @V_LIB@ -lm @LIBS@ - diff --git a/net/ns2/files/patch-indep-utils::webtrace-conv::dec::Makefile.in b/net/ns2/files/patch-indep-utils::webtrace-conv::dec::Makefile.in deleted file mode 100644 index 1535cd1256a8..000000000000 --- a/net/ns2/files/patch-indep-utils::webtrace-conv::dec::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- indep-utils/webtrace-conv/dec/Makefile.in.orig Tue Jan 13 09:58:44 2004 -+++ indep-utils/webtrace-conv/dec/Makefile.in Sun Jun 13 18:22:22 2004 -@@ -38,7 +38,7 @@ - # when including files from ns, we need to take care STL_NAMESPACE - CC = @CXX@ - INCLUDE = -I. @V_INCLUDES@ --CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@ -+CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@ - LDFLAGS = @V_STATIC@ - LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@ - INSTALL = @INSTALL@ diff --git a/net/ns2/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in b/net/ns2/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in deleted file mode 100644 index d845581f9a33..000000000000 --- a/net/ns2/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- indep-utils/webtrace-conv/nlanr/Makefile.in.orig Tue Jan 13 09:58:48 2004 -+++ indep-utils/webtrace-conv/nlanr/Makefile.in Sun Jun 13 18:30:51 2004 -@@ -35,7 +35,7 @@ - # when including files from ns, we need to take care STL_NAMESPACE - CC = @CXX@ - INCLUDE = -I. -I../../.. @V_INCLUDES@ --CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@ -+CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@ - LDFLAGS = @V_STATIC@ - LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@ - INSTALL = @INSTALL@ diff --git a/net/ns2/pkg-descr b/net/ns2/pkg-descr deleted file mode 100644 index 458652a19b35..000000000000 --- a/net/ns2/pkg-descr +++ /dev/null @@ -1,7 +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/ - --Oscar <obonilla@fisicc-ufm.edu> diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist deleted file mode 100644 index a6d579b2d6fd..000000000000 --- a/net/ns2/pkg-plist +++ /dev/null @@ -1,119 +0,0 @@ -bin/ns -share/examples/ns2/agent-gen-script.tcl -share/examples/ns2/agent-gen.tcl -share/examples/ns2/callback_demo.tcl -share/examples/ns2/diffusion-prob-run.tcl -share/examples/ns2/diffusion-rate-run.tcl -share/examples/ns2/dumbbell.tcl -share/examples/ns2/example.tcl -share/examples/ns2/flooding-run.tcl -share/examples/ns2/fq-cbr.tcl -share/examples/ns2/fq.tcl -share/examples/ns2/grid2.tcl -share/examples/ns2/gridkeeper.tcl -share/examples/ns2/hier-rtg-10.tcl -share/examples/ns2/hier-rtg-100.tcl -share/examples/ns2/hts100-0.tcl -share/examples/ns2/lantest.tcl -share/examples/ns2/large-scale-web-traffic-old.tcl -share/examples/ns2/large-scale-web-traffic.tcl -share/examples/ns2/large-sim.tcl -share/examples/ns2/mac-test.tcl -share/examples/ns2/many_tcp.tcl -share/examples/ns2/manytcp_trmodel.tcl -share/examples/ns2/mcast.tcl -share/examples/ns2/miptest.tcl -share/examples/ns2/nam-example-em.tcl -share/examples/ns2/nam-example.tcl -share/examples/ns2/nam-large-flowid.tcl -share/examples/ns2/nam-separate-trace.tcl -share/examples/ns2/nam-simplexlink.tcl -share/examples/ns2/omni-run.tcl -share/examples/ns2/pkts.tcl -share/examples/ns2/ranvar.tcl -share/examples/ns2/rbp_demo.tcl -share/examples/ns2/rc.tcl -share/examples/ns2/redlight.tcl -share/examples/ns2/rng-test.tcl -share/examples/ns2/rng-test2.tcl -share/examples/ns2/route-gen.tcl -share/examples/ns2/sat-aloha.tcl -share/examples/ns2/sat-iridium-links.tcl -share/examples/ns2/sat-iridium-nodes.tcl -share/examples/ns2/sat-iridium.tcl -share/examples/ns2/sat-mixed.tcl -share/examples/ns2/sat-repeater.tcl -share/examples/ns2/sat-teledesic-links.tcl -share/examples/ns2/sat-teledesic-nodes.tcl -share/examples/ns2/sat-teledesic.tcl -share/examples/ns2/sat-wired.tcl -share/examples/ns2/shuttle-mcast.tcl -share/examples/ns2/shuttle.tcl -share/examples/ns2/simple-dyn.tcl -share/examples/ns2/simple-eqp.tcl -share/examples/ns2/simple-eqp1.tcl -share/examples/ns2/simple-fsm-tcp.tcl -share/examples/ns2/simple-heap.tcl -share/examples/ns2/simple-plm.tcl -share/examples/ns2/simple-rtg.tcl -share/examples/ns2/simple-rtp.tcl -share/examples/ns2/simple-tcp.tcl -share/examples/ns2/simple-webcache-comp.tcl -share/examples/ns2/simple-webcache-trace.tcl -share/examples/ns2/simple-webcache.tcl -share/examples/ns2/simple-wireless.tcl -share/examples/ns2/simple.tcl -share/examples/ns2/src_test.tcl -share/examples/ns2/srm-adapt-rep-session.tcl -share/examples/ns2/srm-adapt-rep.tcl -share/examples/ns2/srm-adapt-req-session.tcl -share/examples/ns2/srm-adapt-req.tcl -share/examples/ns2/srm-chain-session.tcl -share/examples/ns2/srm-chain.tcl -share/examples/ns2/srm-demo.tcl -share/examples/ns2/srm-session.tcl -share/examples/ns2/srm-star-session.tcl -share/examples/ns2/srm-star.tcl -share/examples/ns2/srm.tcl -share/examples/ns2/ss.tcl -share/examples/ns2/swp.tcl -share/examples/ns2/t1000.tcl -share/examples/ns2/tcp-et.tcl -share/examples/ns2/tcp-int.tcl -share/examples/ns2/tcpapp.tcl -share/examples/ns2/tcpecn.tcl -share/examples/ns2/tcpsrm.tcl -share/examples/ns2/test-drr.tcl -share/examples/ns2/test-emulator.tcl -share/examples/ns2/test-rcvr.tcl -share/examples/ns2/test-rlm.tcl -share/examples/ns2/test-suite-intserv.tcl -share/examples/ns2/test-suite.tcl -share/examples/ns2/test-tbf.tcl -share/examples/ns2/tg.tcl -share/examples/ns2/topo-gen-script.tcl -share/examples/ns2/topo-gen.tcl -share/examples/ns2/topo-view.tcl -share/examples/ns2/trace-driven.tcl -share/examples/ns2/udpdata.tcl -share/examples/ns2/varybell.tcl -share/examples/ns2/virtual-classifier.tcl -share/examples/ns2/vlantest-flat.tcl -share/examples/ns2/vlantest-hier.tcl -share/examples/ns2/vlantest-mcst.tcl -share/examples/ns2/web-traffic-embobj.tcl -share/examples/ns2/web-traffic.tcl -share/examples/ns2/wired-cum-wireless-sim.tcl -share/examples/ns2/wireless-demo-csci694.tcl -share/examples/ns2/wireless-dsdv-newnode.tcl -share/examples/ns2/wireless-landmark.tcl -share/examples/ns2/wireless-mip-test.tcl -share/examples/ns2/wireless-mitf.tcl -share/examples/ns2/wireless-newnode-energy.tcl -share/examples/ns2/wireless-pkt-demo.tcl -share/examples/ns2/wireless-shadowing-test.tcl -share/examples/ns2/wireless-shadowing-vis-test.tcl -share/examples/ns2/wireless-test.tcl -share/examples/ns2/wireless.tcl -share/examples/ns2/worm.tcl -@dirrm share/examples/ns2 diff --git a/net/ntp-stable/Makefile b/net/ntp-stable/Makefile deleted file mode 100644 index e4d55d4c36bc..000000000000 --- a/net/ntp-stable/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# New ports collection makefile for: ntp -# Date created: Di 5 Mai 1998 21:31:03 CEST -# Whom: andreas -# -# $FreeBSD$ -# - -PORTNAME= ntp -PORTVERSION= 4.2.0 -PORTREVISION= 1 -CATEGORIES= net ipv6 -MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \ - http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \ - ftp://ftp.archive.de.uu.net/pub/unix/ntp/ntp4/ \ - ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/ -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/} - -MAINTAINER= cy@FreeBSD.org -COMMENT= The Network Time Protocol Distribution - -LATEST_LINK= ${PORTNAME} - -GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} - -.if defined(ENABLE_RAWDCF) -CONFIGURE_ARGS+= --enable-RAWDCF -.endif - -.if defined(WITHOUT_SSL) -CONFIGURE_ARGS+= --without-crypto -PLIST_SUB+= SSL="@comment " -.else -USE_OPENSSL= yes -CONFIGURE_ARGS+= --with-openssl-incdir=${OPENSSLINC} \ - --with-openssl-libdir=${OPENSSLLIB} -PLIST_SUB+= SSL="" -.endif - -post-install: - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} - @cd ${WRKSRC}/html && ${FIND} . -print | \ - ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/net/ntp-stable/distinfo b/net/ntp-stable/distinfo deleted file mode 100644 index 78ae64415558..000000000000 --- a/net/ntp-stable/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (ntp-4.2.0.tar.gz) = 0f8fabe87cf54f409b57c6283f0c0c3d -SIZE (ntp-4.2.0.tar.gz) = 2514502 diff --git a/net/ntp-stable/files/patch-Makefile.in b/net/ntp-stable/files/patch-Makefile.in deleted file mode 100644 index 7829972e1366..000000000000 --- a/net/ntp-stable/files/patch-Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile.in.orig Wed Oct 15 02:01:51 2003 -+++ Makefile.in Mon Apr 19 22:01:44 2004 -@@ -224,7 +224,7 @@ - version - - --DISTCLEANFILES = .warning -+DISTCLEANFILES = .gcc-warning - - #ETAGS_ARGS = $(srcdir)/Makefile.am $(srcdir)/configure.in - ETAGS_ARGS = Makefile.am configure.in -@@ -232,8 +232,8 @@ - # HMS: make ports be the last directory... - # DIST_HOOK_DIRS = conf html scripts ports - --# HMS: Keep .warning first, as that way it gets printed first. --BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version -+# HMS: Keep .gcc-warning first, as that way it gets printed first. -+BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version - - - # HMS: The following seems to be a work-in-progress... -@@ -672,7 +672,7 @@ - @for i in `find $(distdir)/ports/winnt -type f -name '*.ds*' -print`; \ - do chmod u+w $$i ; unix2dos $$i $$i; done - --.warning: -+.gcc-warning: - @echo "Compiling with GCC now generates lots of new warnings." - @echo " " - @echo "Don't be concerned. They're just warnings." -@@ -682,7 +682,7 @@ - @echo "Feel free to send patches that fix these warnings, though." - @echo " " - @sleep 1 -- @touch .warning -+ @touch .gcc-warning - - .buildcvo: - echo "$(CVO)" > .buildcvo diff --git a/net/ntp-stable/files/patch-aa b/net/ntp-stable/files/patch-aa deleted file mode 100644 index df54ce2e249b..000000000000 --- a/net/ntp-stable/files/patch-aa +++ /dev/null @@ -1,39 +0,0 @@ ---- ntpd/ntp_control.c.orig Mon Apr 9 13:19:56 2001 -+++ ntpd/ntp_control.c Wed Apr 11 20:53:28 2001 -@@ -1823,7 +1823,7 @@ - * Delete leading commas and white space - */ - while (reqpt < reqend && (*reqpt == ',' || -- isspace((int)*reqpt))) -+ isspace((unsigned char)*reqpt))) - reqpt++; - if (reqpt >= reqend) - return (0); -@@ -1846,7 +1846,7 @@ - tp++; - } - if ((*tp == '\0') || (*tp == '=')) { -- while (cp < reqend && isspace((int)*cp)) -+ while (cp < reqend && isspace((unsigned char)*cp)) - cp++; - if (cp == reqend || *cp == ',') { - buf[0] = '\0'; -@@ -1859,7 +1859,7 @@ - if (*cp == '=') { - cp++; - tp = buf; -- while (cp < reqend && isspace((int)*cp)) -+ while (cp < reqend && isspace((unsigned char)*cp)) - cp++; - while (cp < reqend && *cp != ',') { - *tp++ = *cp++; -@@ -1904,8 +1904,8 @@ - cp++; - *tp-- = '\0'; - while (tp >= buf) { -- if (!isspace((int)(*tp))) -+ if (!isspace((unsigned char)(*tp))) - break; - *tp-- = '\0'; - } - reqpt = cp; diff --git a/net/ntp-stable/files/patch-configure b/net/ntp-stable/files/patch-configure deleted file mode 100644 index 0f7bcb551501..000000000000 --- a/net/ntp-stable/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- configure Tue Dec 18 19:27:28 2001 -+++ configure Sat Dec 22 00:41:29 2001 -@@ -1276,6 +1276,11 @@ - mips-sgi-irix*) - ans=yes - ;; -+ i?86-*-freebsd[[123]].*) -+ ;; -+ i?86-*-freebsd*) -+ ans=yes -+ ;; - esac - ac_cv_var_no_parenb_ignpar=$ans]) - case "$ac_cv_var_no_parenb_ignpar" in diff --git a/net/ntp-stable/files/patch-ntpdc::ntpdc.c b/net/ntp-stable/files/patch-ntpdc::ntpdc.c deleted file mode 100644 index bb13b576a464..000000000000 --- a/net/ntp-stable/files/patch-ntpdc::ntpdc.c +++ /dev/null @@ -1,14 +0,0 @@ ---- ntpdc/ntpdc.c.orig Sat Oct 11 00:52:22 2003 -+++ ntpdc/ntpdc.c Sun Jan 25 13:29:58 2004 -@@ -449,7 +449,11 @@ - hints.ai_flags = AI_NUMERICHOST; - - a_info = getaddrinfo(hname, service, &hints, &ai); -+#ifdef EAI_NODATA - if (a_info == EAI_NONAME || a_info == EAI_NODATA) { -+#else -+ if (a_info == EAI_NONAME) { -+#endif - hints.ai_flags = AI_CANONNAME; - #ifdef AI_ADDRCONFIG - hints.ai_flags |= AI_ADDRCONFIG; diff --git a/net/ntp-stable/files/patch-ntpq::ntpq.c b/net/ntp-stable/files/patch-ntpq::ntpq.c deleted file mode 100644 index 0a221dd0742b..000000000000 --- a/net/ntp-stable/files/patch-ntpq::ntpq.c +++ /dev/null @@ -1,14 +0,0 @@ ---- ntpq/ntpq.c.orig Thu Oct 9 02:27:05 2003 -+++ ntpq/ntpq.c Sun Jan 25 13:49:33 2004 -@@ -630,7 +630,11 @@ - hints.ai_flags = AI_NUMERICHOST; - - a_info = getaddrinfo(hname, service, &hints, &ai); -+#ifdef EAI_NODATA - if (a_info == EAI_NONAME || a_info == EAI_NODATA) { -+#else -+ if (a_info == EAI_NONAME) { -+#endif - hints.ai_flags = AI_CANONNAME; - #ifdef AI_ADDRCONFIG - hints.ai_flags |= AI_ADDRCONFIG; diff --git a/net/ntp-stable/pkg-descr b/net/ntp-stable/pkg-descr deleted file mode 100644 index 8610484769d3..000000000000 --- a/net/ntp-stable/pkg-descr +++ /dev/null @@ -1,18 +0,0 @@ -The Network Time Protocol (NTP) is used to synchronize the time of a -computer client or server to another server or reference time source, -such as a radio or satellite receiver or modem. - -It provides client accuracies typically within a millisecond on LANs -and up to a few tens of milliseconds on WANs relative to a primary -server synchronized to Coordinated Universal Time (UTC) via a Global -Positioning Service (GPS) receiver, for example. - -Typical NTP configurations utilize multiple redundant servers and diverse -network paths, in order to achieve high accuracy and reliability. - -Some configurations include cryptographic authentication to prevent -accidental or malicious protocol attacks. - -See homepage for more infos: - -WWW: http://www.ntp.org/ diff --git a/net/ntp-stable/pkg-plist b/net/ntp-stable/pkg-plist deleted file mode 100644 index 0c009fd0e4bf..000000000000 --- a/net/ntp-stable/pkg-plist +++ /dev/null @@ -1,195 +0,0 @@ -%%SSL%%bin/ntp-keygen -bin/ntp-wait -bin/ntpd -bin/ntpdate -bin/ntpdc -bin/ntpq -bin/ntptime -bin/ntptrace -bin/tickadj -%%PORTDOCS%%%%DOCSDIR%%/accopt.html -%%PORTDOCS%%%%DOCSDIR%%/assoc.html -%%PORTDOCS%%%%DOCSDIR%%/audio.html -%%PORTDOCS%%%%DOCSDIR%%/authopt.html -%%PORTDOCS%%%%DOCSDIR%%/build.html -%%PORTDOCS%%%%DOCSDIR%%/clockopt.html -%%PORTDOCS%%%%DOCSDIR%%/config.html -%%PORTDOCS%%%%DOCSDIR%%/confopt.html -%%PORTDOCS%%%%DOCSDIR%%/copyright.html -%%PORTDOCS%%%%DOCSDIR%%/debug.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver1.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver10.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver11.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver12.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver16.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver18.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver19.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver2.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver20.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver22.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver23.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver24.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver26.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver27.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver28.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver29.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver3.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver30.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver32.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver33.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver34.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver35.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver36.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver37.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver38.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver39.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver40.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver42.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver43.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver44.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver4.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver5.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver6.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver7.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver8.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/driver9.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/oncore-shmem.html -%%PORTDOCS%%%%DOCSDIR%%/drivers/icons/home.gif -%%PORTDOCS%%%%DOCSDIR%%/drivers/icons/mail2.gif -%%PORTDOCS%%%%DOCSDIR%%/extern.html -%%PORTDOCS%%%%DOCSDIR%%/hints/a-ux -%%PORTDOCS%%%%DOCSDIR%%/hints/aix -%%PORTDOCS%%%%DOCSDIR%%/hints/bsdi -%%PORTDOCS%%%%DOCSDIR%%/hints/changes -%%PORTDOCS%%%%DOCSDIR%%/hints/decosf1 -%%PORTDOCS%%%%DOCSDIR%%/hints/decosf2 -%%PORTDOCS%%%%DOCSDIR%%/hints/freebsd -%%PORTDOCS%%%%DOCSDIR%%/hints/hpux -%%PORTDOCS%%%%DOCSDIR%%/hints/linux -%%PORTDOCS%%%%DOCSDIR%%/hints/mpeix -%%PORTDOCS%%%%DOCSDIR%%/hints/netbsd -%%PORTDOCS%%%%DOCSDIR%%/hints/notes-xntp-v3 -%%PORTDOCS%%%%DOCSDIR%%/hints/parse -%%PORTDOCS%%%%DOCSDIR%%/hints/refclocks -%%PORTDOCS%%%%DOCSDIR%%/hints/rs6000 -%%PORTDOCS%%%%DOCSDIR%%/hints/sco.html -%%PORTDOCS%%%%DOCSDIR%%/hints/sgi -%%PORTDOCS%%%%DOCSDIR%%/hints/solaris-dosynctodr.html -%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.html -%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.xtra.4023118 -%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.xtra.4095849 -%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.xtra.S99ntpd -%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.xtra.patchfreq -%%PORTDOCS%%%%DOCSDIR%%/hints/sun4 -%%PORTDOCS%%%%DOCSDIR%%/hints/svr4-dell -%%PORTDOCS%%%%DOCSDIR%%/hints/svr4_package -%%PORTDOCS%%%%DOCSDIR%%/hints/todo -%%PORTDOCS%%%%DOCSDIR%%/hints/vxworks.html -%%PORTDOCS%%%%DOCSDIR%%/hints/winnt.html -%%PORTDOCS%%%%DOCSDIR%%/hints.html -%%PORTDOCS%%%%DOCSDIR%%/howto.html -%%PORTDOCS%%%%DOCSDIR%%/icons/home.gif -%%PORTDOCS%%%%DOCSDIR%%/icons/mail2.gif -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/kern.html -%%PORTDOCS%%%%DOCSDIR%%/keygen.html -%%PORTDOCS%%%%DOCSDIR%%/ldisc.html -%%PORTDOCS%%%%DOCSDIR%%/manyopt.html -%%PORTDOCS%%%%DOCSDIR%%/measure.html -%%PORTDOCS%%%%DOCSDIR%%/miscopt.html -%%PORTDOCS%%%%DOCSDIR%%/monopt.html -%%PORTDOCS%%%%DOCSDIR%%/msyslog.html -%%PORTDOCS%%%%DOCSDIR%%/mx4200data.html -%%PORTDOCS%%%%DOCSDIR%%/notes.html -%%PORTDOCS%%%%DOCSDIR%%/ntpd.html -%%PORTDOCS%%%%DOCSDIR%%/ntpdate.html -%%PORTDOCS%%%%DOCSDIR%%/ntpdc.html -%%PORTDOCS%%%%DOCSDIR%%/ntpdsim.html -%%PORTDOCS%%%%DOCSDIR%%/ntpq.html -%%PORTDOCS%%%%DOCSDIR%%/ntptime.html -%%PORTDOCS%%%%DOCSDIR%%/ntptrace.html -%%PORTDOCS%%%%DOCSDIR%%/parsedata.html -%%PORTDOCS%%%%DOCSDIR%%/parsenew.html -%%PORTDOCS%%%%DOCSDIR%%/patches.html -%%PORTDOCS%%%%DOCSDIR%%/pic/9400n.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/alice11.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice13.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice23.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice31.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice32.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice35.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice38.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice44.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice47.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice51.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/alice61.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/barnstable.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/beaver.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/boom3.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/boom3a.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/bustardfly.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/c51.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/dogsnake.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/driver29.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/driver43_1.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/driver43_2.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/fg6021.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/fg6039.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/gadget.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/gps167.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/hornraba.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/igclock.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/neoclock4x.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/oncore_evalbig.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/oncore_remoteant.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/oncore_utplusbig.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/oz2.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/panda.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pd_om006.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pd_om011.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pogo.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pogo1a.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pogo3a.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pogo4.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pogo5.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pogo6.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pogo8.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/pzf509.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/rabbit.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/radio2.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/sheepb.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/stack1a.jpg -%%PORTDOCS%%%%DOCSDIR%%/pic/tonea.gif -%%PORTDOCS%%%%DOCSDIR%%/pic/wingdorothy.gif -%%PORTDOCS%%%%DOCSDIR%%/porting.html -%%PORTDOCS%%%%DOCSDIR%%/pps.html -%%PORTDOCS%%%%DOCSDIR%%/prefer.html -%%PORTDOCS%%%%DOCSDIR%%/quick.html -%%PORTDOCS%%%%DOCSDIR%%/rdebug.html -%%PORTDOCS%%%%DOCSDIR%%/refclock.html -%%PORTDOCS%%%%DOCSDIR%%/release.html -%%PORTDOCS%%%%DOCSDIR%%/scripts/footer.txt -%%PORTDOCS%%%%DOCSDIR%%/scripts/links10.txt -%%PORTDOCS%%%%DOCSDIR%%/scripts/links11.txt -%%PORTDOCS%%%%DOCSDIR%%/scripts/links12.txt -%%PORTDOCS%%%%DOCSDIR%%/scripts/links7.txt -%%PORTDOCS%%%%DOCSDIR%%/scripts/links8.txt -%%PORTDOCS%%%%DOCSDIR%%/scripts/links9.txt -%%PORTDOCS%%%%DOCSDIR%%/scripts/style.css -%%PORTDOCS%%%%DOCSDIR%%/sntp.html -%%PORTDOCS%%%%DOCSDIR%%/tickadj.html -%%EXAMPLESDIR%%/README -%%EXAMPLESDIR%%/baldwin.conf -%%EXAMPLESDIR%%/beauregard.conf -%%EXAMPLESDIR%%/grundoon.conf -%%EXAMPLESDIR%%/malarky.conf -%%EXAMPLESDIR%%/pogo.conf -%%EXAMPLESDIR%%/rackety.conf -%%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts -%%PORTDOCS%%@dirrm %%DOCSDIR%%/pic -%%PORTDOCS%%@dirrm %%DOCSDIR%%/icons -%%PORTDOCS%%@dirrm %%DOCSDIR%%/hints -%%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/icons -%%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%EXAMPLESDIR%% diff --git a/net/opal/Makefile b/net/opal/Makefile deleted file mode 100644 index 07eeffec3a8c..000000000000 --- a/net/opal/Makefile +++ /dev/null @@ -1,68 +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.12.0 -PORTREVISION= 4 -CATEGORIES= net -MASTER_SITES= http://www.openh323.org/bin/ \ - http://www.de.openh323.org/bin/ \ - http://www.gnomemeeting.org/downloads/0.98.0/sources/ -DISTNAME= ${PORTNAME}_${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A H323 Video Conferencing library - -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build - -LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 - -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -# Check for telephony.h in the two places the source is hard coded to check -# /usr/include/sys and /usr/local/include/sys -# If it is not present, extract it from the comms/ixj port -.if !exists(/usr/include/sys/telephony.h) -.if !exists(/usr/local/include/sys/telephony.h) -PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch -.endif -.endif -.endif - -WRKSRC= ${WRKDIR}/${PORTNAME} - -PLIST_FILES= bin/simph323 -USE_BISON= yes - -USE_GMAKE= yes -USE_OPENLDAP= yes -USE_AUTOCONF_VER= 253 -GNU_CONFIGURE= yes -CONFIGURE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIR}/openh323 -ALL_TARGET= optnoshared -MAKE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIR}/openh323 -THE_MACHTYPE= ${ARCH:S/i386/x86/} -MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} - -post-patch: -.if ${OSVERSION} < 500000 -.if !exists(/usr/include/sys/telephony.h) -.if !exists(/usr/local/include/sys/telephony.h) - # Copy ixj driver include files into OpenH323 include directory - ${MKDIR} ${WRKDIR}/openh323/include/sys - ${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys - ${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys -.endif -.endif -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin - -.include <bsd.port.post.mk> diff --git a/net/opal/distinfo b/net/opal/distinfo deleted file mode 100644 index bc1860481dea..000000000000 --- a/net/opal/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392 -SIZE (openh323_1.12.0.tar.gz) = 2325128 diff --git a/net/opal/files/patch-configurein b/net/opal/files/patch-configurein deleted file mode 100644 index edff8fef174b..000000000000 --- a/net/opal/files/patch-configurein +++ /dev/null @@ -1,50 +0,0 @@ -Index: configure.in -diff -c configure.in.orig configure.in -*** configure.in.orig Thu May 22 21:25:00 2003 ---- configure.in Sun Nov 23 22:51:33 2003 -*************** -*** 73,85 **** - - dnl ######################################################################## - dnl get pwlib directory -! if test "${PWLIBDIR:-unset}" == "unset" ; then - PWLIBDIR=`ptlib-config --prefix` - fi -! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then - PWLIBDIR="/usr/share/pwlib/" - fi -! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then - PWLIBDIR="/usr/local/share/pwlib/" - fi - echo "PWLib prefix set to.... $PWLIBDIR" ---- 73,85 ---- - - dnl ######################################################################## - dnl get pwlib directory -! if test "${PWLIBDIR:-unset}" = "unset" ; then - PWLIBDIR=`ptlib-config --prefix` - fi -! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then - PWLIBDIR="/usr/share/pwlib/" - fi -! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then - PWLIBDIR="/usr/local/share/pwlib/" - fi - echo "PWLib prefix set to.... $PWLIBDIR" -*************** -*** 96,102 **** - else - AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) - if test "${H323_AVCODEC:-unset}" != "unset" ; then -! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg - AVCODECLIBDIR=/usr/local/lib - fi - fi ---- 96,102 ---- - else - AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) - if test "${H323_AVCODEC:-unset}" != "unset" ; then -! AVCODECINCLUDEDIR=/usr/local/include - AVCODECLIBDIR=/usr/local/lib - fi - fi diff --git a/net/opal/files/patch-include::gkserver.h b/net/opal/files/patch-include::gkserver.h deleted file mode 100644 index cdc0ba88ce08..000000000000 --- a/net/opal/files/patch-include::gkserver.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/gkserver.h 2004/08/28 17:16:13 1.1 -+++ include/gkserver.h 2004/08/28 17:16:24 -@@ -404,7 +404,6 @@ - H225_RegistrationConfirm & rcf; - H225_RegistrationReject & rrj; - -- protected: - virtual Response OnHandlePDU(); - }; - diff --git a/net/opal/files/patch-ixjlid b/net/opal/files/patch-ixjlid deleted file mode 100644 index faec5f30ea6b..000000000000 --- a/net/opal/files/patch-ixjlid +++ /dev/null @@ -1,21 +0,0 @@ -*** include/ixjlid.h.orig Tue Sep 2 17:32:20 2003 ---- include/ixjlid.h Tue Sep 2 17:32:37 2003 -*************** -*** 253,260 **** - #include <linux/ixjuser.h> - #endif - #ifdef P_FREEBSD -! #include <sys/telephony.h> -! #include <sys/ixjuser.h> - #endif - #endif - ---- 253,260 ---- - #include <linux/ixjuser.h> - #endif - #ifdef P_FREEBSD -! #include "sys/telephony.h" -! #include "sys/ixjuser.h" - #endif - #endif - diff --git a/net/opal/files/patch-openh323uin b/net/opal/files/patch-openh323uin deleted file mode 100644 index 4613a12f810e..000000000000 --- a/net/opal/files/patch-openh323uin +++ /dev/null @@ -1,53 +0,0 @@ -*** openh323u.mak.in.orig Wed May 14 20:52:44 2003 ---- openh323u.mak.in Sun Aug 31 21:26:51 2003 -*************** LIBDIRS += $(OPENH323DIR) -*** 142,152 **** - - - OH323_SRCDIR = $(OPENH323DIR)/src -! ifdef PREFIX -! OH323_INCDIR = $(PREFIX)/include/openh323 -! else - OH323_INCDIR = $(OPENH323DIR)/include -! endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - ---- 142,152 ---- - - - OH323_SRCDIR = $(OPENH323DIR)/src -! #ifdef PREFIX -! #OH323_INCDIR = $(PREFIX)/include/openh323 -! #else - OH323_INCDIR = $(OPENH323DIR)/include -! #endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - -*************** ifdef OH323_SUPPRESS_H235 -*** 184,189 **** ---- 184,190 ---- - STDCCFLAGS += -DOH323_SUPPRESS_H235 - endif - -+ # Check for the ixj/telephony header files on the system. - ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -*************** endif -*** 197,202 **** ---- 198,210 ---- - ifneq (,$(wildcard /usr/local/include/sys/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -I/usr/local/include -+ endif -+ -+ # In the FreeBSD port, we make a local copy of the ixj header files from -+ # the ixj driver in openh323/include/sys -+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) -+ HAS_IXJ = 1 -+ STDCCFLAGS += -DHAS_IXJ - endif - - #Check if we have an OSS soundcard.h diff --git a/net/opal/files/patch-src::h263codec.cxx b/net/opal/files/patch-src::h263codec.cxx deleted file mode 100644 index d8b45f8b078f..000000000000 --- a/net/opal/files/patch-src::h263codec.cxx +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/h263codec.cxx -diff -u src/h263codec.cxx.orig src/h263codec.cxx ---- src/h263codec.cxx.orig Fri Jun 6 15:32:08 2003 -+++ src/h263codec.cxx Sat Nov 22 23:17:45 2003 -@@ -109,7 +109,7 @@ - #include "rtp.h" - - extern "C" { --#include <avcodec.h> -+#include <ffmpeg/avcodec.h> - }; - - 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/opal3/Makefile b/net/opal3/Makefile deleted file mode 100644 index 07eeffec3a8c..000000000000 --- a/net/opal3/Makefile +++ /dev/null @@ -1,68 +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.12.0 -PORTREVISION= 4 -CATEGORIES= net -MASTER_SITES= http://www.openh323.org/bin/ \ - http://www.de.openh323.org/bin/ \ - http://www.gnomemeeting.org/downloads/0.98.0/sources/ -DISTNAME= ${PORTNAME}_${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A H323 Video Conferencing library - -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build - -LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 - -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -# Check for telephony.h in the two places the source is hard coded to check -# /usr/include/sys and /usr/local/include/sys -# If it is not present, extract it from the comms/ixj port -.if !exists(/usr/include/sys/telephony.h) -.if !exists(/usr/local/include/sys/telephony.h) -PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch -.endif -.endif -.endif - -WRKSRC= ${WRKDIR}/${PORTNAME} - -PLIST_FILES= bin/simph323 -USE_BISON= yes - -USE_GMAKE= yes -USE_OPENLDAP= yes -USE_AUTOCONF_VER= 253 -GNU_CONFIGURE= yes -CONFIGURE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIR}/openh323 -ALL_TARGET= optnoshared -MAKE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIR}/openh323 -THE_MACHTYPE= ${ARCH:S/i386/x86/} -MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} - -post-patch: -.if ${OSVERSION} < 500000 -.if !exists(/usr/include/sys/telephony.h) -.if !exists(/usr/local/include/sys/telephony.h) - # Copy ixj driver include files into OpenH323 include directory - ${MKDIR} ${WRKDIR}/openh323/include/sys - ${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys - ${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys -.endif -.endif -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin - -.include <bsd.port.post.mk> diff --git a/net/opal3/distinfo b/net/opal3/distinfo deleted file mode 100644 index bc1860481dea..000000000000 --- a/net/opal3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392 -SIZE (openh323_1.12.0.tar.gz) = 2325128 diff --git a/net/opal3/files/patch-configurein b/net/opal3/files/patch-configurein deleted file mode 100644 index edff8fef174b..000000000000 --- a/net/opal3/files/patch-configurein +++ /dev/null @@ -1,50 +0,0 @@ -Index: configure.in -diff -c configure.in.orig configure.in -*** configure.in.orig Thu May 22 21:25:00 2003 ---- configure.in Sun Nov 23 22:51:33 2003 -*************** -*** 73,85 **** - - dnl ######################################################################## - dnl get pwlib directory -! if test "${PWLIBDIR:-unset}" == "unset" ; then - PWLIBDIR=`ptlib-config --prefix` - fi -! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then - PWLIBDIR="/usr/share/pwlib/" - fi -! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then - PWLIBDIR="/usr/local/share/pwlib/" - fi - echo "PWLib prefix set to.... $PWLIBDIR" ---- 73,85 ---- - - dnl ######################################################################## - dnl get pwlib directory -! if test "${PWLIBDIR:-unset}" = "unset" ; then - PWLIBDIR=`ptlib-config --prefix` - fi -! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then - PWLIBDIR="/usr/share/pwlib/" - fi -! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then - PWLIBDIR="/usr/local/share/pwlib/" - fi - echo "PWLib prefix set to.... $PWLIBDIR" -*************** -*** 96,102 **** - else - AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) - if test "${H323_AVCODEC:-unset}" != "unset" ; then -! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg - AVCODECLIBDIR=/usr/local/lib - fi - fi ---- 96,102 ---- - else - AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) - if test "${H323_AVCODEC:-unset}" != "unset" ; then -! AVCODECINCLUDEDIR=/usr/local/include - AVCODECLIBDIR=/usr/local/lib - fi - fi diff --git a/net/opal3/files/patch-include::gkserver.h b/net/opal3/files/patch-include::gkserver.h deleted file mode 100644 index cdc0ba88ce08..000000000000 --- a/net/opal3/files/patch-include::gkserver.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/gkserver.h 2004/08/28 17:16:13 1.1 -+++ include/gkserver.h 2004/08/28 17:16:24 -@@ -404,7 +404,6 @@ - H225_RegistrationConfirm & rcf; - H225_RegistrationReject & rrj; - -- protected: - virtual Response OnHandlePDU(); - }; - diff --git a/net/opal3/files/patch-ixjlid b/net/opal3/files/patch-ixjlid deleted file mode 100644 index faec5f30ea6b..000000000000 --- a/net/opal3/files/patch-ixjlid +++ /dev/null @@ -1,21 +0,0 @@ -*** include/ixjlid.h.orig Tue Sep 2 17:32:20 2003 ---- include/ixjlid.h Tue Sep 2 17:32:37 2003 -*************** -*** 253,260 **** - #include <linux/ixjuser.h> - #endif - #ifdef P_FREEBSD -! #include <sys/telephony.h> -! #include <sys/ixjuser.h> - #endif - #endif - ---- 253,260 ---- - #include <linux/ixjuser.h> - #endif - #ifdef P_FREEBSD -! #include "sys/telephony.h" -! #include "sys/ixjuser.h" - #endif - #endif - diff --git a/net/opal3/files/patch-openh323uin b/net/opal3/files/patch-openh323uin deleted file mode 100644 index 4613a12f810e..000000000000 --- a/net/opal3/files/patch-openh323uin +++ /dev/null @@ -1,53 +0,0 @@ -*** openh323u.mak.in.orig Wed May 14 20:52:44 2003 ---- openh323u.mak.in Sun Aug 31 21:26:51 2003 -*************** LIBDIRS += $(OPENH323DIR) -*** 142,152 **** - - - OH323_SRCDIR = $(OPENH323DIR)/src -! ifdef PREFIX -! OH323_INCDIR = $(PREFIX)/include/openh323 -! else - OH323_INCDIR = $(OPENH323DIR)/include -! endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - ---- 142,152 ---- - - - OH323_SRCDIR = $(OPENH323DIR)/src -! #ifdef PREFIX -! #OH323_INCDIR = $(PREFIX)/include/openh323 -! #else - OH323_INCDIR = $(OPENH323DIR)/include -! #endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - -*************** ifdef OH323_SUPPRESS_H235 -*** 184,189 **** ---- 184,190 ---- - STDCCFLAGS += -DOH323_SUPPRESS_H235 - endif - -+ # Check for the ixj/telephony header files on the system. - ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -*************** endif -*** 197,202 **** ---- 198,210 ---- - ifneq (,$(wildcard /usr/local/include/sys/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -I/usr/local/include -+ endif -+ -+ # In the FreeBSD port, we make a local copy of the ixj header files from -+ # the ixj driver in openh323/include/sys -+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) -+ HAS_IXJ = 1 -+ STDCCFLAGS += -DHAS_IXJ - endif - - #Check if we have an OSS soundcard.h diff --git a/net/opal3/files/patch-src::h263codec.cxx b/net/opal3/files/patch-src::h263codec.cxx deleted file mode 100644 index d8b45f8b078f..000000000000 --- a/net/opal3/files/patch-src::h263codec.cxx +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/h263codec.cxx -diff -u src/h263codec.cxx.orig src/h263codec.cxx ---- src/h263codec.cxx.orig Fri Jun 6 15:32:08 2003 -+++ src/h263codec.cxx Sat Nov 22 23:17:45 2003 -@@ -109,7 +109,7 @@ - #include "rtp.h" - - extern "C" { --#include <avcodec.h> -+#include <ffmpeg/avcodec.h> - }; - - 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/openh323-112/Makefile b/net/openh323-112/Makefile deleted file mode 100644 index 07eeffec3a8c..000000000000 --- a/net/openh323-112/Makefile +++ /dev/null @@ -1,68 +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.12.0 -PORTREVISION= 4 -CATEGORIES= net -MASTER_SITES= http://www.openh323.org/bin/ \ - http://www.de.openh323.org/bin/ \ - http://www.gnomemeeting.org/downloads/0.98.0/sources/ -DISTNAME= ${PORTNAME}_${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= A H323 Video Conferencing library - -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/pwlib:build - -LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 - -.include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 -# Check for telephony.h in the two places the source is hard coded to check -# /usr/include/sys and /usr/local/include/sys -# If it is not present, extract it from the comms/ixj port -.if !exists(/usr/include/sys/telephony.h) -.if !exists(/usr/local/include/sys/telephony.h) -PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/comms/ixj:patch -.endif -.endif -.endif - -WRKSRC= ${WRKDIR}/${PORTNAME} - -PLIST_FILES= bin/simph323 -USE_BISON= yes - -USE_GMAKE= yes -USE_OPENLDAP= yes -USE_AUTOCONF_VER= 253 -GNU_CONFIGURE= yes -CONFIGURE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIR}/openh323 -ALL_TARGET= optnoshared -MAKE_ENV= PWLIBDIR=${WRKDIR}/../../../devel/pwlib/work/pwlib \ - OPENH323DIR=${WRKDIR}/openh323 -THE_MACHTYPE= ${ARCH:S/i386/x86/} -MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} - -post-patch: -.if ${OSVERSION} < 500000 -.if !exists(/usr/include/sys/telephony.h) -.if !exists(/usr/local/include/sys/telephony.h) - # Copy ixj driver include files into OpenH323 include directory - ${MKDIR} ${WRKDIR}/openh323/include/sys - ${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/telephony.h ${WRKDIR}/openh323/include/sys - ${CP} ${WRKDIRPREFIX}${.CURDIR}/../../comms/ixj/work/ixj_freebsd/ixjuser.h ${WRKDIR}/openh323/include/sys -.endif -.endif -.endif - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/samples/simple/obj_${OPSYS}_${THE_MACHTYPE}_r/simph323 ${PREFIX}/bin - -.include <bsd.port.post.mk> diff --git a/net/openh323-112/distinfo b/net/openh323-112/distinfo deleted file mode 100644 index bc1860481dea..000000000000 --- a/net/openh323-112/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (openh323_1.12.0.tar.gz) = f7932f0a17d6afafc7332036a4b5d392 -SIZE (openh323_1.12.0.tar.gz) = 2325128 diff --git a/net/openh323-112/files/patch-configurein b/net/openh323-112/files/patch-configurein deleted file mode 100644 index edff8fef174b..000000000000 --- a/net/openh323-112/files/patch-configurein +++ /dev/null @@ -1,50 +0,0 @@ -Index: configure.in -diff -c configure.in.orig configure.in -*** configure.in.orig Thu May 22 21:25:00 2003 ---- configure.in Sun Nov 23 22:51:33 2003 -*************** -*** 73,85 **** - - dnl ######################################################################## - dnl get pwlib directory -! if test "${PWLIBDIR:-unset}" == "unset" ; then - PWLIBDIR=`ptlib-config --prefix` - fi -! if test "x$PWLIBDIR" == "x/usr" -o "x$PWLIBDIR" == "x/usr/"; then - PWLIBDIR="/usr/share/pwlib/" - fi -! if test "xPWLIBDIR" == "x/usr/local" -o "x$PWLIBDIR" == "x/usr/"; then - PWLIBDIR="/usr/local/share/pwlib/" - fi - echo "PWLib prefix set to.... $PWLIBDIR" ---- 73,85 ---- - - dnl ######################################################################## - dnl get pwlib directory -! if test "${PWLIBDIR:-unset}" = "unset" ; then - PWLIBDIR=`ptlib-config --prefix` - fi -! if test "x$PWLIBDIR" = "x/usr" -o "x$PWLIBDIR" = "x/usr/"; then - PWLIBDIR="/usr/share/pwlib/" - fi -! if test "xPWLIBDIR" = "x/usr/local" -o "x$PWLIBDIR" = "x/usr/"; then - PWLIBDIR="/usr/local/share/pwlib/" - fi - echo "PWLib prefix set to.... $PWLIBDIR" -*************** -*** 96,102 **** - else - AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) - if test "${H323_AVCODEC:-unset}" != "unset" ; then -! AVCODECINCLUDEDIR=/usr/local/include/ffmpeg - AVCODECLIBDIR=/usr/local/lib - fi - fi ---- 96,102 ---- - else - AC_CHECK_FILE(/usr/local/include/ffmpeg/avcodec.h, H323_AVCODEC=1) - if test "${H323_AVCODEC:-unset}" != "unset" ; then -! AVCODECINCLUDEDIR=/usr/local/include - AVCODECLIBDIR=/usr/local/lib - fi - fi diff --git a/net/openh323-112/files/patch-include::gkserver.h b/net/openh323-112/files/patch-include::gkserver.h deleted file mode 100644 index cdc0ba88ce08..000000000000 --- a/net/openh323-112/files/patch-include::gkserver.h +++ /dev/null @@ -1,10 +0,0 @@ ---- include/gkserver.h 2004/08/28 17:16:13 1.1 -+++ include/gkserver.h 2004/08/28 17:16:24 -@@ -404,7 +404,6 @@ - H225_RegistrationConfirm & rcf; - H225_RegistrationReject & rrj; - -- protected: - virtual Response OnHandlePDU(); - }; - diff --git a/net/openh323-112/files/patch-ixjlid b/net/openh323-112/files/patch-ixjlid deleted file mode 100644 index faec5f30ea6b..000000000000 --- a/net/openh323-112/files/patch-ixjlid +++ /dev/null @@ -1,21 +0,0 @@ -*** include/ixjlid.h.orig Tue Sep 2 17:32:20 2003 ---- include/ixjlid.h Tue Sep 2 17:32:37 2003 -*************** -*** 253,260 **** - #include <linux/ixjuser.h> - #endif - #ifdef P_FREEBSD -! #include <sys/telephony.h> -! #include <sys/ixjuser.h> - #endif - #endif - ---- 253,260 ---- - #include <linux/ixjuser.h> - #endif - #ifdef P_FREEBSD -! #include "sys/telephony.h" -! #include "sys/ixjuser.h" - #endif - #endif - diff --git a/net/openh323-112/files/patch-openh323uin b/net/openh323-112/files/patch-openh323uin deleted file mode 100644 index 4613a12f810e..000000000000 --- a/net/openh323-112/files/patch-openh323uin +++ /dev/null @@ -1,53 +0,0 @@ -*** openh323u.mak.in.orig Wed May 14 20:52:44 2003 ---- openh323u.mak.in Sun Aug 31 21:26:51 2003 -*************** LIBDIRS += $(OPENH323DIR) -*** 142,152 **** - - - OH323_SRCDIR = $(OPENH323DIR)/src -! ifdef PREFIX -! OH323_INCDIR = $(PREFIX)/include/openh323 -! else - OH323_INCDIR = $(OPENH323DIR)/include -! endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - ---- 142,152 ---- - - - OH323_SRCDIR = $(OPENH323DIR)/src -! #ifdef PREFIX -! #OH323_INCDIR = $(PREFIX)/include/openh323 -! #else - OH323_INCDIR = $(OPENH323DIR)/include -! #endif - OH323_LIBDIR = $(OPENH323DIR)/lib - - -*************** ifdef OH323_SUPPRESS_H235 -*** 184,189 **** ---- 184,190 ---- - STDCCFLAGS += -DOH323_SUPPRESS_H235 - endif - -+ # Check for the ixj/telephony header files on the system. - ifneq (,$(wildcard $(SYSINCDIR)/linux/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -*************** endif -*** 197,202 **** ---- 198,210 ---- - ifneq (,$(wildcard /usr/local/include/sys/telephony.h)) - HAS_IXJ = 1 - STDCCFLAGS += -DHAS_IXJ -I/usr/local/include -+ endif -+ -+ # In the FreeBSD port, we make a local copy of the ixj header files from -+ # the ixj driver in openh323/include/sys -+ ifneq (,$(wildcard $(OPENH323DIR)/include/sys/telephony.h)) -+ HAS_IXJ = 1 -+ STDCCFLAGS += -DHAS_IXJ - endif - - #Check if we have an OSS soundcard.h diff --git a/net/openh323-112/files/patch-src::h263codec.cxx b/net/openh323-112/files/patch-src::h263codec.cxx deleted file mode 100644 index d8b45f8b078f..000000000000 --- a/net/openh323-112/files/patch-src::h263codec.cxx +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/h263codec.cxx -diff -u src/h263codec.cxx.orig src/h263codec.cxx ---- src/h263codec.cxx.orig Fri Jun 6 15:32:08 2003 -+++ src/h263codec.cxx Sat Nov 22 23:17:45 2003 -@@ -109,7 +109,7 @@ - #include "rtp.h" - - extern "C" { --#include <avcodec.h> -+#include <ffmpeg/avcodec.h> - }; - - diff --git a/net/openh323-112/pkg-descr b/net/openh323-112/pkg-descr deleted file mode 100644 index 5ea7add9f222..000000000000 --- a/net/openh323-112/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/openldap23-client/Makefile b/net/openldap23-client/Makefile deleted file mode 100644 index f5ce1cde5e5b..000000000000 --- a/net/openldap23-client/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: openldap22-client -# Date created: 10 Jul 2003 -# Whom: Oliver Eikemeier <eikemeier@fillmore-labs.com> -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -client - -COMMENT= Open source LDAP client implementation - -CLIENT_ONLY= yes - -MASTERDIR= ${.CURDIR}/../openldap22-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/openldap23-sasl-client/Makefile b/net/openldap23-sasl-client/Makefile deleted file mode 100644 index def3d97655fe..000000000000 --- a/net/openldap23-sasl-client/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: openldap22-sasl-client -# Date created: 01 May 2004 -# Whom: Oliver Eikemeier -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -sasl-client - -COMMENT= Open source LDAP client implementation with SASL2 support - -CLIENT_ONLY= yes -WITH_SASL= yes - -MASTERDIR= ${.CURDIR}/../openldap22-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/openldap23-sasl-server/Makefile b/net/openldap23-sasl-server/Makefile deleted file mode 100644 index 7cf17b2ff915..000000000000 --- a/net/openldap23-sasl-server/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: openldap22-sasl-server -# Date created: 01 May 2004 -# Whom: Oliver Eikemeier -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -sasl-server - -COMMENT= Open source LDAP server implementation with SASL2 support - -WITH_SASL= yes - -MASTERDIR= ${.CURDIR}/../openldap22-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile deleted file mode 100644 index 7c96b9236559..000000000000 --- a/net/openldap23-server/Makefile +++ /dev/null @@ -1,415 +0,0 @@ -# New ports collection makefile for: openldap22-server -# Date created: 10 Jul 2003 -# Whom: Oliver Eikemeier -# -# $FreeBSD$ -# - -PORTNAME= openldap -PORTVERSION= 2.2.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.shellhung.org/pub/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%/ \ - http://openldap.cdpa.nsysu.edu.tw/OpenLDAP/%SUBDIR%/ \ - ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/ -MASTER_SITE_SUBDIR= openldap-release -PKGNAMESUFFIX?= -server -EXTRACT_SUFX= .tgz - -MAINTAINER= eik@FreeBSD.org -COMMENT?= Open source LDAP server implementation - -UNIQUENAME?= ${PKGNAMEPREFIX}openldap22 -LATEST_LINK?= ${UNIQUENAME}${PKGNAMESUFFIX} - -WANT_OPENLDAP_VER?= 22 -.if ${WANT_OPENLDAP_VER} != 22 -BROKEN= "incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}" -.endif - -PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 - -.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.[!2].* -.elif ${PKGNAMESUFFIX} == "-client" -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!2].* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* -.else -BROKEN= Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX} -.endif - -.if !defined(NOPORTDOCS) -PORTDOCS= CHANGES drafts rfc -.endif - -.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) -RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-sasl-client -.else -RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client -.endif - -.if ${PKGNAMESUFFIX} == "-sasl-server" -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[!2].* -.elif ${PKGNAMESUFFIX} == "-server" -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[!2].* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.* -.else -BROKEN= Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX} -.endif - -.endif - -USE_OPENSSL= yes -USE_REINPLACE= yes -USE_LIBTOOL_VER= 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 - -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) -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 - -INSTALLS_SHLIB= yes - -.else -# server specific configuration - -USE_RC_SUBR= yes - -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in - -.if defined(WITH_MODULES) || defined(WITH_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) -USE_LIBLTDL= yes -CONFIGURE_ARGS+= --enable-modules -PLIST_SUB+= MODULES="" -.else -PLIST_SUB+= MODULES="@comment " -.endif - -.if defined(WITH_DYNAMIC_BACKENDS) -BACKEND_ENABLE= "mod" -BACKEND_PLIST= "" -.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(WITHOUT_BDB) -CONFIGURE_ARGS+= --disable-bdb \ - --disable-hdb \ - --with-ldbm-api=bcompat -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB="@comment " -.else - -WITH_BDB_VER?= 42 - -.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 or 42 -.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(WITH_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) -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_CLDAP) -CPPFLAGS+= -DLDAP_CONNECTIONLESS -.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 - -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}" - -.include <bsd.port.pre.mk> - -.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 - -pre-everything:: - @${ECHO} "=============================================================" - @${ECHO} - @${ECHO} "You can build ${PKGNAME} with the following options:" - @${ECHO} -.if defined(CLIENT_ONLY) - @${ECHO} "WITH_SASL with (Cyrus) SASL2 support" -.else - @${ECHO} "WITH_BDB_VER select BerkeleyDB version (default 42)" - @${ECHO} "WITH_SASL with (Cyrus) SASL2 password verification" - @${ECHO} "WITH_PERL with Perl backend" - @${ECHO} "WITH_SHELL with Shell backend" - @${ECHO} "WITH_ODBC with SQL backend" - @${ECHO} "WITH_ODBC_TYPE select ODBC interface (iODBC or unixODBC)" - @${ECHO} "WITH_SLAPI with Netscape SLAPI plugin API - @${ECHO} "WITHOUT_TCP_WRAPPERS without tcp wrapper support" - @${ECHO} "WITHOUT_BDB without BerkeleyDB support" - @${ECHO} "WITH_DYNGROUP with Dynamic Group overlay" - @${ECHO} "WITH_PROXYCACHE with Proxy Cache overlay" - @${ECHO} "WITH_DYNAMIC_BACKENDS build backends as modules" -.if defined(DFOSVERSION) || ${OSVERSION} >= 500038 - @${ECHO} "WITH_RCORDER slapd(1) should start early in the boot process" -.endif -.endif - @${ECHO} - @${ECHO} "=============================================================" - @${ECHO} - -post-patch: - @${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \ - -e 's,\(back_[a-z]*\).la,\1,g' \ - ${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(WITH_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/openldap23-server/distinfo b/net/openldap23-server/distinfo deleted file mode 100644 index 00c8773fd414..000000000000 --- a/net/openldap23-server/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (openldap-2.2.19.tgz) = e196c24c4eb714758c57d12f3b962bae -SIZE (openldap-2.2.19.tgz) = 2601096 diff --git a/net/openldap23-server/files/extrapatch-Makefile.in b/net/openldap23-server/files/extrapatch-Makefile.in deleted file mode 100644 index e274e6bd35f2..000000000000 --- a/net/openldap23-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/openldap23-server/files/manpages b/net/openldap23-server/files/manpages deleted file mode 100644 index bf7071542349..000000000000 --- a/net/openldap23-server/files/manpages +++ /dev/null @@ -1,194 +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-meta.5 \ - slapd-monitor.5 \ - slapd-null.5 \ - slapd-passwd.5 \ - slapd-perl.5 \ - slapd-shell.5 \ - slapd-sql.5 \ - slapd-tcl.5 \ - slapd.access.5 \ - slapd.conf.5 \ - slapd.plugin.5 \ - slapd.replog.5 - -MAN8+= slapadd.8 \ - slapcat.8 \ - slapd.8 \ - slapdn.8 \ - slapindex.8 \ - slappasswd.8 \ - slaptest.8 \ - slurpd.8 diff --git a/net/openldap23-server/files/patch-build::top.mk b/net/openldap23-server/files/patch-build::top.mk deleted file mode 100644 index 1a7d0bb01646..000000000000 --- a/net/openldap23-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 -@@ -194,6 +194,8 @@ - SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_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/openldap23-server/files/patch-configure b/net/openldap23-server/files/patch-configure deleted file mode 100644 index 7f32b0a770b9..000000000000 --- a/net/openldap23-server/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig Tue Jul 27 18:33:12 2004 -+++ configure Sat Aug 14 17:05:23 2004 -@@ -20145,7 +20145,7 @@ - - - if test $ol_cv_bdb_compat = yes ; then -- ol_enable_bdb=yes -+ ol_enable_bdb=${ol_enable_bdb-yes} - elif test $ol_enable_bdb = yes ; then - { echo "configure: error: BDB: BerkeleyDB version incompatible" 1>&2; exit 1; } - else -@@ -20997,7 +20997,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liodbc $LIBS" -+LIBS="-liodbc $LIBS $LTHREAD_LIBS" - cat > conftest.$ac_ext <<EOF - #line 21003 "configure" - #include "confdefs.h" -@@ -21041,7 +21041,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lodbc $LIBS" -+LIBS="-lodbc $LIBS $LTHREAD_LIBS" - cat > conftest.$ac_ext <<EOF - #line 21047 "configure" - #include "confdefs.h" diff --git a/net/openldap23-server/files/patch-include::ldap_defaults.h b/net/openldap23-server/files/patch-include::ldap_defaults.h deleted file mode 100644 index 6ea31dbcd65c..000000000000 --- a/net/openldap23-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/openldap23-server/files/patch-servers::slapd::Makefile.in b/net/openldap23-server/files/patch-servers::slapd::Makefile.in deleted file mode 100644 index 15fec0e4f888..000000000000 --- a/net/openldap23-server/files/patch-servers::slapd::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- servers/slapd/Makefile.in.orig Mon Dec 29 19:10:38 2003 -+++ servers/slapd/Makefile.in Tue Jan 20 02:33:39 2004 -@@ -354,7 +354,6 @@ - - install-slapd: FORCE - -$(MKDIR) $(DESTDIR)$(libexecdir) -- -$(MKDIR) $(DESTDIR)$(localstatedir)/run - $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \ - slapd$(EXEEXT) $(DESTDIR)$(libexecdir) - @for i in $(SUBDIRS); do \ diff --git a/net/openldap23-server/files/slapd.sh b/net/openldap23-server/files/slapd.sh deleted file mode 100644 index 6c6066220aec..000000000000 --- a/net/openldap23-server/files/slapd.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: slapd -# REQUIRE: NETWORKING SERVERS -# BEFORE: securelevel -# KEYWORD: FreeBSD 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/openldap23-server/files/slurpd.sh b/net/openldap23-server/files/slurpd.sh deleted file mode 100644 index 79021305b400..000000000000 --- a/net/openldap23-server/files/slurpd.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: slurpd -# REQUIRE: slapd -# BEFORE: -# KEYWORD: FreeBSD 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/openldap23-server/pkg-deinstall b/net/openldap23-server/pkg-deinstall deleted file mode 100644 index 2a5ec1ef8f65..000000000000 --- a/net/openldap23-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/openldap23-server/pkg-descr b/net/openldap23-server/pkg-descr deleted file mode 100644 index 509e40a2462f..000000000000 --- a/net/openldap23-server/pkg-descr +++ /dev/null @@ -1,15 +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 the latest release of OpenLDAP Software for general use. - -WWW: http://www.OpenLDAP.org/ - -- Oliver Eikemeier -eikemeier@fillmore-labs.com diff --git a/net/openldap23-server/pkg-descr.client b/net/openldap23-server/pkg-descr.client deleted file mode 100644 index 7e508c450d4a..000000000000 --- a/net/openldap23-server/pkg-descr.client +++ /dev/null @@ -1,16 +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 - -This is the latest release of OpenLDAP Software for general use. - -WWW: http://www.OpenLDAP.org/ - -- Oliver Eikemeier -eikemeier@fillmore-labs.com diff --git a/net/openldap23-server/pkg-install b/net/openldap23-server/pkg-install deleted file mode 100644 index aa9b0cf46da9..000000000000 --- a/net/openldap23-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/openldap23-server/pkg-message b/net/openldap23-server/pkg-message deleted file mode 100644 index c0e6a9292a63..000000000000 --- a/net/openldap23-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/admin22/ -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/openldap23-server/pkg-message.client b/net/openldap23-server/pkg-message.client deleted file mode 100644 index 92ef70d0f99b..000000000000 --- a/net/openldap23-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/openldap23-server/pkg-plist b/net/openldap23-server/pkg-plist deleted file mode 100644 index 193acee2941d..000000000000 --- a/net/openldap23-server/pkg-plist +++ /dev/null @@ -1,59 +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 -@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 -%%SLAPI%%lib/libslapi.a -%%SLAPI%%lib/libslapi.so -%%SLAPI%%lib/libslapi-2.2.so -%%SLAPI%%lib/libslapi-2.2.so.7 -%%MODULES%%@exec mkdir -p %D/libexec/openldap -%%BACK_BDB%%libexec/openldap/back_bdb.so -%%BACK_BDB%%libexec/openldap/back_bdb-2.2.so -%%BACK_BDB%%libexec/openldap/back_bdb-2.2.so.7 -%%BACK_HDB%%libexec/openldap/back_hdb.so -%%BACK_HDB%%libexec/openldap/back_hdb-2.2.so -%%BACK_HDB%%libexec/openldap/back_hdb-2.2.so.7 -%%BACKEND%%libexec/openldap/back_ldap.so -%%BACKEND%%libexec/openldap/back_ldap-2.2.so -%%BACKEND%%libexec/openldap/back_ldap-2.2.so.7 -%%BACKEND%%libexec/openldap/back_ldbm.so -%%BACKEND%%libexec/openldap/back_ldbm-2.2.so -%%BACKEND%%libexec/openldap/back_ldbm-2.2.so.7 -%%BACKEND%%libexec/openldap/back_meta.so -%%BACKEND%%libexec/openldap/back_meta-2.2.so -%%BACKEND%%libexec/openldap/back_meta-2.2.so.7 -%%BACKEND%%libexec/openldap/back_monitor.so -%%BACKEND%%libexec/openldap/back_monitor-2.2.so -%%BACKEND%%libexec/openldap/back_monitor-2.2.so.7 -%%BACKEND%%libexec/openldap/back_null.so -%%BACKEND%%libexec/openldap/back_null-2.2.so -%%BACKEND%%libexec/openldap/back_null-2.2.so.7 -%%BACK_PERL%%libexec/openldap/back_perl.so -%%BACK_PERL%%libexec/openldap/back_perl-2.2.so -%%BACK_PERL%%libexec/openldap/back_perl-2.2.so.7 -%%BACK_SHELL%%libexec/openldap/back_shell.so -%%BACK_SHELL%%libexec/openldap/back_shell-2.2.so -%%BACK_SHELL%%libexec/openldap/back_shell-2.2.so.7 -%%BACK_SQL%%libexec/openldap/back_sql.so -%%BACK_SQL%%libexec/openldap/back_sql-2.2.so -%%BACK_SQL%%libexec/openldap/back_sql-2.2.so.7 -%%MODULES%%@unexec rmdir %D/libexec/openldap 2>/dev/null || true -libexec/slapd -libexec/slurpd -@comment sbin/slapacl -sbin/slapadd -@comment 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/openldap23-server/pkg-plist.client b/net/openldap23-server/pkg-plist.client deleted file mode 100644 index dc0a65c63837..000000000000 --- a/net/openldap23-server/pkg-plist.client +++ /dev/null @@ -1,42 +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 -@unexec rmdir %D/etc/openldap 2>/dev/null || true -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.a -lib/liblber.so -lib/liblber-2.2.so -lib/liblber-2.2.so.7 -lib/libldap.a -lib/libldap.so -lib/libldap-2.2.so -lib/libldap-2.2.so.7 -lib/libldap_r.a -lib/libldap_r.so -lib/libldap_r-2.2.so -lib/libldap_r-2.2.so.7 -share/openldap/ucdata/case.dat -share/openldap/ucdata/cmbcl.dat -share/openldap/ucdata/comp.dat -share/openldap/ucdata/ctype.dat -share/openldap/ucdata/decomp.dat -share/openldap/ucdata/kdecomp.dat -share/openldap/ucdata/num.dat -@dirrm share/openldap/ucdata -@dirrm share/openldap diff --git a/net/openldap24-client/Makefile b/net/openldap24-client/Makefile deleted file mode 100644 index f5ce1cde5e5b..000000000000 --- a/net/openldap24-client/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# New ports collection makefile for: openldap22-client -# Date created: 10 Jul 2003 -# Whom: Oliver Eikemeier <eikemeier@fillmore-labs.com> -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -client - -COMMENT= Open source LDAP client implementation - -CLIENT_ONLY= yes - -MASTERDIR= ${.CURDIR}/../openldap22-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/openldap24-sasl-client/Makefile b/net/openldap24-sasl-client/Makefile deleted file mode 100644 index def3d97655fe..000000000000 --- a/net/openldap24-sasl-client/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# New ports collection makefile for: openldap22-sasl-client -# Date created: 01 May 2004 -# Whom: Oliver Eikemeier -# -# $FreeBSD$ -# - -PKGNAMESUFFIX= -sasl-client - -COMMENT= Open source LDAP client implementation with SASL2 support - -CLIENT_ONLY= yes -WITH_SASL= yes - -MASTERDIR= ${.CURDIR}/../openldap22-server - -.include "${MASTERDIR}/Makefile" diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile deleted file mode 100644 index 7c96b9236559..000000000000 --- a/net/openldap24-server/Makefile +++ /dev/null @@ -1,415 +0,0 @@ -# New ports collection makefile for: openldap22-server -# Date created: 10 Jul 2003 -# Whom: Oliver Eikemeier -# -# $FreeBSD$ -# - -PORTNAME= openldap -PORTVERSION= 2.2.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.shellhung.org/pub/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%/ \ - http://openldap.cdpa.nsysu.edu.tw/OpenLDAP/%SUBDIR%/ \ - ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/ -MASTER_SITE_SUBDIR= openldap-release -PKGNAMESUFFIX?= -server -EXTRACT_SUFX= .tgz - -MAINTAINER= eik@FreeBSD.org -COMMENT?= Open source LDAP server implementation - -UNIQUENAME?= ${PKGNAMEPREFIX}openldap22 -LATEST_LINK?= ${UNIQUENAME}${PKGNAMESUFFIX} - -WANT_OPENLDAP_VER?= 22 -.if ${WANT_OPENLDAP_VER} != 22 -BROKEN= "incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}" -.endif - -PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 - -.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.[!2].* -.elif ${PKGNAMESUFFIX} == "-client" -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[!2].* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* -.else -BROKEN= Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX} -.endif - -.if !defined(NOPORTDOCS) -PORTDOCS= CHANGES drafts rfc -.endif - -.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) -RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-sasl-client -.else -RUN_DEPENDS= ${LOCALBASE}/lib/libldap-2.2.so.7:${PORTSDIR}/net/openldap22-client -.endif - -.if ${PKGNAMESUFFIX} == "-sasl-server" -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.[!2].* -.elif ${PKGNAMESUFFIX} == "-server" -CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[!2].* \ - ${PKGNAMEPREFIX}${PORTNAME}-sasl-server-2.* -.else -BROKEN= Unknown PKGNAMESUFFIX ${PKGNAMESUFFIX} -.endif - -.endif - -USE_OPENSSL= yes -USE_REINPLACE= yes -USE_LIBTOOL_VER= 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 - -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) -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 - -INSTALLS_SHLIB= yes - -.else -# server specific configuration - -USE_RC_SUBR= yes - -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in - -.if defined(WITH_MODULES) || defined(WITH_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) -USE_LIBLTDL= yes -CONFIGURE_ARGS+= --enable-modules -PLIST_SUB+= MODULES="" -.else -PLIST_SUB+= MODULES="@comment " -.endif - -.if defined(WITH_DYNAMIC_BACKENDS) -BACKEND_ENABLE= "mod" -BACKEND_PLIST= "" -.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(WITHOUT_BDB) -CONFIGURE_ARGS+= --disable-bdb \ - --disable-hdb \ - --with-ldbm-api=bcompat -PLIST_SUB+= BACK_BDB="@comment " \ - BACK_HDB="@comment " -.else - -WITH_BDB_VER?= 42 - -.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 or 42 -.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(WITH_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) -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_CLDAP) -CPPFLAGS+= -DLDAP_CONNECTIONLESS -.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 - -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}" - -.include <bsd.port.pre.mk> - -.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 - -pre-everything:: - @${ECHO} "=============================================================" - @${ECHO} - @${ECHO} "You can build ${PKGNAME} with the following options:" - @${ECHO} -.if defined(CLIENT_ONLY) - @${ECHO} "WITH_SASL with (Cyrus) SASL2 support" -.else - @${ECHO} "WITH_BDB_VER select BerkeleyDB version (default 42)" - @${ECHO} "WITH_SASL with (Cyrus) SASL2 password verification" - @${ECHO} "WITH_PERL with Perl backend" - @${ECHO} "WITH_SHELL with Shell backend" - @${ECHO} "WITH_ODBC with SQL backend" - @${ECHO} "WITH_ODBC_TYPE select ODBC interface (iODBC or unixODBC)" - @${ECHO} "WITH_SLAPI with Netscape SLAPI plugin API - @${ECHO} "WITHOUT_TCP_WRAPPERS without tcp wrapper support" - @${ECHO} "WITHOUT_BDB without BerkeleyDB support" - @${ECHO} "WITH_DYNGROUP with Dynamic Group overlay" - @${ECHO} "WITH_PROXYCACHE with Proxy Cache overlay" - @${ECHO} "WITH_DYNAMIC_BACKENDS build backends as modules" -.if defined(DFOSVERSION) || ${OSVERSION} >= 500038 - @${ECHO} "WITH_RCORDER slapd(1) should start early in the boot process" -.endif -.endif - @${ECHO} - @${ECHO} "=============================================================" - @${ECHO} - -post-patch: - @${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \ - -e 's,\(back_[a-z]*\).la,\1,g' \ - ${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(WITH_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 00c8773fd414..000000000000 --- a/net/openldap24-server/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (openldap-2.2.19.tgz) = e196c24c4eb714758c57d12f3b962bae -SIZE (openldap-2.2.19.tgz) = 2601096 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 bf7071542349..000000000000 --- a/net/openldap24-server/files/manpages +++ /dev/null @@ -1,194 +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-meta.5 \ - slapd-monitor.5 \ - slapd-null.5 \ - slapd-passwd.5 \ - slapd-perl.5 \ - slapd-shell.5 \ - slapd-sql.5 \ - slapd-tcl.5 \ - slapd.access.5 \ - slapd.conf.5 \ - slapd.plugin.5 \ - slapd.replog.5 - -MAN8+= slapadd.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 1a7d0bb01646..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 -@@ -194,6 +194,8 @@ - SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_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 7f32b0a770b9..000000000000 --- a/net/openldap24-server/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig Tue Jul 27 18:33:12 2004 -+++ configure Sat Aug 14 17:05:23 2004 -@@ -20145,7 +20145,7 @@ - - - if test $ol_cv_bdb_compat = yes ; then -- ol_enable_bdb=yes -+ ol_enable_bdb=${ol_enable_bdb-yes} - elif test $ol_enable_bdb = yes ; then - { echo "configure: error: BDB: BerkeleyDB version incompatible" 1>&2; exit 1; } - else -@@ -20997,7 +20997,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liodbc $LIBS" -+LIBS="-liodbc $LIBS $LTHREAD_LIBS" - cat > conftest.$ac_ext <<EOF - #line 21003 "configure" - #include "confdefs.h" -@@ -21041,7 +21041,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lodbc $LIBS" -+LIBS="-lodbc $LIBS $LTHREAD_LIBS" - cat > conftest.$ac_ext <<EOF - #line 21047 "configure" - #include "confdefs.h" 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 15fec0e4f888..000000000000 --- a/net/openldap24-server/files/patch-servers::slapd::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- servers/slapd/Makefile.in.orig Mon Dec 29 19:10:38 2003 -+++ servers/slapd/Makefile.in Tue Jan 20 02:33:39 2004 -@@ -354,7 +354,6 @@ - - install-slapd: FORCE - -$(MKDIR) $(DESTDIR)$(libexecdir) -- -$(MKDIR) $(DESTDIR)$(localstatedir)/run - $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \ - slapd$(EXEEXT) $(DESTDIR)$(libexecdir) - @for i in $(SUBDIRS); do \ diff --git a/net/openldap24-server/files/slapd.sh b/net/openldap24-server/files/slapd.sh deleted file mode 100644 index 6c6066220aec..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: FreeBSD 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 79021305b400..000000000000 --- a/net/openldap24-server/files/slurpd.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: slurpd -# REQUIRE: slapd -# BEFORE: -# KEYWORD: FreeBSD 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 509e40a2462f..000000000000 --- a/net/openldap24-server/pkg-descr +++ /dev/null @@ -1,15 +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 the latest release of OpenLDAP Software for general use. - -WWW: http://www.OpenLDAP.org/ - -- Oliver Eikemeier -eikemeier@fillmore-labs.com diff --git a/net/openldap24-server/pkg-descr.client b/net/openldap24-server/pkg-descr.client deleted file mode 100644 index 7e508c450d4a..000000000000 --- a/net/openldap24-server/pkg-descr.client +++ /dev/null @@ -1,16 +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 - -This is the latest release of OpenLDAP Software for general use. - -WWW: http://www.OpenLDAP.org/ - -- Oliver Eikemeier -eikemeier@fillmore-labs.com 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 c0e6a9292a63..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/admin22/ -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 193acee2941d..000000000000 --- a/net/openldap24-server/pkg-plist +++ /dev/null @@ -1,59 +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 -@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 -%%SLAPI%%lib/libslapi.a -%%SLAPI%%lib/libslapi.so -%%SLAPI%%lib/libslapi-2.2.so -%%SLAPI%%lib/libslapi-2.2.so.7 -%%MODULES%%@exec mkdir -p %D/libexec/openldap -%%BACK_BDB%%libexec/openldap/back_bdb.so -%%BACK_BDB%%libexec/openldap/back_bdb-2.2.so -%%BACK_BDB%%libexec/openldap/back_bdb-2.2.so.7 -%%BACK_HDB%%libexec/openldap/back_hdb.so -%%BACK_HDB%%libexec/openldap/back_hdb-2.2.so -%%BACK_HDB%%libexec/openldap/back_hdb-2.2.so.7 -%%BACKEND%%libexec/openldap/back_ldap.so -%%BACKEND%%libexec/openldap/back_ldap-2.2.so -%%BACKEND%%libexec/openldap/back_ldap-2.2.so.7 -%%BACKEND%%libexec/openldap/back_ldbm.so -%%BACKEND%%libexec/openldap/back_ldbm-2.2.so -%%BACKEND%%libexec/openldap/back_ldbm-2.2.so.7 -%%BACKEND%%libexec/openldap/back_meta.so -%%BACKEND%%libexec/openldap/back_meta-2.2.so -%%BACKEND%%libexec/openldap/back_meta-2.2.so.7 -%%BACKEND%%libexec/openldap/back_monitor.so -%%BACKEND%%libexec/openldap/back_monitor-2.2.so -%%BACKEND%%libexec/openldap/back_monitor-2.2.so.7 -%%BACKEND%%libexec/openldap/back_null.so -%%BACKEND%%libexec/openldap/back_null-2.2.so -%%BACKEND%%libexec/openldap/back_null-2.2.so.7 -%%BACK_PERL%%libexec/openldap/back_perl.so -%%BACK_PERL%%libexec/openldap/back_perl-2.2.so -%%BACK_PERL%%libexec/openldap/back_perl-2.2.so.7 -%%BACK_SHELL%%libexec/openldap/back_shell.so -%%BACK_SHELL%%libexec/openldap/back_shell-2.2.so -%%BACK_SHELL%%libexec/openldap/back_shell-2.2.so.7 -%%BACK_SQL%%libexec/openldap/back_sql.so -%%BACK_SQL%%libexec/openldap/back_sql-2.2.so -%%BACK_SQL%%libexec/openldap/back_sql-2.2.so.7 -%%MODULES%%@unexec rmdir %D/libexec/openldap 2>/dev/null || true -libexec/slapd -libexec/slurpd -@comment sbin/slapacl -sbin/slapadd -@comment 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 dc0a65c63837..000000000000 --- a/net/openldap24-server/pkg-plist.client +++ /dev/null @@ -1,42 +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 -@unexec rmdir %D/etc/openldap 2>/dev/null || true -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.a -lib/liblber.so -lib/liblber-2.2.so -lib/liblber-2.2.so.7 -lib/libldap.a -lib/libldap.so -lib/libldap-2.2.so -lib/libldap-2.2.so.7 -lib/libldap_r.a -lib/libldap_r.so -lib/libldap_r-2.2.so -lib/libldap_r-2.2.so.7 -share/openldap/ucdata/case.dat -share/openldap/ucdata/cmbcl.dat -share/openldap/ucdata/comp.dat -share/openldap/ucdata/ctype.dat -share/openldap/ucdata/decomp.dat -share/openldap/ucdata/kdecomp.dat -share/openldap/ucdata/num.dat -@dirrm share/openldap/ucdata -@dirrm share/openldap diff --git a/net/openslp/files/slpd.in b/net/openslp/files/slpd.in deleted file mode 100644 index 4fe3d0826913..000000000000 --- a/net/openslp/files/slpd.in +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: slpd -# REQUIRE: DAEMON -# KEYWORD: FreeBSD -# -# 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 f13351ccb9df..000000000000 --- a/net/p5-IO-Socket-INET6/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: p5-IO-INET6 -# Date created: 02 July 2003 -# Whom: Janos.Mohacsi@bsd.hu -# -# $FreeBSD$ -# - -PORTNAME= INET6 -PORTVERSION= 2.01 -CATEGORIES= net perl5 ipv6 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN} -MASTER_SITE_SUBDIR= IO -PKGNAMEPREFIX= p5-IO- - -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 845a6f78ee3a..000000000000 --- a/net/p5-IO-Socket-INET6/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (INET6-2.01.tar.gz) = 032a6e50c8c16e400836a9565cdb2f0b -SIZE (INET6-2.01.tar.gz) = 8628 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 03f3cc9ffa4f..000000000000 --- a/net/p5-IO-Socket-INET6/files/5.005_03.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- INET6.pm.orig Tue Jun 24 14:14:26 2003 -+++ INET6.pm Wed Jul 2 21:33:28 2003 -@@ -10,7 +10,7 @@ - package IO::Socket::INET6; - - use strict; --our(@ISA, $VERSION); -+use vars qw(@ISA $VERSION); - use IO::Socket; - use Socket6; - use Carp; -@@ -20,7 +20,7 @@ - @ISA = qw(IO::Socket); - $VERSION = "1.27"; - --my $EINVAL = exists(&Errno::EINVAL) ? Errno::EINVAL() : 1; -+my $EINVAL = defined(&Errno::EINVAL) ? Errno::EINVAL() : 1; - - IO::Socket::INET6->register_domain( AF_INET6 ); - -@@ -183,7 +183,7 @@ - } - - if ($arg->{ReusePort}) { -- $sock->sockopt(SO_REUSEPORT,1) or -+ $sock->sockopt(0x0200,1) or - return _error($sock, $!, "$!"); - } - diff --git a/net/p5-IO-Socket-INET6/pkg-descr b/net/p5-IO-Socket-INET6/pkg-descr deleted file mode 100644 index d39177b8d527..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/search?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 c55dad737f54..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 -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO/Socket 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/IO 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO/Socket 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/IO 2>/dev/null || true diff --git a/net/pear-Net_URL2/Makefile b/net/pear-Net_URL2/Makefile deleted file mode 100644 index 2e895314c29a..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-PEAR -RUN_DEPENDS= ${BUILD_DEPENDS} - -CATEGORY= Net -FILES= URL.php -EXAMPLES= example.php -_EXAMPLESDIR= docs - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" -.include <bsd.port.post.mk> diff --git a/net/pear-Net_URL2/distinfo b/net/pear-Net_URL2/distinfo deleted file mode 100644 index 38abfc67790e..000000000000 --- a/net/pear-Net_URL2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (PEAR/Net_URL-1.0.14.tgz) = 4be5ac05dc5a9bc54a33cec66d87eb0a -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 da2c948409fa..000000000000 --- a/net/phpldapadmin098/Makefile +++ /dev/null @@ -1,116 +0,0 @@ -# New ports collection makefile for: phpLDAPadmin -# Date created: 30 Apr 2004 -# Whom: Matthew Seaman -# -# $FreeBSD$ -# - -PORTNAME= phpldapadmin -PORTVERSION= 0.9.4b -PORTREVISION= 3 -CATEGORIES= net www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= phpldapadmin - -MAINTAINER= m.seaman@infracaninophile.co.uk -COMMENT= A set of PHP-scripts to administer LDAP servers over the web - -NO_BUILD= yes -USE_PHP= ldap openssl pcre session - -BROKEN_WITH_PHP= 5 - -.if defined(WITH_SUPHP) - -PKGNAMESUFFIX= -suphp -RUN_DEPENDS+= ${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp -WANT_PHP_CGI= yes -PKGINST_SKEL= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} -PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} -PKGDEINST_SKEL= ${PKGDIR}/pkg-deinstall${PKGNAMESUFFIX} -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall${PKGNAMESUFFIX} - -PLAUSR?= pldapadm - -SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%PLADIR%%,${PLADIR},g' \ - -e 's,%%PLAUSR%%,${PLAUSR},g' \ - -e 's,%%PLAGRP%%,${PLAGRP},g' - -.else - -WANT_PHP_WEB= yes - -.endif - -MSG_SKEL= ${PKGDIR}/pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message - -# PLAUSR is only used WITH_SUPHP -PLADIR?= www/${PORTNAME} -PLAGRP?= ${WWWGRP} -CFGFILE= config.php - -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: - ${RM} -f ${PLIST} - cd ${WRKSRC} ; \ - ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore | \ - ${SORT} | ${SED} "s,^\.,%%PLADIR%%," >${PLIST} ; \ - ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ - ${FIND} . -type d | ${SORT} -r | ${SED} \ - -e "s,^\.$$,@unexec rmdir %D/%%PLADIR%% 2>/dev/null || true," \ - -e "s,^\.,@dirrm %%PLADIR%%," >>${PLIST} - ${SED} -e 's,%%PKGNAME%%,${PKGNAME},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%PLADIR%%,${PLADIR},g' ${MSG_SKEL} > ${PKGMESSAGE} -.if defined(WITH_SUPHP) - ${SED} ${SED_SCRIPT} ${PKGINST_SKEL} > ${PKGINSTALL} - ${SED} ${SED_SCRIPT} ${PKGDEINST_SKEL} > ${PKGDEINSTALL} -.endif - -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} ; \ - ${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 7b559f5d01ab..000000000000 --- a/net/phpldapadmin098/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (phpldapadmin-0.9.4b.tar.gz) = 0aa6021da066c637e56354980dccddbe -SIZE (phpldapadmin-0.9.4b.tar.gz) = 375889 diff --git a/net/phpldapadmin098/pkg-deinstall-suphp b/net/phpldapadmin098/pkg-deinstall-suphp deleted file mode 100644 index 3e29ddb5febb..000000000000 --- a/net/phpldapadmin098/pkg-deinstall-suphp +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -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/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-install-suphp b/net/phpldapadmin098/pkg-install-suphp deleted file mode 100644 index 6348afacd7a6..000000000000 --- a/net/phpldapadmin098/pkg-install-suphp +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -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/pkg-message b/net/phpldapadmin098/pkg-message deleted file mode 100644 index 07f058f5fe8d..000000000000 --- a/net/phpldapadmin098/pkg-message +++ /dev/null @@ -1,12 +0,0 @@ - -%%PKGNAME%% has been installed into: - - %%PREFIX%%/%%PLADIR%% - -Please edit config.php and edit 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%%/" - diff --git a/net/phpldapadmin098/pkg-plist-chunk b/net/phpldapadmin098/pkg-plist-chunk deleted file mode 100644 index 29ae43a7b280..000000000000 --- a/net/phpldapadmin098/pkg-plist-chunk +++ /dev/null @@ -1,7 +0,0 @@ -@mode 640 -@group %%PLAGRP%% -@unexec if cmp -s %D/%%PLADIR%%/config.php.example %D/%%PLADIR%%/config.php ; then rm -f %D/%%PLADIR%%/config.php ; fi -%%PLADIR%%/config.php.example -@exec [ ! -f %B/config.php ] && cp -p %B/%f %B/config.php || true -@mode -@group diff --git a/net/py-kenosis-bittorrent/Makefile b/net/py-kenosis-bittorrent/Makefile deleted file mode 100644 index 06cbc48e7568..000000000000 --- a/net/py-kenosis-bittorrent/Makefile +++ /dev/null @@ -1,103 +0,0 @@ -# New ports collection makefile for: BitTorrent -# Date created: Sun Mar 16 06:34:12 UTC 2003 -# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= BitTorrent -PORTVERSION= 3.4.2 -PORTREVISION= 4 -PORTEPOCH= 1 -CATEGORIES?= net python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME:L} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -#DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/} - -MAINTAINER= lioux@FreeBSD.org -COMMENT?= A peer-to-peer tool for distributing files written in Python - -USE_PYTHON= yes -USE_PYDISTUTILS= yes -USE_REINPLACE= yes - -CONFLICTS= py??-*[Bb]it[Tt]orrent* py??-*[Bb]it[Tt]ornado* btqueue* - -PORTDOCS= BUILD.windows.txt INSTALL.unix.txt LICENSE.txt \ - README.txt credits.txt - -.include <bsd.port.pre.mk> - -.if ${ARCH} != "i386" -WITHOUT_PSYCO= yes -.endif - -# required for GUI -.ifndef(WITHOUT_GUI) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython - -PLIST_FILES+= \ - bin/btcompletedirgui.py \ - bin/btdownloadgui.py -.else -EXTRA_PATCHES+= ${FILESDIR}/extra-nogui-patch-setup.py -.endif -# required for PSYCO -.ifndef(WITHOUT_PSYCO) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/psyco/_psyco.so:${PORTSDIR}/devel/py-psyco - -EXTRA_PATCHES+= \ - ${FILESDIR}/extra-psyco-patch-btcompletedir.py \ - ${FILESDIR}/extra-psyco-patch-btcompletedirgui.py \ - ${FILESDIR}/extra-psyco-patch-btdownloadcurses.py \ - ${FILESDIR}/extra-psyco-patch-btdownloadgui.py \ - ${FILESDIR}/extra-psyco-patch-btdownloadheadless.py \ - ${FILESDIR}/extra-psyco-patch-btlaunchmany.py \ - ${FILESDIR}/extra-psyco-patch-btlaunchmanycurses.py \ - ${FILESDIR}/extra-psyco-patch-btmakemetafile.py \ - ${FILESDIR}/extra-psyco-patch-bttrack.py - -PLIST_FILES+= \ - ${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent/PSYCO.py \ - ${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent/PSYCO.pyc \ - ${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent/PSYCO.pyo -.endif - -pre-everything:: -.ifndef(WITHOUT_GUI) - @${ECHO_MSG} '===> Define WITHOUT_GUI to disable GUI installation' -.endif -.ifndef(WITHOUT_PSYCO) - @${ECHO_MSG} '===> Define WITHOUT_PSYCO to disable devel/py-psyco optimization' -.endif - -post-patch: - @${FIND} ${WRKSRC} -type f | \ - ${XARGS} -x -n 10 \ - ${REINPLACE_CMD} -E \ - -e 's|/usr/bin/env python2|${LOCALBASE}/bin/python|' -.ifdef(WITHOUT_GUI) - @${REINPLACE_CMD} -E \ - -e 's|btdownloadgui.py|btdownloadcurses.py|' \ - ${WRKSRC}/INSTALL.unix.txt -.endif -.ifndef(WITHOUT_PSYCO) -# activate psyco optimization - @${ECHO_CMD} 'psyco = 1' > ${WRKSRC}/BitTorrent/PSYCO.py -.endif - -post-install: -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif -# set proper permissions - @${CHMOD} -R ${SHAREMODE} \ - ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent - @${CHMOD} ${SHAREMODE} ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent - @${CHMOD} a+x ${PREFIX}/${PYTHON_SITELIBDIR:S|^${PYTHONBASE}/||}/BitTorrent - -.include <bsd.port.post.mk> diff --git a/net/py-kenosis-bittorrent/distinfo b/net/py-kenosis-bittorrent/distinfo deleted file mode 100644 index dcdf62a43f57..000000000000 --- a/net/py-kenosis-bittorrent/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (BitTorrent-3.4.2.tar.gz) = b854f25a33289565bcaeaded04955c1a -SIZE (BitTorrent-3.4.2.tar.gz) = 198026 diff --git a/net/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py b/net/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py deleted file mode 100644 index 7461547d430a..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-nogui-patch-setup.py +++ /dev/null @@ -1,14 +0,0 @@ ---- setup.py.orig Sun Mar 30 17:01:05 2003 -+++ setup.py Sun Mar 30 17:01:20 2003 -@@ -18,9 +18,9 @@ - - packages = ["BitTorrent"], - -- scripts = ["btdownloadgui.py", "btdownloadheadless.py", "btdownloadlibrary.py", -+ scripts = ["btdownloadheadless.py", "btdownloadlibrary.py", - "bttrack.py", "btmakemetafile.py", "btlaunchmany.py", "btcompletedir.py", -- "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", -+ "btdownloadcurses.py", "btlaunchmanycurses.py", - "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py", - "bttest.py"] - ) diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedir.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedir.py deleted file mode 100644 index 7313c0b3b815..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedir.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btcompletedir.py Thu Dec 16 11:03:11 2004 -+++ btcompletedir.py Thu Dec 16 11:12:55 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from os.path import join, split - from threading import Event - from traceback import print_exc diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedirgui.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedirgui.py deleted file mode 100644 index 750f7f3b4ff6..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btcompletedirgui.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btcompletedirgui.py Thu Dec 16 11:03:11 2004 -+++ btcompletedirgui.py Thu Dec 16 11:13:34 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from sys import argv, version - - from btcompletedir import completedir diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadcurses.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadcurses.py deleted file mode 100644 index f9914687c61b..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadcurses.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btdownloadcurses.py Thu Dec 16 11:03:11 2004 -+++ btdownloadcurses.py Thu Dec 16 11:13:54 2004 -@@ -3,6 +3,15 @@ - # Written by Henry 'Pi' James - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from BitTorrent.download import download - from threading import Event - from os.path import abspath diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadgui.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadgui.py deleted file mode 100644 index d9f8aa0300da..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadgui.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btdownloadgui.py Thu Dec 16 11:03:11 2004 -+++ btdownloadgui.py Thu Dec 16 11:14:07 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen and Myers Carpenter - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from sys import argv - from BitTorrent import version - from BitTorrent.download import download diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadheadless.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadheadless.py deleted file mode 100644 index ba6038187d07..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btdownloadheadless.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btdownloadheadless.py Thu Dec 16 11:03:11 2004 -+++ btdownloadheadless.py Thu Dec 16 11:14:16 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from BitTorrent.download import download - from threading import Event - from os.path import abspath diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmany.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmany.py deleted file mode 100644 index b52ef8d96737..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmany.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btlaunchmany.py Thu Dec 16 11:03:11 2004 -+++ btlaunchmany.py Thu Dec 16 11:14:54 2004 -@@ -7,6 +7,15 @@ - # fmttime and fmtsize stolen from btdownloadcurses. - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from BitTorrent.download import download - from threading import Thread, Event, Lock - from os import listdir diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py deleted file mode 100644 index 7cf9c34eefdb..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btlaunchmanycurses.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btlaunchmanycurses.py Thu Dec 16 11:03:11 2004 -+++ btlaunchmanycurses.py Thu Dec 16 11:14:47 2004 -@@ -7,6 +7,15 @@ - # fmttime and fmtsize stolen from btdownloadcurses. - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from BitTorrent.download import download - from threading import Thread, Event, Lock - from os import listdir diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btmakemetafile.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-btmakemetafile.py deleted file mode 100644 index 27caf5b03793..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-btmakemetafile.py +++ /dev/null @@ -1,18 +0,0 @@ ---- btmakemetafile.py Thu Dec 16 11:03:11 2004 -+++ btmakemetafile.py Thu Dec 16 11:15:10 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from sys import argv - from os.path import getsize, split, join, abspath, isdir - from os import listdir diff --git a/net/py-kenosis-bittorrent/files/extra-psyco-patch-bttrack.py b/net/py-kenosis-bittorrent/files/extra-psyco-patch-bttrack.py deleted file mode 100644 index eee72f22c626..000000000000 --- a/net/py-kenosis-bittorrent/files/extra-psyco-patch-bttrack.py +++ /dev/null @@ -1,18 +0,0 @@ ---- bttrack.py Thu Dec 16 11:03:11 2004 -+++ bttrack.py Thu Dec 16 11:15:33 2004 -@@ -3,6 +3,15 @@ - # Written by Bram Cohen - # see LICENSE.txt for license information - -+from BitTorrent import PSYCO -+if PSYCO.psyco: -+ try: -+ import psyco -+ assert psyco.__version__ >= 0x010300f0 -+ psyco.full() -+ except: -+ pass -+ - from sys import argv - from BitTorrent.track import track - diff --git a/net/py-kenosis-bittorrent/files/patch-BitTorrent::Rerequester.py b/net/py-kenosis-bittorrent/files/patch-BitTorrent::Rerequester.py deleted file mode 100644 index 25875c61f12c..000000000000 --- a/net/py-kenosis-bittorrent/files/patch-BitTorrent::Rerequester.py +++ /dev/null @@ -1,30 +0,0 @@ ---- BitTorrent/Rerequester.py Sat Apr 3 01:10:23 2004 -+++ BitTorrent/Rerequester.py Sun Apr 18 17:03:33 2004 -@@ -5,7 +5,7 @@ - from btformats import check_peers - from bencode import bdecode - from threading import Thread, Lock --from socket import error -+from socket import error, gethostbyname - from time import time - from random import randrange - from binascii import b2a_hex -@@ -18,8 +18,7 @@ - self.url = ('%s?info_hash=%s&peer_id=%s&port=%s&key=%s' % - (url, quote(infohash), quote(myid), str(port), - b2a_hex(''.join([chr(randrange(256)) for i in xrange(4)])))) -- if ip != '': -- self.url += '&ip=' + quote(ip) -+ self.ip = ip - self.interval = interval - self.last = None - self.trackerid = None -@@ -81,6 +80,8 @@ - - def rerequest(self, url, set): - try: -+ if self.ip: -+ url += '&ip=' + gethostbyname(self.ip) - h = urlopen(url) - r = h.read() - h.close() diff --git a/net/py-kenosis-bittorrent/files/patch-BitTorrent::track.py b/net/py-kenosis-bittorrent/files/patch-BitTorrent::track.py deleted file mode 100644 index 7a98123784d9..000000000000 --- a/net/py-kenosis-bittorrent/files/patch-BitTorrent::track.py +++ /dev/null @@ -1,300 +0,0 @@ ---- BitTorrent/track.py Sun Mar 21 16:32:55 2004 -+++ BitTorrent/track.py Sun Jun 6 09:33:07 2004 -@@ -37,12 +37,15 @@ - 'minimum time it must have been since the last flush to do another one'), - ('allowed_dir', '', 'only allow downloads for .torrents in this dir'), - ('parse_allowed_interval', 15, 'minutes between reloading of allowed_dir'), -+ ('show_infopage', 1, "whether to display an info page when the tracker's root dir is loaded"), -+ ('infopage_redirect', '', 'a URL to redirect the info page to'), - ('show_names', 1, 'whether to display names from allowed dir'), - ('favicon', '', 'file containing x-icon data to return when browser requests favicon.ico'), - ('only_local_override_ip', 1, "ignore the ip GET parameter from machines which aren't on local network IPs"), - ('logfile', '', 'file to write the tracker logs, use - for stdout (default)'), - ('allow_get', 0, 'use with allowed_dir; adds a /file?hash={hash} url that allows users to download the torrent file'), - ('keep_dead', 0, 'keep dead torrents after they expire (so they still show up on your /scrape and web page)'), -+ ('scrape_allowed', 'full', 'scrape access allowed (can be none, specific or full)'), - ('max_give', 200, 'maximum number of peers to give with any one request'), - ] - -@@ -124,11 +127,11 @@ - favicon = config['favicon'] - self.favicon = None - if favicon: -- if isfile(favicon): -+ try: - h = open(favicon, 'rb') - self.favicon = h.read() - h.close() -- else: -+ except: - print "**warning** specified favicon file -- %s -- does not exist." % favicon - self.rawserver = rawserver - self.becache1 = {} -@@ -190,6 +193,130 @@ - self.uq_broken = 0 - self.keep_dead = config['keep_dead'] - -+ def get_infopage(self): -+ if not self.config['show_infopage']: -+ return (404, 'Not Found', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'}, alas) -+ red = self.config['infopage_redirect'] -+ if red != '': -+ return (302, 'Found', {'Content-Type': 'text/html', 'Location': red}, -+ '<A HREF="'+red+'">Click Here</A>') -+ -+ s = StringIO() -+ s.write('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n' \ -+ '<html><head><title>BitTorrent download info</title>\n') -+ if self.favicon != None: -+ s.write('<link rel="shortcut icon" href="/favicon.ico" />\n') -+ s.write('</head>\n<body>\n' \ -+ '<h3>BitTorrent download info</h3>\n'\ -+ '<ul>\n' -+ '<li><strong>tracker version:</strong> %s</li>\n' \ -+ '<li><strong>server time:</strong> %s</li>\n' \ -+ '</ul>\n' % (version, isotime())) -+ names = self.downloads.keys() -+ if not names: -+ s.write('<p>not tracking any files yet...</p>\n') -+ else: -+ names.sort() -+ tn = 0 -+ tc = 0 -+ td = 0 -+ tt = 0 # Total transferred -+ ts = 0 # Total size -+ nf = 0 # Number of files displayed -+ uc = {} -+ ud = {} -+ if self.allowed != None and self.show_names: -+ s.write('<table summary="files" border="1">\n' \ -+ '<tr><th>info hash</th><th>torrent name</th><th align="right">size</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th><th align="right">transferred</th></tr>\n') -+ else: -+ s.write('<table summary="files">\n' \ -+ '<tr><th>info hash</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th></tr>\n') -+ for name in names: -+ l = self.downloads[name] -+ n = self.completed.get(name, 0) -+ tn = tn + n -+ lc = [] -+ for i in l.values(): -+ if type(i) == DictType: -+ if i['left'] == 0: -+ lc.append(1) -+ uc[i['ip']] = 1 -+ else: -+ ud[i['ip']] = 1 -+ c = len(lc) -+ tc = tc + c -+ d = len(l) - c -+ td = td + d -+ if self.allowed != None and self.show_names: -+ if self.allowed.has_key(name): -+ nf = nf + 1 -+ sz = self.allowed[name]['length'] # size -+ ts = ts + sz -+ szt = sz * n # Transferred for this torrent -+ tt = tt + szt -+ if self.allow_get == 1: -+ linkname = '<a href="/file?info_hash=' + quote(name) + '">' + self.allowed[name]['name'] + '</a>' -+ else: -+ linkname = self.allowed[name]['name'] -+ s.write('<tr><td><code>%s</code></td><td>%s</td><td align="right">%s</td><td align="right">%i</td><td align="right">%i</td><td align="right">%i</td><td align="right">%s</td></tr>\n' \ -+ % (b2a_hex(name), linkname, size_format(sz), c, d, n, size_format(szt))) -+ else: -+ s.write('<tr><td><code>%s</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td></tr>\n' \ -+ % (b2a_hex(name), c, d, n)) -+ ttn = 0 -+ for i in self.completed.values(): -+ ttn = ttn + i -+ if self.allowed != None and self.show_names: -+ s.write('<tr><td align="right" colspan="2">%i files</td><td align="right">%s</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%s</td></tr>\n' -+ % (nf, size_format(ts), len(uc), tc, len(ud), td, tn, ttn, size_format(tt))) -+ else: -+ s.write('<tr><td align="right">%i files</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td></tr>\n' -+ % (nf, len(uc), tc, len(ud), td, tn, ttn)) -+ s.write('</table>\n' \ -+ '<ul>\n' \ -+ '<li><em>info hash:</em> SHA1 hash of the "info" section of the metainfo (*.torrent)</li>\n' \ -+ '<li><em>complete:</em> number of connected clients with the complete file (total: unique IPs/total connections)</li>\n' \ -+ '<li><em>downloading:</em> number of connected clients still downloading (total: unique IPs/total connections)</li>\n' \ -+ '<li><em>downloaded:</em> reported complete downloads (total: current/all)</li>\n' \ -+ '<li><em>transferred:</em> torrent size * total downloaded (does not include partial transfers)</li>\n' \ -+ '</ul>\n') -+ s.write('</body>\n' \ -+ '</html>\n') -+ return (200, 'OK', {'Content-Type': 'text/html; charset=iso-8859-1'}, s.getvalue()) -+ -+ def scrapedata(self, name, return_name = True): -+ l = self.downloads[name] -+ n = self.completed.get(name, 0) -+ c = len([1 for i in l.values() if i['left'] == 0]) -+ d = len(l) - c -+ f = {'complete': c, 'incomplete': d, 'downloaded': n} -+ if ( return_name and self.show_names -+ and self.allowed is not None and self.allowed.has_key(name) ): -+ f['name'] = self.allowed[name]['name'] -+ return (f) -+ -+ def get_scrape(self, paramslist): -+ fs = {} -+ if paramslist.has_key('info_hash'): -+ if self.config['scrape_allowed'] not in ['specific', 'full']: -+ return (400, 'Not Authorized', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'}, -+ bencode({'failure reason': -+ 'specific scrape function is not available with this tracker.'})) -+ for infohash in paramslist['info_hash']: -+ if infohash in self.downloads.keys(): -+ fs[infohash] = self.scrapedata(infohash) -+ else: -+ if self.config['scrape_allowed'] != 'full': -+ return (400, 'Not Authorized', {'Content-Type': 'text/plain', 'Pragma': 'no-cache'}, -+ bencode({'failure reason': -+ 'full scrape function is not available with this tracker.'})) -+ names = self.downloads.keys() -+ names.sort() -+ for name in names: -+ fs[name] = self.scrapedata(name) -+ -+ return (200, 'OK', {'Content-Type': 'text/plain'}, bencode({'files': fs})) -+ - def get(self, connection, path, headers): - try: - (scheme, netloc, path, pars, query, fragment) = urlparse(path) -@@ -197,117 +324,22 @@ - path = path.replace('+',' ') - query = query.replace('+',' ') - path = unquote(path)[1:] -+ paramslist = {} - params = {} - for s in query.split('&'): - if s != '': - i = s.index('=') -- params[unquote(s[:i])] = unquote(s[i+1:]) -+ kw = unquote(s[:i]) -+ key, value = unquote(s[:i]), unquote(s[i+1:]) -+ paramslist.setdefault(key, []).append(value) -+ params[key] = value - except ValueError, e: - return (400, 'Bad Request', {'Content-Type': 'text/plain'}, - 'you sent me garbage - ' + str(e)) - if path == '' or path == 'index.html': -- s = StringIO() -- s.write('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\n' \ -- '<html><head><title>BitTorrent download info</title>\n') -- if self.favicon != None: -- s.write('<link rel="shortcut icon" href="/favicon.ico" />\n') -- s.write('</head>\n<body>\n' \ -- '<h3>BitTorrent download info</h3>\n'\ -- '<ul>\n' -- '<li><strong>tracker version:</strong> %s</li>\n' \ -- '<li><strong>server time:</strong> %s</li>\n' \ -- '</ul>\n' % (version, isotime())) -- names = self.downloads.keys() -- if names: -- names.sort() -- tn = 0 -- tc = 0 -- td = 0 -- tt = 0 # Total transferred -- ts = 0 # Total size -- nf = 0 # Number of files displayed -- uc = {} -- ud = {} -- if self.allowed != None and self.show_names: -- s.write('<table summary="files" border="1">\n' \ -- '<tr><th>info hash</th><th>torrent name</th><th align="right">size</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th><th align="right">transferred</th></tr>\n') -- else: -- s.write('<table summary="files">\n' \ -- '<tr><th>info hash</th><th align="right">complete</th><th align="right">downloading</th><th align="right">downloaded</th></tr>\n') -- for name in names: -- l = self.downloads[name] -- n = self.completed.get(name, 0) -- tn = tn + n -- lc = [] -- for i in l.values(): -- if type(i) == DictType: -- if i['left'] == 0: -- lc.append(1) -- uc[i['ip']] = 1 -- else: -- ud[i['ip']] = 1 -- c = len(lc) -- tc = tc + c -- d = len(l) - c -- td = td + d -- if self.allowed != None and self.show_names: -- if self.allowed.has_key(name): -- nf = nf + 1 -- sz = self.allowed[name]['length'] # size -- ts = ts + sz -- szt = sz * n # Transferred for this torrent -- tt = tt + szt -- if self.allow_get == 1: -- linkname = '<a href="/file?info_hash=' + quote(name) + '">' + self.allowed[name]['name'] + '</a>' -- else: -- linkname = self.allowed[name]['name'] -- s.write('<tr><td><code>%s</code></td><td>%s</td><td align="right">%s</td><td align="right">%i</td><td align="right">%i</td><td align="right">%i</td><td align="right">%s</td></tr>\n' \ -- % (b2a_hex(name), linkname, size_format(sz), c, d, n, size_format(szt))) -- else: -- s.write('<tr><td><code>%s</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td><td align="right"><code>%i</code></td></tr>\n' \ -- % (b2a_hex(name), c, d, n)) -- ttn = 0 -- for i in self.completed.values(): -- ttn = ttn + i -- if self.allowed != None and self.show_names: -- s.write('<tr><td align="right" colspan="2">%i files</td><td align="right">%s</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%s</td></tr>\n' -- % (nf, size_format(ts), len(uc), tc, len(ud), td, tn, ttn, size_format(tt))) -- else: -- s.write('<tr><td align="right">%i files</td><td align="right">%i/%i</td><td align="right">%i/%i</td><td align="right">%i/%i</td></tr>\n' -- % (nf, len(uc), tc, len(ud), td, tn, ttn)) -- s.write('</table>\n' \ -- '<ul>\n' \ -- '<li><em>info hash:</em> SHA1 hash of the "info" section of the metainfo (*.torrent)</li>\n' \ -- '<li><em>complete:</em> number of connected clients with the complete file (total: unique IPs/total connections)</li>\n' \ -- '<li><em>downloading:</em> number of connected clients still downloading (total: unique IPs/total connections)</li>\n' \ -- '<li><em>downloaded:</em> reported complete downloads (total: current/all)</li>\n' \ -- '<li><em>transferred:</em> torrent size * total downloaded (does not include partial transfers)</li>\n' \ -- '</ul>\n') -- else: -- s.write('<p>not tracking any files yet...</p>\n') -- s.write('</body>\n' \ -- '</html>\n') -- return (200, 'OK', {'Content-Type': 'text/html; charset=iso-8859-1'}, s.getvalue()) -+ return self.get_infopage() - elif path == 'scrape': -- fs = {} -- names = [] -- if params.has_key('info_hash'): -- if self.downloads.has_key(params['info_hash']): -- names = [ params['info_hash'] ] -- # else return nothing -- else: -- names = self.downloads.keys() -- names.sort() -- for name in names: -- l = self.downloads[name] -- n = self.completed.get(name, 0) -- c = len([1 for i in l.values() if type(i) == DictType and i['left'] == 0]) -- d = len(l) - c -- fs[name] = {'complete': c, 'incomplete': d, 'downloaded': n} -- if (self.allowed is not None) and self.allowed.has_key(name) and self.show_names: -- fs[name]['name'] = self.allowed[name]['name'] -- r = {'files': fs} -- return (200, 'OK', {'Content-Type': 'text/plain'}, bencode(r)) -+ return self.get_scrape(paramslist) - elif (path == 'file') and (self.allow_get == 1) and params.has_key('info_hash') and self.allowed.has_key(params['info_hash']): - hash = params['info_hash'] - fname = self.allowed[hash]['file'] -@@ -506,9 +538,9 @@ - r = str(s) + 'B' - elif (s < 1048576): - r = str(int(s/1024)) + 'KiB' -- elif (s < 1073741824l): -+ elif (s < 1073741824L): - r = str(int(s/1048576)) + 'MiB' -- elif (s < 1099511627776l): -+ elif (s < 1099511627776L): - r = str(int((s/1073741824.0)*100.0)/100.0) + 'GiB' - else: - r = str(int((s/1099511627776.0)*100.0)/100.0) + 'TiB' diff --git a/net/py-kenosis-bittorrent/files/patch-BitTorrent::zurllib.py b/net/py-kenosis-bittorrent/files/patch-BitTorrent::zurllib.py deleted file mode 100644 index deca5e24f028..000000000000 --- a/net/py-kenosis-bittorrent/files/patch-BitTorrent::zurllib.py +++ /dev/null @@ -1,18 +0,0 @@ ---- BitTorrent/zurllib.py.orig Thu Dec 9 10:36:43 2004 -+++ BitTorrent/zurllib.py Thu Dec 9 10:38:19 2004 -@@ -35,7 +35,14 @@ - if DEBUG: - pprint.pprint(headers.dict) - url = fp.url -- return addinfourldecompress(fp, headers, url) -+ resp = addinfourldecompress(fp, headers, url) -+ # As of Python 2.4 http_open response also has 'code' and 'msg' -+ # members, and HTTPErrorProcessor breaks if they don't exist. -+ if 'code' in dir(fp): -+ resp.code = fp.code -+ if 'msg' in dir(fp): -+ resp.msg = fp.msg -+ return resp - - - class addinfourldecompress(addinfourl): diff --git a/net/py-kenosis-bittorrent/files/patch-btcompletedir.py b/net/py-kenosis-bittorrent/files/patch-btcompletedir.py deleted file mode 100644 index f70d4e932b7c..000000000000 --- a/net/py-kenosis-bittorrent/files/patch-btcompletedir.py +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN BitTorrent-3.4.2/btcompletedir.py BitTorrent.cvs/btcompletedir.py ---- btcompletedir.py Wed Mar 3 14:44:06 2004 -+++ btcompletedir.py Sun May 23 04:31:44 2004 -@@ -30,6 +30,8 @@ - subtotal[0] += x - vc(float(subtotal[0]) / total) - for i in togen: -+ if flag.isSet(): -+ break - t = split(i) - if t[1] == '': - i = t[0] diff --git a/net/py-kenosis-bittorrent/files/zurllib.py b/net/py-kenosis-bittorrent/files/zurllib.py deleted file mode 100644 index a99ca51142bb..000000000000 --- a/net/py-kenosis-bittorrent/files/zurllib.py +++ /dev/null @@ -1,61 +0,0 @@ -# Written by John Hoffman -# see LICENSE.txt for license information - -from httplib import HTTPConnection -from urlparse import urlparse -import socket -from gzip import GzipFile -from StringIO import StringIO -from urllib import quote, unquote -from __init__ import version - -MAX_REDIRECTS = 10 - -class urlopen: - def __init__(self, url): - self.tries = 0 - self._open(url) - - def _open(self, url): - self.tries += 1 - if self.tries > MAX_REDIRECTS: - raise IOError, ('http error', 500, - "Internal Server Error: Redirect Recursion") - (scheme, netloc, path, pars, query, fragment) = urlparse(url) - if scheme != 'http': - raise IOError, ('url error', 'unknown url type', scheme, url) - url = path - if pars: - url += ';'+pars - if query: - url += '?'+query -# if fragment: - self.connection = HTTPConnection(netloc) - self.connection.request('GET', url, None, - { 'User-Agent': 'BitTorrent/' + version, - 'Accept-Encoding': 'gzip' } ) - self.response = self.connection.getresponse() - status = self.response.status - if status in (301,302): - try: - self.connection.close() - except: - pass - self._open(self.response.getheader('Location')) - return - if status != 200: - raise IOError, ('http error', status, self.response.reason) - - def read(self): - data = self.response.read() - if self.response.getheader('Content-Encoding','').find('gzip') >= 0: - try: - compressed = StringIO(data) - f = GzipFile(fileobj = compressed) - data = f.read() - except: - raise IOError, ('http error', 'got corrupt response') - return data - - def close(self): - self.connection.close() diff --git a/net/py-kenosis-bittorrent/pkg-descr b/net/py-kenosis-bittorrent/pkg-descr deleted file mode 100644 index 837ee21b9341..000000000000 --- a/net/py-kenosis-bittorrent/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -[ excerpt from distribution's README.txt ] - -BitTorrent is a tool for distributing files. It's extremely easy -to use - downloads are started by clicking on hyperlinks. Whenever -more than one person is downloading at once they send pieces of the -file(s) to each other, thus relieving the central server's bandwidth -burden. Even with many simultaneous downloads, the upload burden -on the central server remains quite small, since each new downloader -introduces new upload capacity. - -WWW: http://bittorrent.com/ diff --git a/net/py-kenosis-bittorrent/pkg-plist b/net/py-kenosis-bittorrent/pkg-plist deleted file mode 100644 index b342f01be83f..000000000000 --- a/net/py-kenosis-bittorrent/pkg-plist +++ /dev/null @@ -1,93 +0,0 @@ -bin/btcompletedir.py -bin/btdownloadcurses.py -bin/btdownloadheadless.py -bin/btdownloadlibrary.py -bin/btlaunchmany.py -bin/btlaunchmanycurses.py -bin/btmakemetafile.py -bin/btreannounce.py -bin/btrename.py -bin/btshowmetainfo.py -bin/bttest.py -bin/bttrack.py -%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.py -%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/Choker.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.py -%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/Connecter.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.py -%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/CurrentRateMeasure.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.py -%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/Downloader.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.py -%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/DownloaderFeedback.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.py -%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/Encrypter.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.py -%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/HTTPHandler.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.py -%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/NatCheck.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.py -%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/PiecePicker.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.py -%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/RateMeasure.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.py -%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/RawServer.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.py -%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/Rerequester.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.py -%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/Storage.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.py -%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/StorageWrapper.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.py -%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/Uploader.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.py -%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/__init__.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.py -%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/bencode.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.py -%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/bitfield.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.py -%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/btformats.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/download.py -%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/download.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.py -%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/fakeopen.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.py -%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/parseargs.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.py -%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/selectpoll.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.py -%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/testtest.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/track.py -%%PYTHON_SITELIBDIR%%/BitTorrent/track.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/track.pyo -%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.py -%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyc -%%PYTHON_SITELIBDIR%%/BitTorrent/zurllib.pyo -@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent -@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true -@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true diff --git a/net/py-soappy-devel/Makefile b/net/py-soappy-devel/Makefile deleted file mode 100644 index 9cb226d2366f..000000000000 --- a/net/py-soappy-devel/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# New ports collection makefile for: py-soappy -# Date created: 2 Aug 2004 -# Whom: Alexander Leidinger -# -# $FreeBSD$ -# - -PORTNAME= soappy -PORTVERSION= 0.11.6 -CATEGORIES= net python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= pywebsvcs -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= SOAPpy-${PORTVERSION} - -MAINTAINER= marcus@corp.grupos.com.br -COMMENT= A SOAP implementation - -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/fpconst.py:${PORTSDIR}/math/py-fpconst -RUN_DEPENDS= ${PYXML} \ - ${BUILD_DEPENDS} - -USE_PYTHON= yes -USE_PYDISTUTILS= yes - -.include <bsd.port.mk> diff --git a/net/py-soappy-devel/distinfo b/net/py-soappy-devel/distinfo deleted file mode 100644 index b83d312baf10..000000000000 --- a/net/py-soappy-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (SOAPpy-0.11.6.tar.gz) = 51ac835366badedd932c64f26fa8336b -SIZE (SOAPpy-0.11.6.tar.gz) = 159078 diff --git a/net/py-soappy-devel/pkg-descr b/net/py-soappy-devel/pkg-descr deleted file mode 100644 index 4f2034de4484..000000000000 --- a/net/py-soappy-devel/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A SOAP implementation for python. - -WWW: http://pywebsvcs.sourceforge.net/ diff --git a/net/py-soappy-devel/pkg-plist b/net/py-soappy-devel/pkg-plist deleted file mode 100644 index 6b43b05109c7..000000000000 --- a/net/py-soappy-devel/pkg-plist +++ /dev/null @@ -1,71 +0,0 @@ -%%PYTHON_SITELIBDIR%%/SOAPpy/Client.py -%%PYTHON_SITELIBDIR%%/SOAPpy/Client.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/Client.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/Config.py -%%PYTHON_SITELIBDIR%%/SOAPpy/Config.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/Config.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/Errors.py -%%PYTHON_SITELIBDIR%%/SOAPpy/Errors.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/Errors.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/GSIServer.py -%%PYTHON_SITELIBDIR%%/SOAPpy/GSIServer.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/GSIServer.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/NS.py -%%PYTHON_SITELIBDIR%%/SOAPpy/NS.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/NS.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/Parser.py -%%PYTHON_SITELIBDIR%%/SOAPpy/Parser.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/Parser.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/SOAP.py -%%PYTHON_SITELIBDIR%%/SOAPpy/SOAP.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/SOAP.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/SOAPBuilder.py -%%PYTHON_SITELIBDIR%%/SOAPpy/SOAPBuilder.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/SOAPBuilder.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/Server.py -%%PYTHON_SITELIBDIR%%/SOAPpy/Server.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/Server.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/Types.py -%%PYTHON_SITELIBDIR%%/SOAPpy/Types.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/Types.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/URLopener.py -%%PYTHON_SITELIBDIR%%/SOAPpy/URLopener.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/URLopener.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/Utilities.py -%%PYTHON_SITELIBDIR%%/SOAPpy/Utilities.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/Utilities.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/WSDL.py -%%PYTHON_SITELIBDIR%%/SOAPpy/WSDL.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/WSDL.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/__init__.py -%%PYTHON_SITELIBDIR%%/SOAPpy/__init__.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/__init__.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/version.py -%%PYTHON_SITELIBDIR%%/SOAPpy/version.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/version.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Namespaces.py -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Namespaces.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Namespaces.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/TimeoutSocket.py -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/TimeoutSocket.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/TimeoutSocket.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/UserTuple.py -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/UserTuple.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/UserTuple.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Utility.py -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Utility.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/Utility.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/WSDLTools.py -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/WSDLTools.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/WSDLTools.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLSchema.py -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLSchema.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLSchema.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLname.py -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLname.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/XMLname.pyo -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/__init__.py -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/__init__.pyc -%%PYTHON_SITELIBDIR%%/SOAPpy/wstools/__init__.pyo -@dirrm %%PYTHON_SITELIBDIR%%/SOAPpy/wstools -@dirrm %%PYTHON_SITELIBDIR%%/SOAPpy diff --git a/net/py-zsi-devel/Makefile b/net/py-zsi-devel/Makefile deleted file mode 100644 index 3548fe44d28c..000000000000 --- a/net/py-zsi-devel/Makefile +++ /dev/null @@ -1,41 +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.22.6 -CATEGORIES= net python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= pywebsvcs -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME:U}-${PORTVERSION:C|\.([^.]*)$|-\1|} -EXTRACT_SUFX= .tgz - -MAINTAINER= ports@FreeBSD.org -COMMENT= A pure Python module that provides an implementation of SOAP 1.1 - -RUN_DEPENDS= ${PYXML} - -USE_PYTHON= yes -USE_PYDISTUTILS= yes -WRKSRC= ${WRKDIR}/${PORTNAME:U}-1.2 - -pre-install: - @ ${SH} ${PKGREQ} INSTALL - -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} - @ ${INSTALL_DATA} ${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 370196f544f0..000000000000 --- a/net/py-zsi-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (ZSI-1.22-6.tgz) = fb856af33d83fd883b334c0be8cc3309 -SIZE (ZSI-1.22-6.tgz) = 231571 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 43d4082b83c9..000000000000 --- a/net/py-zsi-devel/pkg-plist +++ /dev/null @@ -1,91 +0,0 @@ -%%PORTDOCS%%share/doc/zsi/CHANGES -%%PORTDOCS%%share/doc/zsi/README -%%PORTDOCS%%share/doc/zsi/c01-intro.tex -%%PORTDOCS%%share/doc/zsi/c02-samples.tex -%%PORTDOCS%%share/doc/zsi/c03-except.tex -%%PORTDOCS%%share/doc/zsi/c04-utils.tex -%%PORTDOCS%%share/doc/zsi/c05-parse.tex -%%PORTDOCS%%share/doc/zsi/c06-tc.tex -%%PORTDOCS%%share/doc/zsi/c07-writer.tex -%%PORTDOCS%%share/doc/zsi/c08-fault.tex -%%PORTDOCS%%share/doc/zsi/c09-resolve.tex -%%PORTDOCS%%share/doc/zsi/c10-dispatch.tex -%%PORTDOCS%%share/doc/zsi/version.tex -%%PORTDOCS%%share/doc/zsi/zsi.css -%%PORTDOCS%%share/doc/zsi/zsi.html -%%PORTDOCS%%share/doc/zsi/zsi.pdf -%%PORTDOCS%%share/doc/zsi/zsi.ps -%%PORTDOCS%%share/doc/zsi/zsi.tex -%%PORTDOCS%%share/doc/zsi/zsi.xsd -%%PORTDOCS%%share/doc/zsi/zsixsd.tex -%%PORTDOCS%%share/examples/zsi/interop/InteropTest.wsdl -%%PORTDOCS%%share/examples/zsi/interop/InteropTestB.wsdl -%%PORTDOCS%%share/examples/zsi/interop/README -%%PORTDOCS%%share/examples/zsi/interop/client.py -%%PORTDOCS%%share/examples/zsi/interop/cpackets.py -%%PORTDOCS%%share/examples/zsi/interop/echoHeaderBindings.wsdl -%%PORTDOCS%%share/examples/zsi/interop/sclasses.py -%%PORTDOCS%%share/examples/zsi/interop/server.py -%%PORTDOCS%%share/examples/zsi/samples/README -%%PORTDOCS%%share/examples/zsi/samples/poly.py -%%PORTDOCS%%share/examples/zsi/test/README -%%PORTDOCS%%share/examples/zsi/test/cgicli.py -%%PORTDOCS%%share/examples/zsi/test/t1.py -%%PORTDOCS%%share/examples/zsi/test/t2.py -%%PORTDOCS%%share/examples/zsi/test/t3.py -%%PORTDOCS%%share/examples/zsi/test/t4.py -%%PORTDOCS%%share/examples/zsi/test/t5.py -%%PORTDOCS%%share/examples/zsi/test/t6.py -%%PORTDOCS%%share/examples/zsi/test/t7.py -%%PORTDOCS%%share/examples/zsi/test/tests.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TC.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCapache.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCcompound.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCnumbers.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/TCtimes.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/__init__.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/auth.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/client.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/compat.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/dispatch.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/fault.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/parse.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/resolvers.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/version.pyo -lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.py -lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.pyc -lib/%%PYTHON_VERSION%%/site-packages/ZSI/writer.pyo -@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZSI -%%PORTDOCS%%@dirrm share/examples/zsi/test -%%PORTDOCS%%@dirrm share/examples/zsi/samples -%%PORTDOCS%%@dirrm share/examples/zsi/interop -%%PORTDOCS%%@dirrm share/examples/zsi -%%PORTDOCS%%@dirrm share/doc/zsi diff --git a/net/py-zsi-devel/pkg-req b/net/py-zsi-devel/pkg-req deleted file mode 100644 index fd3eb3555f86..000000000000 --- a/net/py-zsi-devel/pkg-req +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -PATH=$PATH:/usr/local/bin - -if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then - PYTHON_GT=`python -c 'import string, sys; \ - print string.split(sys.version)[0] >= "2.0" and 1'` - if [ "x${PYTHON_GT}" = "x1" ]; then - exit 0 - else - echo "-----------------------------------------------------------" - echo "ZSI requires Python version 2.0 or greater -" - echo " please update your Python installation before proceeding." - echo "-----------------------------------------------------------" - exit 1 - fi -fi 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 3af212d4c836..000000000000 --- a/net/rqm/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (rqm-1.0.0.tar.gz) = 406a9bfe4a3e9ad9f1a981701072f54a -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/rrdtool10/Makefile b/net/rrdtool10/Makefile deleted file mode 100644 index 0c9cfd2ed15a..000000000000 --- a/net/rrdtool10/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# New ports collection makefile for: rrdtool -# Date created: 20 July 1999 -# Whom: Dmitry Sivachenko <dima@Chg.RU> -# -# $FreeBSD$ -# - -PORTNAME= rrdtool -PORTVERSION= 1.0.49 -CATEGORIES= net -MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/ - -MAINTAINER= demon@FreeBSD.org -COMMENT= Round Robin Database Tools - -USE_PERL5= yes -MAKE_ENV+= PERL=${PERL} - -GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ - --program-transform-name='' -CONFIGURE_ENV= PERL=${PERL} -CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -LDFLAGS+= -L${LOCALBASE}/lib -CFLAGS:= ${CFLAGS:N-ffast-math} - -MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \ - rrdfetch.1 rrdgraph.1 rrdlast.1 rrdresize.1 rrdrestore.1 \ - rrdtool.1 rrdtune.1 rrdtutorial.1 rrdtutorial.es.1 rrdupdate.1 \ - cdeftutorial.1 rpntutorial.1 rrdinfo.1 rrdxport.1 rrd-beginners.1 -MAN3= RRDp.3 RRDs.3 -MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} - -.include <bsd.port.pre.mk> - -.if defined(WITH_LATIN2) -CONFIGURE_ARGS+= --enable-latin2 -.endif - -.if ${ARCH} == "amd64" -CONFIGURE_ARGS+=--with-pic -.endif - -pre-extract: -.if !defined(WITH_LATIN2) - @${ECHO_MSG} "" - @${ECHO_MSG} "You can enable support for ISO-8859-2 fonts by defining WITH_LATIN2." - @${ECHO_MSG} "" -.endif - -post-install: -.if !defined(BATCH) - @${ECHO_MSG} "" - @${ECHO_MSG} "############################################################################" - @${ECHO_MSG} "# See ${PREFIX}/share/examples/rrdtool for some demonstration code #" - @${ECHO_MSG} "############################################################################" -.endif - -.include <bsd.port.post.mk> diff --git a/net/rrdtool10/distinfo b/net/rrdtool10/distinfo deleted file mode 100644 index 5f69d61f8f67..000000000000 --- a/net/rrdtool10/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (rrdtool-1.0.49.tar.gz) = fbe492dbf3d68abb1d86c2322e7ed44a -SIZE (rrdtool-1.0.49.tar.gz) = 1466897 diff --git a/net/rrdtool10/files/patch-aa b/net/rrdtool10/files/patch-aa deleted file mode 100644 index 8436cf0346fb..000000000000 --- a/net/rrdtool10/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- perl-shared/Makefile.PL.in.orig Thu Apr 8 01:04:53 2004 -+++ perl-shared/Makefile.PL.in Sun Aug 8 18:11:16 2004 -@@ -10,7 +10,7 @@ - 'NAME' => 'RRDs', - 'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION - 'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}", -- 'INC' => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3', -+ 'INC' => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3', - 'CCFLAGS' => "$Config{ccflags} -DHAVE_CONFIG_H", - # where to look for the necessary libraries - # Perl will figure out which one is valid diff --git a/net/rrdtool10/files/patch-ac b/net/rrdtool10/files/patch-ac deleted file mode 100644 index a43ad994692b..000000000000 --- a/net/rrdtool10/files/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.in.orig Sun Aug 8 14:40:15 2004 -+++ Makefile.in Sun Aug 8 18:16:44 2004 -@@ -633,21 +633,7 @@ - # lets schedule the perl stuff for installation - # the special call to install-sh is because the -d switch is not portable - # mac os X has its perl module in bundles so it seems --install-data-local: -- @if test "x$(PERL)" != "xno"; then \ -- echo "$(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \ -- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \ -- echo "$(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl"; \ -- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl; \ -- echo "$(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl"; \ -- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl; \ -- echo "$(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs"; \ -- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs; \ -- echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true"; \ -- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true; \ -- echo "test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true"; \ -- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs|| true; \ -- fi -+install-data-local: site-perl-inst - - # rules for building the perl module - diff --git a/net/rrdtool10/files/patch-ae b/net/rrdtool10/files/patch-ae deleted file mode 100644 index b1465ab16354..000000000000 --- a/net/rrdtool10/files/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ ---- doc/Makefile.in.orig Sun Apr 14 11:51:02 2002 -+++ doc/Makefile.in Wed May 1 16:05:42 2002 -@@ -110,9 +110,9 @@ - EXTRA_DIST = $(POD) $(HTML) $(TXT) - - # some install rules --idocdir = $(prefix)/doc -+idocdir = $(prefix)/share/doc/rrdtool/ - idoc_DATA = $(POD) $(TXT) --ihtmldir = $(prefix)/html -+ihtmldir = $(prefix)/share/doc/rrdtool/html - ihtml_DATA = $(HTML) - imandir = $(prefix)/man/man1 - iman_DATA = $(MAN) diff --git a/net/rrdtool10/files/patch-af b/net/rrdtool10/files/patch-af deleted file mode 100644 index ab74382bf032..000000000000 --- a/net/rrdtool10/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/Makefile.in.orig Sun Apr 14 11:51:04 2002 -+++ examples/Makefile.in Wed May 1 16:07:13 2002 -@@ -93,7 +93,7 @@ - - EXTRA_DIST = cgi-demo.cgi.in piped-demo.pl.in shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in - --examplesdir = $(prefix)/examples -+examplesdir = $(prefix)/share/examples/rrdtool - examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl - mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs - CONFIG_HEADER = ../config/config.h diff --git a/net/rrdtool10/files/patch-ag b/net/rrdtool10/files/patch-ag deleted file mode 100644 index 205d5ac7228c..000000000000 --- a/net/rrdtool10/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/Makefile.in.orig Sun Apr 14 11:51:05 2002 -+++ contrib/Makefile.in Wed May 1 16:08:10 2002 -@@ -88,7 +88,7 @@ - ZLIB_LIB_DIR = @ZLIB_LIB_DIR@ - - SUBDIRS = trytime --contribdir = $(prefix)/contrib -+contribdir = $(prefix)/share/examples/rrdtool - contrib_DATA = README - EXTRA_DIST = rrdview log2rrd rrd-file-icon rrdproc rrdlastds add_ds killspike rrdfetchnames snmpstats rrdexplorer php3 php4 - mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs diff --git a/net/rrdtool10/files/patch-ak b/net/rrdtool10/files/patch-ak deleted file mode 100644 index 982c95f4fd38..000000000000 --- a/net/rrdtool10/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/trytime/Makefile.in.orig Mon Apr 5 02:03:53 2004 -+++ contrib/trytime/Makefile.in Tue Apr 6 11:17:12 2004 -@@ -162,7 +162,7 @@ - target_vendor = @target_vendor@ - AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3 - EXTRA_DIST = trytime.c --contribdir = $(prefix)/contrib/trytime -+contribdir = $(prefix)/share/examples/rrdtool/trytime - contrib_DATA = README trytime.c - bin_PROGRAMS = trytime - trytime_SOURCES = trytime.c diff --git a/net/rrdtool10/files/patch-rrd_graph.c b/net/rrdtool10/files/patch-rrd_graph.c deleted file mode 100644 index b8fcdefb8c77..000000000000 --- a/net/rrdtool10/files/patch-rrd_graph.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/rrd_graph.c.orig Sun Aug 8 14:58:13 2004 -+++ src/rrd_graph.c Sun Aug 8 18:19:06 2004 -@@ -2966,7 +2966,7 @@ - - - opt = getopt_long(argc, argv, -- "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMX:L:S:RB:O:U:", -+ "s:e:x:y:v:w:h:iu:l:rb:oc:t:f:a:zgjFYAMNX:L:S:RB:O:U:", - long_options, &option_index); - - if (opt == EOF) diff --git a/net/rrdtool10/pkg-descr b/net/rrdtool10/pkg-descr deleted file mode 100644 index 4b15e3d55ab5..000000000000 --- a/net/rrdtool10/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -It is pretty easy to gather status information from all sorts of things, -ranging from the temperature in your office to the number of octets which -have passed through the FDDI interface of your router. But it is not so -trivial to store this data in a efficient and systematic manner. This is -where RRDtool kicks in. It lets you log and analyze the data you gather from -all kinds of data-sources. The data analysis part of RRDtool is based -on the ability to quickly generate graphical representations of the data -values collected over a definable time period. - -WWW: http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/ diff --git a/net/rrdtool10/pkg-plist b/net/rrdtool10/pkg-plist deleted file mode 100644 index 6235d8efb1b3..000000000000 --- a/net/rrdtool10/pkg-plist +++ /dev/null @@ -1,92 +0,0 @@ -bin/rrdtool -bin/rrdcgi -bin/trytime -bin/rrdupdate -lib/librrd.a -lib/librrd.la -lib/librrd.so.0 -lib/librrd.so -include/rrd.h -share/examples/rrdtool/cgi-demo.cgi -share/examples/rrdtool/piped-demo.pl -share/examples/rrdtool/shared-demo.pl -share/examples/rrdtool/stripes.pl -share/examples/rrdtool/bigtops.pl -share/examples/rrdtool/minmax.pl -share/examples/rrdtool/trytime/trytime.c -share/examples/rrdtool/trytime/README -share/examples/rrdtool/README -share/doc/rrdtool/rrdtool.pod -share/doc/rrdtool/rrdinfo.pod -share/doc/rrdtool/rrdlast.pod -share/doc/rrdtool/rrdcreate.pod -share/doc/rrdtool/rrdupdate.pod -share/doc/rrdtool/cdeftutorial.pod -share/doc/rrdtool/rpntutorial.pod -share/doc/rrdtool/rrdgraph.pod -share/doc/rrdtool/bin_dec_hex.pod -share/doc/rrdtool/rrdfetch.pod -share/doc/rrdtool/rrdrestore.pod -share/doc/rrdtool/rrddump.pod -share/doc/rrdtool/rrdtune.pod -share/doc/rrdtool/rrdresize.pod -share/doc/rrdtool/rrdcgi.pod -share/doc/rrdtool/rrdtutorial.pod -share/doc/rrdtool/rrdtutorial.es.pod -share/doc/rrdtool/rrdxport.pod -share/doc/rrdtool/rrd-beginners.pod -share/doc/rrdtool/rrdtool.txt -share/doc/rrdtool/rrdinfo.txt -share/doc/rrdtool/rrdlast.txt -share/doc/rrdtool/rrdcreate.txt -share/doc/rrdtool/rrdupdate.txt -share/doc/rrdtool/cdeftutorial.txt -share/doc/rrdtool/rpntutorial.txt -share/doc/rrdtool/rrdgraph.txt -share/doc/rrdtool/bin_dec_hex.txt -share/doc/rrdtool/rrdfetch.txt -share/doc/rrdtool/rrdrestore.txt -share/doc/rrdtool/rrddump.txt -share/doc/rrdtool/rrdtune.txt -share/doc/rrdtool/rrdresize.txt -share/doc/rrdtool/rrdcgi.txt -share/doc/rrdtool/rrdtutorial.txt -share/doc/rrdtool/rrdtutorial.es.txt -share/doc/rrdtool/RRDs.txt -share/doc/rrdtool/RRDp.txt -share/doc/rrdtool/rrdxport.txt -share/doc/rrdtool/rrd-beginners.txt -share/doc/rrdtool/html/rrdtool.html -share/doc/rrdtool/html/rrdinfo.html -share/doc/rrdtool/html/rrdlast.html -share/doc/rrdtool/html/rrdcreate.html -share/doc/rrdtool/html/rrdupdate.html -share/doc/rrdtool/html/cdeftutorial.html -share/doc/rrdtool/html/rpntutorial.html -share/doc/rrdtool/html/rrdgraph.html -share/doc/rrdtool/html/bin_dec_hex.html -share/doc/rrdtool/html/rrdfetch.html -share/doc/rrdtool/html/rrdrestore.html -share/doc/rrdtool/html/rrddump.html -share/doc/rrdtool/html/rrdtune.html -share/doc/rrdtool/html/rrdresize.html -share/doc/rrdtool/html/rrdcgi.html -share/doc/rrdtool/html/rrdtutorial.html -share/doc/rrdtool/html/rrdtutorial.es.html -share/doc/rrdtool/html/RRDs.html -share/doc/rrdtool/html/RRDp.html -share/doc/rrdtool/html/rrdxport.html -share/doc/rrdtool/html/rrd-beginners.html -%%SITE_PERL%%/RRDp.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm -%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl -%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so -%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs -%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist -@dirrm share/examples/rrdtool/trytime -@dirrm share/examples/rrdtool -@dirrm share/doc/rrdtool/html -@dirrm share/doc/rrdtool -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs 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 ff94a72ca8fe..000000000000 --- a/net/rtptools/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (rtptools-1.17.tar.gz) = 4af6ef6ba430f659d3d6478719911b65 -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 1feb090e28b7..000000000000 --- a/net/rwhoisd/Makefile +++ /dev/null @@ -1,46 +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.7.3 -PORTREVISION= 1 -CATEGORIES= net ipv6 -MASTER_SITES= ftp://ftp.ayamura.org/pub/rwhois/ \ - ftp://ftp.jp.pgpi.org/pub/rwhois/ -DISTNAME= ${PORTNAME}d-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= The Internic referral whois server - -.if !exists(/usr/include/tcpd.h) -LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper -.endif - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX}/lib/rwhois - -BINOWN= bin -BINGRP= bin - -MAN8= rwhois_indexer.8 rwhoisd.8 - -MYPORTDOCS= INSTALL.html TODO UPGRADE operations_guide.html \ - operations_guide.txt rfc2167.txt security.html security.txt - -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 ${MYPORTDOCS} - ${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 d6b9f3dd6116..000000000000 --- a/net/rwhoisd/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (rwhoisd-1.5.7.3.tar.gz) = b3a1d951454afec598a7531919ce22a0 -SIZE (rwhoisd-1.5.7.3.tar.gz) = 452141 diff --git a/net/rwhoisd/files/patch-aa b/net/rwhoisd/files/patch-aa deleted file mode 100644 index c3ff541a6aaa..000000000000 --- a/net/rwhoisd/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Jun 3 23:20:53 1997 -+++ Makefile.in Sat Nov 25 15:44:00 2000 -@@ -25,7 +25,7 @@ - BIN_SUBDIRS = server tools - ALL_SUBDIRS = $(LIB_SUBDIRS) $(BIN_SUBDIRS) $(SAMPLE_DATA_DIR) - --all: libraries libwrap binaries -+all: libraries binaries - - libraries: - @for dir in $(LIB_SUBDIRS); do \ diff --git a/net/rwhoisd/files/patch-ac b/net/rwhoisd/files/patch-ac deleted file mode 100644 index 05ca015c5c8c..000000000000 --- a/net/rwhoisd/files/patch-ac +++ /dev/null @@ -1,33 +0,0 @@ ---- server/Makefile.in.orig Fri May 12 01:10:25 2000 -+++ server/Makefile.in Sat Nov 25 15:27:16 2000 -@@ -9,7 +9,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = $(exec_prefix)/bin --etcdir = $(exec_prefix)/etc -+sbindir = $(exec_prefix)/sbin - - srcdir = @srcdir@ - VPATH = @srcdir@ -@@ -18,8 +18,8 @@ - COMMON_INC = -I$(srcdir)/../common - COMMON_LIBS = -L../common -lrwcommon - --WRAP_INC = -I$(srcdir)../tools/tcpd_wrapper --WRAP_LIBS = -L../tools/tcpd_wrapper -lwrap -+WRAP_INC = -I${LOCALBASE}/include -+WRAP_LIBS = -L${LOCALBASE}/lib -lwrap - - MKDB_INC = -I$(srcdir)/../mkdb - MKDB_LIBS = -L../mkdb -lmkdb -@@ -97,8 +97,8 @@ - - install: - if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi -- if [ ! -d $(etcdir) ]; then mkdir $(etcdir); fi -- $(INSTALL) rwhoisd $(etcdir) -+ if [ ! -d $(sbindir) ]; then mkdir $(sbindir); fi -+ $(INSTALL) rwhoisd $(sbindir) - - uninstall: - $(RM) $(etcdir)/rwhoisd diff --git a/net/rwhoisd/files/patch-ae b/net/rwhoisd/files/patch-ae deleted file mode 100644 index 6d86925ae455..000000000000 --- a/net/rwhoisd/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- sample.data/rwhoisd.conf.orig Wed Nov 26 08:23:46 1997 -+++ sample.data/rwhoisd.conf Sat Nov 25 15:30:05 2000 -@@ -109,7 +109,7 @@ - # users group, as found in /etc/passwd. - # note that this really, really should be an unprivileged user - # this options doesn't have a default. --userid: rwhoisd -+userid: nobody - - # pid-file: where to put the file containing the pid of the server. - # normal default is "rwhoisd.pid" diff --git a/net/rwhoisd/files/patch-common-client_msgs.c b/net/rwhoisd/files/patch-common-client_msgs.c deleted file mode 100644 index 77a8d9a2ef23..000000000000 --- a/net/rwhoisd/files/patch-common-client_msgs.c +++ /dev/null @@ -1,35 +0,0 @@ ---- common/client_msgs.c.orig Tue Oct 28 02:24:02 2003 -+++ common/client_msgs.c Tue Oct 28 02:25:00 2003 -@@ -145,22 +145,16 @@ - printf ("%%ok\n"); - } - --void print_response(va_alist) -- va_dcl -+void print_response(int resp_no, char *format, ...) - { - va_list list; - int i; -- int resp_no; -- char *format; - FILE *fp; - -- va_start(list); -+ va_start(list, format); - - fp = get_out_fp(); - -- resp_no = va_arg(list, int); -- format = va_arg(list, char *); -- - for (i = 0; i < N_RESP; i++) - { - if (resp[i].resp_no == resp_no) -@@ -179,6 +173,7 @@ - } - - vfprintf(fp, format, list); -+ va_end(list); - - fprintf(fp, "\n"); - } diff --git a/net/rwhoisd/files/patch-common-client_msgs.h b/net/rwhoisd/files/patch-common-client_msgs.h deleted file mode 100644 index 625697efba0b..000000000000 --- a/net/rwhoisd/files/patch-common-client_msgs.h +++ /dev/null @@ -1,11 +0,0 @@ ---- common/client_msgs.h.orig Tue Oct 28 02:25:14 2003 -+++ common/client_msgs.h Tue Oct 28 02:25:30 2003 -@@ -85,7 +85,7 @@ - - void print_error PROTO((int err_no, char *str)); - --void print_response PROTO(()); -+void print_response PROTO((int resp_no, char *format, ...)); - - void print_ok PROTO((void)); - diff --git a/net/rwhoisd/files/patch-common-common.h b/net/rwhoisd/files/patch-common-common.h deleted file mode 100644 index 84f7d11ad8fd..000000000000 --- a/net/rwhoisd/files/patch-common-common.h +++ /dev/null @@ -1,11 +0,0 @@ ---- common/common.h.orig Tue Oct 28 02:23:23 2003 -+++ common/common.h Tue Oct 28 02:23:33 2003 -@@ -56,7 +56,7 @@ - # undef _VA_ALIGN - # undef __va_stack_arg - # endif --#include <varargs.h> -+#include <stdarg.h> - #endif /* HAVE_VPRINTF */ - - /* this should probably be #ifdef USG */ diff --git a/net/rwhoisd/files/patch-common-log.c b/net/rwhoisd/files/patch-common-log.c deleted file mode 100644 index c4da8e6e911d..000000000000 --- a/net/rwhoisd/files/patch-common-log.c +++ /dev/null @@ -1,38 +0,0 @@ ---- common/log.c.orig Tue Oct 28 02:26:55 2003 -+++ common/log.c Tue Oct 28 02:28:25 2003 -@@ -139,15 +139,12 @@ - /* log_error: prints a error message to the console. This is intended - for server side errors only. */ - void --log_error(va_alist) -- va_dcl -+log_error(char *format, ...) - { - va_list list; -- char *format; - char err_buf[MAX_LINE]; - -- va_start(list); -- format = va_arg(list, char *); -+ va_start(list, format); - - #ifdef HAVE_VSNPRINTF - vsnprintf(err_buf, sizeof(err_buf), format, list); -@@ -164,15 +161,12 @@ - /* log_warning: prints a warning message to the console. This is intended - for server side warnings only. */ - void --log_warning(va_alist) -- va_dcl -+log_warning(char *format, ...) - { - va_list list; -- char *format; - char err_buf[MAX_LINE]; - -- va_start(list); -- format = va_arg(list, char *); -+ va_start(list, format); - - #ifdef HAVE_VSNPRINTF - vsnprintf(err_buf, sizeof(err_buf), format, list); diff --git a/net/rwhoisd/files/patch-common-log.h b/net/rwhoisd/files/patch-common-log.h deleted file mode 100644 index 1c105a1f8612..000000000000 --- a/net/rwhoisd/files/patch-common-log.h +++ /dev/null @@ -1,23 +0,0 @@ ---- common/log.h.orig Tue Oct 28 02:25:55 2003 -+++ common/log.h Tue Oct 28 02:29:55 2003 -@@ -95,8 +95,8 @@ - /* old prototypes for backward compatibility */ - - #define l_strerror strerror --void log_error PROTO(()); --void log_warning PROTO(()); -+void log_error PROTO((char *format, ...)); -+void log_warning PROTO((char *format, ...)); - char *get_client_hostname PROTO((int sock)); - char *timestamp PROTO(()); - -@@ -106,7 +106,8 @@ - (L_LOG_EMERG, L_LOG_ALERT, etc. [see internal_log_level in - types.h) and SECTION is one of (NETWORK, QUERY, CONFIG, etc [see - log_section in types.h) */ --void log PROTO(()); -+#define log Log -+void log PROTO((internal_log_levels level, int section, char *format, ...)); - - void setup_logging PROTO((void)); - diff --git a/net/rwhoisd/files/patch-common-rw_log.c b/net/rwhoisd/files/patch-common-rw_log.c deleted file mode 100644 index 3807b136a551..000000000000 --- a/net/rwhoisd/files/patch-common-rw_log.c +++ /dev/null @@ -1,38 +0,0 @@ ---- common/rw_log.c.orig Tue Oct 28 02:28:43 2003 -+++ common/rw_log.c Tue Oct 28 02:30:14 2003 -@@ -17,13 +17,10 @@ - #include "types.h" - - void --log(va_alist) -- va_dcl -+log(internal_log_levels level, int section, char *format, ...) - { - va_list ap; -- internal_log_levels level; - FILE *fp; -- char *format; - char *filename; - char *hostname; - char message[MAX_LINE]; -@@ -31,13 +28,9 @@ - char *section_name; - int fd; - int use_syslog; -- int section; - int syslog_level; - -- va_start(ap); -- level = (internal_log_levels) va_arg(ap, int); -- section = (int) va_arg(ap, int); -- format = va_arg(ap, char*); -+ va_start(ap, format); - - /* verbosity sets the level at which we ignore log messages */ - if (level > get_verbosity()) -@@ -142,4 +135,5 @@ - - fclose(fp); - } -+ va_end(ap); - } diff --git a/net/rwhoisd/files/patch-server-notify.c b/net/rwhoisd/files/patch-server-notify.c deleted file mode 100644 index e4e71a95d91b..000000000000 --- a/net/rwhoisd/files/patch-server-notify.c +++ /dev/null @@ -1,31 +0,0 @@ ---- server/notify.c.orig Tue Oct 28 02:30:38 2003 -+++ server/notify.c Tue Oct 28 02:31:26 2003 -@@ -75,18 +75,13 @@ - - /* log notify information */ - int --log_entry(va_alist) -- va_dcl -+log_entry(char *filename, char *format, ...) - { - va_list ap; - FILE *fp; -- char *format; -- char *filename; - char *hostname; - -- va_start(ap); -- filename = va_arg (ap, char*); -- format = va_arg(ap, char*); -+ va_start(ap, format); - - /* lock the file */ - fp = get_file_lock(filename, "a", 60); -@@ -103,6 +98,7 @@ - fprintf(fp, " [%-15s] PID: %-8d", hostname, (int) getpid()); - vfprintf(fp, format, ap); - fprintf(fp, "\n"); -+ va_end(ap); - - release_file_lock(filename, fp); - 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 b408906ebb78..000000000000 --- a/net/rwhoisd/pkg-plist +++ /dev/null @@ -1,63 +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/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/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 -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADE -%%PORTDOCS%%%%DOCSDIR%%/operations_guide.html -%%PORTDOCS%%%%DOCSDIR%%/operations_guide.txt -%%PORTDOCS%%%%DOCSDIR%%/rfc2167.txt -%%PORTDOCS%%%%DOCSDIR%%/security.html -%%PORTDOCS%%%%DOCSDIR%%/security.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@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/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 e4b43bae78a4..000000000000 --- a/net/sdr/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (sdr-3.0.tar.gz) = df7df7911b5c08df968296f970f9e31d -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 c6b47e298ebb..000000000000 --- a/net/skype-devel/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# New ports collection makefile for: skype -# Date created: Jun 21. 2004 -# Whom: netchild@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= skype -PORTVERSION= 0.92.0.12 -PORTREVISION= 1 -CATEGORIES= net -MASTER_SITES= http://download.skype.com/linux/ -DISTNAME= skype_staticQT-${PORTVERSION} - -MAINTAINER= netchild@FreeBSD.org -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 \ - ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs - -USE_BZIP2= yes -PREFIX?= ${X11BASE} -USE_LINUX= yes -WANT_GNOME= yes -ONLY_FOR_ARCHS= i386 - -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}/${DISTNAME} - -do-build: - ${BRANDELF} -t Linux ${WRKSRC}/skype - -do-install: - ${INSTALL} ${WRKSRC}/skype ${PREFIX}/bin/ -.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 - ${INSTALL_DATA} ${WRKSRC}/icons/* ${DATADIR}/icons/ - ${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}/lang/ - ${INSTALL_DATA} ${WRKSRC}/call_in.wav ${DATADIR}/ - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DATADIR}/ - -post-install: - @${ECHO} "##########################################################################" - @${ECHO} "Since skype uses a hadcoded path to the data/language files (/usr/share/skype and .../lang) which a port isn't allowed to install files into, call_in.wav and the language files are not installed into the official path and therefore are not usable out of the box." | fmt - @${ECHO} - @${ECHO} "Known good soundcards for the use with Skype:" - @${ECHO} " - SiS 7012 (snd_ich) based ones" - @${ECHO} " - CMedia CMI8738 (snd_cmi) based ones" - @${ECHO} " - Creative EMU10K1 (snd_emu10k1) based ones" - @${ECHO} - @${ECHO} "Probably bad soundcards for the use with Skype:" - @${ECHO} " - VIA on-board sound (FreeBSD 5.1 seems to be ok)" - @${ECHO} " - Creative CT5880 (snd_es137x) based ones" - @${ECHO} " - Yamaha DS-1E (snd_ds1) based ones (reported for FreeBSD 4.10)" - @${ECHO} - @${ECHO} "If your soundcard is not listed here, send the the output of 'cat /dev/sndstat' with a short note if it works or not to ${MAINTAINER} please." | fmt - @${ECHO} "##########################################################################" - -.include <bsd.port.post.mk> diff --git a/net/skype-devel/distinfo b/net/skype-devel/distinfo deleted file mode 100644 index f1a4e8325a69..000000000000 --- a/net/skype-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (skype_staticQT-0.92.0.12.tar.bz2) = 08732abe23aeb9102cfc03731bbeb357 -SIZE (skype_staticQT-0.92.0.12.tar.bz2) = 6477090 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 d4fb046506c4..000000000000 --- a/net/skype-devel/pkg-plist +++ /dev/null @@ -1,33 +0,0 @@ -bin/skype -%%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%%/call_in.wav -%%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 be453e5bf938..000000000000 --- a/net/spread4/Makefile +++ /dev/null @@ -1,83 +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.2 -CATEGORIES= net perl5 -MASTER_SITES= http://www.cnds.jhu.edu/download/noformdown/ -DISTNAME= ${PORTNAME}-src-${PORTVERSION} - -MAINTAINER= joshua@roughtrade.net -COMMENT= The Spread Group Communication System, a network toolkit - -WRKSRC= ${WRKDIR}/${PORTNAME}_src-${PORTVERSION} -USE_REINPLACE= yes -GNU_CONFIGURE= yes - -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 - -USE_PERL5= yes -USE_RC_SUBR= yes -INSTALLS_SHLIB= yes -PKGMESSAGE= ${WRKSRC}/license.txt - -MAKE_ARGS+= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} - -.if !defined(NOPORTDOCS) -PORTDOCS+= Readme.txt LICENSE -.endif - -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} - -.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/spread.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}/spread.sh > ${WRKDIR}/spread.sh - -pre-install: - ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -post-install: - ${INSTALL_SCRIPT} ${WRKDIR}/spread.sh ${PREFIX}/etc/rc.d/spread.sh - ${INSTALL_DATA} ${WRKSRC}/sp.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/sp_func.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/sp_events.h ${PREFIX}/include - ${INSTALL_DATA} ${WRKSRC}/sample.spread.conf ${PREFIX}/etc/spread.conf.sample - ${INSTALL_DATA} ${WRKSRC}/sample.spread.access_ip ${PREFIX}/etc/spread.access_ip.sample - (cd ${WRKSRC}/perl/Spread && ${MAKE} install) -.if !defined(NOPORTDOCS) - ${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR} - ${INSTALL} -d -o root -g wheel -m 0755 ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}/LICENSE - ${INSTALL_SCRIPT} ${WRKSRC}/perl/Spread/test.pl ${EXAMPLESDIR} -.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 091600afbf48..000000000000 --- a/net/spread4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (spread-src-3.17.2.tar.gz) = 5ed0fae793978353a4ed5f195989b9d1 -SIZE (spread-src-3.17.2.tar.gz) = 289180 diff --git a/net/spread4/files/patch-Makefile.in b/net/spread4/files/patch-Makefile.in deleted file mode 100644 index 91e69fceaf9e..000000000000 --- a/net/spread4/files/patch-Makefile.in +++ /dev/null @@ -1,105 +0,0 @@ ---- Makefile.in Thu Nov 13 08:42:54 2003 -+++ Makefile.in Thu Jul 15 21:42:27 2004 -@@ -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 - -@@ -124,8 +126,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) -@@ -143,8 +148,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) -@@ -153,17 +161,17 @@ - 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.so user.o -+ $(LD) -o $@ user.o $(LDFLAGS) -lspread $(LIBS) - --spflooder$(EXEEXT): libspread.a flooder.o -- $(LD) -o $@ flooder.o $(LDFLAGS) libspread.a $(LIBS) -+spflooder$(EXEEXT): libspread.so flooder.o -+ $(LD) -o $@ flooder.o $(LDFLAGS) -lspread $(LIBS) - - spmonitor$(EXEEXT): $(MONITOROBJS) - $(LD) -o $@ $(MONITOROBJS) $(LDFLAGS) $(LIBS) - --sptuser$(EXEEXT): user.to libtspread.a -- $(LD) $(THLDFLAGS) -o $@ user.to libtspread.a $(LDFLAGS) $(LIBS) $(THLIBS) -+sptuser$(EXEEXT): user.to libtspread.so -+ $(LD) $(THLDFLAGS) -o $@ user.to -ltspread $(LDFLAGS) $(LIBS) $(THLIBS) - - spsimple_user$(EXEEXT): simple_user.o libspread.a - $(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS) -@@ -192,7 +200,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 - -@@ -248,11 +256,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 b571a339aba8..000000000000 --- a/net/spread4/files/patch-configuration.c +++ /dev/null @@ -1,12 +0,0 @@ ---- configuration.c Sun Sep 22 12:56:52 2002 -+++ configuration.c Tue Aug 5 21:24:19 2003 -@@ -128,9 +128,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 bf1b2a7b8851..000000000000 --- a/net/spread4/files/patch-sp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sp.c Tue Aug 5 21:35:28 2003 -+++ sp.c Tue Aug 5 21:24:19 2003 -@@ -551,7 +551,7 @@ - Alarm( SESSION, "SP_connect: set sndbuf/rcvbuf to %d\n", 1024*(i-5) ); - - 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 ); - while( ((ret = connect( s, (struct sockaddr *)&unix_addr, sizeof(unix_addr) )) == -1) - && ((sock_errno == EINTR) || (sock_errno == EAGAIN) || (sock_errno == EWOULDBLOCK)) ) - { 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 adc11250484f..000000000000 --- a/net/spread4/files/spread.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: spread -# REQUIRE: LOGIN -# KEYWORD: FreeBSD 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-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 85ffe55a99df..000000000000 --- a/net/spread4/pkg-plist +++ /dev/null @@ -1,26 +0,0 @@ -bin/spflooder -bin/spmonitor -bin/sptuser -bin/spuser -etc/rc.d/spread.sh -etc/spread.access_ip.sample -etc/spread.conf.sample -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 -%%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 -sbin/spread -%%PORTDOCS%%%%EXAMPLESDIR%%/test.pl -@unexec rmdir /var/run/spread 2>/dev/null || true -@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Spread 2>/dev/null || true -%%PORTDOCS%%@unexec rmdir %D/%%EXAMPLESDIR%% 2>/dev/null || true diff --git a/net/tcptraceroute-devel/Makefile b/net/tcptraceroute-devel/Makefile deleted file mode 100644 index ae2cdcd0fb1e..000000000000 --- a/net/tcptraceroute-devel/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# New ports collection makefile for: tcptraceroute -# Date created: 21 March 2002 -# Whom: jeff@cetlink.net -# -# $FreeBSD$ -# - -PORTNAME= tcptraceroute -PORTVERSION= 1.4 -CATEGORIES= net -MASTER_SITES= http://michael.toren.net/code/tcptraceroute/ - -MAINTAINER= corecode@corecode.ath.cx -COMMENT= A traceroute implementation using TCP packets - -BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet - -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 19fd48412cc8..000000000000 --- a/net/tcptraceroute-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (tcptraceroute-1.4.tar.gz) = 35c5e7d960f2b073db0109e0004e134e -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/tkabber-devel/Makefile b/net/tkabber-devel/Makefile deleted file mode 100644 index d2d6c8f9e1e7..000000000000 --- a/net/tkabber-devel/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# New ports collection makefile for: tkabber -# Date created: 22 October 2003 -# Whom: Alexander Timoshenko <gonzo@univ.kiev.ua> -# -# $FreeBSD$ -# - -PORTNAME= tkabber -PORTVERSION= 0.9.7 -CATEGORIES= net -MASTER_SITES= http://www.jabberstudio.org/files/tkabber/ - -MAINTAINER= gonzo@univ.kiev.ua -COMMENT= Tcl/Tk based jabber client - -TCLLIBVER!= ${MAKE} -C ${.CURDIR}/../../devel/tcllib -V PORTVERSION -RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 \ - ${LOCALBASE}/lib/tcllib${TCLLIBVER}/pkgIndex.tcl:${PORTSDIR}/devel/tcllib \ - ${LOCALBASE}/lib/tls/pkgIndex.tcl:${PORTSDIR}/devel/tcltls \ - ${LOCALBASE}/lib/bwidget/pkgIndex.tcl:${PORTSDIR}/x11-toolkits/bwidget - -WRKSRC= ${WRKDIR}/${DISTNAME} -NO_BUILD= yes - -SUBDIRS= aniemoteicons emoticons-tkabber ifaceck ifacetk plugins \ - jabberlib-tclxml pixmaps sounds textundo msgs mclistbox-1.02 - -do-install: - ${ECHO} -e "#!/bin/sh\nexec wish8.4 ${DATADIR}/tkabber.tcl \ - -name tkabber \"\$$@\"\n" > ${PREFIX}/bin/tkabber - ${CHMOD} +x ${PREFIX}/bin/tkabber - ${MKDIR} ${DATADIR} - ${CP} ${WRKSRC}/*.tcl ${DATADIR} -.for i in ${SUBDIRS} - ${CP} -R ${WRKSRC}/${i} ${DATADIR} -.endfor - ${MKDIR} ${EXAMPLESDIR} - ${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for i in tkabber.html tkabber.xml - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR} -.endfor -.endif - -.include <bsd.port.mk> diff --git a/net/tkabber-devel/distinfo b/net/tkabber-devel/distinfo deleted file mode 100644 index 53bbf34f9903..000000000000 --- a/net/tkabber-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (tkabber-0.9.7.tar.gz) = 41a0f24239415edb8e3d2cd86e532f38 -SIZE (tkabber-0.9.7.tar.gz) = 714184 diff --git a/net/tkabber-devel/files/patch-login.tcl b/net/tkabber-devel/files/patch-login.tcl deleted file mode 100644 index 22f7687b9d12..000000000000 --- a/net/tkabber-devel/files/patch-login.tcl +++ /dev/null @@ -1,15 +0,0 @@ ---- login.tcl.orig Tue Aug 3 14:35:36 2004 -+++ login.tcl Tue Aug 3 14:35:54 2004 -@@ -36,10 +36,10 @@ - custom::defvar loginconf(usedigest) 1 \ - [::msgcat::mc "Use hashed password transmission."] \ - -group Login -type boolean --custom::defvar loginconf(resource) "tkabber" \ -+custom::defvar loginconf(resource) "TKabber" \ - [::msgcat::mc "Resource."] \ - -group Login -type string --custom::defvar loginconf(server) "localhost" \ -+custom::defvar loginconf(server) "jabber.ru" \ - [::msgcat::mc "Server name."] \ - -group Login -type string - custom::defvar loginconf(port) "5222" \ diff --git a/net/tkabber-devel/files/patch-tkabber.tcl b/net/tkabber-devel/files/patch-tkabber.tcl deleted file mode 100644 index 194b89eea4b9..000000000000 --- a/net/tkabber-devel/files/patch-tkabber.tcl +++ /dev/null @@ -1,19 +0,0 @@ ---- tkabber.tcl.orig Tue Jul 27 17:37:59 2004 -+++ tkabber.tcl Tue Aug 3 14:34:43 2004 -@@ -1,6 +1,6 @@ - #!/bin/sh - # the next line restarts using the correct interpreter \ --exec wish "$0" -name tkabber "$@" -+exec wish8.4 "$0" -name tkabber "$@" - - # $Id: tkabber.tcl,v 1.219 2004/07/10 20:05:04 aleksey Exp $ - -@@ -118,7 +118,7 @@ - debugmsg tkabber "closed $chan '$res'" - } - } -- exit $status -+ quit $status - } - - namespace eval ssj {} diff --git a/net/tkabber-devel/pkg-descr b/net/tkabber-devel/pkg-descr deleted file mode 100644 index a6b84e265228..000000000000 --- a/net/tkabber-devel/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Tkabber is a free client for an instant messaging system called -Jabber. It is written in Tcl/Tk and supports many features like -support of unicode, ssl support, http proxy, file transfers and -support of multi-user conference protocol. - -WWW: http://tkabber.jabber.ru/ diff --git a/net/tkabber-devel/pkg-plist b/net/tkabber-devel/pkg-plist deleted file mode 100644 index 9544a24466fb..000000000000 --- a/net/tkabber-devel/pkg-plist +++ /dev/null @@ -1,662 +0,0 @@ -bin/tkabber -%%DATADIR%%/Tclx.tcl -%%DATADIR%%/aniemoteicons/aniemoteicons.tcl -%%DATADIR%%/aniemoteicons/anigif.tcl -%%DATADIR%%/avatars.tcl -%%DATADIR%%/balloon.tcl -%%DATADIR%%/browser.tcl -%%DATADIR%%/chats.tcl -%%DATADIR%%/ckabber.tcl -%%DATADIR%%/custom.tcl -%%DATADIR%%/datagathering.tcl -%%DATADIR%%/default.tcl -%%DATADIR%%/disco.tcl -%%DATADIR%%/emoticons-tkabber/FaceIronic.gif -%%DATADIR%%/emoticons-tkabber/FaceStartled.gif -%%DATADIR%%/emoticons-tkabber/FaceStraight.gif -%%DATADIR%%/emoticons-tkabber/beer.gif -%%DATADIR%%/emoticons-tkabber/facegrinning.gif -%%DATADIR%%/emoticons-tkabber/facehappy.gif -%%DATADIR%%/emoticons-tkabber/facesad.gif -%%DATADIR%%/emoticons-tkabber/facewinking.gif -%%DATADIR%%/emoticons-tkabber/faceyukky.gif -%%DATADIR%%/emoticons-tkabber/icondef.xml -%%DATADIR%%/emoticons.tcl -%%DATADIR%%/filetransfer.tcl -%%DATADIR%%/filters.tcl -%%DATADIR%%/gpgme.tcl -%%DATADIR%%/hooks.tcl -%%DATADIR%%/iface.tcl -%%DATADIR%%/ifaceck/default.xrdb -%%DATADIR%%/ifaceck/iface.tcl -%%DATADIR%%/ifaceck/ilogin.tcl -%%DATADIR%%/ifaceck/iroster.tcl -%%DATADIR%%/ifaceck/widgets.tcl -%%DATADIR%%/ifacetk/bwidget_workarounds.tcl -%%DATADIR%%/ifacetk/default.xrdb -%%DATADIR%%/ifacetk/idefault.tcl -%%DATADIR%%/ifacetk/iface.tcl -%%DATADIR%%/ifacetk/ilogin.tcl -%%DATADIR%%/ifacetk/iroster.tcl -%%DATADIR%%/iq.tcl -%%DATADIR%%/itemedit.tcl -%%DATADIR%%/jabberlib-tclxml/jabberlib.tcl -%%DATADIR%%/jabberlib-tclxml/pkgIndex.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/pkgIndex.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.0.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.1.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/sgmlparser.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.0.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.1.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.0.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.1.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/xml__tcl.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/xmldep.tcl -%%DATADIR%%/jabberlib-tclxml/tclxml/xpath.tcl -%%DATADIR%%/jabberlib-tclxml/wrapper.tcl -%%DATADIR%%/jidlink.tcl -%%DATADIR%%/joingrdialog.tcl -%%DATADIR%%/login.tcl -%%DATADIR%%/mclistbox-1.02/mclistbox.tcl -%%DATADIR%%/messages.tcl -%%DATADIR%%/msgs/ca.msg -%%DATADIR%%/msgs/de.msg -%%DATADIR%%/msgs/en.msg -%%DATADIR%%/msgs/eo.msg -%%DATADIR%%/msgs/es.msg -%%DATADIR%%/msgs/eu.msg -%%DATADIR%%/msgs/fr.msg -%%DATADIR%%/msgs/it.msg -%%DATADIR%%/msgs/nl.msg -%%DATADIR%%/msgs/pl.msg -%%DATADIR%%/msgs/pl.rc -%%DATADIR%%/msgs/pt.msg -%%DATADIR%%/msgs/ro.msg -%%DATADIR%%/msgs/ru.msg -%%DATADIR%%/msgs/ru.rc -%%DATADIR%%/msgs/ua.msg -%%DATADIR%%/muc.tcl -%%DATADIR%%/negotiate.tcl -%%DATADIR%%/pixmaps/amibulb/browser/aim_online.gif -%%DATADIR%%/pixmaps/amibulb/browser/icq_online.gif -%%DATADIR%%/pixmaps/amibulb/browser/msn_online.gif -%%DATADIR%%/pixmaps/amibulb/browser/user.gif -%%DATADIR%%/pixmaps/amibulb/browser/yahoo_online.gif -%%DATADIR%%/pixmaps/amibulb/docking/tkabber.ico -%%DATADIR%%/pixmaps/amibulb/roster/available-away.gif -%%DATADIR%%/pixmaps/amibulb/roster/available-chat.gif -%%DATADIR%%/pixmaps/amibulb/roster/available-dnd.gif -%%DATADIR%%/pixmaps/amibulb/roster/available-xa.gif -%%DATADIR%%/pixmaps/amibulb/roster/available.gif -%%DATADIR%%/pixmaps/amibulb/roster/group-closed.gif -%%DATADIR%%/pixmaps/amibulb/roster/group-opened.gif -%%DATADIR%%/pixmaps/amibulb/roster/icondef.xml -%%DATADIR%%/pixmaps/amibulb/roster/invisible.gif -%%DATADIR%%/pixmaps/amibulb/roster/stalker.gif -%%DATADIR%%/pixmaps/amibulb/roster/unavailable.gif -%%DATADIR%%/pixmaps/amibulb/tkabber/glade-groupchat.gif -%%DATADIR%%/pixmaps/amibulb/tkabber/glade-new-user.gif -%%DATADIR%%/pixmaps/amibulb/tkabber/glade-offline.gif -%%DATADIR%%/pixmaps/amibulb/tkabber/glade-online.gif -%%DATADIR%%/pixmaps/amibulb/tkabber/jb.gif -%%DATADIR%%/pixmaps/default/browser/aim_online.gif -%%DATADIR%%/pixmaps/default/browser/gg_online.gif -%%DATADIR%%/pixmaps/default/browser/glade-message.gif -%%DATADIR%%/pixmaps/default/browser/group_on.gif -%%DATADIR%%/pixmaps/default/browser/icq_online.gif -%%DATADIR%%/pixmaps/default/browser/jud.gif -%%DATADIR%%/pixmaps/default/browser/msn_online.gif -%%DATADIR%%/pixmaps/default/browser/service-jabber.gif -%%DATADIR%%/pixmaps/default/browser/unknown.gif -%%DATADIR%%/pixmaps/default/browser/user.gif -%%DATADIR%%/pixmaps/default/browser/weather_online.gif -%%DATADIR%%/pixmaps/default/browser/yahoo_online.gif -%%DATADIR%%/pixmaps/default/docking/available-away.gif -%%DATADIR%%/pixmaps/default/docking/available-chat.gif -%%DATADIR%%/pixmaps/default/docking/available-dnd.gif -%%DATADIR%%/pixmaps/default/docking/available-xa.gif -%%DATADIR%%/pixmaps/default/docking/available.gif -%%DATADIR%%/pixmaps/default/docking/invisible.gif -%%DATADIR%%/pixmaps/default/docking/tkabber.ico -%%DATADIR%%/pixmaps/default/docking/unavailable.gif -%%DATADIR%%/pixmaps/default/roster/available-away.gif -%%DATADIR%%/pixmaps/default/roster/available-chat.gif -%%DATADIR%%/pixmaps/default/roster/available-dnd.gif -%%DATADIR%%/pixmaps/default/roster/available-xa.gif -%%DATADIR%%/pixmaps/default/roster/available.gif -%%DATADIR%%/pixmaps/default/roster/group-closed.gif -%%DATADIR%%/pixmaps/default/roster/group-opened.gif -%%DATADIR%%/pixmaps/default/roster/group_off.gif -%%DATADIR%%/pixmaps/default/roster/group_on.gif -%%DATADIR%%/pixmaps/default/roster/invisible.gif -%%DATADIR%%/pixmaps/default/roster/stalker.gif -%%DATADIR%%/pixmaps/default/roster/unavailable.gif -%%DATADIR%%/pixmaps/default/services/aim_away.xpm -%%DATADIR%%/pixmaps/default/services/aim_chat.xpm -%%DATADIR%%/pixmaps/default/services/aim_dnd.xpm -%%DATADIR%%/pixmaps/default/services/aim_offline.xpm -%%DATADIR%%/pixmaps/default/services/aim_online.xpm -%%DATADIR%%/pixmaps/default/services/aim_xa.xpm -%%DATADIR%%/pixmaps/default/services/gg_away.gif -%%DATADIR%%/pixmaps/default/services/gg_chat.gif -%%DATADIR%%/pixmaps/default/services/gg_dnd.gif -%%DATADIR%%/pixmaps/default/services/gg_offline.gif -%%DATADIR%%/pixmaps/default/services/gg_online.gif -%%DATADIR%%/pixmaps/default/services/gg_xa.gif -%%DATADIR%%/pixmaps/default/services/icq_away.xpm -%%DATADIR%%/pixmaps/default/services/icq_chat.xpm -%%DATADIR%%/pixmaps/default/services/icq_dnd.xpm -%%DATADIR%%/pixmaps/default/services/icq_offline.xpm -%%DATADIR%%/pixmaps/default/services/icq_online.xpm -%%DATADIR%%/pixmaps/default/services/icq_xa.xpm -%%DATADIR%%/pixmaps/default/services/jud.gif -%%DATADIR%%/pixmaps/default/services/msn_away.xpm -%%DATADIR%%/pixmaps/default/services/msn_chat.xpm -%%DATADIR%%/pixmaps/default/services/msn_dnd.xpm -%%DATADIR%%/pixmaps/default/services/msn_offline.xpm -%%DATADIR%%/pixmaps/default/services/msn_online.xpm -%%DATADIR%%/pixmaps/default/services/msn_xa.xpm -%%DATADIR%%/pixmaps/default/services/rss.xpm -%%DATADIR%%/pixmaps/default/services/rss2.xpm -%%DATADIR%%/pixmaps/default/services/rss3.xpm -%%DATADIR%%/pixmaps/default/services/sms.xpm -%%DATADIR%%/pixmaps/default/services/weather_away.gif -%%DATADIR%%/pixmaps/default/services/weather_chat.gif -%%DATADIR%%/pixmaps/default/services/weather_dnd.gif -%%DATADIR%%/pixmaps/default/services/weather_offline.gif -%%DATADIR%%/pixmaps/default/services/weather_online.gif -%%DATADIR%%/pixmaps/default/services/weather_xa.gif -%%DATADIR%%/pixmaps/default/services/yahoo_away.xpm -%%DATADIR%%/pixmaps/default/services/yahoo_chat.xpm -%%DATADIR%%/pixmaps/default/services/yahoo_dnd.xpm -%%DATADIR%%/pixmaps/default/services/yahoo_offline.xpm -%%DATADIR%%/pixmaps/default/services/yahoo_online.xpm -%%DATADIR%%/pixmaps/default/services/yahoo_xa.xpm -%%DATADIR%%/pixmaps/default/tkabber/bookmark.xpm -%%DATADIR%%/pixmaps/default/tkabber/glade-groupchat.gif -%%DATADIR%%/pixmaps/default/tkabber/glade-new-user.gif -%%DATADIR%%/pixmaps/default/tkabber/glade-offline.gif -%%DATADIR%%/pixmaps/default/tkabber/glade-online.gif -%%DATADIR%%/pixmaps/default/tkabber/gpg-badsigned.gif -%%DATADIR%%/pixmaps/default/tkabber/gpg-encrypted.gif -%%DATADIR%%/pixmaps/default/tkabber/gpg-signed.gif -%%DATADIR%%/pixmaps/default/tkabber/gpg-unencrypted.gif -%%DATADIR%%/pixmaps/default/tkabber/gpg-unsigned.gif -%%DATADIR%%/pixmaps/default/tkabber/jb.gif -%%DATADIR%%/pixmaps/default/tkabber/mainlogo.gif -%%DATADIR%%/pixmaps/default/tkabber/new-msg.gif -%%DATADIR%%/pixmaps/default/tkabber/search_bk.gif -%%DATADIR%%/pixmaps/default/tkabber/search_case.gif -%%DATADIR%%/pixmaps/default/tkabber/search_exact.gif -%%DATADIR%%/pixmaps/default/tkabber/search_fw.gif -%%DATADIR%%/pixmaps/feather22/roster/available-away.gif -%%DATADIR%%/pixmaps/feather22/roster/available-chat.gif -%%DATADIR%%/pixmaps/feather22/roster/available-dnd.gif -%%DATADIR%%/pixmaps/feather22/roster/available-xa.gif -%%DATADIR%%/pixmaps/feather22/roster/available.gif -%%DATADIR%%/pixmaps/feather22/roster/invisible.gif -%%DATADIR%%/pixmaps/feather22/roster/unavailable.gif -%%DATADIR%%/pixmaps/gabber/browser/aim_online.gif -%%DATADIR%%/pixmaps/gabber/browser/glade-message.gif -%%DATADIR%%/pixmaps/gabber/browser/group_on.gif -%%DATADIR%%/pixmaps/gabber/browser/icq_online.gif -%%DATADIR%%/pixmaps/gabber/browser/jud.gif -%%DATADIR%%/pixmaps/gabber/browser/msn_online.gif -%%DATADIR%%/pixmaps/gabber/browser/user.gif -%%DATADIR%%/pixmaps/gabber/browser/yahoo_online.gif -%%DATADIR%%/pixmaps/gabber/docking/available-away.gif -%%DATADIR%%/pixmaps/gabber/docking/available-chat.gif -%%DATADIR%%/pixmaps/gabber/docking/available-dnd.gif -%%DATADIR%%/pixmaps/gabber/docking/available-xa.gif -%%DATADIR%%/pixmaps/gabber/docking/available.gif -%%DATADIR%%/pixmaps/gabber/docking/invisible.gif -%%DATADIR%%/pixmaps/gabber/docking/tkabber.ico -%%DATADIR%%/pixmaps/gabber/docking/unavailable.gif -%%DATADIR%%/pixmaps/gabber/roster/available-away.gif -%%DATADIR%%/pixmaps/gabber/roster/available-chat.gif -%%DATADIR%%/pixmaps/gabber/roster/available-dnd.gif -%%DATADIR%%/pixmaps/gabber/roster/available-xa.gif -%%DATADIR%%/pixmaps/gabber/roster/available.gif -%%DATADIR%%/pixmaps/gabber/roster/glade-groupchat-menu.xpm -%%DATADIR%%/pixmaps/gabber/roster/group-closed.gif -%%DATADIR%%/pixmaps/gabber/roster/group-opened.gif -%%DATADIR%%/pixmaps/gabber/roster/group_off.gif -%%DATADIR%%/pixmaps/gabber/roster/group_on.gif -%%DATADIR%%/pixmaps/gabber/roster/stalker.gif -%%DATADIR%%/pixmaps/gabber/roster/unavailable.gif -%%DATADIR%%/pixmaps/gabber/services/aim_away.xpm -%%DATADIR%%/pixmaps/gabber/services/aim_chat.xpm -%%DATADIR%%/pixmaps/gabber/services/aim_dnd.xpm -%%DATADIR%%/pixmaps/gabber/services/aim_offline.xpm -%%DATADIR%%/pixmaps/gabber/services/aim_online.xpm -%%DATADIR%%/pixmaps/gabber/services/aim_xa.xpm -%%DATADIR%%/pixmaps/gabber/services/icq_away.xpm -%%DATADIR%%/pixmaps/gabber/services/icq_chat.xpm -%%DATADIR%%/pixmaps/gabber/services/icq_dnd.xpm -%%DATADIR%%/pixmaps/gabber/services/icq_offline.xpm -%%DATADIR%%/pixmaps/gabber/services/icq_online.xpm -%%DATADIR%%/pixmaps/gabber/services/icq_xa.xpm -%%DATADIR%%/pixmaps/gabber/services/jud.gif -%%DATADIR%%/pixmaps/gabber/services/msn_away.xpm -%%DATADIR%%/pixmaps/gabber/services/msn_chat.xpm -%%DATADIR%%/pixmaps/gabber/services/msn_dnd.xpm -%%DATADIR%%/pixmaps/gabber/services/msn_offline.xpm -%%DATADIR%%/pixmaps/gabber/services/msn_online.xpm -%%DATADIR%%/pixmaps/gabber/services/msn_xa.xpm -%%DATADIR%%/pixmaps/gabber/services/rss.xpm -%%DATADIR%%/pixmaps/gabber/services/rss2.xpm -%%DATADIR%%/pixmaps/gabber/services/rss3.xpm -%%DATADIR%%/pixmaps/gabber/services/sms.xpm -%%DATADIR%%/pixmaps/gabber/services/yahoo_away.xpm -%%DATADIR%%/pixmaps/gabber/services/yahoo_chat.xpm -%%DATADIR%%/pixmaps/gabber/services/yahoo_dnd.xpm -%%DATADIR%%/pixmaps/gabber/services/yahoo_offline.xpm -%%DATADIR%%/pixmaps/gabber/services/yahoo_online.xpm -%%DATADIR%%/pixmaps/gabber/services/yahoo_xa.xpm -%%DATADIR%%/pixmaps/gabber/tkabber/glade-groupchat.gif -%%DATADIR%%/pixmaps/gabber/tkabber/glade-new-user.gif -%%DATADIR%%/pixmaps/gabber/tkabber/glade-offline.gif -%%DATADIR%%/pixmaps/gabber/tkabber/glade-online.gif -%%DATADIR%%/pixmaps/gabber/tkabber/jb.gif -%%DATADIR%%/pixmaps/gush/browser/aim_online.gif -%%DATADIR%%/pixmaps/gush/browser/icq_online.gif -%%DATADIR%%/pixmaps/gush/browser/msn_online.gif -%%DATADIR%%/pixmaps/gush/browser/user.gif -%%DATADIR%%/pixmaps/gush/browser/yahoo_online.gif -%%DATADIR%%/pixmaps/gush/docking/tkabber.ico -%%DATADIR%%/pixmaps/gush/roster/available-away.gif -%%DATADIR%%/pixmaps/gush/roster/available-chat.gif -%%DATADIR%%/pixmaps/gush/roster/available-dnd.gif -%%DATADIR%%/pixmaps/gush/roster/available-xa.gif -%%DATADIR%%/pixmaps/gush/roster/available.gif -%%DATADIR%%/pixmaps/gush/roster/available2.gif -%%DATADIR%%/pixmaps/gush/roster/group-closed.gif -%%DATADIR%%/pixmaps/gush/roster/group-opened.gif -%%DATADIR%%/pixmaps/gush/roster/invisible.gif -%%DATADIR%%/pixmaps/gush/roster/stalker.gif -%%DATADIR%%/pixmaps/gush/roster/unavailable.gif -%%DATADIR%%/pixmaps/gush/tkabber/glade-groupchat.gif -%%DATADIR%%/pixmaps/gush/tkabber/glade-new-user.gif -%%DATADIR%%/pixmaps/gush/tkabber/glade-offline.gif -%%DATADIR%%/pixmaps/gush/tkabber/glade-online.gif -%%DATADIR%%/pixmaps/gush/tkabber/jb.gif -%%DATADIR%%/pixmaps/icq/docking/available-away.gif -%%DATADIR%%/pixmaps/icq/docking/available-chat.gif -%%DATADIR%%/pixmaps/icq/docking/available-dnd.gif -%%DATADIR%%/pixmaps/icq/docking/available-xa.gif -%%DATADIR%%/pixmaps/icq/docking/available.gif -%%DATADIR%%/pixmaps/icq/docking/invisible.gif -%%DATADIR%%/pixmaps/icq/docking/unavailable.gif -%%DATADIR%%/pixmaps/icq/roster/available-away.gif -%%DATADIR%%/pixmaps/icq/roster/available-chat.gif -%%DATADIR%%/pixmaps/icq/roster/available-dnd.gif -%%DATADIR%%/pixmaps/icq/roster/available-xa.gif -%%DATADIR%%/pixmaps/icq/roster/available.gif -%%DATADIR%%/pixmaps/icq/roster/invisible.gif -%%DATADIR%%/pixmaps/icq/roster/message.gif -%%DATADIR%%/pixmaps/icq/roster/send.gif -%%DATADIR%%/pixmaps/icq/roster/stalker.gif -%%DATADIR%%/pixmaps/icq/roster/unavailable.gif -%%DATADIR%%/pixmaps/icq/tkabber/glade-groupchat.gif -%%DATADIR%%/pixmaps/icq/tkabber/glade-new-user.gif -%%DATADIR%%/pixmaps/icq/tkabber/glade-offline.gif -%%DATADIR%%/pixmaps/icq/tkabber/glade-online.gif -%%DATADIR%%/pixmaps/icq/tkabber/jb.gif -%%DATADIR%%/pixmaps/icq/tkabber/mainlogo.gif -%%DATADIR%%/pixmaps/icq/tkabber/new-msg.gif -%%DATADIR%%/pixmaps/jajc/browser/aim_online.gif -%%DATADIR%%/pixmaps/jajc/browser/group_on.gif -%%DATADIR%%/pixmaps/jajc/browser/icq_online.gif -%%DATADIR%%/pixmaps/jajc/browser/jud.gif -%%DATADIR%%/pixmaps/jajc/browser/msn_online.gif -%%DATADIR%%/pixmaps/jajc/browser/user.gif -%%DATADIR%%/pixmaps/jajc/browser/yahoo_online.gif -%%DATADIR%%/pixmaps/jajc/docking/available-away.gif -%%DATADIR%%/pixmaps/jajc/docking/available-chat.gif -%%DATADIR%%/pixmaps/jajc/docking/available-dnd.gif -%%DATADIR%%/pixmaps/jajc/docking/available-xa.gif -%%DATADIR%%/pixmaps/jajc/docking/available.gif -%%DATADIR%%/pixmaps/jajc/docking/tkabber.ico -%%DATADIR%%/pixmaps/jajc/docking/unavailable.gif -%%DATADIR%%/pixmaps/jajc/roster/available-away.gif -%%DATADIR%%/pixmaps/jajc/roster/available-chat.gif -%%DATADIR%%/pixmaps/jajc/roster/available-dnd.gif -%%DATADIR%%/pixmaps/jajc/roster/available-xa.gif -%%DATADIR%%/pixmaps/jajc/roster/available.gif -%%DATADIR%%/pixmaps/jajc/roster/group-closed.gif -%%DATADIR%%/pixmaps/jajc/roster/group-opened.gif -%%DATADIR%%/pixmaps/jajc/roster/group_closed.gif -%%DATADIR%%/pixmaps/jajc/roster/group_off.gif -%%DATADIR%%/pixmaps/jajc/roster/group_on.gif -%%DATADIR%%/pixmaps/jajc/roster/group_opened.gif -%%DATADIR%%/pixmaps/jajc/roster/unavailable.gif -%%DATADIR%%/pixmaps/jajc/services/aim_away.xpm -%%DATADIR%%/pixmaps/jajc/services/aim_chat.xpm -%%DATADIR%%/pixmaps/jajc/services/aim_dnd.xpm -%%DATADIR%%/pixmaps/jajc/services/aim_offline.xpm -%%DATADIR%%/pixmaps/jajc/services/aim_online.xpm -%%DATADIR%%/pixmaps/jajc/services/aim_xa.xpm -%%DATADIR%%/pixmaps/jajc/services/icq_away.xpm -%%DATADIR%%/pixmaps/jajc/services/icq_chat.xpm -%%DATADIR%%/pixmaps/jajc/services/icq_dnd.xpm -%%DATADIR%%/pixmaps/jajc/services/icq_offline.xpm -%%DATADIR%%/pixmaps/jajc/services/icq_online.xpm -%%DATADIR%%/pixmaps/jajc/services/icq_xa.xpm -%%DATADIR%%/pixmaps/jajc/services/jud.gif -%%DATADIR%%/pixmaps/jajc/services/msn_away.xpm -%%DATADIR%%/pixmaps/jajc/services/msn_chat.xpm -%%DATADIR%%/pixmaps/jajc/services/msn_dnd.xpm -%%DATADIR%%/pixmaps/jajc/services/msn_offline.xpm -%%DATADIR%%/pixmaps/jajc/services/msn_online.xpm -%%DATADIR%%/pixmaps/jajc/services/msn_xa.xpm -%%DATADIR%%/pixmaps/jajc/services/sms.xpm -%%DATADIR%%/pixmaps/jajc/services/yahoo_away.xpm -%%DATADIR%%/pixmaps/jajc/services/yahoo_chat.xpm -%%DATADIR%%/pixmaps/jajc/services/yahoo_dnd.xpm -%%DATADIR%%/pixmaps/jajc/services/yahoo_offline.xpm -%%DATADIR%%/pixmaps/jajc/services/yahoo_online.xpm -%%DATADIR%%/pixmaps/jajc/services/yahoo_xa.xpm -%%DATADIR%%/pixmaps/jajc/tkabber/glade-groupchat.gif -%%DATADIR%%/pixmaps/jajc/tkabber/glade-new-user.gif -%%DATADIR%%/pixmaps/jajc/tkabber/glade-offline.gif -%%DATADIR%%/pixmaps/jajc/tkabber/glade-online.gif -%%DATADIR%%/pixmaps/jajc/tkabber/jb.gif -%%DATADIR%%/pixmaps/jarl/roster/available-away.gif -%%DATADIR%%/pixmaps/jarl/roster/available-chat.gif -%%DATADIR%%/pixmaps/jarl/roster/available-dnd.gif -%%DATADIR%%/pixmaps/jarl/roster/available-xa.gif -%%DATADIR%%/pixmaps/jarl/roster/available.gif -%%DATADIR%%/pixmaps/jarl/roster/invisible.gif -%%DATADIR%%/pixmaps/jarl/roster/unavailable.gif -%%DATADIR%%/pixmaps/kroc/browser/aim_online.gif -%%DATADIR%%/pixmaps/kroc/browser/gg_online.gif -%%DATADIR%%/pixmaps/kroc/browser/glade-message.gif -%%DATADIR%%/pixmaps/kroc/browser/group_on.gif -%%DATADIR%%/pixmaps/kroc/browser/icq_online.gif -%%DATADIR%%/pixmaps/kroc/browser/jud.gif -%%DATADIR%%/pixmaps/kroc/browser/msn_online.gif -%%DATADIR%%/pixmaps/kroc/browser/service-jabber.gif -%%DATADIR%%/pixmaps/kroc/browser/unknown.gif -%%DATADIR%%/pixmaps/kroc/browser/user.gif -%%DATADIR%%/pixmaps/kroc/browser/weather_online.gif -%%DATADIR%%/pixmaps/kroc/browser/yahoo_online.gif -%%DATADIR%%/pixmaps/kroc/docking/available-away.gif -%%DATADIR%%/pixmaps/kroc/docking/available-chat.gif -%%DATADIR%%/pixmaps/kroc/docking/available-dnd.gif -%%DATADIR%%/pixmaps/kroc/docking/available-xa.gif -%%DATADIR%%/pixmaps/kroc/docking/available.gif -%%DATADIR%%/pixmaps/kroc/docking/invisible.gif -%%DATADIR%%/pixmaps/kroc/docking/tkabber.ico -%%DATADIR%%/pixmaps/kroc/docking/unavailable.gif -%%DATADIR%%/pixmaps/kroc/roster/available-away.gif -%%DATADIR%%/pixmaps/kroc/roster/available-chat.gif -%%DATADIR%%/pixmaps/kroc/roster/available-dnd.gif -%%DATADIR%%/pixmaps/kroc/roster/available-xa.gif -%%DATADIR%%/pixmaps/kroc/roster/available.gif -%%DATADIR%%/pixmaps/kroc/roster/group-closed.gif -%%DATADIR%%/pixmaps/kroc/roster/group-opened.gif -%%DATADIR%%/pixmaps/kroc/roster/group_closed.gif -%%DATADIR%%/pixmaps/kroc/roster/group_off.gif -%%DATADIR%%/pixmaps/kroc/roster/group_on.gif -%%DATADIR%%/pixmaps/kroc/roster/group_opened.gif -%%DATADIR%%/pixmaps/kroc/roster/invisible.gif -%%DATADIR%%/pixmaps/kroc/roster/stalker.gif -%%DATADIR%%/pixmaps/kroc/roster/unavailable.gif -%%DATADIR%%/pixmaps/kroc/services/aim_away.xpm -%%DATADIR%%/pixmaps/kroc/services/aim_chat.xpm -%%DATADIR%%/pixmaps/kroc/services/aim_dnd.xpm -%%DATADIR%%/pixmaps/kroc/services/aim_offline.xpm -%%DATADIR%%/pixmaps/kroc/services/aim_online.xpm -%%DATADIR%%/pixmaps/kroc/services/aim_xa.xpm -%%DATADIR%%/pixmaps/kroc/services/gg_away.gif -%%DATADIR%%/pixmaps/kroc/services/gg_chat.gif -%%DATADIR%%/pixmaps/kroc/services/gg_dnd.gif -%%DATADIR%%/pixmaps/kroc/services/gg_offline.gif -%%DATADIR%%/pixmaps/kroc/services/gg_online.gif -%%DATADIR%%/pixmaps/kroc/services/gg_xa.gif -%%DATADIR%%/pixmaps/kroc/services/icq_away.xpm -%%DATADIR%%/pixmaps/kroc/services/icq_chat.xpm -%%DATADIR%%/pixmaps/kroc/services/icq_dnd.xpm -%%DATADIR%%/pixmaps/kroc/services/icq_offline.xpm -%%DATADIR%%/pixmaps/kroc/services/icq_online.xpm -%%DATADIR%%/pixmaps/kroc/services/icq_xa.xpm -%%DATADIR%%/pixmaps/kroc/services/jud.gif -%%DATADIR%%/pixmaps/kroc/services/msn_away.xpm -%%DATADIR%%/pixmaps/kroc/services/msn_chat.xpm -%%DATADIR%%/pixmaps/kroc/services/msn_dnd.xpm -%%DATADIR%%/pixmaps/kroc/services/msn_offline.xpm -%%DATADIR%%/pixmaps/kroc/services/msn_online.xpm -%%DATADIR%%/pixmaps/kroc/services/msn_xa.xpm -%%DATADIR%%/pixmaps/kroc/services/rss.xpm -%%DATADIR%%/pixmaps/kroc/services/rss2.xpm -%%DATADIR%%/pixmaps/kroc/services/rss3.xpm -%%DATADIR%%/pixmaps/kroc/services/sms.xpm -%%DATADIR%%/pixmaps/kroc/services/weather_away.gif -%%DATADIR%%/pixmaps/kroc/services/weather_chat.gif -%%DATADIR%%/pixmaps/kroc/services/weather_dnd.gif -%%DATADIR%%/pixmaps/kroc/services/weather_offline.gif -%%DATADIR%%/pixmaps/kroc/services/weather_online.gif -%%DATADIR%%/pixmaps/kroc/services/weather_xa.gif -%%DATADIR%%/pixmaps/kroc/services/yahoo_away.xpm -%%DATADIR%%/pixmaps/kroc/services/yahoo_chat.xpm -%%DATADIR%%/pixmaps/kroc/services/yahoo_dnd.xpm -%%DATADIR%%/pixmaps/kroc/services/yahoo_offline.xpm -%%DATADIR%%/pixmaps/kroc/services/yahoo_online.xpm -%%DATADIR%%/pixmaps/kroc/services/yahoo_xa.xpm -%%DATADIR%%/pixmaps/kroc/tkabber/glade-groupchat.gif -%%DATADIR%%/pixmaps/kroc/tkabber/glade-new-user.gif -%%DATADIR%%/pixmaps/kroc/tkabber/glade-offline.gif -%%DATADIR%%/pixmaps/kroc/tkabber/glade-online.gif -%%DATADIR%%/pixmaps/kroc/tkabber/gpg-badsigned.gif -%%DATADIR%%/pixmaps/kroc/tkabber/gpg-encrypted.gif -%%DATADIR%%/pixmaps/kroc/tkabber/gpg-signed.gif -%%DATADIR%%/pixmaps/kroc/tkabber/gpg-unencrypted.gif -%%DATADIR%%/pixmaps/kroc/tkabber/gpg-unsigned.gif -%%DATADIR%%/pixmaps/kroc/tkabber/jb.gif -%%DATADIR%%/pixmaps/kroc/tkabber/new-msg.gif -%%DATADIR%%/pixmaps/kroc/tkabber/search_bk.gif -%%DATADIR%%/pixmaps/kroc/tkabber/search_case.gif -%%DATADIR%%/pixmaps/kroc/tkabber/search_exact.gif -%%DATADIR%%/pixmaps/kroc/tkabber/search_fw.gif -%%DATADIR%%/pixmaps/psi/browser/aim_online.gif -%%DATADIR%%/pixmaps/psi/browser/icq_online.gif -%%DATADIR%%/pixmaps/psi/browser/msn_online.gif -%%DATADIR%%/pixmaps/psi/browser/user.gif -%%DATADIR%%/pixmaps/psi/browser/yahoo_online.gif -%%DATADIR%%/pixmaps/psi/roster/available-away.gif -%%DATADIR%%/pixmaps/psi/roster/available-chat.gif -%%DATADIR%%/pixmaps/psi/roster/available-dnd.gif -%%DATADIR%%/pixmaps/psi/roster/available-xa.gif -%%DATADIR%%/pixmaps/psi/roster/available.gif -%%DATADIR%%/pixmaps/psi/roster/group-closed.gif -%%DATADIR%%/pixmaps/psi/roster/group-opened.gif -%%DATADIR%%/pixmaps/psi/roster/stalker.gif -%%DATADIR%%/pixmaps/psi/roster/unavailable.gif -%%DATADIR%%/pixmaps/psi/tkabber/glade-groupchat.gif -%%DATADIR%%/pixmaps/psi/tkabber/glade-new-user.gif -%%DATADIR%%/pixmaps/psi/tkabber/glade-offline.gif -%%DATADIR%%/pixmaps/psi/tkabber/glade-online.gif -%%DATADIR%%/pixmaps/psi/tkabber/jb.gif -%%DATADIR%%/plugins.tcl -%%DATADIR%%/plugins/chat/bookmark_highlighted.tcl -%%DATADIR%%/plugins/chat/clear.tcl -%%DATADIR%%/plugins/chat/complete_last_nick.tcl -%%DATADIR%%/plugins/chat/completion.tcl -%%DATADIR%%/plugins/chat/draw_encrypted.tcl -%%DATADIR%%/plugins/chat/draw_error.tcl -%%DATADIR%%/plugins/chat/draw_info.tcl -%%DATADIR%%/plugins/chat/draw_message.tcl -%%DATADIR%%/plugins/chat/draw_normal_message.tcl -%%DATADIR%%/plugins/chat/draw_server_message.tcl -%%DATADIR%%/plugins/chat/draw_signed.tcl -%%DATADIR%%/plugins/chat/draw_timestamp.tcl -%%DATADIR%%/plugins/chat/draw_xhtml_message.tcl -%%DATADIR%%/plugins/chat/empty_body.tcl -%%DATADIR%%/plugins/chat/events.tcl -%%DATADIR%%/plugins/chat/exec_command.tcl -%%DATADIR%%/plugins/chat/highlight.tcl -%%DATADIR%%/plugins/chat/history.tcl -%%DATADIR%%/plugins/chat/info_commands.tcl -%%DATADIR%%/plugins/chat/irc_commands.tcl -%%DATADIR%%/plugins/chat/logger.tcl -%%DATADIR%%/plugins/chat/me_command.tcl -%%DATADIR%%/plugins/chat/nick_colors.tcl -%%DATADIR%%/plugins/chat/open_window.tcl -%%DATADIR%%/plugins/chat/popupmenu.tcl -%%DATADIR%%/plugins/chat/send_message.tcl -%%DATADIR%%/plugins/chat/unisymbols.tcl -%%DATADIR%%/plugins/filetransfer/http.tcl -%%DATADIR%%/plugins/filetransfer/jidlink.tcl -%%DATADIR%%/plugins/filetransfer/si.tcl -%%DATADIR%%/plugins/general/autoaway.tcl -%%DATADIR%%/plugins/general/clientinfo.tcl -%%DATADIR%%/plugins/general/conferenceinfo.tcl -%%DATADIR%%/plugins/general/message_archive.tcl -%%DATADIR%%/plugins/general/presenceinfo.tcl -%%DATADIR%%/plugins/general/rawxml.tcl -%%DATADIR%%/plugins/general/stats.tcl -%%DATADIR%%/plugins/general/tkcon.tcl -%%DATADIR%%/plugins/iq/browse.tcl -%%DATADIR%%/plugins/iq/last.tcl -%%DATADIR%%/plugins/iq/oob.tcl -%%DATADIR%%/plugins/iq/time.tcl -%%DATADIR%%/plugins/iq/version.tcl -%%DATADIR%%/plugins/jidlink/dtcp.tcl -%%DATADIR%%/plugins/jidlink/ibb.tcl -%%DATADIR%%/plugins/si/ibb.tcl -%%DATADIR%%/plugins/si/socks5.tcl -%%DATADIR%%/plugins/unix/dockingtray.tcl -%%DATADIR%%/plugins/unix/ispell.tcl -%%DATADIR%%/plugins/unix/menu.tcl -%%DATADIR%%/plugins/unix/menu8.4.tcl -%%DATADIR%%/plugins/unix/wmdock.tcl -%%DATADIR%%/plugins/windows/console.tcl -%%DATADIR%%/plugins/windows/mousewheel.tcl -%%DATADIR%%/plugins/windows/taskbar.tcl -%%DATADIR%%/presence.tcl -%%DATADIR%%/privacy.tcl -%%DATADIR%%/register.tcl -%%DATADIR%%/roster.tcl -%%DATADIR%%/search.tcl -%%DATADIR%%/si.tcl -%%DATADIR%%/sound.tcl -%%DATADIR%%/sounds/default/chat_their_message.wav -%%DATADIR%%/sounds/default/connected.wav -%%DATADIR%%/sounds/default/groupchat_server_message.wav -%%DATADIR%%/sounds/default/groupchat_their_message.wav -%%DATADIR%%/sounds/default/groupchat_their_message_to_me.wav -%%DATADIR%%/sounds/default/presence_available.wav -%%DATADIR%%/sounds/default/presence_unavailable.wav -%%DATADIR%%/sounds/psi/chat_their_message.wav -%%DATADIR%%/sounds/psi/connected.wav -%%DATADIR%%/sounds/psi/groupchat_server_message.wav -%%DATADIR%%/sounds/psi/groupchat_their_message.wav -%%DATADIR%%/sounds/psi/groupchat_their_message_to_me.wav -%%DATADIR%%/sounds/psi/presence_available.wav -%%DATADIR%%/sounds/psi/presence_unavailable.wav -%%DATADIR%%/splash.tcl -%%DATADIR%%/textundo/dkflib.tcl -%%DATADIR%%/textundo/textundo.tcl -%%DATADIR%%/tkabber.tcl -%%DATADIR%%/userinfo.tcl -%%DATADIR%%/utils.tcl -%%DATADIR%%/xmppmime.tcl -%%EXAMPLESDIR%%/badlop-config-home.tcl -%%EXAMPLESDIR%%/badlop-config.tcl -%%EXAMPLESDIR%%/badlop-dark.xrdb -%%EXAMPLESDIR%%/black.xrdb -%%EXAMPLESDIR%%/config.tcl -%%EXAMPLESDIR%%/dark.xrdb -%%EXAMPLESDIR%%/dark2.xrdb -%%EXAMPLESDIR%%/ermine.xrdb -%%EXAMPLESDIR%%/green.xrdb -%%EXAMPLESDIR%%/ice.xrdb -%%EXAMPLESDIR%%/light.xrdb -%%EXAMPLESDIR%%/mtr-config.tcl -%%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/build.sh -%%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/tclCarbonNotification.tcl -%%EXAMPLESDIR%%/teo-config.tcl -%%EXAMPLESDIR%%/teopetuk.xrdb -%%EXAMPLESDIR%%/tkabber_setstatus -%%EXAMPLESDIR%%/tools/howto.txt -%%EXAMPLESDIR%%/tools/jbot -%%EXAMPLESDIR%%/tools/jsend.tcl -%%EXAMPLESDIR%%/tools/rssbot -%%EXAMPLESDIR%%/tools/rssbot.tcl -%%EXAMPLESDIR%%/warm.xrdb - -%%PORTDOCS%%%%DOCSDIR%%/tkabber.html -%%PORTDOCS%%%%DOCSDIR%%/tkabber.xml -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%DATADIR%%/aniemoteicons -@dirrm %%DATADIR%%/emoticons-tkabber -@dirrm %%DATADIR%%/ifaceck -@dirrm %%DATADIR%%/ifacetk -@dirrm %%DATADIR%%/jabberlib-tclxml/tclxml -@dirrm %%DATADIR%%/jabberlib-tclxml -@dirrm %%DATADIR%%/mclistbox-1.02 -@dirrm %%DATADIR%%/msgs -@dirrm %%DATADIR%%/pixmaps/amibulb/browser -@dirrm %%DATADIR%%/pixmaps/amibulb/docking -@dirrm %%DATADIR%%/pixmaps/amibulb/roster -@dirrm %%DATADIR%%/pixmaps/amibulb/tkabber -@dirrm %%DATADIR%%/pixmaps/amibulb -@dirrm %%DATADIR%%/pixmaps/default/browser -@dirrm %%DATADIR%%/pixmaps/default/docking -@dirrm %%DATADIR%%/pixmaps/default/roster -@dirrm %%DATADIR%%/pixmaps/default/services -@dirrm %%DATADIR%%/pixmaps/default/tkabber -@dirrm %%DATADIR%%/pixmaps/default -@dirrm %%DATADIR%%/pixmaps/feather22/roster -@dirrm %%DATADIR%%/pixmaps/feather22 -@dirrm %%DATADIR%%/pixmaps/gabber/browser -@dirrm %%DATADIR%%/pixmaps/gabber/docking -@dirrm %%DATADIR%%/pixmaps/gabber/roster -@dirrm %%DATADIR%%/pixmaps/gabber/services -@dirrm %%DATADIR%%/pixmaps/gabber/tkabber -@dirrm %%DATADIR%%/pixmaps/gabber -@dirrm %%DATADIR%%/pixmaps/gush/browser -@dirrm %%DATADIR%%/pixmaps/gush/docking -@dirrm %%DATADIR%%/pixmaps/gush/roster -@dirrm %%DATADIR%%/pixmaps/gush/tkabber -@dirrm %%DATADIR%%/pixmaps/gush -@dirrm %%DATADIR%%/pixmaps/icq/docking -@dirrm %%DATADIR%%/pixmaps/icq/roster -@dirrm %%DATADIR%%/pixmaps/icq/tkabber -@dirrm %%DATADIR%%/pixmaps/icq -@dirrm %%DATADIR%%/pixmaps/jajc/browser -@dirrm %%DATADIR%%/pixmaps/jajc/docking -@dirrm %%DATADIR%%/pixmaps/jajc/roster -@dirrm %%DATADIR%%/pixmaps/jajc/services -@dirrm %%DATADIR%%/pixmaps/jajc/tkabber -@dirrm %%DATADIR%%/pixmaps/jajc -@dirrm %%DATADIR%%/pixmaps/jarl/roster -@dirrm %%DATADIR%%/pixmaps/jarl -@dirrm %%DATADIR%%/pixmaps/kroc/browser -@dirrm %%DATADIR%%/pixmaps/kroc/docking -@dirrm %%DATADIR%%/pixmaps/kroc/roster -@dirrm %%DATADIR%%/pixmaps/kroc/services -@dirrm %%DATADIR%%/pixmaps/kroc/tkabber -@dirrm %%DATADIR%%/pixmaps/kroc -@dirrm %%DATADIR%%/pixmaps/psi/browser -@dirrm %%DATADIR%%/pixmaps/psi/roster -@dirrm %%DATADIR%%/pixmaps/psi/tkabber -@dirrm %%DATADIR%%/pixmaps/psi -@dirrm %%DATADIR%%/pixmaps -@dirrm %%DATADIR%%/plugins/chat -@dirrm %%DATADIR%%/plugins/filetransfer -@dirrm %%DATADIR%%/plugins/general -@dirrm %%DATADIR%%/plugins/iq -@dirrm %%DATADIR%%/plugins/jidlink -@dirrm %%DATADIR%%/plugins/si -@dirrm %%DATADIR%%/plugins/unix -@dirrm %%DATADIR%%/plugins/windows -@dirrm %%DATADIR%%/plugins -@dirrm %%DATADIR%%/sounds/default -@dirrm %%DATADIR%%/sounds/psi -@dirrm %%DATADIR%%/sounds -@dirrm %%DATADIR%%/textundo -@dirrm %%DATADIR%% -@dirrm %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0 -@dirrm %%EXAMPLESDIR%%/tools -@dirrm %%EXAMPLESDIR%% diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile deleted file mode 100644 index acf081a58a01..000000000000 --- a/net/trafshow3/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# New ports collection makefile for: trafshow -# Date created: 25 September 1996 -# Whom: igor@zynaps.ru -# -# $FreeBSD$ -# - -PORTNAME= trafshow -PORTVERSION= 3.1 -PORTREVISION= 4 -PORTEPOCH= 1 -CATEGORIES= net -MASTER_SITES= ftp://ftp.sasknow.com/pub/trafshow/ \ - ftp://ftp.nsk.su/pub/RinetSoftware/ -EXTRACT_SUFX= .tgz - -MAINTAINER= ryan@sasknow.com -COMMENT= Full screen visualization of network traffic - -CONFLICTS= trafshow-4.* - -.include <bsd.port.pre.mk> - -.if defined(WITH_TRAFSHOW_SLANG) || \ - (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG)) -LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang -.else -.if ${OSVERSION} < 400010 -LIB_DEPENDS= ncurses.5:${PORTSDIR}/devel/ncurses -.endif -.endif - -USE_REINPLACE= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" -ALL_TARGET= trafshow - -MAN1= trafshow.1 - -post-patch: - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/trafshow.1 ${PREFIX}/man/man1 - ${INSTALL_DATA} ${WRKSRC}/.trafshow ${PREFIX}/etc/trafshow.dist - ${CP} ${PREFIX}/etc/trafshow.dist ${PREFIX}/etc/trafshow - -.include <bsd.port.post.mk> diff --git a/net/trafshow3/distinfo b/net/trafshow3/distinfo deleted file mode 100644 index c7c38bea360e..000000000000 --- a/net/trafshow3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (trafshow-3.1.tgz) = 085b99f160002a269b358aab1c5004f0 -SIZE (trafshow-3.1.tgz) = 72342 diff --git a/net/trafshow3/files/patch-ac b/net/trafshow3/files/patch-ac deleted file mode 100644 index c15ab541f4d8..000000000000 --- a/net/trafshow3/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- color.c.orig Mon Jan 24 10:59:01 2000 -+++ color.c Mon Jan 24 10:57:36 2000 -@@ -336,7 +336,7 @@ - error(1, "init_color_mask: getpwuid"); - (void) sprintf(buf, "%s/.%s", pw->pw_dir, program_name); - if ((fp = fopen(buf, "r")) == NULL) { -- (void) strcpy(buf, "/etc/"); -+ (void) strcpy(buf, "%%PREFIX%%/etc/"); - (void) strcat(buf, program_name); - if ((fp = fopen(buf, "r")) == NULL) return 0; - } diff --git a/net/trafshow3/files/patch-af b/net/trafshow3/files/patch-af deleted file mode 100644 index dba73df91ae9..000000000000 --- a/net/trafshow3/files/patch-af +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig Mon Aug 24 13:54:16 1998 -+++ Makefile.in Tue May 2 00:51:47 2000 -@@ -28,8 +28,8 @@ - - PROG = trafshow - CC = @CC@ --CCOPT = @V_CCOPT@ --INCLS = -I. @V_INCLS@ -+CCOPT = @CFLAGS@ -+INCLS = -I. @CPPFLAGS@ - DEFS = @DEFS@ - - CFLAGS = $(CCOPT) $(DEFS) $(INCLS) diff --git a/net/trafshow3/files/patch-ag b/net/trafshow3/files/patch-ag deleted file mode 100644 index 959cd5221318..000000000000 --- a/net/trafshow3/files/patch-ag +++ /dev/null @@ -1,20 +0,0 @@ ---- util.c.orig Thu Sep 25 06:37:57 1997 -+++ util.c Fri Jul 30 18:20:20 2004 -@@ -123,11 +123,17 @@ - { "egp", IPPROTO_EGP }, - { "ospf", IPPROTO_OSPF }, - { "igmp", IPPROTO_IGMP }, -+ { "gre", IPPROTO_GRE }, -+ { "gif", IPPROTO_IPIP }, -+ { "esp", IPPROTO_ESP }, - #ifdef IPPROTO_GGP - { "ggp", IPPROTO_GGP }, - #endif - #ifdef IPPROTO_ENCAP - { "encap",IPPROTO_ENCAP}, -+#endif -+#ifdef IPPROTO_IPV6 -+ { "ipv6", IPPROTO_IPV6}, - #endif - { "ip", IPPROTO_IP }, - { "raw", IPPROTO_RAW }, diff --git a/net/trafshow3/files/patch-configure b/net/trafshow3/files/patch-configure deleted file mode 100644 index 8510310f4a13..000000000000 --- a/net/trafshow3/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Sat Jan 5 17:07:53 2002 -+++ configure Sat Jan 5 17:07:53 2002 -@@ -874,7 +874,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_lbl_gcc_vers=`$CC -v 2>&1 | \ -- sed -n -e '$s/.* //' -e '$s/\..*//p'` -+ sed -n -e '$s/^.*version //' -e '$s/\..*//p'` - fi - - echo "$ac_t""$ac_cv_lbl_gcc_vers" 1>&6 diff --git a/net/trafshow3/pkg-descr b/net/trafshow3/pkg-descr deleted file mode 100644 index c3121121390e..000000000000 --- a/net/trafshow3/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -TrafShow continuously displays the information regarding packet -traffic on the configured network interface that matches the boolean -expression. It periodically sorts and updates this information. It -may be useful for locating suspicious network traffic on the net. - -WWW: http://soft.risp.ru/trafshow/index_en.shtml - -- Ryan Thompson <ryan@sasknow.com> diff --git a/net/trafshow3/pkg-plist b/net/trafshow3/pkg-plist deleted file mode 100644 index 00f2059110f7..000000000000 --- a/net/trafshow3/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/trafshow -@unexec if cmp -s %D/etc/trafshow %D/etc/trafshow.dist; then rm -f %D/etc/trafshow; fi -etc/trafshow.dist -@exec if [ ! -f %D/etc/trafshow.dist ]; then cp -p %D/%F %B/trafshow.dist; fi 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 13d2ffab7400..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= lioux@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 a810bd158ea0..000000000000 --- a/net/udpcast/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (udpcast-20040531.tar.gz) = e965fae35ae7450098c29984d3997344 -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/unison-devel/Makefile b/net/unison-devel/Makefile deleted file mode 100644 index 149126354848..000000000000 --- a/net/unison-devel/Makefile +++ /dev/null @@ -1,50 +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.9.20 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/ -DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -EXTRACT_ONLY= src.tar.gz - -MAINTAINER= daniel+unison@pelleg.org -COMMENT= A user-level file synchronization tool - -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml -PATCH_DEPENDS= ${BUILD_DEPENDS} - -USE_GMAKE= yes -MAKE_ARGS= UISTYLE=text CFLAGS="" - -.if !defined(NOPORTDOCS) -DOCS= BUGS.txt NEWS README -EXTRA_DOCS= unison-manual.dvi unison-manual.html \ - unison-manual.pdf unison-manual.ps -.endif - -pre-patch: - @if [ `ocamlc -version | ${SED} -e s/\\\.//g -e s/\\\+.*//` -gt 307 ] ; then \ - if ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/ocaml-external-patch-ab ; then \ - ${TRUE} ; \ - else \ - ${ECHO_MSG} ">> Patch ocaml-external-patch-ab failed to apply cleanly." ; \ - ${FALSE} ; \ - fi; \ - fi - -post-install: - @${STRIP_CMD} ${PREFIX}/bin/unison -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/net/unison-devel/distinfo b/net/unison-devel/distinfo deleted file mode 100644 index 1044547f1238..000000000000 --- a/net/unison-devel/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -MD5 (unison-2.9.20/src.tar.gz) = a0a1b734e11212623bc6ea996aace960 -SIZE (unison-2.9.20/src.tar.gz) = 363079 -MD5 (unison-2.9.20/unison-manual.dvi) = 9d51f63ad9b592f4e94f593f682b4533 -SIZE (unison-2.9.20/unison-manual.dvi) = 248060 -MD5 (unison-2.9.20/unison-manual.html) = babc84fe1729382c9569a7cc0dfd7851 -SIZE (unison-2.9.20/unison-manual.html) = 209167 -MD5 (unison-2.9.20/unison-manual.pdf) = 4f85a8fb7c2587d5f8e8184b49d90636 -SIZE (unison-2.9.20/unison-manual.pdf) = 332136 -MD5 (unison-2.9.20/unison-manual.ps) = db69ed340c6e88a56890ef37804ee3ed -SIZE (unison-2.9.20/unison-manual.ps) = 440361 diff --git a/net/unison-devel/files/ocaml-external-patch-ab b/net/unison-devel/files/ocaml-external-patch-ab deleted file mode 100644 index 247ae274f9f7..000000000000 --- a/net/unison-devel/files/ocaml-external-patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- ubase/uprintf.ml.orig Thu Jul 29 22:50:35 2004 -+++ ubase/uprintf.ml Thu Jul 29 22:51:55 2004 -@@ -10,8 +10,8 @@ - (* *) - (***********************************************************************) - --external format_int: string -> int -> string = "format_int" --external format_float: string -> float -> string = "format_float" -+external format_int: string -> int -> string = "caml_format_int" -+external format_float: string -> float -> string = "caml_format_float" - - let fprintf outchan doafter format = - let format = (Obj.magic format : string) in diff --git a/net/unison-devel/files/patch-aa b/net/unison-devel/files/patch-aa deleted file mode 100644 index a14c18bfa972..000000000000 --- a/net/unison-devel/files/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.orig Tue Aug 28 16:27:01 2001 -+++ Makefile Wed Aug 29 09:15:09 2001 -@@ -62,12 +62,12 @@ - ###################################################################### - # Installation - --INSTALLDIR = $(HOME)/bin/ -+INSTALLDIR = ${PREFIX}/bin/ - - install: $(NAME)$(EXEC_EXT) -- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) -+# -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) - cp $(NAME)$(EXEC_EXT) $(INSTALLDIR) -- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT) -+# cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT) - @# If we're running at Penn, install a public version too - if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi - -@@ -231,7 +231,7 @@ - tags: - -$(ETAGS) *.ml *.mli *.txt - --all:: TAGS -+#all:: TAGS - - TAGS: - $(MAKE) tags diff --git a/net/unison-devel/pkg-descr b/net/unison-devel/pkg-descr deleted file mode 100644 index 10d805d9eb0a..000000000000 --- a/net/unison-devel/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/unison-devel/pkg-plist b/net/unison-devel/pkg-plist deleted file mode 100644 index 5c8fc8567c8f..000000000000 --- a/net/unison-devel/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/unison -%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/unison-manual.dvi -%%PORTDOCS%%%%DOCSDIR%%/unison-manual.html -%%PORTDOCS%%%%DOCSDIR%%/unison-manual.pdf -%%PORTDOCS%%%%DOCSDIR%%/unison-manual.ps -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/net/unison232/Makefile b/net/unison232/Makefile deleted file mode 100644 index 149126354848..000000000000 --- a/net/unison232/Makefile +++ /dev/null @@ -1,50 +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.9.20 -PORTREVISION= 2 -CATEGORIES= net -MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/${DIST_SUBDIR}/ -DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS} -DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} -EXTRACT_ONLY= src.tar.gz - -MAINTAINER= daniel+unison@pelleg.org -COMMENT= A user-level file synchronization tool - -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml -PATCH_DEPENDS= ${BUILD_DEPENDS} - -USE_GMAKE= yes -MAKE_ARGS= UISTYLE=text CFLAGS="" - -.if !defined(NOPORTDOCS) -DOCS= BUGS.txt NEWS README -EXTRA_DOCS= unison-manual.dvi unison-manual.html \ - unison-manual.pdf unison-manual.ps -.endif - -pre-patch: - @if [ `ocamlc -version | ${SED} -e s/\\\.//g -e s/\\\+.*//` -gt 307 ] ; then \ - if ${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/ocaml-external-patch-ab ; then \ - ${TRUE} ; \ - else \ - ${ECHO_MSG} ">> Patch ocaml-external-patch-ab failed to apply cleanly." ; \ - ${FALSE} ; \ - fi; \ - fi - -post-install: - @${STRIP_CMD} ${PREFIX}/bin/unison -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} - cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${EXTRA_DOCS} ${DOCSDIR} -.endif - -.include <bsd.port.mk> diff --git a/net/unison232/distinfo b/net/unison232/distinfo deleted file mode 100644 index 1044547f1238..000000000000 --- a/net/unison232/distinfo +++ /dev/null @@ -1,10 +0,0 @@ -MD5 (unison-2.9.20/src.tar.gz) = a0a1b734e11212623bc6ea996aace960 -SIZE (unison-2.9.20/src.tar.gz) = 363079 -MD5 (unison-2.9.20/unison-manual.dvi) = 9d51f63ad9b592f4e94f593f682b4533 -SIZE (unison-2.9.20/unison-manual.dvi) = 248060 -MD5 (unison-2.9.20/unison-manual.html) = babc84fe1729382c9569a7cc0dfd7851 -SIZE (unison-2.9.20/unison-manual.html) = 209167 -MD5 (unison-2.9.20/unison-manual.pdf) = 4f85a8fb7c2587d5f8e8184b49d90636 -SIZE (unison-2.9.20/unison-manual.pdf) = 332136 -MD5 (unison-2.9.20/unison-manual.ps) = db69ed340c6e88a56890ef37804ee3ed -SIZE (unison-2.9.20/unison-manual.ps) = 440361 diff --git a/net/unison232/files/ocaml-external-patch-ab b/net/unison232/files/ocaml-external-patch-ab deleted file mode 100644 index 247ae274f9f7..000000000000 --- a/net/unison232/files/ocaml-external-patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- ubase/uprintf.ml.orig Thu Jul 29 22:50:35 2004 -+++ ubase/uprintf.ml Thu Jul 29 22:51:55 2004 -@@ -10,8 +10,8 @@ - (* *) - (***********************************************************************) - --external format_int: string -> int -> string = "format_int" --external format_float: string -> float -> string = "format_float" -+external format_int: string -> int -> string = "caml_format_int" -+external format_float: string -> float -> string = "caml_format_float" - - let fprintf outchan doafter format = - let format = (Obj.magic format : string) in diff --git a/net/unison232/files/patch-aa b/net/unison232/files/patch-aa deleted file mode 100644 index a14c18bfa972..000000000000 --- a/net/unison232/files/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.orig Tue Aug 28 16:27:01 2001 -+++ Makefile Wed Aug 29 09:15:09 2001 -@@ -62,12 +62,12 @@ - ###################################################################### - # Installation - --INSTALLDIR = $(HOME)/bin/ -+INSTALLDIR = ${PREFIX}/bin/ - - install: $(NAME)$(EXEC_EXT) -- -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) -+# -mv $(INSTALLDIR)/$(NAME)$(EXEC_EXT) /tmp/$(NAME)-$(shell echo $$$$) - cp $(NAME)$(EXEC_EXT) $(INSTALLDIR) -- cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT) -+# cp $(NAME)$(EXEC_EXT) $(INSTALLDIR)$(NAME)-$(VERSION)$(EXEC_EXT) - @# If we're running at Penn, install a public version too - if [ -d /plclub/bin ]; then cp $(NAME)$(EXEC_EXT) /plclub/bin/$(NAME)-$(VERSION)$(EXEC_EXT); fi - -@@ -231,7 +231,7 @@ - tags: - -$(ETAGS) *.ml *.mli *.txt - --all:: TAGS -+#all:: TAGS - - TAGS: - $(MAKE) tags 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-plist b/net/unison232/pkg-plist deleted file mode 100644 index 5c8fc8567c8f..000000000000 --- a/net/unison232/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/unison -%%PORTDOCS%%%%DOCSDIR%%/BUGS.txt -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/unison-manual.dvi -%%PORTDOCS%%%%DOCSDIR%%/unison-manual.html -%%PORTDOCS%%%%DOCSDIR%%/unison-manual.pdf -%%PORTDOCS%%%%DOCSDIR%%/unison-manual.ps -%%PORTDOCS%%@dirrm %%DOCSDIR%% 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 e6f3ab0b72c8..000000000000 --- a/net/wb/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (i386-wb-1.59.tar.Z) = 7601eb1192ee2774940d805500c0a9ce -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 dd63427e2928..000000000000 --- a/net/wireshark/Makefile +++ /dev/null @@ -1,103 +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.8 -CATEGORIES= net ipv6 -MASTER_SITES= ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \ - ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \ - ftp://ftp.sunet.se/pub/network/monitoring/ethereal/all-versions/ \ - ftp://ftp.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/ \ - http://www.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/ - -MAINTAINER= marcus@FreeBSD.org -COMMENT?= A powerful network analyzer/capture tool - -USE_PERL5_BUILD=yes -USE_BZIP2= yes -WANT_GNOME= yes -CONFIGURE_ARGS+= --program-transform-name="" -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 - -.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 - -USE_LIBTOOL_VER=15 -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 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.7:${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 75c84405c89c..000000000000 --- a/net/wireshark/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (ethereal-0.10.8.tar.bz2) = aa1f1470f7f8bd301c92dd199a4ae60e -SIZE (ethereal-0.10.8.tar.bz2) = 5351028 diff --git a/net/wireshark/files/patch-capture_loop.c b/net/wireshark/files/patch-capture_loop.c deleted file mode 100644 index 55b53f795033..000000000000 --- a/net/wireshark/files/patch-capture_loop.c +++ /dev/null @@ -1,11 +0,0 @@ ---- capture_loop.c.orig Thu Jul 22 00:23:01 2004 -+++ capture_loop.c Thu Jul 22 00:23:15 2004 -@@ -126,7 +126,7 @@ - * 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 6962120d124c..000000000000 --- a/net/wireshark/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Tue Dec 14 15:39:30 2004 -+++ configure Sat Dec 18 00:17:55 2004 -@@ -16120,7 +16120,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" -@@ -16178,7 +16178,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" 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 eaa43c5e4bf1..000000000000 --- a/net/wireshark/pkg-plist +++ /dev/null @@ -1,63 +0,0 @@ -%%CAPINFOS%% -bin/dftest -%%EDITCAP%% -%%ETHEREAL%% -%%IDL2ETH%% -%%MERGECAP%% -bin/tethereal -%%TEXT2PCAP%% -lib/ethereal/plugins/%%PORTVERSION%%/acn.so -lib/ethereal/plugins/%%PORTVERSION%%/artnet.so -lib/ethereal/plugins/%%PORTVERSION%%/asn1.so -lib/ethereal/plugins/%%PORTVERSION%%/ciscosm.so -lib/ethereal/plugins/%%PORTVERSION%%/coseventcomm.so -lib/ethereal/plugins/%%PORTVERSION%%/cosnaming.so -lib/ethereal/plugins/%%PORTVERSION%%/docsis.so -lib/ethereal/plugins/%%PORTVERSION%%/enttec.so -lib/ethereal/plugins/%%PORTVERSION%%/gryphon.so -lib/ethereal/plugins/%%PORTVERSION%%/irda.so -lib/ethereal/plugins/%%PORTVERSION%%/lwres.so -lib/ethereal/plugins/%%PORTVERSION%%/megaco.so -lib/ethereal/plugins/%%PORTVERSION%%/mgcp.so -lib/ethereal/plugins/%%PORTVERSION%%/opsi.so -lib/ethereal/plugins/%%PORTVERSION%%/pcli.so -lib/ethereal/plugins/%%PORTVERSION%%/rdm.so -lib/ethereal/plugins/%%PORTVERSION%%/rlm.so -lib/ethereal/plugins/%%PORTVERSION%%/rtnet.so -lib/ethereal/plugins/%%PORTVERSION%%/rudp.so -lib/ethereal/plugins/%%PORTVERSION%%/v5ua.so -lib/libethereal.a -lib/libethereal.so -lib/libethereal.so.0 -lib/libwiretap.a -lib/libwiretap.so -lib/libwiretap.so.0 -%%DATADIR%%/AUTHORS-SHORT -%%DATADIR%%/capinfos.html -%%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%%/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%%/tethereal.html -%%DATADIR%%/text2pcap.html -@dirrm lib/ethereal/plugins/%%PORTVERSION%% -@dirrm lib/ethereal/plugins -@dirrm lib/ethereal -@dirrm %%DATADIR%%/diameter -@dirrm %%DATADIR%%/help -@dirrm %%DATADIR%% diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile deleted file mode 100644 index ab13daa88d13..000000000000 --- a/net/xmlrpc-c-devel/Makefile +++ /dev/null @@ -1,30 +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= 1 -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 -USE_INC_LIBTOOL_VER=13 -INSTALLS_SHLIB= 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 - -.include <bsd.port.mk> diff --git a/net/xmlrpc-c-devel/distinfo b/net/xmlrpc-c-devel/distinfo deleted file mode 100644 index e38335487986..000000000000 --- a/net/xmlrpc-c-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (xmlrpc-c-0.9.10.tar.gz) = 847410fae881f0fb641a186db6c8c015 -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 5d41e79f58a7..000000000000 --- a/net/xmlrpc-c-devel/pkg-plist +++ /dev/null @@ -1,32 +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.so -lib/libxmlrpc.so.7 -lib/libxmlrpc_abyss.a -lib/libxmlrpc_abyss.so -lib/libxmlrpc_abyss.so.7 -lib/libxmlrpc_abyss_server.a -lib/libxmlrpc_abyss_server.so -lib/libxmlrpc_abyss_server.so.7 -lib/libxmlrpc_cgi.a -lib/libxmlrpc_cgi.so -lib/libxmlrpc_cgi.so.7 -lib/libxmlrpc_client.a -lib/libxmlrpc_client.so -lib/libxmlrpc_client.so.7 -lib/libxmlrpc_cpp.a -lib/libxmlrpc_xmlparse.a -lib/libxmlrpc_xmlparse.so -lib/libxmlrpc_xmlparse.so.7 -lib/libxmlrpc_xmltok.a -lib/libxmlrpc_xmltok.so -lib/libxmlrpc_xmltok.so.7 diff --git a/net/zaptel12/Makefile b/net/zaptel12/Makefile deleted file mode 100644 index fcda076a1a7f..000000000000 --- a/net/zaptel12/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# Ports collection makefile for: zaptel -# Date created: 29 April 2004 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= zaptel -PORTVERSION= 0.8 -PORTREVISION= 1 -CATEGORIES= misc -MASTER_SITES= http://www.portaone.com/~sobomax/ -DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION} - -MAINTAINER= sobomax@FreeBSD.org -COMMENT= A FreeBSD Driver for Digium X100P/TDM400P Telephony Cards - -LIB_DEPENDS= newt.51:${PORTSDIR}/devel/newt - -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 - -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 - -pre-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.mk> diff --git a/net/zaptel12/distinfo b/net/zaptel12/distinfo deleted file mode 100644 index 19b5ccedf4cc..000000000000 --- a/net/zaptel12/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (zaptel-freebsd-0.8.tar.gz) = 3bad15ca522e4e29728781ff3ae78e39 -SIZE (zaptel-freebsd-0.8.tar.gz) = 131352 diff --git a/net/zaptel12/files/patch-test::Makefile b/net/zaptel12/files/patch-test::Makefile deleted file mode 100644 index c8e181554796..000000000000 --- a/net/zaptel12/files/patch-test::Makefile +++ /dev/null @@ -1,31 +0,0 @@ - -$FreeBSD$ - ---- test/Makefile -+++ test/Makefile -@@ -7,17 +7,17 @@ - - all: zttool fxo_test ztmonitor zttest - --fxo_test: fxo_test.o -- ${CC} ${CFLAGS} -o fxo_test fxo_test.o -ltonezone -L../ztcfg -+fxo_test: fxo_test.c -+ ${CC} ${CFLAGS} -o fxo_test fxo_test.c -ltonezone -L../ztcfg - --ztmonitor: ztmonitor.o -- ${CC} ${CFLAGS} -o ztmonitor ztmonitor.o -ltonezone -L../ztcfg -+ztmonitor: ztmonitor.c -+ ${CC} ${CFLAGS} -o ztmonitor ztmonitor.c -ltonezone -L../ztcfg - --zttool: zttool.o -- ${CC} ${CFLAGS} -o zttool zttool.o -ltonezone -L${LOCALBASE}/lib -lnewt -L../ztcfg -+zttool: zttool.c -+ ${CC} ${CFLAGS} -o zttool zttool.c -ltonezone -L${LOCALBASE}/lib -lnewt -L../ztcfg - --zttest: zttest.o -- ${CC} ${CFLAGS} -o zttest zttest.o -+zttest: zttest.c -+ ${CC} ${CFLAGS} -o zttest zttest.c - - clean: - rm -f fxo_test ztmonitor zttool ztls zttest *.o diff --git a/net/zaptel12/files/patch-wcfxo::wcfxo.c b/net/zaptel12/files/patch-wcfxo::wcfxo.c deleted file mode 100644 index 1a2810a58b6d..000000000000 --- a/net/zaptel12/files/patch-wcfxo::wcfxo.c +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- wcfxo/wcfxo.c -+++ wcfxo/wcfxo.c -@@ -267,8 +267,14 @@ - - /* Character device entry points */ - static struct cdevsw wcfxo_cdevsw = { --#if __FreeBSD_version >= 502103 -- .d_version = D_VERSION, -+#if __FreeBSD_version < 502103 -+#ifdef MAJOR_AUTO -+ .d_maj = MAJOR_AUTO, -+#else -+ .d_maj = 197, -+#endif -+#else -+ .d_version = D_VERSION, - #endif - .d_name = "wcfxo", - .d_open = wcfxo_sys_open, diff --git a/net/zaptel12/files/patch-wcfxs::wcfxs.c b/net/zaptel12/files/patch-wcfxs::wcfxs.c deleted file mode 100644 index bab8faf9d09e..000000000000 --- a/net/zaptel12/files/patch-wcfxs::wcfxs.c +++ /dev/null @@ -1,20 +0,0 @@ - -$FreeBSD$ - ---- wcfxs/wcfxs.c -+++ wcfxs/wcfxs.c -@@ -308,7 +308,13 @@ - - /* Character device entry points */ - static struct cdevsw wcfxs_cdevsw = { --#if __FreeBSD_version >= 502103 -+#if __FreeBSD_version < 502103 -+#ifdef MAJOR_AUTO -+ .d_maj = MAJOR_AUTO, -+#else -+ .d_maj = 198, -+#endif -+#else - .d_version = D_VERSION, - #endif - .d_name = "wcfxs", diff --git a/net/zaptel12/files/patch-zaptel::zaptel.c b/net/zaptel12/files/patch-zaptel::zaptel.c deleted file mode 100644 index a5fc0b4cf7d9..000000000000 --- a/net/zaptel12/files/patch-zaptel::zaptel.c +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- zaptel/zaptel.c -+++ zaptel/zaptel.c -@@ -156,12 +156,17 @@ - #endif - - static struct cdevsw zt_devsw = { --#if __FreeBSD_version >= 502103 -+#if __FreeBSD_version < 502103 -+#ifdef MAJOR_AUTO -+ .d_maj = MAJOR_AUTO, -+#else -+ .d_maj = ZT_MAJOR, -+#endif -+#else - .d_version = D_VERSION, - #endif - .d_open = ztopen, -- .d_name = "zaptel", -- .d_maj = ZT_MAJOR -+ .d_name = "zaptel" - }; - - diff --git a/net/zaptel12/files/patch-zaptel::zaptel.h b/net/zaptel12/files/patch-zaptel::zaptel.h deleted file mode 100644 index b25d6f31755b..000000000000 --- a/net/zaptel12/files/patch-zaptel::zaptel.h +++ /dev/null @@ -1,16 +0,0 @@ - -$FreeBSD$ - ---- zaptel/zaptel.h.orig -+++ zaptel/zaptel.h -@@ -34,9 +34,9 @@ - #if !defined(_ZAPTEL_H) - #define _ZAPTEL_H - -+#ifdef _KERNEL - #include "os.h" - --#ifdef _KERNEL - #include <sys/select.h> - #include <sys/param.h> - diff --git a/net/zaptel12/files/patch-ztcfg::Makefile b/net/zaptel12/files/patch-ztcfg::Makefile deleted file mode 100644 index cc147a290b14..000000000000 --- a/net/zaptel12/files/patch-ztcfg::Makefile +++ /dev/null @@ -1,26 +0,0 @@ - -$FreeBSD$ - ---- ztcfg/Makefile -+++ ztcfg/Makefile -@@ -10,10 +10,19 @@ - - all: ztcfg libtonezone.a - --ztcfg: ztcfg.o tonezone.o zonedata.o -+ztcfg: ztcfg.o tonezone.o zonedata.o - ${CC} ${CFLAGS} -o ztcfg ztcfg.o tonezone.o zonedata.o -lm - - ztcfg.c: ztcfg.h -+ -+ztcfg.o: ztcfg.c -+ ${CC} ${CFLAGS} -o ztcfg.o -c ztcfg.c -+ -+tonezone.o: tonezone.c -+ ${CC} ${CFLAGS} -o tonezone.o -c tonezone.c -+ -+zonedata.o: zonedata.c -+ ${CC} ${CFLAGS} -o zonedata.o -c zonedata.c - - libtonezone.a: tonezone.o - ar r libtonezone.a tonezone.o zonedata.o diff --git a/net/zaptel12/files/zaptel.sh b/net/zaptel12/files/zaptel.sh deleted file mode 100644 index 29da7fc86ad4..000000000000 --- a/net/zaptel12/files/zaptel.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -PREFIX=%%PREFIX%% -LIBDIR=${PREFIX}/lib/zaptel - -case "$1" in - start) - /sbin/kldload ${LIBDIR}/zaptel.ko || exit 1 - /sbin/kldload ${LIBDIR}/wcfxo.ko || exit 1 - /sbin/kldload ${LIBDIR}/wcfxs.ko || exit 1 - if [ ! -d /dev/zap ] - then - mkdir -p /dev/zap || exit 1 - fi - if [ ! -c /dev/zap/channel ] - then - /sbin/mknod /dev/zap/channel c 196 254 || exit 1 - fi - if [ ! -c /dev/zap/ctl ] - then - /sbin/mknod /dev/zap/ctl c 196 0 || exit 1 - fi - if [ ! -c /dev/zap/pseudo ] - then - /sbin/mknod /dev/zap/pseudo c 196 255 || exit 1 - fi - if [ ! -c /dev/zap/timer ] - then - /sbin/mknod /dev/zap/timer c 196 253 || exit 1 - fi - z=" zaptel" - if /usr/sbin/pciconf -l | /usr/bin/grep -q ^wcfxo - then - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - do - if /usr/sbin/pciconf -l | /usr/bin/grep -q ^wcfxo${i} - then - if [ ! -c /dev/wcfxo${i} ] - then - /sbin/mknod /dev/wcfxo${i} c 197 ${i} || exit 1 - fi - fi - done - ${PREFIX}/bin/ztcfg 2> /dev/null - else - if /usr/sbin/pciconf -l | /usr/bin/grep -q ^wcfxs - then - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 - do - if /usr/sbin/pciconf -l | /usr/bin/grep -q ^wcfxs${i} - then - if [ ! -c /dev/wcfxs${i} ] - then - /sbin/mknod /dev/wcfxo${i} c 198 ${i} || exit 1 - fi - fi - done - ${PREFIX}/bin/ztcfg 2> /dev/null - else - z="" - fi - fi - echo -n ${z} - ;; - - stop) - /sbin/kldunload wcfxs.ko || exit 1 - /sbin/kldunload wcfxo.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 a3c2eab71fff..000000000000 --- a/net/zaptel12/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -A FreeBSD Driver for Digium X100P and TDM400P 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 239e4c30b5c0..000000000000 --- a/net/zaptel12/pkg-message +++ /dev/null @@ -1,34 +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 and others contributors of the bounty project. - -Also, we would be grateful if anyone who uses this driver can send a short -note to DigiumBSD@portaone.com, with brief description of what X100P is used -for as well as with extimated number of cards deployed under FreeBSD. We will -use this information to persuage Digium that in the order to sell more -hardware they have to support FreeBSD drivers along with Linux ones. - -Thanks and enjoy! - --Maxim -------------------------------------------------------------------------------- diff --git a/net/zaptel12/pkg-plist b/net/zaptel12/pkg-plist deleted file mode 100644 index 84b9f3a9ea77..000000000000 --- a/net/zaptel12/pkg-plist +++ /dev/null @@ -1,18 +0,0 @@ -bin/fxo_test -bin/ztcfg -bin/ztmonitor -bin/zttest -bin/zttool -etc/rc.d/zaptel.sh.sample -@unexec if cmp -s %D/etc/zaptel.conf %D/etc/zaptel.conf.sample; then rm -f %D/etc/zaptel.conf; fi -etc/zaptel.conf.sample -@exec [ -f %B/zaptel.conf ] || cp %B/%f %B/zaptel.conf -include/tonezone.h -include/zaptel.h -lib/libtonezone.a -lib/zaptel/linker.hints -lib/zaptel/wcfxo.ko -lib/zaptel/wcfxs.ko -lib/zaptel/zaptel.ko -lib/zaptel/ztdummy.ko -@dirrm lib/zaptel |