diff options
| author | joerg <joerg@pkgsrc.org> | 2006-09-08 07:35:50 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-09-08 07:35:50 +0000 |
| commit | e48cfa950912c8554669b9df2dcd98691c3b6abd (patch) | |
| tree | e513ad5702f319911ec913c03275f03f92ae2f57 | |
| parent | 975278c35288de29562b72fc0dd3baadc25f2cb6 (diff) | |
| download | pkgsrc-e48cfa950912c8554669b9df2dcd98691c3b6abd.tar.gz | |
Consistently use c++ frontend end, not -x c++ on FreeBSD and DragonFly.
| -rw-r--r-- | comms/estic/distinfo | 4 | ||||
| -rw-r--r-- | comms/estic/patches/patch-ag | 43 |
2 files changed, 37 insertions, 10 deletions
diff --git a/comms/estic/distinfo b/comms/estic/distinfo index 36533c5a375..c4bc267f3ba 100644 --- a/comms/estic/distinfo +++ b/comms/estic/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2006/01/05 17:12:35 joerg Exp $ +$NetBSD: distinfo,v 1.9 2006/09/08 07:35:50 joerg Exp $ SHA1 (estic-1.60-sources.zip) = ce66a6d52faaf6adba492bb3f74e49eab608d0c3 RMD160 (estic-1.60-sources.zip) = be071c72ab881c815dc9a0847f2b09914bdeb2ed @@ -12,7 +12,7 @@ SHA1 (patch-ac) = 2dd445fc1b14bc58d361fed4d6e2366a060b5203 SHA1 (patch-ad) = b7287df75abc237859ee25ce04c5b3df4d338c37 SHA1 (patch-ae) = 29ce3dafba535a26aef00e53da05d51eb09617be SHA1 (patch-af) = 39a39789e8875d901bce07581b544ef8590af4fa -SHA1 (patch-ag) = f12d7fe2bf40a420b8b045e52215cb844cae33e5 +SHA1 (patch-ag) = 8d73c2923b1a083683c30fbb066b4fe2872ce927 SHA1 (patch-ah) = 4a5ce78d5d7173132c91ec5dbcf20b0484afe882 SHA1 (patch-ai) = d7fdcc29f357a9a8b0790e2491f577160d05db34 SHA1 (patch-aj) = afaa7e22e01fc698418fb6543fe8e7f81feab106 diff --git a/comms/estic/patches/patch-ag b/comms/estic/patches/patch-ag index 773ad9daed8..53ae0eb3e40 100644 --- a/comms/estic/patches/patch-ag +++ b/comms/estic/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.3 2002/09/21 07:06:42 jlam Exp $ +$NetBSD: patch-ag,v 1.4 2006/09/08 07:35:50 joerg Exp $ ---- ../spunk/make/freebsd-x.mak.orig Sun Nov 24 22:33:26 1996 -+++ ../spunk/make/freebsd-x.mak Sat Feb 10 19:06:51 2001 -@@ -27,10 +27,9 @@ +--- ../spunk/make/freebsd-x.mak.orig 1996-11-24 22:33:26.000000000 +0100 ++++ ../spunk/make/freebsd-x.mak +@@ -27,10 +27,9 @@ AS = gas AR = ar LD = ld ZIP = zip @@ -10,11 +10,11 @@ $NetBSD: patch-ag,v 1.3 2002/09/21 07:06:42 jlam Exp $ # Flags for the gnu compiler -CFLAGS = -DFREEBSD -DUSE_OLD_TTY -g -Wall -x c++ -I /usr/X11R6/include -fno-implicit-templates -DEXPLICIT_TEMPLATES -+CFLAGS += -DFREEBSD -Wall -x c++ -I$(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES ++CFLAGS += -DFREEBSD -Wall -I$(X11BASE)/include -fno-implicit-templates -DEXPLICIT_TEMPLATES LIB = spunk.a ZIPFILE = spunk.zip -@@ -42,7 +41,7 @@ +@@ -42,7 +41,7 @@ ZIPFILE = spunk.zip $(CC) $(CFLAGS) -c $< .cc.o: @@ -23,7 +23,7 @@ $NetBSD: patch-ag,v 1.3 2002/09/21 07:06:42 jlam Exp $ # ------------------------------------------------------------------------------ # All SPUNK OBJ files -@@ -136,7 +135,7 @@ +@@ -136,7 +135,7 @@ RESEDITOBJS = resed.o \ # Dummy targets xresed: $(LIB) $(RESEDITOBJS) @@ -32,7 +32,7 @@ $NetBSD: patch-ag,v 1.3 2002/09/21 07:06:42 jlam Exp $ lib: $(LIB) -@@ -149,7 +148,7 @@ +@@ -149,28 +148,28 @@ $(LIB): $(OBJS) depend dep: @echo "Creating dependency information" @@ -41,3 +41,30 @@ $NetBSD: patch-ag,v 1.3 2002/09/21 07:06:42 jlam Exp $ # ------------------------------------------------------------------------------ # Target specific files + + console.o: xsrc/console.cc $(HDRS) +- $(CC) $(CFLAGS) -c $< ++ $(CXX) $(CFLAGS) -c $< + + delay.o: unixsrc/delay.cc $(HDRS) +- $(CC) $(CFLAGS) -c $< ++ $(CXX) $(CFLAGS) -c $< + + filesys.o: unixsrc/filesys.cc $(HDRS) +- $(CC) $(CFLAGS) -c $< ++ $(CXX) $(CFLAGS) -c $< + + nlsinit.o: unixsrc/nlsinit.cc $(HDRS) +- $(CC) $(CFLAGS) -c $< ++ $(CXX) $(CFLAGS) -c $< + + screen.o: xsrc/screen.cc $(HDRS) +- $(CC) $(CFLAGS) -c $< ++ $(CXX) $(CFLAGS) -c $< + + sercom.o: unixsrc/sercom.cc $(HDRS) +- $(CC) $(CFLAGS) -c $< ++ $(CXX) $(CFLAGS) -c $< + + # ------------------------------------------------------------------------------ + # Create a ZIP file |