4 files changed, 58 insertions, 31 deletions

diff --git a/x11-fm/endeavour/Makefile b/x11-fm/endeavour/Makefile
index 951165009926..3669eecf6125 100644
--- a/x11-fm/endeavour/Makefile
+++ b/x11-fm/endeavour/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	endeavour
-PORTVERSION= 	1.07
+PORTVERSION= 	1.12
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://fox.mit.edu/pub/xsw/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -17,10 +17,11 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	Imlib.5:${PORTSDIR}/graphics/imlib \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/endeavour
 
+USE_X_PREFIX=	yes
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/endeavour ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/endeavour ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11-fm/endeavour/distinfo b/x11-fm/endeavour/distinfo
index 05d9bee62f76..873c77f72ed3 100644
--- a/x11-fm/endeavour/distinfo
+++ b/x11-fm/endeavour/distinfo
@@ -1 +1 @@
-MD5 (endeavour1.07.tgz) = fdcff6ccf3f23dca7566eead5615763d
+MD5 (endeavour1.12.tgz) = ba229b1a96fc97a3d5a88a224c654389
diff --git a/x11-fm/endeavour/files/patch-aa b/x11-fm/endeavour/files/patch-aa
index 6b8dd064ecdf..ecc1e8c8052a 100644
--- a/x11-fm/endeavour/files/patch-aa
+++ b/x11-fm/endeavour/files/patch-aa
@@ -1,41 +1,57 @@
---- Makefile.orig	Thu Oct  7 01:19:46 1999
-+++ Makefile	Thu Oct  7 13:52:49 1999
-@@ -15,9 +15,9 @@
+--- Makefile.orig	Tue Feb  1 19:02:33 2000
++++ Makefile	Wed Jun 21 21:09:33 2000
+@@ -18,7 +18,7 @@
+ #   You may modify any value as needed. Change only the ones you are
+ #   absolutly sure that requires modification.
+ #
+-PREFIX = /usr
++PREFIX ?= /usr
+ 
+ 
  # ########################################################################
- # Libraries:
+@@ -57,8 +57,7 @@
+ #                               this option unless you are attempting
+ #                               to debug the program.
  #
--INC     = -I/usr/include
--LIB     = -lImlib -lpng -ltiff -lgif -ljpeg -lXpm -lXext -lX11 -lz -lm
--LIB_DIR = -L/usr/X11/lib
-+INC     = -I/usr/local/include -I/usr/X11R6/include
-+LIB     = `imlib-config --libs` -lXpm
-+LIB_DIR = -L/usr/X11R6/lib -L/usr/local/lib
+-CFLAGS = -D__USE_BSD -DUSE_XSHM -DUSE_IMLIB \
+-         -O2
++CFLAGS += -D__USE_BSD -DUSE_XSHM -DUSE_IMLIB
  
  
  # ########################################################################
-@@ -37,14 +37,14 @@
- #				internal viewing of many graphics
- #				formats.
+@@ -72,7 +71,7 @@
+ #   to the LIB line depending on what you have set in the CFLAGS line
+ #   farther above.
  #
--CFLAGS  = -O2 -DUSE_XSHM -DUSE_IMLIB -D__USE_BSD -funroll-loops
-+CFLAGS  += -DUSE_XSHM -DUSE_IMLIB -D__USE_BSD -funroll-loops
+-LIB = -lm -lImlib -lpng -ltiff -lgif -ljpeg -lX11 -lXpm -lXext -lz
++LIB = `imlib-config --libs` -lXpm
+ # If you do not have Imlib, comment the above line and uncomment this line.
+ #LIB = -lm -lX11 -lXpm -lXext
+ 
+@@ -83,7 +82,7 @@
+ #   Each argument is of the format -L<dir> where <dir> is the full
+ #   path to the directory.
+ #
+-LIB_DIR = -L/usr/X11R6/lib
++LIB_DIR =
+ 
+ # Header File Directories:
+ #
+@@ -93,7 +92,7 @@
+ #   Each argument is of the format -I<dir> where <dir> is the full
+ #   path to the directory.
+ #
+-INC = -I/usr/include
++INC = `imlib-config --cflags`
  
  
  # ########################################################################
- # Program source and header files:
+@@ -101,7 +100,7 @@
  #
+ include Makefile.srclist
  
 -CC  = gcc
 +CC  ?= gcc
  BIN = endeavour
- SRC = comfdialog.c cursor.c devrec.c dither.c disk.c drag.c edwalloc.c \
-       edwcb.c edwevent.c edwlist.c edwmacros.c edwselect.c fass.c \
-@@ -79,7 +79,7 @@
- INSTMANFLAGS = -m 0444
- INSTDATFLAGS = -m 0444
- 
--DIR_XBIN     = /usr/X11/bin
-+DIR_XBIN     = /usr/X11R6/bin
- 
- 
- # ########################################################################
+ OBJ = $(SRC:.c=.o)
+ .c.o:
diff --git a/x11-fm/endeavour/files/patch-ao b/x11-fm/endeavour/files/patch-ao
new file mode 100644
index 000000000000..3a8097523428
--- /dev/null
+++ b/x11-fm/endeavour/files/patch-ao
@@ -0,0 +1,10 @@
+--- fio.c.orig	Tue Feb  1 19:02:34 2000
++++ fio.c	Wed Jun 21 21:17:15 2000
+@@ -16,7 +16,6 @@
+ */
+ 
+ #include <stdio.h>
+-#include <malloc.h>
+ #include <string.h>
+ 
+ #include "../include/fio.h"