Date: Mon, 26 Apr 1999 12:23:45 +0400 (MSD) From: Andrey Zakhvatov <andy@icc.surw.chel.su> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11326: Update port: x11-fm/dfm Message-ID: <199904260823.MAA64648@icc.surw.chel.su>
next in thread | raw e-mail | index | archive | help
>Number: 11326 >Category: ports >Synopsis: Update port: x11-fm/dfm >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 Apr 26 01:30:00 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Andrey Zakhvatov >Release: FreeBSD 3.1-RELEASE i386 >Organization: South Ural Railway ICC >Environment: >Description: This is a patch to update x11-fm/dfm port. diff -Nru dfm/Makefile dfm-0.99.1/Makefile --- dfm/Makefile Thu Jan 7 14:35:21 1999 +++ dfm-0.99.1/Makefile Mon Apr 26 11:54:52 1999 @@ -6,14 +6,21 @@ # $Id: Makefile,v 1.10 1999/01/07 08:19:53 simokawa Exp $ # -DISTNAME= dfm-0.9.10 +DISTNAME= dfm-0.99.1 CATEGORIES= x11-fm MASTER_SITES= http://www-c.informatik.uni-hannover.de/~kaiser/dfm/ MAINTAINER= andy@icc.surw.chel.su LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - xforms.0:${PORTSDIR}/x11-toolkits/xforms + intl.1:${PORTSDIR}/devel/gettext \ + gmodule12.1:${PORTSDIR}/devel/glib12 \ + glib12.1:${PORTSDIR}/devel/glib12 \ + gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ + gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 + +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${X11BASE}/include" GTK_CONFIG="${X11BASE}/bin/gtk12-config" # depends on xforms ONLY_FOR_ARCHS= i386 @@ -24,28 +31,15 @@ MAN1= dfm.1 -do-configure: - @ cd ${WRKSRC}; ./config - -do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/dfm ${PREFIX}/bin - @ ${INSTALL_MAN} ${WRKSRC}/dfm.1x ${PREFIX}/man/man1/dfm.1 - @ ${MKDIR} ${PREFIX}/share/dfm - @ ${MKDIR} ${PREFIX}/share/dfm/backgrounds - @ ${INSTALL_DATA} ${WRKSRC}/share/backgrounds/*.xpm ${PREFIX}/share/dfm/backgrounds - @ ${MKDIR} ${PREFIX}/share/dfm/icons - @ ${INSTALL_DATA} ${WRKSRC}/share/icons/*.xpm ${PREFIX}/share/dfm/icons - @ ${MKDIR} ${PREFIX}/share/dfm/icons/Appicons - @ ${INSTALL_DATA} ${WRKSRC}/share/icons/Appicons/*.xpm ${PREFIX}/share/dfm/icons/Appicons - @ ${MKDIR} ${PREFIX}/share/dfm/icons/Moreicons - @ ${INSTALL_DATA} ${WRKSRC}/share/icons/Moreicons/*.xpm ${PREFIX}/share/dfm/icons/Moreicons +post-install: + @ ${MV} ${PREFIX}/man/man1/dfm.1x ${PREFIX}/man/man1/dfm.1 @ ${MKDIR} ${PREFIX}/share/examples/dfm - @ ${INSTALL_DATA} ${WRKSRC}/extensions/dfmext_local ${PREFIX}/share/examples/dfm/dfmext.sample.local - @ ${INSTALL_DATA} ${WRKSRC}/extensions/dfmext_normal ${PREFIX}/share/examples/dfm/dfmext.sample.normal - @ ${INSTALL_DATA} ${WRKSRC}/extensions/dfmext_user ${PREFIX}/share/examples/dfm/dfmext.sample.user + @ ${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_local ${PREFIX}/share/examples/dfm/dfmext.sample.local + @ ${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_normal ${PREFIX}/share/examples/dfm/dfmext.sample.normal + @ ${INSTALL_DATA} ${WRKSRC}/dfmext-samples/dfmext_user ${PREFIX}/share/examples/dfm/dfmext.sample.user .if !defined(NOPORTDOCS) @ ${MKDIR} ${PREFIX}/share/doc/dfm -.for file in ANNOUNCE BUGS COPYING COPYRIGHT CREDITS HELP.ERROR NO_WARRANTY README START TESTED TODO +.for file in ANNOUNCE BUGS COPYING COPYRIGHT CREDITS ChangeLog DOWNLOAD HELP.ERROR NO_WARRANTY README START TESTED TODO @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/dfm .endfor .endif diff -Nru dfm/files/md5 dfm-0.99.1/files/md5 --- dfm/files/md5 Sun Aug 9 14:30:19 1998 +++ dfm-0.99.1/files/md5 Sat Apr 24 18:13:08 1999 @@ -1 +1 @@ -MD5 (dfm-0.9.10.tar.gz) = 56c89293b2c5e9c6019a30d5a117955c +MD5 (dfm-0.99.1.tar.gz) = 69107be951265fc35db868cd2272304f diff -Nru dfm/patches/patch-aa dfm-0.99.1/patches/patch-aa --- dfm/patches/patch-aa Thu Jun 11 07:41:58 1998 +++ dfm-0.99.1/patches/patch-aa Thu Jan 1 03:00:00 1970 @@ -1,32 +0,0 @@ ---- config.orig Sat May 2 09:45:37 1998 -+++ config Wed Jun 10 23:27:18 1998 -@@ -4,6 +4,7 @@ - mname=`uname -m` - - case $name in -+ *FreeBSD) echo "SYSTEM = -DFREEBSD" > src/Makefile;; - *Linux) echo "SYSTEM = -DLINUX" > src/Makefile;; - *SunOS) echo "SYSTEM = -DSUNOS" > src/Makefile;; - *IRIX) echo "SYSTEM = -DIRIX" > src/Makefile;; -@@ -16,12 +17,6 @@ - **) mnamed="";; - esac - --if type gcc; then -- echo "CC = gcc -O2 -Wall -pedantic "$mnamed >> src/Makefile --else -- echo "CC = cc -O2" >> src/Makefile --fi -- - if [ -f /usr/include/zlib.h ] || [ -f /usr/local/include/zlib.h ]; then - if [ -f /usr/lib/libz.so ] || [ -f /usr/local/lib/libz.so ]; then - echo "LIBGZIP = -lz" >> src/Makefile -@@ -47,7 +42,7 @@ - make clean - - echo --if [ $name = "Linux" ] || [ $name = "SunOS" ] || [ $name = "IRIX" ]; then -+if [ $name = "Linux" ] || [ $name = "SunOS" ] || [ $name = "FreeBSD" ] || [ $name = "IRIX" ]; then - echo "'$name' has been successfully configured." - echo "Now type 'make'. If it won't work try to edit the" - echo "Makefile in src/ and mail me." diff -Nru dfm/patches/patch-ab dfm-0.99.1/patches/patch-ab --- dfm/patches/patch-ab Thu Jun 11 07:41:58 1998 +++ dfm-0.99.1/patches/patch-ab Thu Jan 1 03:00:00 1970 @@ -1,18 +0,0 @@ ---- src/Makefile.in.orig Mon Jun 1 07:02:58 1998 -+++ src/Makefile.in Wed Jun 10 23:22:30 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 - -@@ -14,7 +14,7 @@ - positionarrange.o arcwindow.o fnmatch.o gui.o options.o\ - selectcolor.o shellgui.o ClientWin.o handler.o rubwindow.o - --LIBRARYS = -lforms -lXpm -lX11 -lm -lXext $(LIBGZIP) -+LIBRARYS = -lxforms -lXpm -lX11 -lm -lXext $(LIBGZIP) - - all:../dfm - diff -Nru dfm/patches/patch-ac dfm-0.99.1/patches/patch-ac --- dfm/patches/patch-ac Sun Aug 9 14:30:20 1998 +++ dfm-0.99.1/patches/patch-ac Thu Jan 1 03:00:00 1970 @@ -1,38 +0,0 @@ ---- 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.99.1/patches/patch-ad --- dfm/patches/patch-ad Sun Aug 9 14:30:20 1998 +++ dfm-0.99.1/patches/patch-ad Thu Jan 1 03:00:00 1970 @@ -1,11 +0,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.99.1/patches/patch-ae --- dfm/patches/patch-ae Sun Aug 9 05:00:32 1998 +++ dfm-0.99.1/patches/patch-ae Thu Jan 1 03:00:00 1970 @@ -1,9 +0,0 @@ ---- 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/PLIST dfm-0.99.1/pkg/PLIST --- dfm/pkg/PLIST Thu Aug 20 14:27:08 1998 +++ dfm-0.99.1/pkg/PLIST Mon Apr 26 12:12:07 1999 @@ -1,4 +1,5 @@ bin/dfm +share/dfm/dfmext share/dfm/backgrounds/background2.xpm share/dfm/backgrounds/blues.xpm share/dfm/backgrounds/flock.xpm @@ -10,13 +11,17 @@ share/dfm/icons/icon_binary.xpm share/dfm/icons/icon_binary_ms.xpm share/dfm/icons/icon_bitmap.xpm +share/dfm/icons/icon_blitz.xpm share/dfm/icons/icon_c.xpm share/dfm/icons/icon_cc.xpm share/dfm/icons/icon_core.xpm share/dfm/icons/icon_document.xpm share/dfm/icons/icon_document_tex.xpm +share/dfm/icons/icon_document_lout.xpm share/dfm/icons/icon_document_lyx.xpm share/dfm/icons/icon_document_print.xpm +share/dfm/icons/icon_document_spreadsheet.xpm +share/dfm/icons/icon_document_spreadsheet2.xpm share/dfm/icons/icon_editor.xpm share/dfm/icons/icon_file.xpm share/dfm/icons/icon_fig.xpm @@ -31,6 +36,7 @@ share/dfm/icons/icon_o.xpm share/dfm/icons/icon_pdf.xpm share/dfm/icons/icon_phone.xpm +share/dfm/icons/icon_php3.xpm share/dfm/icons/icon_picture.xpm share/dfm/icons/icon_printer.xpm share/dfm/icons/icon_ps.xpm @@ -45,6 +51,22 @@ share/dfm/icons/Appicons/x11amp-icon3.xpm share/dfm/icons/Appicons/xcalc.xpm share/dfm/icons/Appicons/xv.xpm +share/dfm/icons/FileManagerIcons/file.bak.xpm +share/dfm/icons/FileManagerIcons/file.c.xpm +share/dfm/icons/FileManagerIcons/file.cc.xpm +share/dfm/icons/FileManagerIcons/file.gimp5.xpm +share/dfm/icons/FileManagerIcons/file.gz.xpm +share/dfm/icons/FileManagerIcons/file.html3.xpm +share/dfm/icons/FileManagerIcons/file.o.xpm +share/dfm/icons/FileManagerIcons/file.picture.xpm +share/dfm/icons/FileManagerIcons/file.picture2.xpm +share/dfm/icons/FileManagerIcons/file.ps.xpm +share/dfm/icons/FileManagerIcons/file.tar.xpm +share/dfm/icons/FileManagerIcons/file.text.xpm +share/dfm/icons/FileManagerIcons/file.tgz.xpm +share/dfm/icons/FileManagerIcons/file.xpm +share/dfm/icons/FileManagerIcons/folder.xpm +share/dfm/icons/FileManagerIcons/trash.empty.xpm share/dfm/icons/Moreicons/ColoredCompactDisc.xpm share/dfm/icons/Moreicons/DiskFloppy.xpm share/dfm/icons/Moreicons/FilingCabinet.xpm @@ -86,6 +108,8 @@ share/doc/dfm/COPYING share/doc/dfm/COPYRIGHT share/doc/dfm/CREDITS +share/doc/dfm/ChangeLog +share/doc/dfm/DOWNLOAD share/doc/dfm/HELP.ERROR share/doc/dfm/NO_WARRANTY share/doc/dfm/README @@ -97,6 +121,7 @@ share/examples/dfm/dfmext.sample.user @dirrm share/dfm/backgrounds @dirrm share/dfm/icons/Appicons +@dirrm share/dfm/icons/FileManagerIcons @dirrm share/dfm/icons/Moreicons @dirrm share/dfm/icons @dirrm share/dfm >How-To-Repeat: >Fix: Please, check and apply this patch. >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?199904260823.MAA64648>