summaryrefslogtreecommitdiff
path: root/www/erwn
diff options
context:
space:
mode:
Diffstat (limited to 'www/erwn')
-rw-r--r--www/erwn/Makefile2
-rw-r--r--www/erwn/files/patch-aa25
2 files changed, 19 insertions, 8 deletions
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index d28184fc728d..22bfbe473e81 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -19,9 +19,9 @@ GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
USE_GMAKE= yes
+MAKE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
- @strip ${PREFIX}/bin/erwin
.if !defined(NOPORTDOCS)
@${ECHO} "===> Installing README in ${PREFIX}/share/doc/erwin"
@${MKDIR} ${PREFIX}/share/doc/erwin && ${CHMOD} a+rx ${PREFIX}/share/doc/erwin
diff --git a/www/erwn/files/patch-aa b/www/erwn/files/patch-aa
index c98fcd3edbeb..7d20775801f7 100644
--- a/www/erwn/files/patch-aa
+++ b/www/erwn/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Sat Jul 24 15:33:08 1999
-+++ Makefile Sun Sep 19 13:48:47 1999
+--- Makefile.orig Sun Jul 25 05:33:08 1999
++++ Makefile Sat Jul 1 17:57:20 2000
@@ -2,14 +2,14 @@
bindir = $(prefix)/bin
@@ -10,23 +10,34 @@
OBJS = erwin.o erwinmenu.o erwinfunctions.o erwintoolbar.o \
erwinnotebook.o erwindialogs.o erwintags.o gtkmessage.o
INSTALL = install
- DEBUG = -g -DDEBUG
+-DEBUG = -g -DDEBUG
++DEBUG = # -g -DDEBUG
-CFLAGS = -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -m486 -fno-strength-reduce -malign-functions=4 -malign-jumps=4 -malign-loops=4 -ffast-math -fexpensive-optimizations
-+CFLAGS = -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -fno-strength-reduce -ffast-math -fexpensive-optimizations
++CFLAGS += -DNAME=\"$(NAME)\" $(DEBUG) -fno-strength-reduce -ffast-math -fexpensive-optimizations
all: license $(PROG)
-@@ -28,10 +28,10 @@
+@@ -17,8 +17,7 @@
+ strip $(PROG)
+
+ install: strip
+- $(INSTALL) -d $(bindir)
+- $(INSTALL) -m 0755 $(PROG) $(bindir)
++ ${BSD_INSTALL_PROGRAM} $(PROG) $(bindir)
+
+ uninstall:
+
+@@ -28,10 +27,10 @@
rm -f $(PROG) $(OBJS) *.?~ core license.h
$(PROG): $(OBJS)
- $(CC) $(LDFLAGS) $(shell gtk-config --libs) -o $@ $(OBJS)
-+ $(CC) $(LDFLAGS) $(shell gtk12-config --libs) -o $@ $(OBJS)
++ $(CC) $(LDFLAGS) `$(GTK_CONFIG) --libs` -o $@ $(OBJS)
%.o: %.c
- $(CC) $(CFLAGS) $(shell gtk-config --cflags) -o $@ -c $<
-+ $(CC) $(CFLAGS) $(shell gtk12-config --cflags) -o $@ -c $<
++ $(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -o $@ -c $<
tar: clean
cd ..; ln -s erwin $(NAME);tar cf - $(NAME)/* > $(NAME).tar;rm $(NAME);gzip -f $(NAME).tar