Fix and sort plist, and make this port respect CXX and CFLAGS

4 files changed, 56 insertions, 44 deletions

diff --git a/misc/estic/files/patch-aa b/misc/estic/files/patch-aa
index 2e3ce5734f67..5da664d178bf 100644
--- a/misc/estic/files/patch-aa
+++ b/misc/estic/files/patch-aa
@@ -1,15 +1,25 @@
---- estic/make/freebsd-x.mak.orig	Sat Feb 26 18:42:30 2000
-+++ estic/make/freebsd-x.mak	Sat Feb 26 18:43:26 2000
-@@ -35,7 +35,7 @@
+--- estic/make/freebsd-x.mak.orig	Sat Sep 14 15:40:16 1996
++++ estic/make/freebsd-x.mak	Fri Mar  9 23:10:30 2001
+@@ -27,7 +27,8 @@
+ AR = ar
+ LD = ld
+ ZIP = zip
+-CC = g++
++CXX ?= g++
++CC = ${CXX}
+ 
+ LIB	= ../spunk/spunk.a
+ INCDIR	= ../spunk
+@@ -35,7 +36,7 @@
  # Both configurations of CFLAGS will probably work since FreeBSD has a
  # 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 +79,7 @@
+@@ -79,7 +80,7 @@
  all:	xestic
  
  xestic: $(LIB) $(OBJS)
diff --git a/misc/estic/files/patch-ab b/misc/estic/files/patch-ab
index 9dbca3d166ab..07436f2a2027 100644
--- a/misc/estic/files/patch-ab
+++ b/misc/estic/files/patch-ab
@@ -1,30 +1,22 @@
-# estic.doc
-# Mir ist mitgeteilt worden, daß die FreeBSD Version das Flag USE_OLD_TTY
-# braucht. Offenbar ist die Behandlung der RS232 Handshakeleitungen
-# geändert worden, die für die neue Platine der Istec (#3) benötigt
-# werden. Nähere Informationen liegen mir nicht vor, ich wäre dankbar,
-# wenn das nochmal jemand verifizieren könnte.
-
-# ovb@swissmail.com does not use -DUSE_OLD_TTY
-# neither does jhs@freebsd.org need it
-
-*** estic/make/freebsd.mak.orig	Sat Sep 14 15:40:16 1996
---- estic/make/freebsd.mak	Mon Nov 18 03:08:31 1996
-***************
-*** 35,41 ****
-  # 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
-  
-  
-  # ------------------------------------------------------------------------------
---- 35,42 ----
-  # 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 -g -Wall -I$(INCDIR) -x c++ -fno-implicit-templates -DEXPLICIT_TEMPLATES
-  
-  
-  # ------------------------------------------------------------------------------
+--- estic/make/freebsd.mak.orig	Sat Sep 14 15:40:16 1996
++++ estic/make/freebsd.mak	Fri Mar  9 23:10:46 2001
+@@ -27,7 +27,8 @@
+ AR = ar
+ LD = ld
+ ZIP = zip
+-CC = g++
++CXX ?= g++
++CC = ${CXX}
+ 
+ LIB	= ../spunk/spunk.a
+ INCDIR	= ../spunk
+@@ -35,7 +36,8 @@
+ # 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
+ 
+ 
+ # ------------------------------------------------------------------------------
diff --git a/misc/estic/files/patch-au b/misc/estic/files/patch-au
index 2c95e2cc9ed2..aa2a0569ab32 100644
--- a/misc/estic/files/patch-au
+++ b/misc/estic/files/patch-au
@@ -1,15 +1,21 @@
---- spunk/make/freebsd-x.mak.orig	Sat Feb 26 18:19:20 2000
-+++ spunk/make/freebsd-x.mak	Sat Feb 26 18:26:26 2000
-@@ -31,7 +31,7 @@
+--- spunk/make/freebsd-x.mak.orig	Fri Jun 21 12:57:24 1996
++++ spunk/make/freebsd-x.mak	Fri Mar  9 23:13:10 2001
+@@ -27,11 +27,12 @@
+ AR = ar
+ LD = ld
+ ZIP = zip
+-CC = g++
++CXX ?= g++
++CC = ${CXX}
  
  # Flags for the gnu compiler (use the second one for gcc >= 2.6.0)
  #CFLAGS = -DFREEBSD -g -Wall -x c++ -I /usr/X11/include
 -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
  ZIPFILE = spunk.zip
-@@ -206,7 +206,7 @@
+@@ -206,7 +207,7 @@
  # Dummy targets
  
  xresed:		$(LIB) $(RESEDITOBJS) $(HDRS)
diff --git a/misc/estic/pkg-plist b/misc/estic/pkg-plist
index 7e133113efd6..1e67e0a2839a 100644
--- a/misc/estic/pkg-plist
+++ b/misc/estic/pkg-plist
@@ -1,10 +1,14 @@
-bin/xestic
 bin/estic.res
-etc/pbx/estic.ini.generic_example
-etc/pbx/estic.ini.freebsd_example
+bin/xestic
 etc/pbx/aliases.example
-var/log/pbx/debug
 etc/pbx/config
+etc/pbx/estic.ini.freebsd_example
+etc/pbx/estic.ini.generic_example
 share/doc/estic/README
 share/doc/estic/estic.doc
+var/log/pbx/debug
+@dirrm etc/pbx
 @dirrm share/doc/estic
+@dirrm var/log/pbx
+@dirrm var/log
+@dirrm var