ports/60074: Update port: x11/erun

[KATO Tsuguru]

>Number:         60074
>Category:       ports
>Synopsis:       Update port: x11/erun
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 09 06:20:05 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.9-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Fix build ageinst newer version of libepplet

Remove files:
files/patch-aa

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/x11/erun/Makefile x11/erun/Makefile
--- /usr/ports/x11/erun/Makefile	Sun Nov  2 19:38:40 2003
+++ x11/erun/Makefile	Tue Dec  9 19:09:34 2003
@@ -19,6 +19,15 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_X_PREFIX=	yes
-USE_GNOME=	imlib
+
+CPPFLAGS=	-I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${X11BASE}/lib -lepplet ${PTHREAD_LIBS}
+
+do-build:
+	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \
+		${PORTNAME}.c ${LDFLAGS}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}.epplet ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff -urN /usr/ports/x11/erun/files/patch-aa x11/erun/files/patch-aa
--- /usr/ports/x11/erun/files/patch-aa	Mon Jul 10 13:01:52 2000
+++ x11/erun/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,30 +0,0 @@
---- 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)
>Release-Note:
>Audit-Trail:
>Unformatted: