kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- update to 1.61

Browse source 
- allow pipes as input
- fixed build with X11
- fixed option WITHOUT_X11
- new option WITH_ESTIC_DTR_OFF
- honor NOPORTDOCS
Submitted by:	Peter Much & Dirk Meyer
This commit is contained in:
Dirk Meyer 2005-09-06 09:34:47 +00:00
parent 9febea035e
commit f6d73036cd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=142069
22 changed files with 630 additions and 243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
misc/estic/Makefile
View file

@ -6,21 +6,31 @@
# #
PORTNAME= estic PORTNAME= estic
PORTVERSION= 1.40 PORTVERSION= 1.61
CATEGORIES= misc CATEGORIES= misc
MASTER_SITES= ftp://linux01.gwdg.de/pub/isdn/estic/old-versions/v1.40/ MASTER_SITES= ftp://ftp.gwdg.de/pub/misc/isdn/linux/estic/
DISTNAME= estic-${PORTVERSION}-sources PKGNAMESUFFIX?= ${NOX11_SUFFIX}${PKGNAMESUFFIX2}
DISTFILES= estic-1.60-sources.zip estic-1.61-patch-from-1.60.zip
MAINTAINER= dinoex@FreeBSD.org MAINTAINER= dinoex@FreeBSD.org
COMMENT= Controller for ISDN TK-Anlage (PBX) made by Istec COMMENT= Controller for ISDN TK-Anlage (PBX) made by Istec
USE_XLIB= yes
USE_ZIP= yes USE_ZIP= yes
USE_REINPLACE= yes
#USE_GCC= 2.95
NO_WRKSUBDIR= yes NO_WRKSUBDIR= yes
# maybe one of them depends on the vga font from pcemu ? .if defined(WITHOUT_X11)
X_OR_NOT=-x# With X Window System, Runs OK NOX11_SUFFIX?= -nox11
#X_OR_NOT=# Without X Window System, Compile fails X_OR_NOT=
PLIST_SUB+= WITHOUT_X=""
PLIST_SUB+= WITH_X="@comment "
.else
USE_XLIB= yes
X_OR_NOT=-x
PLIST_SUB+= WITHOUT_X="@comment "
PLIST_SUB+= WITH_X=""
.endif
AUTHOR= "Ullrich von Bassewitz" <uz@ibb.schwaben.com> AUTHOR= "Ullrich von Bassewitz" <uz@ibb.schwaben.com>
# Personal Preferences, Where to install. # Personal Preferences, Where to install.
@ -30,33 +40,50 @@ PBX_MAN=${MANPREFIX}/man/man1
PBX_BIN=${PREFIX}/bin PBX_BIN=${PREFIX}/bin
PBX_DOC=${DOCSDIR} PBX_DOC=${DOCSDIR}
ESTIC=${WRKSRC}/estic ESTIC=${WRKSRC}/estic
MAKE_E= make X11BASE=${X11BASE} -f make/freebsd${X_OR_NOT}.mak AREACODE_DATAFILE=${PREFIX}/etc/pbx/areacodes
MAKEFILE=make/freebsd${X_OR_NOT}.mak
.if defined(WITH_ESTIC_DTR_OFF)
EXTRA_PATCHES+= ${FILESDIR}/dtr-off.patch
.endif
pre-patch:
@${ECHO_MSG} "===> Applying distribution patches for ${PKGNAME}"
# @${PATCH} -d ${PATCH_WRKSRC}/estic --forward --quiet -E -p0 --batch < ${WRKDIR}/estic.diff
do-configure: do-configure:
@cd ${WRKSRC}/spunk ; ${MAKE_E} dep @cd ${WRKSRC}/spunk ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} dep
@cd ${ESTIC} ; ${MAKE_E} dep @cd ${WRKSRC}/areacode ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} dep
@cd ${ESTIC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} dep
do-build: do-build:
@# If you don't want ResourceEditor you can `cd spunk ; ${MAKE_E} lib` cd ${WRKSRC}/spunk ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
cd ${WRKSRC}/spunk ; ${MAKE_E} cd ${WRKSRC}/areacode ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
cd ${ESTIC} ; ${MAKE_E} cd ${ESTIC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE}
do-install: do-install:
.if defined(WITHOUT_X11)
${INSTALL_PROGRAM} ${ESTIC}/estic ${PBX_BIN}/
.else
${INSTALL_PROGRAM} ${ESTIC}/xestic ${PBX_BIN}/ ${INSTALL_PROGRAM} ${ESTIC}/xestic ${PBX_BIN}/
.endif
${INSTALL_DATA} ${ESTIC}/estic.res ${PBX_BIN}/ ${INSTALL_DATA} ${ESTIC}/estic.res ${PBX_BIN}/
.if !defined(NOPORTDOCS)
@# estic doc says estic.res must be in bin path or current directory @# estic doc says estic.res must be in bin path or current directory
@${MKDIR} ${PBX_DOC} @${MKDIR} ${PBX_DOC}
${INSTALL_MAN} ${ESTIC}/estic.doc ${PBX_DOC} ${INSTALL_MAN} ${ESTIC}/estic.doc ${PBX_DOC}
@# estic.doc is not nroff format, & is in German, volunteers to create @# estic.doc is not nroff format, & is in German, volunteers to create
@# _and maintain_ nroff formatted English should contact ${AUTHOR} @# _and maintain_ nroff formatted English should contact ${AUTHOR}
${INSTALL_MAN} ${FILESDIR}/README ${PBX_DOC} ${INSTALL_MAN} ${FILESDIR}/README ${PBX_DOC}
.endif
@# ${FILESDIR}/README is not in nroff, but is a temporary document. @# ${FILESDIR}/README is not in nroff, but is a temporary document.
@${MKDIR} ${PBX_ETC} ${PBX_VAR} @${MKDIR} ${PBX_ETC} ${PBX_VAR}
${INSTALL_DATA} ${ESTIC}/estic.ini ${PBX_ETC}/estic.ini.generic_example ${INSTALL_DATA} ${ESTIC}/samples/estic.ini ${PBX_ETC}/estic.ini.generic_example
${INSTALL_DATA} ${FILESDIR}/estic.ini ${PBX_ETC}/estic.ini.freebsd_example ${INSTALL_DATA} ${FILESDIR}/estic.ini ${PBX_ETC}/estic.ini.freebsd_example
${INSTALL_DATA} ${ESTIC}/alias.dat ${PBX_ETC}/aliases.example ${INSTALL_DATA} ${ESTIC}/samples/alias.dat ${PBX_ETC}/aliases.example
@# create config & debug so we can change mode to private @# create config & debug so we can change mode to private
@touch ${PBX_ETC}/config ${PBX_VAR}/debug @${TOUCH} ${PBX_ETC}/config ${PBX_VAR}/debug
${CHMOD} 600 ${PBX_VAR}/debug ${PBX_ETC}/config ${CHMOD} 600 ${PBX_VAR}/debug ${PBX_ETC}/config
${CHMOD} 700 ${PBX_VAR} # estic will create ./1996.11 etc ${CHMOD} 700 ${PBX_VAR} # estic will create ./1996.11 etc

6
misc/estic/distinfo
View file

@ -1,2 +1,4 @@
MD5 (estic-1.40-sources.zip) = ed1c71e36e601a25b764cafa8df9bc2d MD5 (estic-1.60-sources.zip) = 871be1b5b591e902d6d5545565e40aa3
SIZE (estic-1.40-sources.zip) = 660165 SIZE (estic-1.60-sources.zip) = 892311
MD5 (estic-1.61-patch-from-1.60.zip) = 81f73057e3978af03088a753c5d20452
SIZE (estic-1.61-patch-from-1.60.zip) = 1017

16
misc/estic/files/dtr-off.patch Normal file
View file

@ -0,0 +1,16 @@
--- estic/iccom.cc.orig Thu Feb 20 22:32:48 1997
+++ estic/iccom.cc Mon Aug 15 12:29:16 2005
@@ -148,6 +148,13 @@
// (beginning from version #3).
Port->RTSOn ();
+#ifdef __FreeBSD__
+ // ovb@swissmail.com, 12-Nov-96: Fix of Rev3.
+ // We have to turn the DTR off as this is needed for the power supply.
+ // -> Power is taken from the RTS(+) and the DTR(-) line.
+ Port->DTROff ();
+#endif
+
// Success
return 0;
}

118
misc/estic/files/patch-areacode-make Normal file
View file

@ -0,0 +1,118 @@
--- areacode/make/freebsd.mak.orig Tue Sep 6 09:54:20 2005
+++ areacode/make/freebsd.mak Tue Sep 6 09:54:20 2005
@@ -0,0 +1,115 @@
+# *****************************************************************************
+# * *
+# * AREACODE Makefile for Freebsd *
+# * *
+# * (C) 1995-97 Ullrich von Bassewitz *
+# * Wacholderweg 14 *
+# * D-70597 Stuttgart *
+# * EMail: uz@ibb.schwaben.com *
+# * *
+# *****************************************************************************
+
+
+
+# $Id$
+#
+# $Log$
+#
+#
+
+
+# ------------------------------------------------------------------------------
+# Stuff you may want to edit
+
+# The name of the data file after installation. You may want to define
+# AREACODE_DATAFILE before calling make instead
+.if defined(AREACODE_DATAFILE)
+DATATARGET=$(AREACODE_DATAFILE)
+.else
+DATATARGET=/usr/lib/areacodes
+.endif
+
+# Command line for the installation of the data file
+INSTALL = install -o bin -g bin -m 644
+
+# ------------------------------------------------------------------------------
+# Definitions
+
+# Names of executables
+AS = gas
+AR = ar
+LD = ld
+ZIP = zip
+CC ?= gcc295
+
+CFLAGS += -DFREEBSD -g -Wall
+
+# Name of the data file
+DATASOURCE=areacode.dat
+
+# ------------------------------------------------------------------------------
+# Implicit rules
+
+.c.o:
+ $(CC) $(CFLAGS) -c $<
+
+# ------------------------------------------------------------------------------
+#
+
+all: actest acvers
+
+actest: areacode.o actest.o
+ $(CC) -o actest areacode.o actest.o
+
+acvers: acvers.o
+ $(CC) -o acvers acvers.o
+
+areacode.o: areacode.h areacode.c
+ $(CC) $(CFLAGS) -DDATA_FILENAME="\"$(DATATARGET)\"" \
+ -DCHARSET_ISO -c -o areacode.o areacode.c
+
+install: areacode.o acvers
+ @if [ `id -u` != 0 ]; then \
+ echo ""; \
+ echo 'Do "make install" as root'; \
+ echo ""; \
+ false; \
+ fi
+ @if [ -f $(DATATARGET) ]; then \
+ NewVersion=`./acvers $(DATASOURCE) | awk '{ print $$3 }'`;\
+ OldVersion=`./acvers $(DATATARGET) | awk '{ print $$3 }'`;\
+ echo "Current datafile build number: $$OldVersion"; \
+ echo "Build number of new datafile: $$NewVersion"; \
+ if [ $$NewVersion -gt $$OldVersion ]; then \
+ echo "Installing new datafile"; \
+ $(INSTALL) $(DATASOURCE) $(DATATARGET); \
+ else \
+ echo "Installed datafile is same or newer, skipping...";\
+ fi; \
+ else \
+ echo "Installing new datafile"; \
+ $(INSTALL) $(DATASOURCE) $(DATATARGET); \
+ fi
+
+# ------------------------------------------------------------------------------
+# Create a dependency file
+
+depend dep:
+ @echo "Creating dependency information"
+ $(CC) -DFREEBSD -MM *.c > .depend
+
+# ------------------------------------------------------------------------------
+# clean up
+
+distclean: clean
+ -rm -f *.bak *~ .depend
+
+
+clean:
+ -rm -f *.o
+ -rm -f acvers actest
+
+zap: distclean
+
+
+

118
misc/estic/files/patch-areacode-make-x Normal file
View file

@ -0,0 +1,118 @@
--- areacode/make/freebsd-x.mak.orig Tue Sep 6 09:54:20 2005
+++ areacode/make/freebsd-x.mak Tue Sep 6 09:54:20 2005
@@ -0,0 +1,115 @@
+# *****************************************************************************
+# * *
+# * AREACODE Makefile for Freebsd *
+# * *
+# * (C) 1995-97 Ullrich von Bassewitz *
+# * Wacholderweg 14 *
+# * D-70597 Stuttgart *
+# * EMail: uz@ibb.schwaben.com *
+# * *
+# *****************************************************************************
+
+
+
+# $Id$
+#
+# $Log$
+#
+#
+
+
+# ------------------------------------------------------------------------------
+# Stuff you may want to edit
+
+# The name of the data file after installation. You may want to define
+# AREACODE_DATAFILE before calling make instead
+.if defined(AREACODE_DATAFILE)
+DATATARGET=$(AREACODE_DATAFILE)
+.else
+DATATARGET=/usr/lib/areacodes
+.endif
+
+# Command line for the installation of the data file
+INSTALL = install -o bin -g bin -m 644
+
+# ------------------------------------------------------------------------------
+# Definitions
+
+# Names of executables
+AS = gas
+AR = ar
+LD = ld
+ZIP = zip
+CC ?= gcc295
+
+CFLAGS += -DFREEBSD -g -Wall
+
+# Name of the data file
+DATASOURCE=areacode.dat
+
+# ------------------------------------------------------------------------------
+# Implicit rules
+
+.c.o:
+ $(CC) $(CFLAGS) -c $<
+
+# ------------------------------------------------------------------------------
+#
+
+all: actest acvers
+
+actest: areacode.o actest.o
+ $(CC) -o actest areacode.o actest.o
+
+acvers: acvers.o
+ $(CC) -o acvers acvers.o
+
+areacode.o: areacode.h areacode.c
+ $(CC) $(CFLAGS) -DDATA_FILENAME="\"$(DATATARGET)\"" \
+ -DCHARSET_ISO -c -o areacode.o areacode.c
+
+install: areacode.o acvers
+ @if [ `id -u` != 0 ]; then \
+ echo ""; \
+ echo 'Do "make install" as root'; \
+ echo ""; \
+ false; \
+ fi
+ @if [ -f $(DATATARGET) ]; then \
+ NewVersion=`./acvers $(DATASOURCE) | awk '{ print $$3 }'`;\
+ OldVersion=`./acvers $(DATATARGET) | awk '{ print $$3 }'`;\
+ echo "Current datafile build number: $$OldVersion"; \
+ echo "Build number of new datafile: $$NewVersion"; \
+ if [ $$NewVersion -gt $$OldVersion ]; then \
+ echo "Installing new datafile"; \
+ $(INSTALL) $(DATASOURCE) $(DATATARGET); \
+ else \
+ echo "Installed datafile is same or newer, skipping...";\
+ fi; \
+ else \
+ echo "Installing new datafile"; \
+ $(INSTALL) $(DATASOURCE) $(DATATARGET); \
+ fi
+
+# ------------------------------------------------------------------------------
+# Create a dependency file
+
+depend dep:
+ @echo "Creating dependency information"
+ $(CC) -DFREEBSD -MM *.c > .depend
+
+# ------------------------------------------------------------------------------
+# clean up
+
+distclean: clean
+ -rm -f *.bak *~ .depend
+
+
+clean:
+ -rm -f *.o
+ -rm -f acvers actest
+
+zap: distclean
+
+
+

1
misc/estic/files/patch-check.h
View file

@ -10,4 +10,3 @@
void (*CheckFailed) (const char* Msg, const char* Cond, int Code, void (*CheckFailed) (const char* Msg, const char* Cond, int Code,
const char* File, int Line); const char* File, int Line);
// Function pointer that is called from Check if the condition code is true. // Function pointer that is called from Check if the condition code is true.
Only in foo/spunk: check.o

11
misc/estic/files/patch-console.cc
View file

@ -1,11 +0,0 @@
--- spunk/xsrc/console.cc.orig Sat Feb 26 17:48:40 2000
+++ spunk/xsrc/console.cc Sat Feb 26 17:49:13 2000
@@ -374,7 +374,7 @@
// the parameter following this name and remove both from the argument list.
{
// Get the argument vector
- const char** Args = GetArgVec ();
+ const char** Args = (const char **)GetArgVec ();
// search for the given argument
int I = 1;

43
misc/estic/files/patch-estic-freebsd-x.mak
View file

@ -1,6 +1,6 @@
--- estic/make/freebsd-x.mak.orig Sat Sep 14 15:40:16 1996 --- estic/make/freebsd-x.mak.orig Fri Jan 31 03:57:24 1997
+++ estic/make/freebsd-x.mak Fri Mar 9 23:10:30 2001 +++ estic/make/freebsd-x.mak Tue Sep 6 09:54:21 2005
@@ -27,7 +27,8 @@ @@ -27,12 +27,13 @@
AR = ar AR = ar
LD = ld LD = ld
ZIP = zip ZIP = zip
@ -10,21 +10,44 @@
LIB = ../spunk/spunk.a LIB = ../spunk/spunk.a
INCDIR = ../spunk INCDIR = ../spunk
@@ -35,7 +36,7 @@
# Both configurations of CFLAGS will probably work since FreeBSD has a -CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
# smart linker...
#CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib
-CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -L /usr/X11R6/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
+CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(X11BASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES +CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -L $(X11BASE)/lib -fno-implicit-templates -DEXPLICIT_TEMPLATES
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@@ -79,7 +80,7 @@ @@ -71,10 +72,10 @@
icintcon.o \
iclog.o \
icmsgwin.o \
- icprefix.o \
icshort.o \
icver.o \
- istecmsg.o
+ istecmsg.o \
+ ../areacode/areacode.o
# ------------------------------------------------------------------------------
#
@@ -82,7 +83,7 @@
all: xestic all: xestic
xestic: $(LIB) $(OBJS) xestic: $(LIB) $(OBJS)
- $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11 - $(CC) -o xestic $(OBJS) $(LIB) -ltermcap -lg++ -lX11
+ $(CC) -L /usr/X11R6/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11 + $(CC) -L $(X11BASE)/lib -o xestic $(OBJS) $(LIB) -ltermcap -lX11
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@@ -114,10 +115,10 @@
clean:
-rm -f *.bak *~
+ -rm -f *.o
+ -rm -f xestic
zap: clean
- -rm -f *.o
-rm -f .depend
-

47
misc/estic/files/patch-estic-freebsd.mak
View file

@ -1,6 +1,6 @@
--- estic/make/freebsd.mak.orig Sat Sep 14 15:40:16 1996 --- estic/make/freebsd.mak.orig Fri Jan 31 03:57:24 1997
+++ estic/make/freebsd.mak Fri Mar 9 23:10:46 2001 +++ estic/make/freebsd.mak Tue Sep 6 09:54:21 2005
@@ -27,7 +27,8 @@ @@ -27,11 +27,12 @@
AR = ar AR = ar
LD = ld LD = ld
ZIP = zip ZIP = zip
@ -10,13 +10,42 @@
LIB = ../spunk/spunk.a LIB = ../spunk/spunk.a
INCDIR = ../spunk INCDIR = ../spunk
@@ -35,7 +36,8 @@ -CFLAGS = -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
# Both configurations of CFLAGS will probably work since FreeBSD has a
# smart linker...
#CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++
-CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
+#CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
+CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES +CFLAGS += -DFREEBSD -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@@ -70,10 +71,10 @@
icintcon.o \
iclog.o \
icmsgwin.o \
- icprefix.o \
icshort.o \
icver.o \
- istecmsg.o
+ istecmsg.o \
+ ../areacode/areacode.o
# ------------------------------------------------------------------------------
#
@@ -81,7 +82,7 @@
all: estic
estic: $(LIB) $(OBJS)
- $(CC) -o estic $(OBJS) $(LIB) -ltermcap -lg++
+ $(CC) -o estic $(OBJS) $(LIB) -ltermcap
# ------------------------------------------------------------------------------
# Create a dependency file
@@ -112,9 +113,10 @@
clean:
-rm -f *.bak *~
+ -rm -f *.o
+ -rm -f estic
zap: clean
- -rm -f *.o
-rm -f .depend

22
misc/estic/files/patch-estic.cc
View file

@ -1,15 +1,15 @@
--- estic/estic.cc.orig Sat Feb 26 18:28:17 2000 --- estic/estic.cc.orig Wed Mar 5 21:20:42 1997
+++ estic/estic.cc Sat Feb 26 18:28:51 2000 +++ estic/estic.cc Tue Sep 6 09:54:21 2005
@@ -75,9 +75,9 @@ @@ -80,9 +80,9 @@
// Diag mode update // Diag mode update
-static const duOff = 0; -static const duOff = 0;
-static const duOn = 1; -static const duOn = 1;
-static const duAuto = 2; // Update if version <= 1.93 -static const duAuto = 2; // Update if version <= 1.93
+static const int duOff = 0; +static const int duOff = 0;
+static const int duOn = 1; +static const int duOn = 1;
+static const int duAuto = 2; // Update if version <= 1.93 +static const int duAuto = 2; // Update if version <= 1.93
static const char VersionStr [] = "1.30"; // Also valid for 1.40 static const char VersionStr [] = "1.50";
static const char VersionID [] = "ESTIC-Version"; static const char VersionID [] = "ESTIC-Version";

10
misc/estic/files/patch-icbaseed.cc
View file

@ -1,6 +1,6 @@
--- estic/icbaseed.cc.orig Sat Feb 26 18:29:22 2000 --- estic/icbaseed.cc.orig Sat Nov 30 01:00:44 1996
+++ estic/icbaseed.cc Sat Feb 26 18:30:01 2000 +++ estic/icbaseed.cc Tue Sep 6 09:54:21 2005
@@ -387,26 +387,26 @@ @@ -451,26 +451,26 @@
// otherwise, Changed is left untouched. // otherwise, Changed is left untouched.
{ {
// ID's of menue items for EditBaseConfig // ID's of menue items for EditBaseConfig
@ -18,6 +18,7 @@
- const miEAZGroups = 120; - const miEAZGroups = 120;
- const miExternalMusicPort = 130; - const miExternalMusicPort = 130;
- const miCountryCode = 140; - const miCountryCode = 140;
- const miSignaling = 150;
+ const int miIstecType = 10; + const int miIstecType = 10;
+ const int miProtocol = 20; + const int miProtocol = 20;
+ const int miExtLevel = 30; + const int miExtLevel = 30;
@ -32,16 +33,15 @@
+ const int miEAZGroups = 120; + const int miEAZGroups = 120;
+ const int miExternalMusicPort = 130; + const int miExternalMusicPort = 130;
+ const int miCountryCode = 140; + const int miCountryCode = 140;
+ const int miSignaling = 150;
// Values for the miMusic toggle item // Values for the miMusic toggle item
- const musOff = 0; - const musOff = 0;
- const musInternal = 1; - const musInternal = 1;
- const musExternal = 2; - const musExternal = 2;
- const musOn = musInternal;
+ const int musOff = 0; + const int musOff = 0;
+ const int musInternal = 1; + const int musInternal = 1;
+ const int musExternal = 2; + const int musExternal = 2;
+ const int musOn = musInternal;

41
misc/estic/files/patch-icdevs.cc
View file

@ -1,29 +1,43 @@
--- estic/icdevs.cc.orig Sat Feb 26 18:30:40 2000 --- estic/icdevs.cc.orig Wed Mar 5 21:48:44 1997
+++ estic/icdevs.cc Sat Feb 26 18:32:24 2000 +++ estic/icdevs.cc Tue Sep 6 09:54:21 2005
@@ -299,8 +299,8 @@ @@ -157,8 +157,8 @@
String DevListBox::RerouteName (unsigned Val, unsigned char* Num) String DevListBox::RerouteName (const String& Num)
// Map the reroute capability to a string with fixed length // Map the reroute capability to a string with fixed length
{ {
- const StringLength = 11; - const StringLength = 18;
- const PadLength = 12; - const PadLength = 21;
+ const int StringLength = 11; + const int StringLength = 18;
+ const int PadLength = 12; + const int PadLength = 21;
String Res (PadLength); String Res (PadLength);
if (Val == 0x00) { if (Num.IsEmpty ()) {
@@ -427,37 +427,37 @@ @@ -269,9 +269,9 @@
static void EditExtReroute (const Point& Pos, IstecDevConfig& Config)
// Edit the extended reroute capabilities of FW 2.0 in a separate menu
{
- const miPhone = 10;
- const miCondition = 20;
- const miRingCount = 30;
+ const int miPhone = 10;
+ const int miCondition = 20;
+ const int miRingCount = 30;
// Load the menu
Menue* M = (Menue*) LoadResource ("@ICDEVS.RerouteMenue");
@@ -407,38 +407,38 @@
static const String StgPosName = "EditDevConfig.ConfigMenue.Position"; static const String StgPosName = "EditDevConfig.ConfigMenue.Position";
// Menue constants // Menue constants
- const miDialCaps = 10; - const miDialCaps = 10;
- const miService = 20; - const miService = 20;
- const miReroute = 30; - const miReroute = 30; // Simple reroute, pre-2.00
- const miChargePulse = 40; - const miChargePulse = 40;
- const miPIN = 50; - const miPIN = 50;
- const miTerminalMode = 60; - const miTerminalMode = 60;
- const miKnockInt = 70; - const miKnockInt = 70;
- const miKnockExt = 80; - const miKnockExt = 80;
- const miKnockTFE = 90; - const miKnockTFE = 90;
- const miExtReroute = 100; // Extended reroute, 2.00 and up
- const miKnockInt21 = 1000; - const miKnockInt21 = 1000;
- const miKnockInt22 = 1010; - const miKnockInt22 = 1010;
- const miKnockInt23 = 1020; - const miKnockInt23 = 1020;
@ -48,13 +62,14 @@
- const miKnockTFE4 = 1230; - const miKnockTFE4 = 1230;
+ const int miDialCaps = 10; + const int miDialCaps = 10;
+ const int miService = 20; + const int miService = 20;
+ const int miReroute = 30; + const int miReroute = 30; // Simple reroute, pre-2.00
+ const int miChargePulse = 40; + const int miChargePulse = 40;
+ const int miPIN = 50; + const int miPIN = 50;
+ const int miTerminalMode = 60; + const int miTerminalMode = 60;
+ const int miKnockInt = 70; + const int miKnockInt = 70;
+ const int miKnockExt = 80; + const int miKnockExt = 80;
+ const int miKnockTFE = 90; + const int miKnockTFE = 90;
+ const int miExtReroute = 100; // Extended reroute, 2.00 and up
+ const int miKnockInt21 = 1000; + const int miKnockInt21 = 1000;
+ const int miKnockInt22 = 1010; + const int miKnockInt22 = 1010;
+ const int miKnockInt23 = 1020; + const int miKnockInt23 = 1020;
@ -79,4 +94,4 @@
+ const int miKnockTFE4 = 1230; + const int miKnockTFE4 = 1230;
// Save the configuration // Save the configuration into a memory stream, remember the CRC

94
misc/estic/files/patch-icfile.cc
View file

@ -1,94 +0,0 @@
These were mailed to jhs@
by uz@wuschel.ibb.schwaben.com (Ullrich von Bassewitz)
They were titled:
Written by Oliver von Bueren, ovb@swissmail.com, 12-Nov-1996
The following is only an addition to the ESTIC program, which is Copyright
by Ullrich von Bassewitz. It's free to integrate into ESTIC as long as
the terms for the original program from UvB are met.
There is absolutely no guarantee that it will work on any other system,
it just works for me on my system.
I Julian Stacey <jhs@freebsd.org> have tried compiling without the
Port->DTROff ();
patch & can confirm for Ullrich, it is necessary, without it, I get
a communications timeout. Thanks Oliver.
*** estic/devstate.cc.orig Sat Sep 14 15:40:16 1996
--- estic/devstate.cc Tue Nov 12 20:11:06 1996
***************
*** 622,628 ****
if (DevNum + 21 == E.Info.U % 256) {
if (GetState (stBusy) == 0) {
// Get the duration
! ForcedRingEnd = Time () + TimeDiff (E.Info.U / 256);
// Set the new state
SetState (stForcedRing | stForcedRingOn);
// Send the command to the istec
--- 622,631 ----
if (DevNum + 21 == E.Info.U % 256) {
if (GetState (stBusy) == 0) {
// Get the duration
! // ovb@swissmail.com, 12-Nov-96: Added typecast (double) as the compiler
! // complained about ambiguous selection
! // possibilities for TimeDiff.
! ForcedRingEnd = Time () + TimeDiff ((double)E.Info.U / 256);
// Set the new state
SetState (stForcedRing | stForcedRingOn);
// Send the command to the istec
*** estic/iccom.cc.orig Sat Sep 14 15:40:16 1996
--- estic/iccom.cc Tue Nov 12 20:05:34 1996
***************
*** 34,39 ****
--- 34,48 ----
#include "iccom.h"
+ /*****************************************************************************/
+ /* Explicit template instantiation */
+ /*****************************************************************************/
+
+ // ovb@swissmail.com, 12-Nov-96: This definition seemed to be missing.
+ #ifdef EXPLICIT_TEMPLATES
+ template class CircularBuffer<IstecMsg*>;
+ #endif
+
/*****************************************************************************/
/* Data */
***************
*** 126,131 ****
--- 135,144 ----
// Make the RTS line active. This is needed for the new PCB of the istec
// (beginning from version #3).
Port->RTSOn ();
+ // ovb@swissmail.com, 12-Nov-96: Fix of Rev3.
+ // We have to turn the DTR off as this is needed for the power supply.
+ // -> Power is taken from the RTS(+) and the DTR(-) line.
+ Port->DTROff ();
// Success
return 0;
***************
*** 159,165 ****
// Post an appropriate event
PostEvent (evChargeUpdate);
}
-
static void IstecWrite (unsigned char* Msg, unsigned BufSize)
--- 172,177 ----
*** estic/icfile.cc.orig Sat Sep 14 15:40:16 1996
--- estic/icfile.cc Tue Nov 12 20:06:33 1996
***************
*** 27,32 ****
--- 27,35 ----
#include "syserror.h"
+ // ovb@swissmail.com, 12-Nov-96: This was missing to compile on FreeBSD 2.1.5
+ extern int errno;
+
#include "icfile.h"

31
misc/estic/files/patch-icshort.cc Normal file
View file

@ -0,0 +1,31 @@
--- estic/icshort.cc.orig Tue Sep 6 09:54:20 2005
+++ estic/icshort.cc Tue Sep 6 09:54:21 2005
@@ -578,17 +578,17 @@
// Item numbers for the short number edit menu
-const miNumber = 10;
-const miUsage = 20;
-const miSignaling = 30;
-const miDevice1 = 110;
-const miDevice2 = 120;
-const miDevice3 = 130;
-const miDevice4 = 140;
-const miDevice5 = 150;
-const miDevice6 = 160;
-const miDevice7 = 170;
-const miDevice8 = 180;
+const int miNumber = 10;
+const int miUsage = 20;
+const int miSignaling = 30;
+const int miDevice1 = 110;
+const int miDevice2 = 120;
+const int miDevice3 = 130;
+const int miDevice4 = 140;
+const int miDevice5 = 150;
+const int miDevice6 = 160;
+const int miDevice7 = 170;
+const int miDevice8 = 180;

58
misc/estic/files/patch-kbd.cc Normal file
View file

@ -0,0 +1,58 @@
--- spunk/bsdsrc/kbd.cc.orig Tue Dec 10 14:41:06 1996
+++ spunk/bsdsrc/kbd.cc Tue Sep 6 09:54:21 2005
@@ -27,7 +27,7 @@
#include <sys/time.h>
#include <sys/ioctl.h>
#ifdef FREEBSD
-# include <machine/console.h>
+# include <sys/kbio.h>
#endif
#include "../machine.h"
@@ -64,7 +64,7 @@
// An array for mapping extended to virtual keys
-const VirtualMapSize = 50;
+const int VirtualMapSize = 50;
struct { Key EK; Key VK; } VirtualMap [VirtualMapSize];
static unsigned VirtualMapCount = 0;
@@ -192,7 +192,11 @@
{
static char CapBuf [128];
char* CapPtr = CapBuf;
+#if __FreeBSD_version <= 500000
+ return tgetstr ((char *)Cap, &CapPtr);
+#else
return tgetstr (Cap, &CapPtr);
+#endif
}
@@ -649,10 +653,22 @@
}
// Now read in a new chunk of chars.
- int Count;
+ int Count = 0;
do {
- Count = read (0, &Buf [BufFill], sizeof (Buf) - BufFill - 1);
- if (Count == 0) {
+ // Timeout is 100ms
+ timeval Timeout;
+ Timeout.tv_usec = 100000; // 100 ms
+ Timeout.tv_sec = 0;
+
+ // File descriptor is 0 (stdin)
+ fd_set Desc;
+ FD_ZERO (&Desc);
+ FD_SET (STDIN_FILENO, &Desc);
+
+ // Check input status
+ if (select (STDIN_FILENO+1, &Desc, NULL, NULL, &Timeout) > 0) {
+ Count = read (STDIN_FILENO, &Buf [BufFill], sizeof (Buf) - BufFill - 1);
+ } else {
// Timeout waiting for a key, allow some idle processing
App->Idle ();
}

12
misc/estic/files/patch-screen.cc Normal file
View file

@ -0,0 +1,12 @@
--- spunk/bsdsrc/screen.cc.orig Thu Nov 7 18:06:54 1996
+++ spunk/bsdsrc/screen.cc Tue Sep 6 09:54:21 2005
@@ -22,7 +22,8 @@
#include <stdlib.h>
#include <sys/ioctl.h>
#ifdef FREEBSD
-# include <machine/console.h>
+# include <sys/kbio.h>
+# include <sys/consio.h>
#endif
#include "../screen.h"

80
misc/estic/files/patch-sercom.h
View file

@ -1,51 +1,51 @@
--- spunk/sercom.h.orig Sat Feb 26 18:01:59 2000 --- spunk/sercom.h.orig Thu Nov 7 18:06:52 1996
+++ spunk/sercom.h Sat Feb 26 18:02:44 2000 +++ spunk/sercom.h Tue Sep 6 09:54:21 2005
@@ -43,29 +43,29 @@ @@ -43,29 +43,29 @@
// Constants for accessing the array of error counters // Constants for accessing the array of error counters
-const ceRXOverflow = 0; // Receive buffer overflow -const ceRXOverflow = 0; // Receive buffer overflow
-const ceTXOverflow = 1; // Transmit buffer overflow -const ceTXOverflow = 1; // Transmit buffer overflow
-const ceOverrun = 2; // UART overrun -const ceOverrun = 2; // UART overrun
-const ceBreak = 3; // Break received -const ceBreak = 3; // Break received
-const ceFrame = 4; // Framing error -const ceFrame = 4; // Framing error
-const ceParity = 5; // Parity error -const ceParity = 5; // Parity error
+const int ceRXOverflow = 0; // Receive buffer overflow +const int ceRXOverflow = 0; // Receive buffer overflow
+const int ceTXOverflow = 1; // Transmit buffer overflow +const int ceTXOverflow = 1; // Transmit buffer overflow
+const int ceOverrun = 2; // UART overrun +const int ceOverrun = 2; // UART overrun
+const int ceBreak = 3; // Break received +const int ceBreak = 3; // Break received
+const int ceFrame = 4; // Framing error +const int ceFrame = 4; // Framing error
+const int ceParity = 5; // Parity error +const int ceParity = 5; // Parity error
// Bitmask constants for evaluating the result of ModemStatus // Bitmask constants for evaluating the result of ModemStatus
-const csDeltaCTS = 0x01; // Delta CTS -const csDeltaCTS = 0x01; // Delta CTS
-const csDeltaDSR = 0x02; // Delta DSR -const csDeltaDSR = 0x02; // Delta DSR
-const csDeltaRI = 0x04; // Falling edge of RI -const csDeltaRI = 0x04; // Falling edge of RI
-const csDeltaCarrierDetect = 0x08; // Delta CD -const csDeltaCarrierDetect = 0x08; // Delta CD
-const csClearToSend = 0x10; // Clear To Send -const csClearToSend = 0x10; // Clear To Send
-const csDataSetReady = 0x20; // Data Set Ready -const csDataSetReady = 0x20; // Data Set Ready
-const csRingIndicator = 0x40; // Ring Indicator -const csRingIndicator = 0x40; // Ring Indicator
-const csCarrierDetect = 0x80; // Carrier Detect -const csCarrierDetect = 0x80; // Carrier Detect
-const csCTS = csClearToSend; -const csCTS = csClearToSend;
-const csDSR = csDataSetReady; -const csDSR = csDataSetReady;
-const csRI = csRingIndicator; -const csRI = csRingIndicator;
-const csCD = csCarrierDetect; -const csCD = csCarrierDetect;
-const csDeltaCD = csDeltaCarrierDetect; -const csDeltaCD = csDeltaCarrierDetect;
+const int csDeltaCTS = 0x01; // Delta CTS +const int csDeltaCTS = 0x01; // Delta CTS
+const int csDeltaDSR = 0x02; // Delta DSR +const int csDeltaDSR = 0x02; // Delta DSR
+const int csDeltaRI = 0x04; // Falling edge of RI +const int csDeltaRI = 0x04; // Falling edge of RI
+const int csDeltaCarrierDetect = 0x08; // Delta CD +const int csDeltaCarrierDetect = 0x08; // Delta CD
+const int csClearToSend = 0x10; // Clear To Send +const int csClearToSend = 0x10; // Clear To Send
+const int csDataSetReady = 0x20; // Data Set Ready +const int csDataSetReady = 0x20; // Data Set Ready
+const int csRingIndicator = 0x40; // Ring Indicator +const int csRingIndicator = 0x40; // Ring Indicator
+const int csCarrierDetect = 0x80; // Carrier Detect +const int csCarrierDetect = 0x80; // Carrier Detect
+const int csCTS = csClearToSend; +const int csCTS = csClearToSend;
+const int csDSR = csDataSetReady; +const int csDSR = csDataSetReady;
+const int csRI = csRingIndicator; +const int csRI = csRingIndicator;
+const int csCD = csCarrierDetect; +const int csCD = csCarrierDetect;
+const int csDeltaCD = csDeltaCarrierDetect; +const int csDeltaCD = csDeltaCarrierDetect;

38
misc/estic/files/patch-spunk-freebsd-x.mak
View file

@ -1,26 +1,40 @@
--- spunk/make/freebsd-x.mak.orig Fri Jun 21 12:57:24 1996 --- spunk/make/freebsd-x.mak.orig Sun Nov 24 22:33:26 1996
+++ spunk/make/freebsd-x.mak Fri Mar 9 23:13:10 2001 +++ spunk/make/freebsd-x.mak Tue Sep 6 09:54:21 2005
@@ -27,11 +27,12 @@ @@ -27,10 +27,10 @@
AR = ar AR = ar
LD = ld LD = ld
ZIP = zip ZIP = zip
-CC = g++ -CC = g++
+CXX ?= g++ +CC = $(CXX)
+CC = ${CXX}
# Flags for the gnu compiler (use the second one for gcc >= 2.6.0) # Flags for the gnu compiler
#CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include -CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
-CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include -fno-implicit-templates -DEXPLICIT_TEMPLATES +CFLAGS += -DFREEBSD -g -Wall -x c++ -I $(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
+CFLAGS += -DFREEBSD -g -Wall -x c++ -I ${X11BASE}/include -fno-implicit-templates -DEXPLICIT_TEMPLATES
LIB = spunk.a LIB = spunk.a
ZIPFILE = spunk.zip ZIPFILE = spunk.zip
@@ -206,7 +207,7 @@ @@ -135,8 +135,8 @@
# ------------------------------------------------------------------------------
# Dummy targets # Dummy targets
xresed: $(LIB) $(RESEDITOBJS) $(HDRS) -xresed: $(LIB) $(RESEDITOBJS)
- $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -lg++ -L/usr/X11R6/lib -lX11 - $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -lg++ -L/usr/X11R6/lib -lX11
+ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L/usr/X11R6/lib -lX11 +resed: $(LIB) $(RESEDITOBJS)
+ $(CC) -g -o xresed $(RESEDITOBJS) $(LIB) -L$(X11BASE)/lib -lX11
lib: $(LIB) lib: $(LIB)
@@ -192,10 +192,12 @@
clean:
-rm -f *~ linuxsrc/*~ bsdsrc/*~ unixsrc/*~
+ -rm -f *.o
+ -rm -f xresed $(LIB) $(ZIPFILE)
zap: clean
- -rm -f *.o
-rm -f .depend
+

36
misc/estic/files/patch-spunk-freebsd.mak Normal file
View file

@ -0,0 +1,36 @@
--- spunk/make/freebsd.mak.orig Sun Nov 24 22:33:26 1996
+++ spunk/make/freebsd.mak Tue Sep 6 09:54:21 2005
@@ -27,10 +27,10 @@
AR = ar
LD = ld
ZIP = zip
-CC = g++
+CC = $(CXX)
# Flags for the gnu compiler
-CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
+CFLAGS += -DFREEBSD -g -Wall -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
LIB = spunk.a
ZIPFILE = spunk.zip
@@ -137,7 +137,7 @@
# Dummy targets
resed: $(LIB) $(RESEDITOBJS)
- $(CC) -g -o resed $(RESEDITOBJS) $(LIB) -ltermcap -lg++
+ $(CC) -g -o resed $(RESEDITOBJS) $(LIB) -ltermcap
lib: $(LIB)
@@ -196,9 +196,10 @@
clean:
-rm -f *~ linuxsrc/*~ bsdsrc/*~ unixsrc/*~
+ -rm -f *.o
+ -rm -f resed $(LIB) $(ZIPFILE)
zap: clean
- -rm -f *.o
-rm -f .depend

12
misc/estic/files/patch-stream.h
View file

@ -1,10 +1,10 @@
--- spunk/stream.h.orig Sat Feb 26 17:47:07 2000 --- spunk/stream.h.orig Thu Nov 7 18:06:52 1996
+++ spunk/stream.h Sat Feb 26 17:47:53 2000 +++ spunk/stream.h Tue Sep 6 09:54:21 2005
@@ -33,17 +33,17 @@ @@ -50,19 +50,19 @@
-static const stOk = 0; // things are allright -static const stOk = 0; // things are allright
-static const stInitError = 1; // error initializing the stream -static const stInitError = 1; // error initializing the stream
-static const stReadError = 2; // error reading from the stream -static const stReadError = 2; // error reading from the stream
-static const stWriteError = 3; // error writing to the stream -static const stWriteError = 3; // error writing to the stream
@ -15,6 +15,8 @@
-static const stLoadError = 8; // Keine Load-Methode oder Fehler bei Load -static const stLoadError = 8; // Keine Load-Methode oder Fehler bei Load
-static const stCopyError = 9; // CopyFrom: error of source stream -static const stCopyError = 9; // CopyFrom: error of source stream
-static const stSeekError = 10; // error using Seek, GetPos etc. -static const stSeekError = 10; // error using Seek, GetPos etc.
-static const stReadTimeout = 11; // Timeout on read (CharacterStream only)
-static const stWriteTimeout = 12; // Timeout on write (CharcterStream only)
+static const int stOk = 0; // things are allright +static const int stOk = 0; // things are allright
+static const int stInitError = 1; // error initializing the stream +static const int stInitError = 1; // error initializing the stream
+static const int stReadError = 2; // error reading from the stream +static const int stReadError = 2; // error reading from the stream
@ -26,6 +28,8 @@
+static const int stLoadError = 8; // Keine Load-Methode oder Fehler bei Load +static const int stLoadError = 8; // Keine Load-Methode oder Fehler bei Load
+static const int stCopyError = 9; // CopyFrom: error of source stream +static const int stCopyError = 9; // CopyFrom: error of source stream
+static const int stSeekError = 10; // error using Seek, GetPos etc. +static const int stSeekError = 10; // error using Seek, GetPos etc.
+static const int stReadTimeout = 11; // Timeout on read (CharacterStream only)
+static const int stWriteTimeout = 12; // Timeout on write (CharcterStream only)

11
misc/estic/files/patch-syserror.cc
View file

@ -1,11 +0,0 @@
--- spunk/syserror.cc.orig Sat Feb 26 18:04:03 2000
+++ spunk/syserror.cc Sat Feb 26 18:04:18 2000
@@ -238,7 +238,7 @@
return FormatStr (LoadMsg (msUnknown).GetStr (), Code);
} else {
#ifndef SOLARIS
- char* Msg = sys_errlist [Code];
+ char* Msg = (char *)sys_errlist [Code];
#else
char* Msg = strerror (Code);
#endif

9
misc/estic/pkg-plist
View file

@ -1,14 +1,15 @@
bin/estic.res bin/estic.res
bin/xestic %%WITHOUT_X%%bin/estic
%%WITH_X%%bin/xestic
etc/pbx/aliases.example etc/pbx/aliases.example
etc/pbx/config etc/pbx/config
etc/pbx/estic.ini.freebsd_example etc/pbx/estic.ini.freebsd_example
etc/pbx/estic.ini.generic_example etc/pbx/estic.ini.generic_example
%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README
%%DOCSDIR%%/estic.doc %%PORTDOCS%%%%DOCSDIR%%/estic.doc
var/log/pbx/debug var/log/pbx/debug
@dirrm etc/pbx @dirrm etc/pbx
@dirrm %%DOCSDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm var/log/pbx @dirrm var/log/pbx
@dirrm var/log @dirrm var/log
@dirrm var @dirrm var