17 files changed, 25 insertions, 226 deletions

diff --git a/x11-fm/endeavour/Makefile b/x11-fm/endeavour/Makefile
index 8c3489216ddf..1035f67e928b 100644
--- a/x11-fm/endeavour/Makefile
+++ b/x11-fm/endeavour/Makefile
@@ -6,22 +6,35 @@
 #
 
 PORTNAME=	endeavour
-PORTVERSION=	1.12
-PORTREVISION=	1
+PORTVERSION=	1.13.0
 CATEGORIES=	x11-fm
-MASTER_SITES=	ftp://fox.mit.edu/pub/xsw/
+MASTER_SITES=	ftp://wolfpack.twu.net/users/wolfpack/
 DISTNAME=	${PORTNAME}${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/endeavour
-
-USE_IMLIB=	yes
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_IMLIB=	yes
+USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	unix
+MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}" CPP="${CXX}" \
+		CFLAGS="${CFLAGS} -D__USE_BSD -DUSE_XSHM -DUSE_IMLIB" \
+		INC_DIRS="`imlib-config --cflags` -I${X11BASE}/include" \
+		LIBS="`imlib-config --libs` -lXpm" \
+		LIB_DIRS="-L${X11BASE}/lib"
+
+pre-patch:
+	@${PERL} -pi -e 's|make |\$$\(MAKE\) |g' ${WRKSRC}/Makefile
+	@find ${WRKSRC}/endeavour -type f | xargs ${PERL} -pi -e \
+		's|#include <malloc.h>||g ; \
+		 s|#include <asm/types.h>||g ; \
+		 s|#include <sys/bitypes.h>||g ; \
+		 s|umode_t|unsigned short|g'
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/endeavour ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/endeavour/endeavour ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/x11-fm/endeavour/distinfo b/x11-fm/endeavour/distinfo
index 873c77f72ed3..f2148a9ffd0c 100644
--- a/x11-fm/endeavour/distinfo
+++ b/x11-fm/endeavour/distinfo
@@ -1 +1 @@
-MD5 (endeavour1.12.tgz) = ba229b1a96fc97a3d5a88a224c654389
+MD5 (endeavour1.13.0.tar.bz2) = 953006f987d58d58f51fee34ba8e9ca1
diff --git a/x11-fm/endeavour/files/patch-aa b/x11-fm/endeavour/files/patch-aa
deleted file mode 100644
index ecc1e8c8052a..000000000000
--- a/x11-fm/endeavour/files/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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
- 
- 
- # ########################################################################
-@@ -57,8 +57,7 @@
- #                               this option unless you are attempting
- #                               to debug the program.
- #
--CFLAGS = -D__USE_BSD -DUSE_XSHM -DUSE_IMLIB \
--         -O2
-+CFLAGS += -D__USE_BSD -DUSE_XSHM -DUSE_IMLIB
- 
- 
- # ########################################################################
-@@ -72,7 +71,7 @@
- #   to the LIB line depending on what you have set in the CFLAGS line
- #   farther above.
- #
--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`
- 
- 
- # ########################################################################
-@@ -101,7 +100,7 @@
- #
- include Makefile.srclist
- 
--CC  = gcc
-+CC  ?= gcc
- BIN = endeavour
- OBJ = $(SRC:.c=.o)
- .c.o:
diff --git a/x11-fm/endeavour/files/patch-ab b/x11-fm/endeavour/files/patch-ab
index c51ff121ff08..a4fdbc39cb35 100644
--- a/x11-fm/endeavour/files/patch-ab
+++ b/x11-fm/endeavour/files/patch-ab
@@ -1,5 +1,5 @@
---- devrec.c.orig	Thu Oct  7 01:19:47 1999
-+++ devrec.c	Thu Oct  7 13:52:49 1999
+--- endeavour/devrec.cpp.orig	Sat May 26 07:03:07 2001
++++ endeavour/devrec.cpp	Thu Jun  7 00:50:17 2001
 @@ -389,8 +389,9 @@
  			capacity_available = atol(strv[3]);
  
diff --git a/x11-fm/endeavour/files/patch-ad b/x11-fm/endeavour/files/patch-ad
deleted file mode 100644
index 9867669040f7..000000000000
--- a/x11-fm/endeavour/files/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
---- endeavour.h.orig	Thu Oct  7 01:19:46 1999
-+++ endeavour.h	Thu Oct  7 13:52:49 1999
-@@ -9,17 +9,16 @@
- 
- 
- 
-+#include <sys/types.h>
- #include <stdio.h>
- #include <errno.h>
- extern int errno;
- #include <unistd.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <time.h>
- extern char *tzname[2];
- #include <signal.h>
--#include <asm/types.h>
- 
- #ifdef USE_IMLIB
- 	#include "../include/Imlibosw.h"
-@@ -475,7 +474,7 @@
- 
- 	/* Stats. */
-         ino_t inode;        /* Inode. */
--        umode_t mode;       /* Mode/permissions/type. */
-+        unsigned short mode;       /* Mode/permissions/type. */
-  
-         nlink_t nlink;      /* Number of hard links. */
-         uid_t uid;          /* User ID of owner */
diff --git a/x11-fm/endeavour/files/patch-ae b/x11-fm/endeavour/files/patch-ae
deleted file mode 100644
index 295bcb81a15c..000000000000
--- a/x11-fm/endeavour/files/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
---- fass.h.orig	Thu Oct  7 01:19:46 1999
-+++ fass.h	Thu Oct  7 13:52:49 1999
-@@ -2,12 +2,10 @@
- #define FASS_H
- 
- 
-+#include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <malloc.h>
--
--#include <sys/bitypes.h>
- 
- #ifdef __linux__
-     #include <linux/limits.h>
diff --git a/x11-fm/endeavour/files/patch-af b/x11-fm/endeavour/files/patch-af
deleted file mode 100644
index b9e825ede771..000000000000
--- a/x11-fm/endeavour/files/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
---- id.h.orig	Thu Oct  7 01:19:47 1999
-+++ id.h	Thu Oct  7 13:52:49 1999
-@@ -5,7 +5,6 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <string.h>
--#include <malloc.h>
- #include <grp.h>
- #include <pwd.h>
- #include <sys/types.h>
diff --git a/x11-fm/endeavour/files/patch-ag b/x11-fm/endeavour/files/patch-ag
deleted file mode 100644
index 56753d8650b8..000000000000
--- a/x11-fm/endeavour/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- object.h.orig	Thu Oct  7 01:19:47 1999
-+++ object.h	Thu Oct  7 13:52:49 1999
-@@ -11,7 +11,7 @@
-         char *link_dest;    /* Destination if this is a symlink. */
-  
-         ino_t inode;        /* Inode. */
--        umode_t mode;       /* Mode/permissions/type. */
-+        unsigned short mode;       /* Mode/permissions/type. */
-  
-         nlink_t nlink;      /* Number of hard links. */
-         uid_t uid;          /* User ID of owner */
diff --git a/x11-fm/endeavour/files/patch-ah b/x11-fm/endeavour/files/patch-ah
deleted file mode 100644
index 2024a9a1239d..000000000000
--- a/x11-fm/endeavour/files/patch-ah
+++ /dev/null
@@ -1,10 +0,0 @@
---- osw-x.c.orig	Thu Oct  7 01:19:46 1999
-+++ osw-x.c	Thu Oct  7 13:52:49 1999
-@@ -271,7 +271,6 @@
- */
- 
- #include <stdio.h>
--#include <malloc.h>
- #include <stdlib.h>   
- #include <string.h>
- #include <unistd.h>
diff --git a/x11-fm/endeavour/files/patch-ai b/x11-fm/endeavour/files/patch-ai
deleted file mode 100644
index fc611caf4028..000000000000
--- a/x11-fm/endeavour/files/patch-ai
+++ /dev/null
@@ -1,10 +0,0 @@
---- prochandle.c.orig	Thu Oct  7 01:19:46 1999
-+++ prochandle.c	Thu Oct  7 13:52:49 1999
-@@ -29,7 +29,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <malloc.h>
- #include <unistd.h>
- #include <signal.h>
- 
diff --git a/x11-fm/endeavour/files/patch-aj b/x11-fm/endeavour/files/patch-aj
deleted file mode 100644
index cc52e37ea5af..000000000000
--- a/x11-fm/endeavour/files/patch-aj
+++ /dev/null
@@ -1,20 +0,0 @@
---- propdialog.c.orig	Thu Oct  7 01:19:47 1999
-+++ propdialog.c	Thu Oct  7 13:52:49 1999
-@@ -457,7 +457,7 @@
- {
- 	int i, len;
- 	int status;
--	umode_t mode;
-+	unsigned short mode;
- 	char stringa[1024];
- 	char old_name[PATH_MAX + NAME_MAX];
- 	char tmp_path[PATH_MAX + NAME_MAX];
-@@ -1388,7 +1388,7 @@
- 	static win_attr_t wattr;
- 	char stringa[1024];
- 	static image_t *image, *image2;
--	static umode_t mode;
-+	static unsigned short mode;
- 
- 
-         if(!IDC() ||
diff --git a/x11-fm/endeavour/files/patch-ak b/x11-fm/endeavour/files/patch-ak
deleted file mode 100644
index 61d10ac52c72..000000000000
--- a/x11-fm/endeavour/files/patch-ak
+++ /dev/null
@@ -1,10 +0,0 @@
---- recbin.h.orig	Thu Oct  7 01:19:47 1999
-+++ recbin.h	Thu Oct  7 13:52:49 1999
-@@ -15,7 +15,6 @@
- extern int errno;
- #include <unistd.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <time.h>
- extern char *tzname[2];
diff --git a/x11-fm/endeavour/files/patch-al b/x11-fm/endeavour/files/patch-al
deleted file mode 100644
index cec8b0db530d..000000000000
--- a/x11-fm/endeavour/files/patch-al
+++ /dev/null
@@ -1,10 +0,0 @@
---- string.c.orig	Thu Oct  7 01:19:46 1999
-+++ string.c	Thu Oct  7 13:52:49 1999
-@@ -62,7 +62,6 @@
- 
- 
- #include <stdio.h>
--#include <malloc.h>
- #include <string.h>
- #include <stdlib.h>
- #include <ctype.h>
diff --git a/x11-fm/endeavour/files/patch-am b/x11-fm/endeavour/files/patch-am
deleted file mode 100644
index 8d8b55a59b5b..000000000000
--- a/x11-fm/endeavour/files/patch-am
+++ /dev/null
@@ -1,10 +0,0 @@
---- tga.c.orig	Thu Oct  7 01:19:46 1999
-+++ tga.c	Thu Oct  7 13:52:49 1999
-@@ -48,7 +48,6 @@
- 
- 
- #include <stdio.h>
--#include <malloc.h>
- #include <string.h>
- #include <db.h>
- #include <sys/types.h>
diff --git a/x11-fm/endeavour/files/patch-an b/x11-fm/endeavour/files/patch-an
deleted file mode 100644
index fbcb919f7fb5..000000000000
--- a/x11-fm/endeavour/files/patch-an
+++ /dev/null
@@ -1,10 +0,0 @@
---- wfbrowser.c.orig	Thu Oct  7 01:19:46 1999
-+++ wfbrowser.c	Thu Oct  7 13:52:49 1999
-@@ -62,7 +62,6 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
- #include <fnmatch.h>
- #include <sys/stat.h>
- 
diff --git a/x11-fm/endeavour/files/patch-ao b/x11-fm/endeavour/files/patch-ao
deleted file mode 100644
index 3a8097523428..000000000000
--- a/x11-fm/endeavour/files/patch-ao
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
diff --git a/x11-fm/endeavour/pkg-descr b/x11-fm/endeavour/pkg-descr
index 6519781fcd8b..2dd4d3118b1e 100644
--- a/x11-fm/endeavour/pkg-descr
+++ b/x11-fm/endeavour/pkg-descr
@@ -2,4 +2,4 @@ Endeavour is a graphical file manager and image viewer
 for X.  It is aimed towards newer users who have a strong
 Windows background.
 
-WWW: http://fox.mit.edu/xsw/edv.htm
+WWW: http://wolfpack.twu.net/Endeavour/