This is a patch to update x11-fm/dfm port. diff -Nru dfm/Makefile dfm-0.9.10/Makefile --- dfm/Makefile Fri Aug 7 22:33:11 1998 +++ dfm-0.9.10/Makefile Sat Aug 8 16:50:36 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: dfm -# Version required: 0.9.8 +# Version required: 0.9.10 # Date created: 25 May 1998 # Whom: Andrey Zakhvatov # # $Id: Makefile,v 1.3 1998/08/07 22:33:11 asami Exp $ # -DISTNAME= dfm-0.9.8 +DISTNAME= dfm-0.9.10 CATEGORIES= x11-fm MASTER_SITES= http://www-c.informatik.uni-hannover.de/~kaiser/dfm/ diff -Nru dfm/files/md5 dfm-0.9.10/files/md5 --- dfm/files/md5 Thu Jun 11 03:41:58 1998 +++ dfm-0.9.10/files/md5 Sat Aug 8 16:50:42 1998 @@ -1 +1 @@ -MD5 (dfm-0.9.8.tar.gz) = 8535c6ac6c6d60fb659cc0bfdd0ecace +MD5 (dfm-0.9.10.tar.gz) = 56c89293b2c5e9c6019a30d5a117955c diff -Nru dfm/patches/patch-ac dfm-0.9.10/patches/patch-ac --- dfm/patches/patch-ac Thu Jun 11 03:41:58 1998 +++ dfm-0.9.10/patches/patch-ac Thu Jun 11 03:41:58 1998 @@ -1,9 +1,38 @@ ---- utils/Makefile.in.orig Sat May 2 09:45:36 1998 -+++ utils/Makefile.in Wed Jun 10 23:25:08 1998 -@@ -1,5 +1,5 @@ - INCLUDEPATHS = -I. -I/usr/include/X11 -I/usr/local/include\ ---I/usr/openwin/include -I/usr/openwin/include/X11 -I/usr/X11R6/include\ -+-I/usr/openwin/include -I/usr/X11R6/include/X11 -I/usr/X11R6/include\ - -I/usr/X11R6/include/X11 - LIBRARYPATHS = -L/usr/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib +--- src/extension.c Mon Jan 26 20:16:26 1998 ++++ /home/andy/tmp/wrk/src/extension.c Fri May 29 22:38:43 1998 +@@ -32,7 +32,7 @@ + /* search dfmext */ + if ((pfext=fopen("./.dfmext", "r")) == NULL) +- if ((pfext=fopen("/usr/etc/dfmext", "r")) == NULL) ++ if ((pfext=fopen("/usr/X11R6/share/dfm/dfmext", "r")) == NULL) + if ((pfext=fopen("/usr/share/dfm/dfmext", "r")) == NULL) + if ((pfext=fopen("/usr/local/share/dfm/dfmext", "r")) == NULL) + if ((pfext=fopen("/usr/local/etc/dfmext", "r")) == NULL) +@@ -124,20 +124,20 @@ + } + if (*icon==NULL || *start==NULL) { + if (filename[strlen(filename)-1]=='/') { +- *icon=malloc(strlen("/usr/X11/lib/X11/dfm/icons/icon_folder.xpm")+1); +- strcpy(*icon,"/usr/X11/lib/X11/dfm/icons/icon_folder.xpm"); ++ *icon=malloc(strlen("/usr/X11R6/share/dfm/icons/icon_folder.xpm")+1); ++ strcpy(*icon,"/usr/X11R6/share/dfm/icons/icon_folder.xpm"); + *start=malloc(strlen("dfm !0!")+1); + strcpy(*start,"dfm !0!"); + } else { + lstat(fullname2,&info); + if ((info.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))!=0) { +- *icon=malloc(strlen("/usr/X11/lib/X11/dfm/icons/icon_binary.xpm")+1); +- strcpy(*icon,"/usr/X11/lib/X11/dfm/icons/icon_binary.xpm"); ++ *icon=malloc(strlen("/usr/X11R6/share/dfm/icons/icon_binary.xpm")+1); ++ strcpy(*icon,"/usr/X11R6/share/dfm/icons/icon_binary.xpm"); + *start=malloc(strlen("!0!")+1); + strcpy(*start,"!0!"); + } else { +- *icon=malloc(strlen("/usr/X11/lib/X11/dfm/icons/icon_file.xpm")+1); +- strcpy(*icon,"/usr/X11/lib/X11/dfm/icons/icon_file.xpm"); ++ *icon=malloc(strlen("/usr/X11R6/share/dfm/icons/icon_file.xpm")+1); ++ strcpy(*icon,"/usr/X11R6/share/dfm/icons/icon_file.xpm"); + *start=malloc(strlen("xedit !0!")+1); + strcpy(*start,"xedit !0!"); + } diff -Nru dfm/patches/patch-ad dfm-0.9.10/patches/patch-ad --- dfm/patches/patch-ad Thu Jun 11 03:41:58 1998 +++ dfm-0.9.10/patches/patch-ad Sat Aug 8 17:02:15 1998 @@ -1,38 +1,11 @@ ---- src/extension.c Mon Jan 26 20:16:26 1998 -+++ /home/andy/tmp/wrk/src/extension.c Fri May 29 22:38:43 1998 -@@ -32,7 +32,7 @@ - - /* search dfmext */ - if ((pfext=fopen("./.dfmext", "r")) == NULL) -- if ((pfext=fopen("/usr/etc/dfmext", "r")) == NULL) -+ if ((pfext=fopen("/usr/X11R6/share/dfm/dfmext", "r")) == NULL) - if ((pfext=fopen("/usr/share/dfm/dfmext", "r")) == NULL) - if ((pfext=fopen("/usr/local/share/dfm/dfmext", "r")) == NULL) - if ((pfext=fopen("/usr/local/etc/dfmext", "r")) == NULL) -@@ -124,20 +124,20 @@ - } - if (*icon==NULL || *start==NULL) { - if (filename[strlen(filename)-1]=='/') { -- *icon=malloc(strlen("/usr/X11/lib/X11/dfm/icons/icon_folder.xpm")+1); -- strcpy(*icon,"/usr/X11/lib/X11/dfm/icons/icon_folder.xpm"); -+ *icon=malloc(strlen("/usr/X11R6/share/dfm/icons/icon_folder.xpm")+1); -+ strcpy(*icon,"/usr/X11R6/share/dfm/icons/icon_folder.xpm"); - *start=malloc(strlen("dfm !0!")+1); - strcpy(*start,"dfm !0!"); - } else { - lstat(fullname2,&info); - if ((info.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))!=0) { -- *icon=malloc(strlen("/usr/X11/lib/X11/dfm/icons/icon_binary.xpm")+1); -- strcpy(*icon,"/usr/X11/lib/X11/dfm/icons/icon_binary.xpm"); -+ *icon=malloc(strlen("/usr/X11R6/share/dfm/icons/icon_binary.xpm")+1); -+ strcpy(*icon,"/usr/X11R6/share/dfm/icons/icon_binary.xpm"); - *start=malloc(strlen("!0!")+1); - strcpy(*start,"!0!"); - } else { -- *icon=malloc(strlen("/usr/X11/lib/X11/dfm/icons/icon_file.xpm")+1); -- strcpy(*icon,"/usr/X11/lib/X11/dfm/icons/icon_file.xpm"); -+ *icon=malloc(strlen("/usr/X11R6/share/dfm/icons/icon_file.xpm")+1); -+ strcpy(*icon,"/usr/X11R6/share/dfm/icons/icon_file.xpm"); - *start=malloc(strlen("xedit !0!")+1); - strcpy(*start,"xedit !0!"); - } +--- src/filemanager.c Mon Aug 3 20:33:39 1998 ++++ /home/andy/tmp/wrk/src/filemanager.c Sat Aug 8 16:58:22 1998 +@@ -327,7 +327,7 @@ + texta=GenerateBackslashName(addfolder); + textf=GenerateBackslashName(filename); + if (status!=0 || move==False) { +-#ifdef LINUX ++#if (defined(LINUX) || defined(__FreeBSD__)) + text=malloc(strlen("cp -rpdf ")+strlen(textf)+strlen(textp)+ + strlen(texta)+2); + strcpy(text,"cp -rpdf "); diff -Nru dfm/patches/patch-ae dfm-0.9.10/patches/patch-ae --- dfm/patches/patch-ae Thu Jan 1 00:00:00 1970 +++ dfm-0.9.10/patches/patch-ae Thu Jun 11 03:41:58 1998 @@ -0,0 +1,9 @@ +--- utils/Makefile.in.orig Sat May 2 09:45:36 1998 ++++ utils/Makefile.in Wed Jun 10 23:25:08 1998 +@@ -1,5 +1,5 @@ + INCLUDEPATHS = -I. -I/usr/include/X11 -I/usr/local/include\ +--I/usr/openwin/include -I/usr/openwin/include/X11 -I/usr/X11R6/include\ ++-I/usr/openwin/include -I/usr/X11R6/include/X11 -I/usr/X11R6/include\ + -I/usr/X11R6/include/X11 + LIBRARYPATHS = -L/usr/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib + diff -Nru dfm/pkg/DESCR dfm-0.9.10/pkg/DESCR --- dfm/pkg/DESCR Thu Jun 11 03:42:00 1998 +++ dfm-0.9.10/pkg/DESCR Sat Aug 8 17:10:32 1998 @@ -1,8 +1,6 @@ -DFM is a desktopmanager for X Window System. Files are shown -as icons and every folder has it's own window. The desktopbackground -is a special folder in the homedirectory. - -The idea is to write a filemanager like the OS/2 WPS. +DFM is Desktop File Manager for X Window System. It works like the +OS/2 WPS. Files are shown as icons and every folder has it's own +window. Desktop background is a special folder in the home directory. Here are some features: @@ -13,6 +11,8 @@ * "Constant position" icons that cannot be moved (or arranged) * easy adding new programs to the desktop * Offix DND support +* Detail View / Structure View +* ... -Homepage: http://www-c.informatik.uni-hannover.de/~kaiser/dfm/dfm.html +http://www-c.informatik.uni-hannover.de/~kaiser/dfm/dfm.html Fix: Please, check and apply this patch.
State Changed From-To: open->closed Update committed, thanks!