Date: Mon, 11 Jun 2001 09:38:48 -0700 (PDT) From: tkato@prontomail.com To: freebsd-gnats-submit@FreeBSD.org Subject: ports/28064: Update port: x11-fm/endeavour to 1.30.0 Message-ID: <200106111638.f5BGcmD84267@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 28064 >Category: ports >Synopsis: Update port: x11-fm/endeavour to 1.30.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jun 11 09:40:14 PDT 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.30.0 Remove file: files/patch-aa files/patch-ac files/patch-ad files/patch-ae files/patch-af files/patch-ag files/patch-ah files/patch-ai files/patch-aj files/patch-ak files/patch-al files/patch-am files/patch-an files/patch-ao >How-To-Repeat: >Fix: diff -urN /usr/ports/x11-fm/endeavour/Makefile x11-fm/endeavour/Makefile --- /usr/ports/x11-fm/endeavour/Makefile Mon May 7 19:40:05 2001 +++ x11-fm/endeavour/Makefile Thu Jun 7 03:09:21 2001 @@ -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 -urN /usr/ports/x11-fm/endeavour/distinfo x11-fm/endeavour/distinfo --- /usr/ports/x11-fm/endeavour/distinfo Fri Jun 30 20:52:13 2000 +++ x11-fm/endeavour/distinfo Thu Jun 7 00:21:44 2001 @@ -1 +1 @@ -MD5 (endeavour1.12.tgz) = ba229b1a96fc97a3d5a88a224c654389 +MD5 (endeavour1.13.0.tar.bz2) = 953006f987d58d58f51fee34ba8e9ca1 diff -urN /usr/ports/x11-fm/endeavour/files/patch-aa x11-fm/endeavour/files/patch-aa --- /usr/ports/x11-fm/endeavour/files/patch-aa Fri Jun 30 20:52:15 2000 +++ x11-fm/endeavour/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-ab x11-fm/endeavour/files/patch-ab --- /usr/ports/x11-fm/endeavour/files/patch-ab Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-ab Thu Jun 7 01:03:33 2001 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-ac x11-fm/endeavour/files/patch-ac --- /usr/ports/x11-fm/endeavour/files/patch-ac Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,10 +0,0 @@ ---- disk.c.orig Thu Oct 7 01:19:46 1999 -+++ disk.c Thu Oct 7 13:52:49 1999 -@@ -39,7 +39,6 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <malloc.h> - #include <string.h> - #include <ctype.h> - #include <fcntl.h> diff -urN /usr/ports/x11-fm/endeavour/files/patch-ad x11-fm/endeavour/files/patch-ad --- /usr/ports/x11-fm/endeavour/files/patch-ad Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-ad Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-ae x11-fm/endeavour/files/patch-ae --- /usr/ports/x11-fm/endeavour/files/patch-ae Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-ae Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-af x11-fm/endeavour/files/patch-af --- /usr/ports/x11-fm/endeavour/files/patch-af Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-af Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-ag x11-fm/endeavour/files/patch-ag --- /usr/ports/x11-fm/endeavour/files/patch-ag Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-ag Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-ah x11-fm/endeavour/files/patch-ah --- /usr/ports/x11-fm/endeavour/files/patch-ah Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-ah Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-ai x11-fm/endeavour/files/patch-ai --- /usr/ports/x11-fm/endeavour/files/patch-ai Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-ai Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-aj x11-fm/endeavour/files/patch-aj --- /usr/ports/x11-fm/endeavour/files/patch-aj Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-aj Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-ak x11-fm/endeavour/files/patch-ak --- /usr/ports/x11-fm/endeavour/files/patch-ak Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-ak Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-al x11-fm/endeavour/files/patch-al --- /usr/ports/x11-fm/endeavour/files/patch-al Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-al Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-am x11-fm/endeavour/files/patch-am --- /usr/ports/x11-fm/endeavour/files/patch-am Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-am Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-an x11-fm/endeavour/files/patch-an --- /usr/ports/x11-fm/endeavour/files/patch-an Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/files/patch-an Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/files/patch-ao x11-fm/endeavour/files/patch-ao --- /usr/ports/x11-fm/endeavour/files/patch-ao Fri Jun 30 20:52:15 2000 +++ x11-fm/endeavour/files/patch-ao Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11-fm/endeavour/pkg-descr x11-fm/endeavour/pkg-descr --- /usr/ports/x11-fm/endeavour/pkg-descr Fri Oct 8 06:04:48 1999 +++ x11-fm/endeavour/pkg-descr Thu Jun 7 00:19:07 2001 @@ -2,4 +2,4 @@ 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/ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200106111638.f5BGcmD84267>