aboutsummaryrefslogtreecommitdiffstats
path: root/comms
diff options
context:
space:
mode:
authorpgollucci <pgollucci@FreeBSD.org>2010-09-08 13:25:12 +0800
committerpgollucci <pgollucci@FreeBSD.org>2010-09-08 13:25:12 +0800
commit922acad8874a47ee8fa9794bfc775f7eaae1d39a (patch)
treec72260d1663a246e379540bed6f2fe9035d10981 /comms
parentdbc71dddbdc1dc9f26a52df9f49a30cf58aad5ae (diff)
downloadfreebsd-ports-graphics-922acad8874a47ee8fa9794bfc775f7eaae1d39a.tar.gz
freebsd-ports-graphics-922acad8874a47ee8fa9794bfc775f7eaae1d39a.tar.zst
freebsd-ports-graphics-922acad8874a47ee8fa9794bfc775f7eaae1d39a.zip
audio/audacious-crossfade||2010-09-08|Broken for 6+ months, unmaintained
audio/ecamegapedal||2010-09-08|Has expired: Abandonned since 2004, please use audio/jack-rack or audio/creox instead. comms/asmodem||2010-09-08|Broken for 6+ months, unmaintained comms/ltmdm||2010-09-08|Broken for 6+ months, unmaintained comms/yawmppp||2010-09-08|Broken for 6+ months, unmaintained devel/p5-ORBit||2010-09-08|Broken for 6+ months, unmaintained emulators/p-interp||2010-09-08|Broken for 6+ months, unmaintained graphics/visionegg||2010-09-08|Broken for 6+ months, unmaintained japanese/okphone||2010-09-08|Broken for 6+ months, unmaintained java/openjit||2010-09-08|Broken for 6+ months, unmaintained multimedia/xmps-win32-plugin||2010-09-08|Broken for 6+ months, unmaintained net-mgmt/tknetmon||2010-09-08|Broken for 6+ months, unmaintained net/arpd||2010-09-08|Broken for 6+ months, unmaintained net/vomit||2010-09-08|Broken for 6+ months, unmaintained sysutils/xwipower||2010-09-08|Broken for 6+ months, unmaintained www/lws||2010-09-08|Broken for 6+ months, unmaintained Reported by: FreeBSD unmaintained ports which are currently marked broken monthly reminder
Diffstat (limited to 'comms')
-rw-r--r--comms/Makefile3
-rw-r--r--comms/asmodem/Makefile31
-rw-r--r--comms/asmodem/distinfo3
-rw-r--r--comms/asmodem/files/patch-aa101
-rw-r--r--comms/asmodem/files/patch-ab25
-rw-r--r--comms/asmodem/files/patch-ac17
-rw-r--r--comms/asmodem/pkg-descr8
-rw-r--r--comms/ltmdm/Makefile74
-rw-r--r--comms/ltmdm/distinfo3
-rw-r--r--comms/ltmdm/files/patch-sys-dev-ltmdm-ltmdmsio.c624
-rw-r--r--comms/ltmdm/files/pkg-message.in17
-rw-r--r--comms/ltmdm/pkg-descr11
-rw-r--r--comms/ltmdm/pkg-plist3
-rw-r--r--comms/yawmppp/Makefile54
-rw-r--r--comms/yawmppp/distinfo3
-rw-r--r--comms/yawmppp/pkg-descr9
-rw-r--r--comms/yawmppp/pkg-plist10
17 files changed, 0 insertions, 996 deletions
diff --git a/comms/Makefile b/comms/Makefile
index 8d9bc03d29e..a432e854842 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -7,7 +7,6 @@
SUBDIR += aldo
SUBDIR += anyremote
SUBDIR += aprsd
- SUBDIR += asmodem
SUBDIR += atslog
SUBDIR += bfhist
SUBDIR += bforce
@@ -78,7 +77,6 @@
SUBDIR += lirc
SUBDIR += locator
SUBDIR += lrzsz
- SUBDIR += ltmdm
SUBDIR += mgetty+sendfax
SUBDIR += minicom
SUBDIR += mlan
@@ -163,7 +161,6 @@
SUBDIR += xwota
SUBDIR += yagiuda
SUBDIR += yaps
- SUBDIR += yawmppp
SUBDIR += yfklog
SUBDIR += zmtx-zmrx
SUBDIR += zssh
diff --git a/comms/asmodem/Makefile b/comms/asmodem/Makefile
deleted file mode 100644
index d77f9777afb..00000000000
--- a/comms/asmodem/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: asmodem
-# Date created: 11 May 1998
-# Whom: Sean Cole <scole@aracnet.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= asmodem
-PORTVERSION= 0.6.1
-PORTREVISION= 1
-CATEGORIES= comms
-MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
-MASTER_SITE_SUBDIR= apps/asmodem
-DISTNAME= ${PORTNAME}-0.6-1
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Displays the modem status, designed to match AfterStep
-
-USE_IMAKE= yes
-USE_XORG= xpm
-
-MAN1= asmodem.1
-PLIST_FILES= bin/asmodem
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800064
-BROKEN= does not build
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/comms/asmodem/distinfo b/comms/asmodem/distinfo
deleted file mode 100644
index 00defb04204..00000000000
--- a/comms/asmodem/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (asmodem-0.6-1.tar.gz) = 357c46651b33c0dcf3df3eb133ff4dc5
-SHA256 (asmodem-0.6-1.tar.gz) = b2cfd556cb96aa630e2ea77cb4bcb37db2352e12210bd988e37e591997fc95e0
-SIZE (asmodem-0.6-1.tar.gz) = 39731
diff --git a/comms/asmodem/files/patch-aa b/comms/asmodem/files/patch-aa
deleted file mode 100644
index 511061c8c79..00000000000
--- a/comms/asmodem/files/patch-aa
+++ /dev/null
@@ -1,101 +0,0 @@
---- asmodem.c.orig Sun Oct 4 12:56:57 1998
-+++ asmodem.c Sat Sep 7 20:40:13 2002
-@@ -25,9 +25,8 @@
- #include <sys/socket.h>
- #include <net/if.h>
-
--#include <asm/types.h>
--#include <linux/types.h>
--#include <linux/ppp_defs.h>
-+#include <sys/types.h>
-+#include <net/if_ppp.h>
-
-
- /* XPM struct and icons ******************************************************/
-@@ -63,7 +62,7 @@
- #define DEFINTERVAL 3 /* Default interval 2 sec */
- #define TRUE 1;
- #define FALSE 0;
--#define DEFAULTMODEM "/var/lock/LCK..modem"
-+#define DEFAULTMODEM "/var/run/cuaa1.if"
-
- int withdrawn= FALSE;
- Display *Disp;
-@@ -114,8 +113,8 @@
- fprintf(stderr,"options:\n");
- fprintf(stderr," -w withdrawn mode (For WindowMaker's Dock)\n");
- fprintf(stderr," -s transparent edge mode\n");
-- fprintf(stderr," -m <file> modem lockfile (ie /var/lock/LCK..cua1) \n");
-- fprintf(stderr," default is /var/lock/LCK..modem (/dev/modem) \n");
-+ fprintf(stderr," -m <file> modem lockfile (ie /var/lock/LCK..modem) \n");
-+ fprintf(stderr," default is /var/run/cuaa1.if \n");
- fprintf(stderr," -u <sec> update frequency (default 5 sec)\n");
- fprintf(stderr," -p [+|-]x[+|-]y position of asmodem\n");
- fprintf(stderr," -d <program> program to execute on click while disconnected (dial?)\n");
-@@ -298,7 +297,7 @@
- {
- XEvent Event;
- XpmIcon Prev;
-- struct ifreq ifreq;
-+ struct ifpppstatsreq ifreq;
- struct ppp_stats stats;
- int rb, tb;
-
-@@ -315,12 +314,12 @@
- //fprintf(stderr, "x ");
- if (CarrierOn) {
- memset(&ifreq, 0, sizeof(ifreq));
-- strcpy(ifreq.ifr_ifrn.ifrn_name, "ppp0");
-- ifreq.ifr_ifru.ifru_data = (caddr_t)&stats;
-- if ((ioctl(sock,SIOCDEVPRIVATE,(caddr_t)&ifreq) < 0)){
-+ strcpy(ifreq.ifr_name, "ppp0");
-+ if ((ioctl(sock,SIOCGPPPSTATS,&ifreq) < 0)){
- fprintf(stderr, "asmodem: ioctl f*cked\n");
- prb = ptb = 0;
- } else {
-+ stats = ifreq.stats;
- rb = stats.p.ppp_ibytes;
- tb = stats.p.ppp_obytes;
- if (rb > prb) {
-@@ -409,7 +408,7 @@
- int WasStatus = 1;
- int NewMailn = 0;
-
-- MailFile = fopen(Mbox, "r");
-+/* MailFile = fopen(Mbox, "r");
-
- while(!feof(MailFile))
- {
-@@ -425,6 +424,8 @@
- fclose(MailFile);
-
- return (NewMailn||!WasStatus);
-+*/
-+ return 0;
- }
-
- /****************************************************************************/
-@@ -433,7 +434,7 @@
- FILE* MailFile = 0;
- int Ret = 0;
-
-- MailFile = fopen(Mbox, "r");
-+/* MailFile = fopen(Mbox, "r");
- if(MailFile == 0)
- Ret = 0;
- else
-@@ -447,6 +448,14 @@
- }
-
- return Ret;
-+*/
-+
-+ if ((MailFile=fopen(Mbox,"r"))==NULL)
-+ return 0;
-+ else {
-+ fclose(MailFile);
-+ return 1;
-+ }
- }
-
- /****************************************************************************/
diff --git a/comms/asmodem/files/patch-ab b/comms/asmodem/files/patch-ab
deleted file mode 100644
index 38ffd94830a..00000000000
--- a/comms/asmodem/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
---- asmodem-0.6/asmodem.man Mon May 11 17:01:06 1998
-+++ asmodem.man Mon May 11 17:23:34 1998
-@@ -1,4 +1,4 @@
--.TH asmodem 0.4 "15 Sept 1996" asmail
-+.TH asmodem 0.6 "15 Sept 1996" asmail
- .UC
- .SH NAME
- \fBasmail\fP \- AfterStep Modem
-@@ -102,10 +102,16 @@
- asmodem: http://www.cs.hope.edu/~malda/
- .RE
- asmail:http://www.rby.hk-r.se/~pt95pli/
-+.RE
-+afterstep:http://www.afterstep.org/
-+.SH FREEBSD PORT
-
-+Note that the FreeBSD port uses /var/run/cuaa1.if as its default lockfile and the names of the serial devices (modems) are spelled with two aa's (e.g. /dev/cuaa1 ).
-
-+Modified May 1998 for FreeBSD.
-
-
-+
-
-
-
diff --git a/comms/asmodem/files/patch-ac b/comms/asmodem/files/patch-ac
deleted file mode 100644
index 70c13384e1c..00000000000
--- a/comms/asmodem/files/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- Imakefile.orig Sat Mar 1 09:48:45 1997
-+++ Imakefile Fri Oct 1 02:09:36 1999
-@@ -1,12 +1,12 @@
-
--XPMLIB = -L/usr/lib/X11 -lXpm
-+XPMLIB = -lXpm
- DEPLIBS = $(DEPXLIB)
-
- LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
-
- LINTLIBS = $(LINTXLIB)
-
--SRCS = asmodem.cpp
-+SRCS = asmodem.c
- OBJS = asmodem.o
-
- ComplexProgramTarget(asmodem)
diff --git a/comms/asmodem/pkg-descr b/comms/asmodem/pkg-descr
deleted file mode 100644
index 50fb753e7d1..00000000000
--- a/comms/asmodem/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Asmodem displays the modem status in an Afterstep type window. It was
-adapted from asmail. It indicates the status of your modem with 3
-blinking lights that indicate when the modem is connected, transmitting,
-and receiving. It is especially useful for internal modems.
-It can execute programs to dial, re-dial, and hang-up when clicked on.
-It only works on device ppp0.
-
-WWW: http://www.cmdrtaco.net/linux/mystuff.shtml
diff --git a/comms/ltmdm/Makefile b/comms/ltmdm/Makefile
deleted file mode 100644
index e9c8fbdbd72..00000000000
--- a/comms/ltmdm/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# New ports collection makefile for: ltmdm
-# Date Created: Nov 11, 2001
-# Whom: Daniel O'Connor <darius@dons.net.au>
-#
-# $FreeBSD$
-#
-
-PORTNAME= ltmdm
-PORTVERSION= 1.4
-PORTREVISION= 19
-CATEGORIES= comms kld
-MASTER_SITES= http://www.dons.net.au/~darius/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Driver for the Lucent LT Winmodem chipset
-
-DEVDIR= /dev
-MODULES_WITH_WORLD?= yes
-ONLY_FOR_ARCHS= i386
-BUILD_WRKSRC= ${WRKSRC}/sys/modules/ltmdm
-NO_WRKSUBDIR= yes
-SUB_FILES+= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
-RESTRICTED= Unknown license type for binary object file ltmdmobj.o
-
-LTMDM_DEV_MAJOR?= 228
-LTMDM_OBJ_VERSION?= 600
-
-.if defined(WITH_595_OBJ)
-MAKE_ARGS+= LTMDM_OBJ_VERSION=595
-.endif
-
-MAKE_ARGS+= LTMDM_DEV_MAJOR=${LTMDM_DEV_MAJOR}
-MAKE_ARGS+= LTMDM_OBJ_VERSION=${LTMDM_OBJ_VERSION}
-#MAKE_ENV+= WERROR=
-
-PORTDOCS= README.TXT README-en.TXT INSTALL.TXT INSTALL-en.TXT
-SYSDIR?= ${SRC_BASE}/sys
-
-PLIST_SUB+= KMODDIR=${KMODDIR}
-
-pre-fetch:
-.if !exists(${SYSDIR}/Makefile)
- @${ECHO} "*************************************************"; \
- ${ECHO} "This port requires the kernel source be available"; \
- ${ECHO} "*************************************************"; \
- exit 1
-.endif
-.if !defined(WITH_595_OBJ)
- @${ECHO} "*************************************************";
- @${ECHO} "If your ISP supports K56flex protocol only and ";
- @${ECHO} " doesn't support V90, define WITH_595_OBJ. ";
- @${ECHO} "Otheriwse your modem will not connect ";
- @${ECHO} "*************************************************";
-.endif
-
-do-install:
- @${INSTALL_KLD} ${BUILD_WRKSRC}/ltmdm.ko ${KMODDIR}
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
- @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
-.endfor
-.endif
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800045
-BROKEN= does not build
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/comms/ltmdm/distinfo b/comms/ltmdm/distinfo
deleted file mode 100644
index c92360ebf28..00000000000
--- a/comms/ltmdm/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ltmdm-1.4.tgz) = 3024e220bf0e4b2921daa7e51b8b85b3
-SHA256 (ltmdm-1.4.tgz) = 14f5b54dde0034e9c1a019942c8c6b6a5ca62d586a9fa75e6ed8e739555cbc84
-SIZE (ltmdm-1.4.tgz) = 499551
diff --git a/comms/ltmdm/files/patch-sys-dev-ltmdm-ltmdmsio.c b/comms/ltmdm/files/patch-sys-dev-ltmdm-ltmdmsio.c
deleted file mode 100644
index 66a232c092b..00000000000
--- a/comms/ltmdm/files/patch-sys-dev-ltmdm-ltmdmsio.c
+++ /dev/null
@@ -1,624 +0,0 @@
---- sys/dev/ltmdm/ltmdmsio.c.orig 2002-03-12 10:47:31.000000000 +0900
-+++ sys/dev/ltmdm/ltmdmsio.c 2008-07-21 20:24:52.000000000 +0900
-@@ -55,12 +55,17 @@
- #include <sys/param.h>
- #include <sys/bus.h>
- #include <sys/systm.h>
-+#if __FreeBSD_version >= 700000
-+#include <sys/priv.h>
-+#endif
- #include <sys/malloc.h>
- #include <sys/tty.h>
- #include <sys/proc.h>
- #include <sys/module.h>
- #include <sys/conf.h>
-+#if __FreeBSD_version < 500101
- #include <sys/dkstat.h>
-+#endif
- #include <sys/fcntl.h>
- #include <sys/interrupt.h>
- #include <sys/kernel.h>
-@@ -69,12 +74,21 @@
- #include <machine/bus.h>
- #include <sys/rman.h>
- #if __FreeBSD_version >= 500000
-+#if __FreeBSD_version < 500034 /* < 20020426 */
- #include <sys/timetc.h>
- #endif
-+#endif
-+#ifdef ENABLE_PPS
- #include <sys/timepps.h>
-+#endif
-
-+#if __FreeBSD_version >= 500000
-+#include <dev/pci/pcireg.h>
-+#include <dev/pci/pcivar.h>
-+#else
- #include <pci/pcireg.h>
- #include <pci/pcivar.h>
-+#endif
-
- #include <machine/clock.h>
-
-@@ -88,7 +102,9 @@
-
- #include <machine/resource.h>
-
--#if __FreeBSD_version >= 500027 /* >= 20011022 */
-+#if __FreeBSD_version >= 501107 /* >= 20030917 */
-+#include <dev/ic/ns16550.h>
-+#elif __FreeBSD_version >= 500027 /* >= 20011022 */
- #include <dev/sio/sioreg.h>
- #else
- #include <isa/sioreg.h>
-@@ -124,10 +140,15 @@
- #endif
-
- #if __FreeBSD_version >= 500023 /* >= 20010912 */
--#define proc thread /* temporary hack: struct proc -> stuct thread */
-+#define proc thread /* XXX struct proc -> stuct thread */
-+#if __FreeBSD_version < 500033 /* < 20020401 */
- #define suser(p) suser_td(p)
- #endif
-+#endif
-
-+#ifndef PCI_BAR
-+#define PCI_BAR(x) PCI_MAPS + (x) * 4
-+#endif
-
- #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */
-
-@@ -230,7 +251,9 @@
- u_char last_modem_status; /* last MSR read by intr handler */
- u_char prev_modem_status; /* last MSR handled by high level */
-
-+#if __FreeBSD_version < 502119
- u_char hotchar; /* ldisc-specific char to be handled ASAP */
-+#endif
- u_char *ibuf; /* start of input buffer */
- u_char *ibufend; /* end of input buffer */
- u_char *ibufold; /* old input buffer, to be freed */
-@@ -256,7 +279,9 @@
- bool_t do_dcd_timestamp;
- struct timeval timestamp;
- struct timeval dcd_timestamp;
-+#ifdef ENABLE_PPS
- struct pps_state pps;
-+#endif
-
- u_long bytes_in; /* statistics */
- u_long bytes_out;
-@@ -268,7 +293,11 @@
- struct resource *iores[6];
- struct resource *irqres;
- void *cookie;
-+#if __FreeBSD_version > 502115
-+ struct cdev *devs[6];
-+#else
- dev_t devs[6];
-+#endif
-
- /*
- * Data area for output buffers. Someday we should build the output
-@@ -352,6 +381,7 @@
- #endif
-
- static struct cdevsw sio_cdevsw = {
-+#if __FreeBSD_version < 500105
- /* open */ sioopen,
- /* close */ sioclose,
- /* read */ sioread,
-@@ -361,7 +391,11 @@
- /* mmap */ nommap,
- /* strategy */ nostrategy,
- /* name */ driver_name,
-+#ifdef MAJOR_AUTO
-+ /* maj */ MAJOR_AUTO,
-+#else
- /* maj */ CDEV_MAJOR,
-+#endif
- /* dump */ nodump,
- /* psize */ nopsize,
- #if __FreeBSD_version < 430000
-@@ -373,10 +407,32 @@
- /* bmaj */ -1,
- /* kqfilter */ ttykqfilter,
- #else /* __FreeBSD_version >= 500000 */
-- /* flags */ D_TTY | D_KQFILTER,
-+ /* flags */ D_TTY,
- /* kqfilter */ ttykqfilter,
- #endif
- #endif
-+#else
-+ .d_open = sioopen,
-+ .d_close = sioclose,
-+ .d_read = sioread,
-+ .d_write = siowrite,
-+ .d_ioctl = sioioctl,
-+ .d_name = driver_name,
-+#if __FreeBSD_version < 600019
-+#ifdef MAJOR_AUTO
-+ .d_maj = MAJOR_AUTO,
-+#else
-+ .d_maj = CDEV_MAJOR,
-+#endif
-+#endif
-+ .d_kqfilter = ttykqfilter,
-+#if __FreeBSD_version >= 502102
-+ .d_flags = D_TTY | D_NEEDGIANT,
-+ .d_version = D_VERSION
-+#else
-+ .d_poll = ttypoll,
-+#endif
-+#endif
- };
-
- static u_int com_events; /* input chars + weighted output completions */
-@@ -566,8 +622,8 @@
- u_int32_t Get_PCI_BASE_ADDRESS_IO_MASK(void);
- u_int8_t Get_PCI_BASE_ADDRESS_SPACE_IO(void);
- u_int32_t VMODEM_Get_System_Time(void);
--u_int8_t inp(u_int16_t addr);
--void outp(u_int16_t addr, u_int8_t value);
-+u_char inp(u_int addr);
-+void outp(u_int addr, u_char value);
- u_int16_t inpw(u_int16_t addr);
- void outpw(u_int16_t addr, u_int16_t value);
- u_int32_t inpd(u_int16_t addr);
-@@ -695,7 +751,7 @@
-
- for (i = 0; i < 6; i++) {
- dev_info->BaseAddress[i]
-- = pci_read_config(lt_dev, PCIR_MAPS + i * 4, 4);
-+ = pci_read_config(lt_dev, PCIR_BAR(i), 4);
- DPRINTF(1,(" BaseAddress[%d] = 0x%08lx\n",
- i, dev_info->BaseAddress[i]));
- }
-@@ -836,12 +892,12 @@
- return t;
- }
-
--u_int8_t inp(u_int16_t addr)
-+u_char inp(u_int addr)
- {
- return inb(addr);
- }
-
--void outp(u_int16_t addr, u_int8_t value)
-+void outp(u_int addr, u_char value)
- {
- outb(addr, value);
- }
-@@ -968,8 +1024,6 @@
- {
- { SWI_TTY , "SWI_TTY" },
- { SWI_NET , "SWI_NET" },
-- { SWI_CAMNET , "SWI_CAMNET" },
-- { SWI_CAMBIO , "SWI_CAMBIO" },
- { -1 , NULL }
- };
-
-@@ -1175,7 +1229,7 @@
-
- found = 0;
- for (i = 0; i < 6; i++) {
-- com->iorid[i] = PCIR_MAPS + 4 * i;
-+ com->iorid[i] = PCIR_BAR(i);
- data = pci_read_config(dev, com->iorid[i], 4);
- if (((data & 0x01UL) == 0x01) &&
- ((data & ~0x03UL) != 0 )) {
-@@ -1232,6 +1286,9 @@
-
- if (intr_type & INTR_TYPE_FAST) {
- ret = bus_setup_intr(dev, com->irqres, intr_type,
-+#if __FreeBSD_version >= 700031
-+ NULL,
-+#endif
- siointr, com, &com->cookie);
- if (ret != 0)
- intr_type &= ~INTR_TYPE_FAST;
-@@ -1240,6 +1297,9 @@
- }
- if (ret != 0) {
- ret = bus_setup_intr(dev, com->irqres, intr_type,
-+#if __FreeBSD_version >= 700031
-+ NULL,
-+#endif
- siointr, com, &com->cookie);
- if (ret == 0 && (ltmdm_intr_type & INTR_TYPE_FAST)) {
- device_printf(dev, "could not activate interrupt in fast mode\n");
-@@ -1295,8 +1355,11 @@
- DPRINTF(1,(" x_chip_version = %d\n", x_chip_version));
-
- com->flags = flags;
-+
-+#ifdef ENABLE_PPS
- com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR;
- pps_init(&com->pps);
-+#endif
-
- /*
- * initialize the device registers as follows:
-@@ -1368,11 +1431,16 @@
- write_vuart_port(UART_FIFO, 0);
- printf("\n");
-
--#if __FreeBSD_version >= 500000
-+#if __FreeBSD_version >= 500000 && __FreeBSD_version < 700003
- if (sio_fast_ih == NULL)
- swi_add(&tty_ithd, "tty:ltmdm", siopoll, NULL, ltmdm_swi_type, 0, &sio_fast_ih);
- if (sio_slow_ih == NULL)
- swi_add(&clk_ithd, "tty:ltmdm", siopoll, NULL, ltmdm_swi_type, 0, &sio_slow_ih);
-+#elif __FreeBSD_version >= 700003
-+ if (sio_fast_ih == NULL)
-+ swi_add(&tty_intr_event, "tty:ltmdm", siopoll, NULL, ltmdm_swi_type, 0, &sio_fast_ih);
-+ if (sio_slow_ih == NULL)
-+ swi_add(&clk_intr_event, "tty:ltmdm", siopoll, NULL, ltmdm_swi_type, 0, &sio_slow_ih);
- #else
- if (!sio_registered) {
- register_swi(ltmdm_swi_type, siopoll);
-@@ -1415,7 +1483,7 @@
- return EBUSY;
-
- com->gone = 1;
--#if __FreeBSD_version >= 500000
-+#if __FreeBSD_version >= 500000 && __FreeBSD_version < 700003
- if (sio_fast_ih != NULL) {
- ithread_remove_handler(sio_fast_ih);
- sio_fast_ih = NULL;
-@@ -1424,6 +1492,15 @@
- ithread_remove_handler(sio_slow_ih);
- sio_slow_ih = NULL;
- }
-+#elif __FreeBSD_version >= 700003
-+ if (sio_fast_ih != NULL) {
-+ intr_event_remove_handler(sio_fast_ih);
-+ sio_fast_ih = NULL;
-+ }
-+ if (sio_slow_ih != NULL) {
-+ intr_event_remove_handler(sio_slow_ih);
-+ sio_slow_ih = NULL;
-+ }
- #else
- if (sio_registered) {
- unregister_swi(ltmdm_swi_type, siopoll);
-@@ -1433,11 +1510,19 @@
-
- s = splfunc();
- if (tp) {
-+#if __FreeBSD_version > 502112
-+ (*linesw[tp->t_line]->l_close)(tp, FNONBLOCK);
-+#else
- (*linesw[tp->t_line].l_close)(tp, FNONBLOCK);
-+#endif
- disc_optim(tp, &tp->t_termios, com);
- comstop(tp, FREAD | FWRITE);
- comhardclose(com);
-+#if __FreeBSD_version < 502122
- ttyclose(tp);
-+#else
-+ ttygone(tp);
-+#endif
- }
- vxdPortClose();
- siosettimeout();
-@@ -1470,7 +1555,11 @@
- }
-
- static int
-+#if __FreeBSD_version > 502115
-+sioopen(struct cdev *dev, int flag, int mode, struct proc *p)
-+#else
- sioopen(dev_t dev, int flag, int mode, struct proc *p)
-+#endif
- {
- struct com_s *com;
- int error;
-@@ -1488,7 +1577,11 @@
- return (ENXIO);
- if (mynor & CONTROL_MASK)
- return (0);
-+#if __FreeBSD_version >= 700012
-+ tp = dev->si_tty = com->tp = ttyalloc();
-+#else
- tp = dev->si_tty = com->tp = ttymalloc(com->tp);
-+#endif
- s = splfunc();
- /*
- * We jump to this label after all non-interrupted sleeps to pick
-@@ -1610,7 +1703,11 @@
- * the true carrier.
- */
- if (com->prev_modem_status & MSR_DCD || mynor & CALLOUT_MASK)
-+#if __FreeBSD_version > 502112
-+ (*linesw[tp->t_line]->l_modem)(tp, 1);
-+#else
- (*linesw[tp->t_line].l_modem)(tp, 1);
-+#endif
- }
- /*
- * Wait for DCD if necessary.
-@@ -1626,7 +1723,11 @@
- goto out;
- goto open_top;
- }
-+#if __FreeBSD_version > 502112
-+ error = (*linesw[tp->t_line]->l_open)(dev, tp);
-+#else
- error = (*linesw[tp->t_line].l_open)(dev, tp);
-+#endif
- disc_optim(tp, &tp->t_termios, com);
- if (tp->t_state & TS_ISOPEN && mynor & CALLOUT_MASK)
- com->active_out = TRUE;
-@@ -1639,7 +1740,11 @@
- }
-
- static int
-+#if __FreeBSD_version > 502115
-+sioclose(struct cdev *dev, int flag, int mode, struct proc *p)
-+#else
- sioclose(dev_t dev, int flag, int mode, struct proc *p)
-+#endif
- {
- struct com_s *com;
- int mynor;
-@@ -1654,11 +1759,19 @@
- return (ENODEV);
- tp = com->tp;
- s = splfunc();
-+#if __FreeBSD_version > 502112
-+ (*linesw[tp->t_line]->l_close)(tp, flag);
-+#else
- (*linesw[tp->t_line].l_close)(tp, flag);
-+#endif
- disc_optim(tp, &tp->t_termios, com);
- comstop(tp, FREAD | FWRITE);
- comhardclose(com);
-+#if __FreeBSD_version < 502122
- ttyclose(tp);
-+#else
-+ tty_close(tp);
-+#endif
- siosettimeout();
- splx(s);
- if (com->gone) {
-@@ -1685,7 +1798,9 @@
- s = splfunc();
- com->do_timestamp = FALSE;
- com->do_dcd_timestamp = FALSE;
-+#ifdef ENABLE_PPS
- com->pps.ppsparam.mode = 0;
-+#endif
- write_vuart_port(UART_CFCR, com->cfcr_image &= ~CFCR_SBREAK);
- {
- write_vuart_port(UART_IER, 0);
-@@ -1724,7 +1839,11 @@
- }
-
- static int
-+#if __FreeBSD_version > 502115
-+sioread(struct cdev *dev, struct uio *uio, int flag)
-+#else
- sioread(dev_t dev, struct uio *uio, int flag)
-+#endif
- {
- int mynor;
- struct com_s *com;
-@@ -1735,11 +1854,19 @@
- com = com_addr(MINOR_TO_UNIT(mynor));
- if (com == NULL || com->gone)
- return (ENODEV);
-+#if __FreeBSD_version > 502112
-+ return ((*linesw[com->tp->t_line]->l_read)(com->tp, uio, flag));
-+#else
- return ((*linesw[com->tp->t_line].l_read)(com->tp, uio, flag));
-+#endif
- }
-
- static int
-+#if __FreeBSD_version > 502115
-+siowrite(struct cdev *dev, struct uio *uio, int flag)
-+#else
- siowrite(dev_t dev, struct uio *uio, int flag)
-+#endif
- {
- int mynor;
- struct com_s *com;
-@@ -1754,7 +1881,11 @@
- if (com == NULL || com->gone)
- return (ENODEV);
-
-+#if __FreeBSD_version > 502112
-+ return ((*linesw[com->tp->t_line]->l_write)(com->tp, uio, flag));
-+#else
- return ((*linesw[com->tp->t_line].l_write)(com->tp, uio, flag));
-+#endif
- }
-
- static void
-@@ -1860,7 +1991,11 @@
- if (line_status & LSR_PE)
- recv_data |= TTY_PE;
- }
-+#if __FreeBSD_version > 502112
-+ (*linesw[tp->t_line]->l_rint)(recv_data, tp);
-+#else
- (*linesw[tp->t_line].l_rint)(recv_data, tp);
-+#endif
- lt_disable_intr();
- } while (buf < com->iptr);
- }
-@@ -1894,23 +2029,34 @@
- u_char recv_data;
- u_char int_ctl;
- u_char int_ctl_new;
-+#ifdef ENABLE_PPS
-+#if __FreeBSD_version < 500034
- struct timecounter *tc;
- u_int count;
-+#endif
-+#endif
-
- int_ctl = read_vuart_port(UART_IER);
- int_ctl_new = int_ctl;
-
- while (!com->gone) {
-+#ifdef ENABLE_PPS
- if (com->pps.ppsparam.mode & PPS_CAPTUREBOTH) {
- modem_status = read_vuart_port(UART_MSR);
- if ((modem_status ^ com->last_modem_status) & MSR_DCD) {
-+#if __FreeBSD_version < 500034
- tc = timecounter;
- count = tc->tc_get_timecount(tc);
- pps_event(&com->pps, tc, count,
-+#else
-+ pps_capture(&com->pps);
-+ pps_event(&com->pps,
-+#endif
- (modem_status & MSR_DCD) ?
- PPS_CAPTUREASSERT : PPS_CAPTURECLEAR);
- }
- }
-+#endif
- line_status = read_vuart_port(UART_LSR);
-
- /* input event? (check first to help avoid overruns) */
-@@ -1948,7 +2094,11 @@
- recv_data = 0;
- }
- ++com->bytes_in;
-+#if __FreeBSD_version > 502118
-+ if (com->tp->t_hotchar != 0 && recv_data == com->tp->t_hotchar)
-+#else
- if (com->hotchar != 0 && recv_data == com->hotchar)
-+#endif
- setsofttty();
- ioptr = com->iptr;
- if (ioptr >= com->ibufend)
-@@ -2053,17 +2203,23 @@
- }
-
- static int
-+#if __FreeBSD_version > 502115
-+sioioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct proc *p)
-+#else
- sioioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
-+#endif
- {
- struct com_s *com;
- int error;
- int mynor;
- int s;
- struct tty *tp;
-+#if __FreeBSD_version < 700003
- #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
- u_long oldcmd;
- struct termios term;
- #endif
-+#endif
-
- mynor = minor(dev);
- com = com_addr(MINOR_TO_UNIT(mynor));
-@@ -2103,6 +2259,7 @@
- }
- }
- tp = com->tp;
-+#if __FreeBSD_version < 700003
- #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
- term = tp->t_termios;
- oldcmd = cmd;
-@@ -2112,6 +2269,7 @@
- if (cmd != oldcmd)
- data = (caddr_t)&term;
- #endif
-+#endif
- if (cmd == TIOCSETA || cmd == TIOCSETAW || cmd == TIOCSETAF) {
- int cc;
- struct termios *dt = (struct termios *)data;
-@@ -2134,7 +2292,11 @@
- if (lt->c_ospeed != 0)
- dt->c_ospeed = tp->t_ospeed;
- }
-+#if __FreeBSD_version > 502112
-+ error = (*linesw[tp->t_line]->l_ioctl)(tp, cmd, data, flag, p);
-+#else
- error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
-+#endif
- if (error != ENOIOCTL)
- return (error);
- s = splfunc();
-@@ -2189,13 +2351,17 @@
- com->do_timestamp = TRUE;
- *(struct timeval *)data = com->timestamp;
- break;
-+#if __FreeBSD_version < 502119
- case TIOCDCDTIMESTAMP:
- com->do_dcd_timestamp = TRUE;
- *(struct timeval *)data = com->dcd_timestamp;
- break;
-+#endif
- default:
- splx(s);
-+#ifdef ENABLE_PPS
- error = pps_ioctl(cmd, data, &com->pps);
-+#endif
- if (error == ENODEV)
- error = ENOTTY;
- return (error);
-@@ -2257,8 +2423,13 @@
- com->state &= ~CS_CHECKMSR;
- lt_enable_intr();
- if (delta_modem_status & MSR_DCD)
-+#if __FreeBSD_version > 502112
-+ (*linesw[tp->t_line]->l_modem)
-+ (tp, com->prev_modem_status & MSR_DCD);
-+#else
- (*linesw[tp->t_line].l_modem)
- (tp, com->prev_modem_status & MSR_DCD);
-+#endif
- }
- if (com->state & CS_ODONE) {
- lt_disable_intr();
-@@ -2270,7 +2441,11 @@
- sio_busycheck_handle = timeout(siobusycheck, com, hz / 100);
- com->extra_state |= CSE_BUSYCHECK;
- }
-+#if __FreeBSD_version > 502112
-+ (*linesw[tp->t_line]->l_start)(tp);
-+#else
- (*linesw[tp->t_line].l_start)(tp);
-+#endif
- }
- if (com_events == 0)
- break;
-@@ -2769,11 +2944,21 @@
- && (!(t->c_iflag & PARMRK)
- || (t->c_iflag & (IGNPAR | IGNBRK)) == (IGNPAR | IGNBRK))
- && !(t->c_lflag & (ECHO | ICANON | IEXTEN | ISIG | PENDIN))
-+#if __FreeBSD_version > 502112
-+ && linesw[tp->t_line]->l_rint == ttyinput)
-+#else
- && linesw[tp->t_line].l_rint == ttyinput)
-+#endif
- tp->t_state |= TS_CAN_BYPASS_L_RINT;
- else
- tp->t_state &= ~TS_CAN_BYPASS_L_RINT;
-+#if __FreeBSD_version > 502112
-+#if __FreeBSD_version < 502119
-+ com->hotchar = linesw[tp->t_line]->l_hotchar;
-+#endif
-+#else
- com->hotchar = linesw[tp->t_line].l_hotchar;
-+#endif
- }
-
- #ifdef KLD_MODULE
-@@ -2796,7 +2981,7 @@
- #endif
-
- DRIVER_MODULE(ltmdm, pci, ltmdm_pci_driver, ltmdm_devclass, ltmdm_event, 0);
--#if 0
-+#if 1
- #if __FreeBSD_version >= 500000
- DRIVER_MODULE(ltmdm, cardbus, ltmdm_pci_driver, ltmdm_devclass, ltmdm_event, 0);
- #endif
diff --git a/comms/ltmdm/files/pkg-message.in b/comms/ltmdm/files/pkg-message.in
deleted file mode 100644
index c3d06c7cbf5..00000000000
--- a/comms/ltmdm/files/pkg-message.in
+++ /dev/null
@@ -1,17 +0,0 @@
-*******************************************************************************
-* *
-* This port contains a prebuilt kernel module. Due to the ever changing *
-* nature of FreeBSD it may be necessary to rebuild the module after a kernel *
-* source update. To do this reinstall the port. *
-* *
-*******************************************************************************
-To use these drivers, make sure that you have loaded the ltmdm kernel
-module, by doing
-
- # kldload ltmdm
-
-or adding
-
- ltmdm_load="YES"
-
-to your /boot/loader.conf.
diff --git a/comms/ltmdm/pkg-descr b/comms/ltmdm/pkg-descr
deleted file mode 100644
index 5739a99dfa4..00000000000
--- a/comms/ltmdm/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-This port contains a driver for several Winmodems based on the Lucent LT
-chipset. It consists of a shim for the Linux binary only object file.
-
-I have tested this code on a Dell Inspiron 8000, and a Mitsubishi Diamond Voice
-internal PCI modem. Mr Watanabe has tested it on a ThinkPad i1124.
-
-The shim code was written Watanabe Kiyoshi
-
-Home page of the Linux driver :- http://www.heby.de/ltmodem
-
-WWW: http://www.heby.de/ltmodem
diff --git a/comms/ltmdm/pkg-plist b/comms/ltmdm/pkg-plist
deleted file mode 100644
index a691912b3ab..00000000000
--- a/comms/ltmdm/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-@cwd %%KMODDIR%%
-ltmdm.ko
-@unexec kldxref %D
diff --git a/comms/yawmppp/Makefile b/comms/yawmppp/Makefile
deleted file mode 100644
index 5174a0963cd..00000000000
--- a/comms/yawmppp/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# New ports collection makefile for: yawmppp
-# Date created: 07 Mar 2000
-# Whom: Will Andrews <andrews@technologist.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= yawmppp
-PORTVERSION= 2.0.2
-PORTREVISION= 5
-CATEGORIES= comms windowmaker
-MASTER_SITES= ftp://ftp.seul.org/pub/yawmppp/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A Window Maker dockapp that helps with easy use of pppd
-
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_GNOME= gtk12
-USE_XORG= xpm x11
-CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-
-MAN1= yawmppp.1x
-
-pre-patch:
- @${REINPLACE_CMD} -e "s@-g -O2@${CFLAGS}@g; s@-O2 -Wall@${CFLAGS} -Wall@g; \
- s@-O2@${CFLAGS}@g" ${WRKSRC}/*/Makefile.in \
- ${WRKSRC}/configure ${WRKSRC}/*/*/Makefile.in
- @${REINPLACE_CMD} -e 's!\/usr\/local!${PREFIX}!; \
- s!/usr/bin!${PREFIX}/bin!' ${WRKSRC}/src/ycommon.c
- @${REINPLACE_CMD} -e 's|/etc/ppp\(/yagetmodemspeed\)|${PREFIX}/bin\1|' \
- ${WRKSRC}/src/gtksetup/applet.c
- @${REINPLACE_CMD} -e 's|tac|cat|' ${WRKSRC}/src/dockapp/getmodemspeed.c
-
-do-install:
-.for file in dockapp/yagetmodemspeed dockapp/${PORTNAME} gtklog/${PORTNAME}.log \
- gtksetup/${PORTNAME}.pref thinppp/${PORTNAME}.thin
- @${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin
-.endfor
- @${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.1x ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in CHANGELOG FAQ README TODO
- @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800064
-BROKEN= does not build
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/comms/yawmppp/distinfo b/comms/yawmppp/distinfo
deleted file mode 100644
index dbba29aacde..00000000000
--- a/comms/yawmppp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (yawmppp-2.0.2.tar.gz) = a0b7f08b977defc7699946c1a2658f61
-SHA256 (yawmppp-2.0.2.tar.gz) = 19de7ea377ecd974412a601eb2e4004131b2317b2aae856b08b52e38e02b13ea
-SIZE (yawmppp-2.0.2.tar.gz) = 102683
diff --git a/comms/yawmppp/pkg-descr b/comms/yawmppp/pkg-descr
deleted file mode 100644
index 9960b8b624a..00000000000
--- a/comms/yawmppp/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-YAWMPPP (Yet Another Window Maker PPP dockapp) is a
-Window Maker dockapp that gets its inspiration from the
-original WMPPP. It has an easy-to-use GUI configuration
-dialog and generates a chat script (as well as stop and
-start scripts) for use with pppd. The dockapp shows
-how long you've been connected, current network traffic,
-and some fairly interesting lights.
-
-WWW: http://yawmppp.seul.org/
diff --git a/comms/yawmppp/pkg-plist b/comms/yawmppp/pkg-plist
deleted file mode 100644
index 1d74fc9deed..00000000000
--- a/comms/yawmppp/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/yagetmodemspeed
-bin/yawmppp
-bin/yawmppp.log
-bin/yawmppp.pref
-bin/yawmppp.thin
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%