[csw-devel] SF.net SVN: gar:[7992] csw/mgar/pkg/dnstop/trunk

[bonivart at users.sourceforge.net]

Revision: 7992
          http://gar.svn.sourceforge.net/gar/?rev=7992&view=rev
Author:   bonivart
Date:     2010-01-13 18:47:33 +0000 (Wed, 13 Jan 2010)

Log Message:
-----------
dnstop: fix arch patch issues

Modified Paths:
--------------
    csw/mgar/pkg/dnstop/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p
    csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p

Removed Paths:
-------------
    csw/mgar/pkg/dnstop/trunk/files/Makefile.p

Modified: csw/mgar/pkg/dnstop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dnstop/trunk/Makefile	2010-01-13 18:21:10 UTC (rev 7991)
+++ csw/mgar/pkg/dnstop/trunk/Makefile	2010-01-13 18:47:33 UTC (rev 7992)
@@ -23,10 +23,16 @@
 
 include gar/category.mk
 
+ifeq ($(shell uname -p), sparc)
+  PATCHFILE = Makefile.sparc.p
+else
+  PATCHFILE = Makefile.i386.p
+endif
+
 pre-build-modulated:
 	@echo " ==> Pre-build $(GARNAME) (custom)"
 	@( cd $(WORKSRC) ; \
-	   gpatch < ../../../../$(FILEDIR)/Makefile.p )
+	   gpatch < ../../../../$(FILEDIR)/$(PATCHFILE) )
 	@$(MAKECOOKIE)
 
 install-custom:

Added: csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p
===================================================================
--- csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p	                        (rev 0)
+++ csw/mgar/pkg/dnstop/trunk/files/Makefile.i386.p	2010-01-13 18:47:33 UTC (rev 7992)
@@ -0,0 +1,13 @@
+--- Makefile	2010-01-13 17:55:54.574796795 +0100
++++ Makefile	2010-01-13 18:00:42.582082173 +0100
+@@ -2,8 +2,8 @@
+ DATE != date +%Y%m%d
+ 
+ CC=/opt/studio/SOS11/SUNWspro/bin/cc
+-CFLAGS=-xO3 -xarch=386
+-LIBS=-lresolv -lnsl -lsocket -lcurses 
++CFLAGS=-xO3 -xarch=386 -I/opt/csw/include
++LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap
+ OPTFLAGS= -DUSE_IPV6=1
+ 
+ prefix=/opt/csw

Deleted: csw/mgar/pkg/dnstop/trunk/files/Makefile.p
===================================================================
--- csw/mgar/pkg/dnstop/trunk/files/Makefile.p	2010-01-13 18:21:10 UTC (rev 7991)
+++ csw/mgar/pkg/dnstop/trunk/files/Makefile.p	2010-01-13 18:47:33 UTC (rev 7992)
@@ -1,12 +0,0 @@
---- Makefile	2010-01-13 17:55:54.574796795 +0100
-+++ Makefile	2010-01-13 18:00:42.582082173 +0100
-@@ -2,7 +2,7 @@
- 
- CC=/opt/studio/SOS11/SUNWspro/bin/cc
--CFLAGS=-xO3 -xarch=386
--LIBS=-lresolv -lnsl -lsocket -lcurses 
-+CFLAGS=-xO3 -xarch=386 -I/opt/csw/include
-+LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap
- OPTFLAGS= -DUSE_IPV6=1
- 
- prefix=/opt/csw

Added: csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p
===================================================================
--- csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p	                        (rev 0)
+++ csw/mgar/pkg/dnstop/trunk/files/Makefile.sparc.p	2010-01-13 18:47:33 UTC (rev 7992)
@@ -0,0 +1,13 @@
+--- Makefile	2010-01-13 19:25:50.435317055 +0100
++++ Makefile	2010-01-13 19:24:07.075661494 +0100
+@@ -2,9 +2,9 @@
+ DATE != date +%Y%m%d
+ 
+ CC=/opt/studio/SOS11/SUNWspro/bin/cc
+-CFLAGS=-xO3 -xarch=v8
+-LIBS=-lresolv -lnsl -lsocket -lcurses 
++CFLAGS=-xO3 -xarch=v8 -I/opt/csw/include
++LIBS=-lresolv -lnsl -lsocket -lcurses -lpcap
+ OPTFLAGS= -DUSE_IPV6=1
+ 
+ prefix=/opt/csw


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.