Attachment #37840 for bug #60074

View | Details | Raw Unified | Return to bug 60074
Collapse All | Expand All

Lines 19-24 Link Here

(-)x11/erun/Makefile (-1 / +10 lines)
19	WRKSRC= ${WRKDIR}/${PORTNAME}	19	WRKSRC= ${WRKDIR}/${PORTNAME}
20		20
21	USE_X_PREFIX= yes	21	USE_X_PREFIX= yes
22	USE_GNOME= imlib	22
		23	CPPFLAGS= -I${X11BASE}/include ${PTHREAD_CFLAGS}
		24	LDFLAGS= -L${X11BASE}/lib -lepplet ${PTHREAD_LIBS}
		25
		26	do-build:
		27	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \
		28	${PORTNAME}.c ${LDFLAGS}
		29
		30	do-install:
		31	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.epplet ${PREFIX}/bin
23		32
24	.include <bsd.port.mk>	33	.include <bsd.port.mk>




--- Makefile.orig	Tue Dec 14 11:14:20 1999
+++ Makefile	Sun Jun 18 01:38:17 2000
@@ -1,12 +1,17 @@
-CFLAGS = -O3 -g
-LINKFLAGS = -lepplet
+CFLAGS ?= -O3 -g
+LINKFLAGS = -lepplet -L/usr/X11R6/lib
+INCLUDEDIRS = -I/usr/X11R6/include
 
-CC = gcc
+CFLAGS += $(INCLUDEDIRS)
+
+CC ?= gcc
 
 EXEC_NAME = E-Run.epplet
 EXEC_OBJECTS = E-Run.o
 
-INSTALL_DIR = /usr/local/bin
+PREFIX ?= /usr/local
+INSTALL_DIR = ${PREFIX}/bin
+INSTALL_PROGRAM ?= install -c -m 755
 
 all: $(EXEC_OBJECTS)
 	$(CC) -o $(EXEC_NAME) $(EXEC_OBJECTS) $(LINKFLAGS)
@@ -15,4 +20,4 @@
 	rm -f $(EXEC_OBJECTS) $(EXEC_NAME) *~
 
 install:
-	install -o root -m 0555 $(EXEC_NAME) $(INSTALL_DIR)
+	$(INSTALL_PROGRAM) $(EXEC_NAME) $(INSTALL_DIR)

Return to bug 60074

Lines 1-30 Link Here

(-)x11/erun/files/patch-aa (-30 lines)
1	--- Makefile.orig Tue Dec 14 11:14:20 1999
2	+++ Makefile Sun Jun 18 01:38:17 2000
3	@@ -1,12 +1,17 @@
4	-CFLAGS = -O3 -g
5	-LINKFLAGS = -lepplet
6	+CFLAGS ?= -O3 -g
7	+LINKFLAGS = -lepplet -L/usr/X11R6/lib
8	+INCLUDEDIRS = -I/usr/X11R6/include
9
10	-CC = gcc
11	+CFLAGS += $(INCLUDEDIRS)
12	+
13	+CC ?= gcc
14
15	EXEC_NAME = E-Run.epplet
16	EXEC_OBJECTS = E-Run.o
17
18	-INSTALL_DIR = /usr/local/bin
19	+PREFIX ?= /usr/local
20	+INSTALL_DIR = ${PREFIX}/bin
21	+INSTALL_PROGRAM ?= install -c -m 755
22
23	all: $(EXEC_OBJECTS)
24	$(CC) -o $(EXEC_NAME) $(EXEC_OBJECTS) $(LINKFLAGS)
25	@@ -15,4 +20,4 @@
26	rm -f $(EXEC_OBJECTS) $(EXEC_NAME) *~
27
28	install:
29	- install -o root -m 0555 $(EXEC_NAME) $(INSTALL_DIR)
30	+ $(INSTALL_PROGRAM) $(EXEC_NAME) $(INSTALL_DIR)