[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / math / grpn / patches

File: [cvs.NetBSD.org] / pkgsrc / math / grpn / patches / patch-aa (download)

Revision 1.4, Sun Nov 15 13:32:17 2009 UTC (12 years, 2 months ago) by drochner
Branch: MAIN
CVS Tags: pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4
Changes since 1.3: +25 -8 lines

update to 1.2
changes:
-Added deg, rad, pol and rect commands
-Added engineer notation
-New function "mod"=remainder introduced
-minor cleanup
-Locale determines the decimal separator point or comma
-Compiles against gtk2

pkgsrc change: DESTDIR support

$NetBSD: patch-aa,v 1.4 2009/11/15 13:32:17 drochner Exp $

--- Makefile.orig	2009-11-14 01:25:54.000000000 +0100
+++ Makefile
@@ -3,10 +3,10 @@
 # Please read the next few lines and enter the correct values.
 
 # where to install GRPN
-PREFIX = /usr/local/
+#PREFIX = /usr/local/
 
 # What compiler should be used
-CC = gcc 
+#CC = gcc 
 
 # Where to find the gtk-config script
 GTK_DIR =
@@ -20,9 +20,10 @@ GTK_DIR =
 # add -DUSE_GNOME if you want to make grpn GNOME compliant.
 
 
-CFLAGS = -g -O2 -I/usr/include/X11  `$(GTK_DIR)pkg-config --cflags gtk+-2.0` -DGTK_VER_2_0 
+#CFLAGS = -g -O2 -I/usr/include/X11  `$(GTK_DIR)pkg-config --cflags gtk+-2.0` -DGTK_VER_2_0 
+CFLAGS+= `pkg-config --cflags gtk+-2.0` -DGTK_VER_2_0
 
-DFLAGS =  -L/usr/lib/X11 
+#DFLAGS =  -L/usr/lib/X11 
 
 # end of user configurable section
 
@@ -49,12 +50,10 @@ pure:	$(OBJS)
 	$(PURIFY) $(CC) $(DFLAGS) -o $@ $(OBJS) $(LIBS) 
 
 install:	grpn
-	mkdirhier $(PREFIX)/bin
-	cp grpn $(PREFIX)/bin
-	chmod 755 $(PREFIX)/bin/grpn
-	mkdirhier $(PREFIX)/man/man1
-	cp grpn.1 $(PREFIX)/man/man1
-	chmod 644 $(PREFIX)/man/man1/grpn.1
+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/bin
+	$(BSD_INSTALL_PROGRAM) grpn $(DESTDIR)$(PREFIX)/bin
+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/man/man1
+	$(BSD_INSTALL_DATA) grpn.1 $(DESTDIR)$(PREFIX)/man/man1
 
 .c.o:
 	$(CC) -c -o $@ $(CFLAGS) $*.c