X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f531e1f34432bcc2fb63b6e1c8ce2f203c52b68b..2427a1a5f9baffc8a4faf578dbdb5b618e23ed53:/package/comgt/patches/001-Makefile.patch

diff --git a/package/comgt/patches/001-Makefile.patch b/package/comgt/patches/001-Makefile.patch
index c3723fa46..ed3e9183d 100644
--- a/package/comgt/patches/001-Makefile.patch
+++ b/package/comgt/patches/001-Makefile.patch
@@ -1,126 +1,88 @@
-diff -rhNp comgt.0.32/Makefile gcom-032/Makefile
-*** comgt.0.32/Makefile	2007-02-10 19:07:58.723709368 +0100
---- gcom-032/Makefile	2007-02-10 19:18:26.764232696 +0100
-***************
-*** 1,7 ****
-  #
-! #   Makefile - build and install the comgt package
-  #   Copyright (C) 2005  Martin Gregorie
-- #   Copyright (C) 2006  Paul Hardwick
-  #
-  #   This program is free software; you can redistribute it and/or modify
-  #   it under the terms of the GNU General Public License as published by
---- 1,6 ----
-  #
-! #   Makefile - build and install the gmon package
-  #   Copyright (C) 2005  Martin Gregorie
-  #
-  #   This program is free software; you can redistribute it and/or modify
-  #   it under the terms of the GNU General Public License as published by
-***************
-*** 17,79 ****
-  #    along with this program; if not, write to the Free Software
-  #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  #
-! #    martin@gregorie.org, paul@peck.org.uk
-  #
-! #    $Id: Makefile,v 1.4 2006/10/20 14:30:19 pharscape Exp $
-  #
-- #
-- 
-- LIB     = -L/usr/local/lib
-- INC     = -I/usr/local/include
-  EXE	= /usr/local/bin
-  MAN     = /usr/share/man/man1
-! CPROG	= comgt
-! SCRIPTPATH = /etc/comgt/
-! SCRIPTSRC = ./scripts/
-! BIN     = $(CPROG) 
-! MANP	= comgt.1 sigmon.1
-! 
-! CFLAGS  = -c
-! LDFLAGS =
-  
-  all: $(BIN)
-  
-  install:
-  	chmod a-w $(BIN)
-  	chmod u+rw $(BIN)
-  	chmod a+x $(BIN)
-! 	cp $(BIN) $(EXE)
-  	chmod a-wx $(MANP)
-  	chmod u+rw $(MANP)
-  	chmod a+r $(MANP)
-  	cp $(MANP) $(MAN)
-- 	-mkdir $(SCRIPTPATH)
-- 	chmod a-w $(SCRIPTPATH)
-- 	chmod u+rw $(SCRIPTPATH)
-- 	chmod a+x $(SCRIPTPATH)
-- 	cp -f $(SCRIPTSRC)* $(SCRIPTPATH)
-- 	chmod a-w $(SCRIPTPATH)*
-- 	chmod u+rw $(SCRIPTPATH)*
-- 	chmod a+x $(SCRIPTPATH)*
-- 
-- 
-- 
-  
-  uninstall:
-  	cd $(EXE); rm $(BIN)
-  	cd $(MAN); rm $(MANP)
-- 	-rm -r $(SCRIPTPATH)
-  
-  clean:
-! 	-rm *.o 
-! 	-rm $(CPROG) 
-! 	-rm *~
-! 	-rm $(SCRIPTSRC)*~
-  
-  
-! comgt: comgt.o
-! 	cc comgt.o $(LDFLAGS) -o comgt
-  
-! comgt.o: comgt.c comgt.h
-! 	cc comgt.c $(CFLAGS) 
-  
---- 16,56 ----
-  #    along with this program; if not, write to the Free Software
-  #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  #
-! #    martin@gregorie.org
-  #
-! #	$Id$
-  #
-  EXE	= /usr/local/bin
-  MAN     = /usr/share/man/man1
-! CPROG	= gcom
-! SCRIPT  = sigmon
-! BIN     = $(CPROG) $(SCRIPT)
-! MANP	= gcom.1 sigmon.1
-  
-  all: $(BIN)
-  
-  install:
-+ 	mv ($BIN} {$BIN2}
-  	chmod a-w $(BIN)
-  	chmod u+rw $(BIN)
-  	chmod a+x $(BIN)
-! 	cp $(BIN) $(EXE)/gcom
-  	chmod a-wx $(MANP)
-  	chmod u+rw $(MANP)
-  	chmod a+r $(MANP)
-  	cp $(MANP) $(MAN)
-  
-  uninstall:
-  	cd $(EXE); rm $(BIN)
-  	cd $(MAN); rm $(MANP)
-  
-  clean:
-! 	rm *.o $(CPROG)
-  
-  
-! gcom: gcom.o
-! 	$(CC) gcom.o $(LDFLAGS) -o gcom
-  
-! gcom.o: comgt.c comgt.h
-! 	$(CC) -c $(CFLAGS) comgt.c -o gcom.o
-  
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,6 @@
+ #
+-#   Makefile - build and install the comgt package
++#   Makefile - build and install the gmon package
+ #   Copyright (C) 2005  Martin Gregorie
+-#   Copyright (C) 2006  Paul Hardwick
+ #
+ #   This program is free software; you can redistribute it and/or modify
+ #   it under the terms of the GNU General Public License as published by
+@@ -17,63 +16,41 @@
+ #    along with this program; if not, write to the Free Software
+ #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #
+-#    martin@gregorie.org, paul@peck.org.uk
++#    martin@gregorie.org
+ #
+-#    $Id: Makefile,v 1.4 2006/10/20 14:30:19 pharscape Exp $
++#	$Id$
+ #
+-#
+-
+-LIB     = -L/usr/local/lib
+-INC     = -I/usr/local/include
+ EXE	= /usr/local/bin
+ MAN     = /usr/share/man/man1
+-CPROG	= comgt
+-SCRIPTPATH = /etc/comgt/
+-SCRIPTSRC = ./scripts/
+-BIN     = $(CPROG) 
+-MANP	= comgt.1 sigmon.1
+-
+-CFLAGS  = -c
+-LDFLAGS =
++CPROG	= gcom
++SCRIPT  = sigmon
++BIN     = $(CPROG) $(SCRIPT)
++MANP	= gcom.1 sigmon.1
+ 
+ all: $(BIN)
+ 
+ install:
++	mv ($BIN} {$BIN2}
+ 	chmod a-w $(BIN)
+ 	chmod u+rw $(BIN)
+ 	chmod a+x $(BIN)
+-	cp $(BIN) $(EXE)
++	cp $(BIN) $(EXE)/gcom
+ 	chmod a-wx $(MANP)
+ 	chmod u+rw $(MANP)
+ 	chmod a+r $(MANP)
+ 	cp $(MANP) $(MAN)
+-	-mkdir $(SCRIPTPATH)
+-	chmod a-w $(SCRIPTPATH)
+-	chmod u+rw $(SCRIPTPATH)
+-	chmod a+x $(SCRIPTPATH)
+-	cp -f $(SCRIPTSRC)* $(SCRIPTPATH)
+-	chmod a-w $(SCRIPTPATH)*
+-	chmod u+rw $(SCRIPTPATH)*
+-	chmod a+x $(SCRIPTPATH)*
+-
+-
+-
+ 
+ uninstall:
+ 	cd $(EXE); rm $(BIN)
+ 	cd $(MAN); rm $(MANP)
+-	-rm -r $(SCRIPTPATH)
+ 
+ clean:
+-	-rm *.o 
+-	-rm $(CPROG) 
+-	-rm *~
+-	-rm $(SCRIPTSRC)*~
++	rm *.o $(CPROG)
+ 
+ 
+-comgt: comgt.o
+-	cc comgt.o $(LDFLAGS) -o comgt
++gcom: gcom.o
++	$(CC) gcom.o $(LDFLAGS) -o gcom
+ 
+-comgt.o: comgt.c comgt.h
+-	cc comgt.c $(CFLAGS) 
++gcom.o: comgt.c comgt.h
++	$(CC) -c $(CFLAGS) comgt.c -o gcom.o
+