Update to version 1.1.2;

Cosmetic changes;
Switch CC behaviour from patch to port Makefile;
Take maintainership, agreed by previous MAINTAINER.

brad@ ok
This commit is contained in:
margarida 2002-12-22 01:30:45 +00:00
parent 3ff9b85c4f
commit 9196b0caff
3 changed files with 19 additions and 34 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.8 2002/12/09 15:37:23 brad Exp $
# $OpenBSD: Makefile,v 1.9 2002/12/22 01:30:45 margarida Exp $
COMMENT= "graphical reverse polish notation calculator"
DISTNAME= grpn-1.1.1
DISTNAME= grpn-1.1.2
CATEGORIES= math x11
MAINTAINER= Mark Grimes <mark@stateful.net>
HOMEPAGE= http://lashwhip.com/grpn.html
MASTER_SITES= http://lashwhip.com/grpn/
HOMEPAGE= http://lashwhip.com/grpn.html
MAINTAINER= Margarida Sequeira <margarida@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
@ -19,6 +19,9 @@ PERMIT_DISTFILES_FTP= Yes
LIB_DEPENDS= gtk.1.2,gdk.1.2::x11/gtk+
MAKE_FLAGS= CC="${CC}"
ALL_TARGET=
NO_REGRESS= Yes
do-install:

View File

@ -1,3 +1,3 @@
MD5 (grpn-1.1.1.tar.gz) = 5f710560fa1500c2f9774179fdc0b6a6
RMD160 (grpn-1.1.1.tar.gz) = aff25d37db41c86292a59e07e0c4e1f30375d71d
SHA1 (grpn-1.1.1.tar.gz) = e112c33437196305a6624a4945a7f3086481920f
MD5 (grpn-1.1.2.tar.gz) = a602f1e4dd3138ba2fe745e14b217039
RMD160 (grpn-1.1.2.tar.gz) = 28a432ec8e4d2095a59440c4e401f12f85d75249
SHA1 (grpn-1.1.2.tar.gz) = c7a6b89d9d9316f89d02b000b77e35a48ec3343b

View File

@ -1,41 +1,23 @@
$OpenBSD: patch-Makefile,v 1.3 2002/09/03 08:30:49 mark Exp $
--- Makefile.orig Mon May 31 18:46:31 1999
+++ Makefile Mon Sep 2 23:43:52 2002
@@ -3,7 +3,7 @@
# Please read the next few lines and enter the correct values.
# What compiler should be used
-CC = gcc
+#CC = gcc
# Where to find the gtk-config script
GTK_DIR =
@@ -17,9 +17,7 @@ GTK_DIR =
$OpenBSD: patch-Makefile,v 1.4 2002/12/22 01:30:45 margarida Exp $
--- Makefile.orig Fri Apr 5 04:56:05 2002
+++ Makefile Sun Dec 22 01:06:20 2002
@@ -20,9 +20,7 @@ GTK_DIR =
# add -DUSE_GNOME if you want to make grpn GNOME compliant.
-CFLAGS = -g -O2 -I/usr/X11/include `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1
-
-DFLAGS = -L/usr/X11/lib
+CFLAGS += `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1
+CFLAGS +=`$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1
# end of user configurable section
@@ -36,7 +34,7 @@ OBJS = test_gtk_ver.o real.o complex.o m
@@ -41,7 +39,7 @@ LIBS = `$(GTK_DIR)gtk-config --libs` -
LIBS = `$(GTK_DIR)gtk-config --libs` -lX11 -lm
-
+all: grpn
grpn: $(OBJS)
$(CC) $(DFLAGS) -o $@ $(OBJS) $(LIBS)
- $(CC) $(DFLAGS) -o $@ $(OBJS) $(LIBS)
+ $(CC) -o $@ $(OBJS) $(LIBS)
@@ -44,8 +42,6 @@ pure: $(OBJS)
pure: $(OBJS)
$(PURIFY) $(CC) $(DFLAGS) -o $@ $(OBJS) $(LIBS)
install: grpn
- cp grpn /usr/local/bin
- chmod 755 /usr/local/bin/grpn
.c.o:
$(CC) -c -o $@ $(CFLAGS) $*.c