Date: Mon, 11 Sep 2006 04:17:08 GMT From: Shane Bell <decept0@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/103121: [UPDATE] sysutils/filelight : update to 1.0 Message-ID: <200609110417.k8B4H8J0092064@www.freebsd.org> Resent-Message-ID: <200609110420.k8B4KH2l021244@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 103121 >Category: ports >Synopsis: [UPDATE] sysutils/filelight : update to 1.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Sep 11 04:20:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shane Bell >Release: >Organization: >Environment: >Description: Update to 1.0 and take maintainership while im at it. >How-To-Repeat: >Fix: diff -ruN /usr/ports/sysutils/filelight/Makefile filelight/Makefile --- /usr/ports/sysutils/filelight/Makefile Sun Jul 30 15:15:21 2006 +++ filelight/Makefile Mon Sep 11 16:12:39 2006 @@ -6,24 +6,22 @@ # PORTNAME= filelight -PORTVERSION= 0.6.4 -PORTREVISION= 5 +PORTVERSION= 1.0 CATEGORIES= sysutils kde MASTER_SITES= http://www.methylblue.com/filelight/packages/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= decept0@gmail.com COMMENT= Represent a file system as a set of concentric segmented-rings USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool:15 +USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes INSTALLS_ICONS= yes post-patch: - @${CP} ${FILESDIR}/mntent* ${WRKSRC}/src @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \ ${WRKSRC}/${CONFIGURE_SCRIPT} - @${RM} ${WRKSRC}/src/settingsdialog.h ${WRKSRC}/src/settingsdialog.cpp .include <bsd.port.mk> diff -ruN /usr/ports/sysutils/filelight/distinfo filelight/distinfo --- /usr/ports/sysutils/filelight/distinfo Sat Nov 26 23:38:07 2005 +++ filelight/distinfo Mon Sep 11 15:59:36 2006 @@ -1,3 +1,3 @@ -MD5 (filelight-0.6.4.tar.gz) = a45ded39158a3de9762aae1a8333f768 -SHA256 (filelight-0.6.4.tar.gz) = 82a0f0f3e3fffdea3dc0713c30763f4e7b2cad20379babd76ae1b3adfbb5249c -SIZE (filelight-0.6.4.tar.gz) = 694495 +MD5 (filelight-1.0.tar.bz2) = aa885e53e09f40e7fdd371395140b957 +SHA256 (filelight-1.0.tar.bz2) = 0743d49e60a1b2fa7b54ecdc13fb15c7a6fb144169ba272bc566a18022c245d6 +SIZE (filelight-1.0.tar.bz2) = 530449 diff -ruN /usr/ports/sysutils/filelight/files/mntent.h filelight/files/mntent.h --- /usr/ports/sysutils/filelight/files/mntent.h Sat Aug 30 11:43:48 2003 +++ filelight/files/mntent.h Thu Jan 1 12:00:00 1970 @@ -1,67 +0,0 @@ -/* -*-C++-*- - - mntent.h - - Copyright (C) 2002 Alan Eldridge - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - $Id$ - - 2002/09/08 alane@geeksrus.net -*/ - -#ifdef HAVE_MNTENT_H -#include <mntent.h> -#else - -#ifndef mntent_h_ -#define mntent_h_ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <sys/param.h> -#include <sys/ucred.h> -#include <sys/mount.h> - -#define MOUNTED "dummy" -#define MNTTYPE_NFS "nfs" - -const int MOPTSLEN (256 - (MNAMELEN * 2 + MFSNAMELEN + 2 * sizeof(int))); - -struct mntent { -public: - char mnt_fsname[ MNAMELEN ]; - char mnt_dir[ MNAMELEN ]; - char mnt_type[ MFSNAMELEN ]; - char mnt_opts[ MOPTSLEN ]; - int mnt_freq, mnt_passno; -private: - void clear(); -public: - mntent() { - clear(); - } - struct mntent *from_statfs(struct statfs *pst); -}; - -FILE *setmntent(const char *szfn, char *szrw); -struct mntent *getmntent(FILE *pf); -char *hasmntopt(const struct mntent *pmnt, const char *szopt); -int endmntent(FILE *pf); - -#endif /* mntent_h_ */ -#endif /* not HAVE_MNTENT_H */ diff -ruN /usr/ports/sysutils/filelight/files/mntent_compat.cpp filelight/files/mntent_compat.cpp --- /usr/ports/sysutils/filelight/files/mntent_compat.cpp Wed Dec 14 19:05:01 2005 +++ filelight/files/mntent_compat.cpp Thu Jan 1 12:00:00 1970 @@ -1,156 +0,0 @@ -/* -*-C++-*- - - mntentemu.c++ - - Copyright (C) 2002 Alan Eldridge - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - $Id: mntent_compat.cc,v 1.3 2002/09/08 18:42:20 alane Exp $ - - 2002/09/08 alane@geeksrus.net -*/ - -#ifndef HAVE_MNTENT_H - -#include "config.h" -#include "mntent.h" - -#include <string> - -// globals (yuck, but easier for debugging) - -mntent G_mntent; -int G_mntpos; -int G_mntsize; -bool G_mntfOpen = false; -struct statfs *G_pmntstat = 0; - -// map option flags to names - -struct optmap { - int fl; - std::string st; -}; - -static struct optmap omap[] = { - { MNT_SYNCHRONOUS, "sync" }, - { MNT_NOEXEC, "noexec" }, - { MNT_NOSUID, "nosuid" }, -#ifdef MNT_NODEV - { MNT_NODEV, "nodev" }, -#endif - { MNT_UNION, "union" }, - { MNT_ASYNC, "async" }, - { MNT_NOATIME, "noatime" }, - { MNT_NOCLUSTERR, "noclusterr" }, - { MNT_NOCLUSTERW, "noclusterw" }, - { MNT_NOSYMFOLLOW, "nosymfollow" }, - { MNT_SUIDDIR, "suiddir" }, - { 0, "noop" } -}; - -// zap everything for clarity - -void -mntent::clear() -{ - memset(mnt_fsname, 0, sizeof(mnt_fsname)); - memset(mnt_dir, 0, sizeof(mnt_dir)); - memset(mnt_type, 0, sizeof(mnt_type)); - memset(mnt_opts, 0, sizeof(mnt_opts)); - mnt_freq = mnt_passno = 0; -} - -// fake it from a statfs struct - -mntent * -mntent::from_statfs(struct statfs *pst) -{ - - clear(); - strcpy(mnt_fsname, pst->f_mntfromname); - strcpy(mnt_dir, pst->f_mntonname); - strcpy(mnt_type, pst->f_fstypename); - mnt_freq = mnt_passno = 0; - - std::string opts; - int fl = pst->f_flags; - - opts += (fl & MNT_RDONLY) ? "ro" : "rw"; - for (optmap *pmp = omap; pmp->fl != 0; pmp++) { - if ((fl & pmp->fl) != 0) { - opts += (" " + pmp->st); - } - } - strcpy(mnt_opts, opts.c_str()); - - return this; -} - -// "rewind" the mtab file - -FILE * -setmntent(const char *, char *) -{ - if (!G_mntfOpen) { - G_mntfOpen = true; - } - - G_mntpos = 0; - G_mntsize = getmntinfo(&G_pmntstat, MNT_NOWAIT); - - return reinterpret_cast<FILE *>(1); -} - -// return ptr to opt string if present - -char * -hasmntopt(const mntent *pmnt, const char *szopt) -{ - std::string opt(szopt); - std::string mntopts(pmnt->mnt_opts); - - std::string::size_type pos = mntopts.find(opt); - const char *szret = (pos == std::string::npos) ? "" : pmnt->mnt_opts + pos; - - return const_cast<char *>(szret); -} - -// get next mntent until all gone, then return 0 - -struct mntent * -getmntent(FILE *) -{ - if (!G_mntfOpen) { - return 0; - } else if (G_mntpos < G_mntsize) { - return G_mntent.from_statfs(G_pmntstat + G_mntpos++); - } else { - G_mntfOpen = false; - return 0; - } -} - -// "close" the mtab file - -int -endmntent(FILE *) -{ - G_mntfOpen = false; - return 0; -} - -#endif /* ifndef HAVE_MNTENT_H */ diff -ruN /usr/ports/sysutils/filelight/files/patch-canvas.h filelight/files/patch-canvas.h --- /usr/ports/sysutils/filelight/files/patch-canvas.h Sat Aug 14 11:21:21 2004 +++ filelight/files/patch-canvas.h Thu Jan 1 12:00:00 1970 @@ -1,11 +0,0 @@ ---- src/canvas.h.orig Sat Aug 14 00:36:14 2004 -+++ src/canvas.h Sat Aug 14 00:36:19 2004 -@@ -97,6 +97,8 @@ - KAction *m_actKonsole; - KAction *m_actCenter; - KAction *m_actRun; -+ -+ friend class FileMap; - }; - - #endif diff -ruN /usr/ports/sysutils/filelight/files/patch-filemap.h filelight/files/patch-filemap.h --- /usr/ports/sysutils/filelight/files/patch-filemap.h Sat Aug 14 11:21:21 2004 +++ filelight/files/patch-filemap.h Thu Jan 1 12:00:00 1970 @@ -1,11 +0,0 @@ ---- src/filemap.h.orig Sat Aug 14 00:36:51 2004 -+++ src/filemap.h Sat Aug 14 00:37:29 2004 -@@ -68,6 +68,8 @@ - double deltaRed, deltaGreen, deltaBlue; - - unsigned int MAP_2MARGIN; -+ -+ friend class Segment; - }; - - diff -ruN /usr/ports/sysutils/filelight/files/patch-scanmanager.cpp filelight/files/patch-scanmanager.cpp --- /usr/ports/sysutils/filelight/files/patch-scanmanager.cpp Mon Jan 19 05:36:32 2004 +++ filelight/files/patch-scanmanager.cpp Thu Jan 1 12:00:00 1970 @@ -1,23 +0,0 @@ ---- src/scanmanager.cpp.orig Wed Jan 14 01:58:11 2004 -+++ src/scanmanager.cpp Wed Jan 14 02:03:36 2004 -@@ -29,7 +29,11 @@ - //readMounts() - #include <fstab.h> - #include <mntent.h> -+#ifdef __FreeBSD__ -+#include "mntent_compat.cpp" -+#else - #include <sys/statfs.h> -+#endif - - #include "scanmanager.h" - #include "filetree.h" -@@ -359,7 +363,7 @@ - - - --static int selector( struct DIRENT const *ent ) -+static int selector( struct DIRENT *ent ) - { - if( strcmp( ent->d_name, "." ) == 0 || strcmp( ent->d_name, ".." ) == 0 ) - return 0; diff -ruN /usr/ports/sysutils/filelight/files/patch-scanmanager.h filelight/files/patch-scanmanager.h --- /usr/ports/sysutils/filelight/files/patch-scanmanager.h Sat Aug 14 11:21:21 2004 +++ filelight/files/patch-scanmanager.h Thu Jan 1 12:00:00 1970 @@ -1,11 +0,0 @@ ---- src/scanmanager.h.orig Fri Aug 13 23:50:09 2004 -+++ src/scanmanager.h Sat Aug 14 00:32:26 2004 -@@ -65,6 +65,8 @@ - static bool readMounts(); - private: - static QStringList localMounts, remoteMounts; -+ -+ friend class ScanThread; - }; - - diff -ruN /usr/ports/sysutils/filelight/pkg-plist filelight/pkg-plist --- /usr/ports/sysutils/filelight/pkg-plist Sun Jul 30 15:15:21 2006 +++ filelight/pkg-plist Mon Sep 11 16:13:39 2006 @@ -1,30 +1,16 @@ bin/filelight -share/applnk/Utilities/filelight.desktop +lib/kde3/libfilelight.a +lib/kde3/libfilelight.la +lib/kde3/libfilelight.so +share/applications/kde/filelight.desktop +share/apps/filelight/filelight_partui.rc share/apps/filelight/filelightui.rc share/config/filelightrc -share/doc/HTML/en/filelight/common -share/doc/HTML/en/filelight/index.cache.bz2 -share/doc/HTML/en/filelight/index.docbook -share/icons/crystalsvg/22x22/apps/filelight.png -share/icons/crystalsvg/48x48/apps/filelight.png -share/icons/crystalsvg/64x64/apps/filelight.png -share/locale/cy/LC_MESSAGES/filelight.mo -share/locale/de/LC_MESSAGES/filelight.mo -share/locale/nl/LC_MESSAGES/filelight.mo -share/locale/ru/LC_MESSAGES/filelight.mo -@dirrmtry share/icons/crystalsvg/64x64/apps -@dirrmtry share/icons/crystalsvg/64x64 -@dirrmtry share/icons/crystalsvg/48x48/apps -@dirrmtry share/icons/crystalsvg/48x48 -@dirrmtry share/icons/crystalsvg/22x22/apps -@dirrmtry share/icons/crystalsvg/22x22 -@dirrmtry share/icons/crystalsvg -@dirrmtry share/icons -@dirrm share/doc/HTML/en/filelight -@dirrmtry share/doc/HTML/en -@dirrmtry share/doc/HTML -@dirrmtry share/config +share/icons/crystalsvg/32x32/actions/view_filelight.png +share/icons/hicolor/16x16/apps/filelight.png +share/icons/hicolor/22x22/apps/filelight.png +share/icons/hicolor/32x32/apps/filelight.png +share/icons/hicolor/48x48/apps/filelight.png +share/icons/hicolor/64x64/apps/filelight.png +share/services/filelight_part.desktop @dirrm share/apps/filelight -@dirrmtry share/apps -@dirrmtry share/applnk/Utilities -@dirrmtry share/applnk >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609110417.k8B4H8J0092064>