ports/56546: [maintainer update] sysutils/filelight to 0.6.1

Markus Brueffer brueffer at phoenix-systems.de
Sat Sep 6 23:20:09 UTC 2003


>Number:         56546
>Category:       ports
>Synopsis:       [maintainer update] sysutils/filelight to 0.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 06 16:20:03 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Markus Brueffer
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD cheops.phoenix 5.1-CURRENT FreeBSD 5.1-CURRENT #5: Tue Sep 2 00:46:07 CEST 2003 brueffer at cheops.phoenix:/usr/obj/usr/src/sys/CHEOPS i386

>Description:
	Update sysutils/filelight to 0.6.1

>How-To-Repeat:
>Fix:

--- filelight.diff begins here ---
diff -ruN filelight.orig/Makefile filelight/Makefile
--- filelight.orig/Makefile	Sun Sep  7 00:18:06 2003
+++ filelight/Makefile	Sun Sep  7 00:18:20 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	filelight
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://www.methylblue.com/filelight/
 
diff -ruN filelight.orig/distinfo filelight/distinfo
--- filelight.orig/distinfo	Sun Sep  7 00:18:06 2003
+++ filelight/distinfo	Sun Sep  7 01:06:33 2003
@@ -1 +1 @@
-MD5 (filelight-0.6.0.tar.gz) = 9d3a35ce1125aac971ba61fd5cc7bcd8
+MD5 (filelight-0.6.1.tar.gz) = f9d16e9e73c55adb2ecb430529e05b28
diff -ruN filelight.orig/files/patch-filelight.cpp filelight/files/patch-filelight.cpp
--- filelight.orig/files/patch-filelight.cpp	Thu Jan  1 01:00:00 1970
+++ filelight/files/patch-filelight.cpp	Sun Sep  7 00:36:32 2003
@@ -0,0 +1,11 @@
+--- filelight/filelight.cpp.orig	Sun Sep  7 00:25:14 2003
++++ filelight/filelight.cpp	Sun Sep  7 00:34:47 2003
+@@ -539,7 +539,7 @@
+       //stop progress update timer
+       m_progressTimer->stop();
+       
+-      Directory* tree = ((scanCompleteEvent*)e)->tree();
++      Directory* tree = const_cast<Directory*>(((scanCompleteEvent*)e)->tree());
+ 
+       //some tree integrity checking before we send the all clear to the UI
+       if( tree == NULL )
diff -ruN filelight.orig/files/patch-filelight::Makefile.in filelight/files/patch-filelight::Makefile.in
--- filelight.orig/files/patch-filelight::Makefile.in	Sun Sep  7 00:18:06 2003
+++ filelight/files/patch-filelight::Makefile.in	Sun Sep  7 00:41:12 2003
@@ -1,121 +1,137 @@
---- filelight/Makefile.in.orig	Fri Aug 29 17:42:18 2003
-+++ filelight/Makefile.in	Fri Aug 29 20:42:07 2003
+--- filelight/Makefile.in.orig	Sun Sep  7 00:37:59 2003
++++ filelight/Makefile.in	Sun Sep  7 00:40:22 2003
 @@ -239,12 +239,12 @@
  ####### kdevelop will overwrite this part!!! (begin)##########
  bin_PROGRAMS = filelight
  
--#>- filelight_SOURCES = settingsdlg.cpp settingsdialog.ui filemap.cpp segmenttip.cpp scanbox.cpp filetree.cpp filelightcanvas.cpp filelight.cpp main.cpp 
-+#>- filelight_SOURCES = settingsdlg.cpp settingsdialog.ui filemap.cpp segmenttip.cpp scanbox.cpp filetree.cpp filelightcanvas.cpp filelight.cpp main.cpp mntent_compat.cpp
+-#>- filelight_SOURCES = canvasevents.cpp canvas.cpp settings.cpp scanthread.cpp settingsdlg.cpp settingsdialog.ui filemap.cpp segmenttip.cpp scanbox.cpp filelight.cpp main.cpp 
++#>- filelight_SOURCES = canvasevents.cpp canvas.cpp settings.cpp scanthread.cpp settingsdlg.cpp settingsdialog.ui filemap.cpp segmenttip.cpp scanbox.cpp filelight.cpp main.cpp mntent_compat.cpp
  #>+ 1
--filelight_SOURCES=settingsdlg.cpp  filemap.cpp segmenttip.cpp scanbox.cpp filetree.cpp filelightcanvas.cpp filelight.cpp main.cpp  settingsdialog.cpp
-+filelight_SOURCES=settingsdlg.cpp  filemap.cpp segmenttip.cpp scanbox.cpp filetree.cpp filelightcanvas.cpp filelight.cpp main.cpp mntent_compat.cpp settingsdialog.cpp
+-filelight_SOURCES=canvasevents.cpp canvas.cpp settings.cpp scanthread.cpp settingsdlg.cpp  filemap.cpp segmenttip.cpp scanbox.cpp filelight.cpp main.cpp  settingsdialog.cpp
++filelight_SOURCES=canvasevents.cpp canvas.cpp settings.cpp scanthread.cpp settingsdlg.cpp  filemap.cpp segmenttip.cpp scanbox.cpp filelight.cpp main.cpp mntent_compat.cpp settingsdialog.cpp
  filelight_LDADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
  
--EXTRA_DIST = main.cpp filelight.cpp filelight.h filelightcanvas.h filelightcanvas.cpp filetree.h filetree.cpp TODO CHANGELOG scanbox.h scanbox.cpp segmenttip.cpp segmenttip.h filemap.cpp filemap.h settingsdialog.ui settingsdlg.cpp settingsdlg.h 
-+EXTRA_DIST = main.cpp filelight.cpp filelight.h filelightcanvas.h filelightcanvas.cpp filetree.h filetree.cpp TODO CHANGELOG scanbox.h scanbox.cpp segmenttip.cpp segmenttip.h filemap.cpp filemap.h settingsdialog.ui settingsdlg.cpp settingsdlg.h mntent_compat.cpp mntent.h
+-EXTRA_DIST = main.cpp filelight.cpp filelight.h TODO CHANGELOG scanbox.h scanbox.cpp segmenttip.cpp segmenttip.h filemap.cpp filemap.h settingsdialog.ui settingsdlg.cpp settingsdlg.h filetree.h scanthread.cpp scanthread.h settings.h settings.cpp canvas.cpp canvas.h canvasevents.cpp 
++EXTRA_DIST = main.cpp filelight.cpp filelight.h TODO CHANGELOG scanbox.h scanbox.cpp segmenttip.cpp segmenttip.h filemap.cpp filemap.h settingsdialog.ui settingsdlg.cpp settingsdlg.h filetree.h scanthread.cpp scanthread.h settings.h settings.cpp canvas.cpp canvas.h canvasevents.cpp mntent_compat.cpp mntent.h
  
  ####### kdevelop will overwrite this part!!! (end)############
  # These paths are KDE specific. Use them:
-@@ -291,14 +291,16 @@
- 
- am_filelight_OBJECTS = settingsdlg.$(OBJEXT) filemap.$(OBJEXT) \
- 	segmenttip.$(OBJEXT) scanbox.$(OBJEXT) filetree.$(OBJEXT) \
--	filelightcanvas.$(OBJEXT) filelight.$(OBJEXT) main.$(OBJEXT)
-+	filelightcanvas.$(OBJEXT) filelight.$(OBJEXT) main.$(OBJEXT) \
-+	mntent_compat.$(OBJEXT)
+@@ -292,15 +292,15 @@
+ am_filelight_OBJECTS = canvasevents.$(OBJEXT) canvas.$(OBJEXT) \
+ 	settings.$(OBJEXT) scanthread.$(OBJEXT) settingsdlg.$(OBJEXT) \
+ 	filemap.$(OBJEXT) segmenttip.$(OBJEXT) scanbox.$(OBJEXT) \
+-	filelight.$(OBJEXT) main.$(OBJEXT)
++	filelight.$(OBJEXT) main.$(OBJEXT) mntent_compat.$(OBJEXT)
  #>- filelight_OBJECTS = $(am_filelight_OBJECTS)
--#>+ 7
-+#>+ 8
+ #>+ 8
  filelight_final_OBJECTS = filelight.all_cpp.o 
- filelight_nofinal_OBJECTS = settingsdlg.$(OBJEXT) filemap.$(OBJEXT) \
- 	segmenttip.$(OBJEXT) scanbox.$(OBJEXT) filetree.$(OBJEXT) \
--	filelightcanvas.$(OBJEXT) filelight.$(OBJEXT) main.$(OBJEXT) settingsdialog.$(OBJEXT)\
--filelightcanvas.moc.o scanbox.moc.o segmenttip.moc.o filelight.moc.o settingsdlg.moc.o 
-+	filelightcanvas.$(OBJEXT) filelight.$(OBJEXT) main.$(OBJEXT) \
-+	mntent_compat.$(OBJEXT) settingsdialog.$(OBJEXT)\
-+filelightcanvas.moc.o settingsdlg.moc.o segmenttip.moc.o filelight.moc.o scanbox.moc.o 
+ filelight_nofinal_OBJECTS = canvasevents.$(OBJEXT) canvas.$(OBJEXT) \
+ 	settings.$(OBJEXT) scanthread.$(OBJEXT) settingsdlg.$(OBJEXT) \
+ 	filemap.$(OBJEXT) segmenttip.$(OBJEXT) scanbox.$(OBJEXT) \
+-	filelight.$(OBJEXT) main.$(OBJEXT) settingsdialog.$(OBJEXT)\
+-scanbox.moc.o segmenttip.moc.o filelight.moc.o canvas.moc.o settingsdlg.moc.o 
++	filelight.$(OBJEXT) main.$(OBJEXT) mntent_compat.$(OBJEXT) settingsdialog.$(OBJEXT)\
++canvas.moc.o settingsdlg.moc.o segmenttip.moc.o filelight.moc.o scanbox.moc.o 
  @KDE_USE_FINAL_FALSE at filelight_OBJECTS = $(filelight_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE at filelight_OBJECTS = $(filelight_final_OBJECTS)
  filelight_DEPENDENCIES =
-@@ -309,21 +311,21 @@
- #>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/filelight.Po \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/filelightcanvas.Po \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/filemap.Po ./$(DEPDIR)/filetree.Po \
+@@ -311,22 +311,25 @@
+ #>- @AMDEP_TRUE at DEP_FILES = ./$(DEPDIR)/canvas.Po \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/canvasevents.Po \
+ #>- @AMDEP_TRUE@	./$(DEPDIR)/filelight.Po ./$(DEPDIR)/filemap.Po \
 -#>- @AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/scanbox.Po \
--#>- @AMDEP_TRUE@	./$(DEPDIR)/segmenttip.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/scanthread.Po ./$(DEPDIR)/segmenttip.Po \
+-#>- @AMDEP_TRUE@	./$(DEPDIR)/settings.Po ./$(DEPDIR)/settingsdlg.Po
+-#>+ 13
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/settingsdialog.P $(DEPDIR)/scanbox.moc.P $(DEPDIR)/segmenttip.moc.P $(DEPDIR)/filelight.moc.P $(DEPDIR)/canvas.moc.P $(DEPDIR)/settingsdlg.moc.P  $(DEPDIR)/filelight.all_cpp.P  ./$(DEPDIR)/canvas.Po \
 +#>- @AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/mntent_compat.Po \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/scanbox.Po ./$(DEPDIR)/segmenttip.Po \
- #>- @AMDEP_TRUE@	./$(DEPDIR)/settingsdlg.Po
- #>+ 13
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/settingsdialog.P $(DEPDIR)/filelightcanvas.moc.P $(DEPDIR)/scanbox.moc.P $(DEPDIR)/segmenttip.moc.P $(DEPDIR)/filelight.moc.P $(DEPDIR)/settingsdlg.moc.P  $(DEPDIR)/filelight.all_cpp.P  ./$(DEPDIR)/filelight.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/settingsdialog.P $(DEPDIR)/filelightcanvas.moc.P $(DEPDIR)/settingsdlg.moc.P $(DEPDIR)/segmenttip.moc.P $(DEPDIR)/filelight.moc.P $(DEPDIR)/scanbox.moc.P  $(DEPDIR)/filelight.all_cpp.P  ./$(DEPDIR)/filelight.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/filelightcanvas.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/filemap.Po ./$(DEPDIR)/filetree.Po \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/scanbox.Po ./$(DEPDIR)/scanthread.Po \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/segmenttip.Po ./$(DEPDIR)/settings.Po \
++#>- @AMDEP_TRUE@	./$(DEPDIR)/settingsdlg.Po
++#>+ 15
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE at DEP_FILES =  $(DEPDIR)/settingsdialog.P $(DEPDIR)/canvas.moc.P $(DEPDIR)/settingsdlg.moc.P $(DEPDIR)/segmenttip.moc.P $(DEPDIR)/filelight.moc.P $(DEPDIR)/scanbox.moc.P  $(DEPDIR)/filelight.all_cpp.P  ./$(DEPDIR)/canvas.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/canvasevents.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/filelight.Po ./$(DEPDIR)/filemap.Po \
 - at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/scanbox.Po \
-- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/segmenttip.Po \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/scanthread.Po ./$(DEPDIR)/segmenttip.Po \
+- at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/settings.Po ./$(DEPDIR)/settingsdlg.Po
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/settingsdialog.P $(DEPDIR)/scanbox.moc.P $(DEPDIR)/segmenttip.moc.P $(DEPDIR)/filelight.moc.P $(DEPDIR)/canvas.moc.P $(DEPDIR)/settingsdlg.moc.P  ./$(DEPDIR)/canvas.Po \
 + at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/mntent_compat.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/scanbox.Po ./$(DEPDIR)/segmenttip.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/settingsdlg.Po
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/settingsdialog.P $(DEPDIR)/filelightcanvas.moc.P $(DEPDIR)/scanbox.moc.P $(DEPDIR)/segmenttip.moc.P $(DEPDIR)/filelight.moc.P $(DEPDIR)/settingsdlg.moc.P  ./$(DEPDIR)/filelight.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/settingsdialog.P $(DEPDIR)/filelightcanvas.moc.P $(DEPDIR)/settingsdlg.moc.P $(DEPDIR)/segmenttip.moc.P $(DEPDIR)/filelight.moc.P $(DEPDIR)/scanbox.moc.P  ./$(DEPDIR)/filelight.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/filelightcanvas.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/filemap.Po ./$(DEPDIR)/filetree.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/scanbox.Po ./$(DEPDIR)/scanthread.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/segmenttip.Po ./$(DEPDIR)/settings.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/settingsdlg.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE at DEP_FILES =  $(DEPDIR)/settingsdialog.P $(DEPDIR)/canvas.moc.P $(DEPDIR)/settingsdlg.moc.P $(DEPDIR)/segmenttip.moc.P $(DEPDIR)/filelight.moc.P $(DEPDIR)/scanbox.moc.P  ./$(DEPDIR)/canvas.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/canvasevents.Po \
+ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/filelight.Po ./$(DEPDIR)/filemap.Po \
 - at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/scanbox.Po \
-- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/segmenttip.Po \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/scanthread.Po ./$(DEPDIR)/segmenttip.Po \
+- at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/settings.Po ./$(DEPDIR)/settingsdlg.Po
 + at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/main.Po ./$(DEPDIR)/mntent_compat.Po \
-+ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/scanbox.Po ./$(DEPDIR)/segmenttip.Po \
- @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/settingsdlg.Po
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/scanbox.Po ./$(DEPDIR)/scanthread.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/segmenttip.Po ./$(DEPDIR)/settings.Po \
++ at AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/settingsdlg.Po
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -362,7 +364,7 @@
+ #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+@@ -364,7 +367,7 @@
  #>+ 3
  	cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  filelight/Makefile
--	cd $(top_srcdir) && perl admin/am_edit filelight-0.6.0/filelight/Makefile.in
+-	cd $(top_srcdir) && perl admin/am_edit filelight-0.6.1/filelight/Makefile.in
 +	cd $(top_srcdir) && perl admin/am_edit filelight/Makefile.in
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@@ -409,6 +411,7 @@
+@@ -411,6 +414,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/filelight.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/filemap.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/filetree.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mntent_compat.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/scanbox.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/scanthread.Po at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/segmenttip.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/settingsdlg.Po at am__quote@
-@@ -532,7 +535,7 @@
+@@ -536,7 +540,7 @@
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=filelight.desktop cr22-app-filelight.png filelight.xcf cr48-app-filelight.png cr64-app-filelight.png 
-+KDE_DIST=cr64-app-filelight.png cr48-app-filelight.png cr22-app-filelight.png filelight.xcf filelight.desktop 
+-KDE_DIST=filelight.desktop cr22-app-filelight.png filelight.xcf cr48-app-filelight.png cr64-app-filelight.png settingsdialog.h 
++KDE_DIST=cr64-app-filelight.png cr22-app-filelight.png filelight.xcf cr48-app-filelight.png settingsdialog.h filelight.desktop 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -689,7 +692,6 @@
+@@ -693,9 +697,6 @@
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
 -
+-
+-
  #>+ 14
  settingsdialog.cpp: $(srcdir)/settingsdialog.ui settingsdialog.h settingsdialog.moc
  	rm -f settingsdialog.cpp
-@@ -710,8 +712,8 @@
- 	$(MOC) $(srcdir)/filelightcanvas.h -o filelightcanvas.moc.cpp
+@@ -712,8 +713,12 @@
+ 	$(MOC) settingsdialog.h -o settingsdialog.moc
  
  #>+ 3
 -scanbox.moc.cpp: $(srcdir)/scanbox.h
 -	$(MOC) $(srcdir)/scanbox.h -o scanbox.moc.cpp
++canvas.moc.cpp: $(srcdir)/canvas.h
++	$(MOC) $(srcdir)/canvas.h -o canvas.moc.cpp
++
++#>+ 3
 +settingsdlg.moc.cpp: $(srcdir)/settingsdlg.h
 +	$(MOC) $(srcdir)/settingsdlg.h -o settingsdlg.moc.cpp
  
  #>+ 3
  segmenttip.moc.cpp: $(srcdir)/segmenttip.h
-@@ -722,12 +724,12 @@
+@@ -724,16 +729,12 @@
  	$(MOC) $(srcdir)/filelight.h -o filelight.moc.cpp
  
  #>+ 3
+-canvas.moc.cpp: $(srcdir)/canvas.h
+-	$(MOC) $(srcdir)/canvas.h -o canvas.moc.cpp
+-
+-#>+ 3
 -settingsdlg.moc.cpp: $(srcdir)/settingsdlg.h
 -	$(MOC) $(srcdir)/settingsdlg.h -o settingsdlg.moc.cpp
 +scanbox.moc.cpp: $(srcdir)/scanbox.h
@@ -123,46 +139,49 @@
  
  #>+ 3
  clean-metasources:
--	-rm -f  filelightcanvas.moc.cpp scanbox.moc.cpp segmenttip.moc.cpp filelight.moc.cpp settingsdlg.moc.cpp
-+	-rm -f  filelightcanvas.moc.cpp settingsdlg.moc.cpp segmenttip.moc.cpp filelight.moc.cpp scanbox.moc.cpp
+-	-rm -f  scanbox.moc.cpp segmenttip.moc.cpp filelight.moc.cpp canvas.moc.cpp settingsdlg.moc.cpp
++	-rm -f  canvas.moc.cpp settingsdlg.moc.cpp segmenttip.moc.cpp filelight.moc.cpp scanbox.moc.cpp
  
  #>+ 4
  clean-ui:
-@@ -755,15 +757,15 @@
+@@ -761,15 +762,15 @@
  force-reedit:
  		cd $(top_srcdir) && \
  	  $(AUTOMAKE) --gnu  filelight/Makefile
--	cd $(top_srcdir) && perl admin/am_edit filelight-0.6.0/filelight/Makefile.in
+-	cd $(top_srcdir) && perl admin/am_edit filelight-0.6.1/filelight/Makefile.in
 +	cd $(top_srcdir) && perl admin/am_edit filelight/Makefile.in
  
  
  #>+ 11
--filelight.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/settingsdlg.cpp $(srcdir)/filemap.cpp $(srcdir)/segmenttip.cpp $(srcdir)/scanbox.cpp $(srcdir)/filetree.cpp $(srcdir)/filelightcanvas.cpp $(srcdir)/filelight.cpp $(srcdir)/main.cpp $(srcdir)/settingsdialog.cpp segmenttip.moc.cpp scanbox.moc.cpp filelightcanvas.moc.cpp filelight.moc.cpp settingsdlg.moc.cpp  settingsdialog.moc
-+filelight.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/settingsdlg.cpp $(srcdir)/filemap.cpp $(srcdir)/segmenttip.cpp $(srcdir)/scanbox.cpp $(srcdir)/filetree.cpp $(srcdir)/filelightcanvas.cpp $(srcdir)/filelight.cpp $(srcdir)/main.cpp $(srcdir)/mntent_compat.cpp $(srcdir)/settingsdialog.cpp filelightcanvas.moc.cpp settingsdlg.moc.cpp segmenttip.moc.cpp filelight.moc.cpp scanbox.moc.cpp  settingsdialog.moc
+-filelight.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/canvasevents.cpp $(srcdir)/canvas.cpp $(srcdir)/settings.cpp $(srcdir)/scanthread.cpp $(srcdir)/settingsdlg.cpp $(srcdir)/filemap.cpp $(srcdir)/segmenttip.cpp $(srcdir)/scanbox.cpp $(srcdir)/filelight.cpp $(srcdir)/main.cpp $(srcdir)/settingsdialog.cpp segmenttip.moc.cpp scanbox.moc.cpp filelight.moc.cpp canvas.moc.cpp settingsdlg.moc.cpp  settingsdialog.moc
++filelight.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/canvasevents.cpp $(srcdir)/canvas.cpp $(srcdir)/settings.cpp $(srcdir)/scanthread.cpp $(srcdir)/settingsdlg.cpp $(srcdir)/filemap.cpp $(srcdir)/segmenttip.cpp $(srcdir)/scanbox.cpp $(srcdir)/filelight.cpp $(srcdir)/main.cpp $(srcdir)/mntent_compat.cpp $(srcdir)/settingsdialog.cpp $(srcdir)/settingsdlg.moc.cpp $(srcdir)/canvas.moc.cpp $(srcdir)/segmenttip.moc.cpp $(srcdir)/filelight.moc.cpp $(srcdir)/scanbox.moc.cpp  settingsdialog.moc
  	@echo 'creating filelight.all_cpp.cpp ...'; \
  	rm -f filelight.all_cpp.files filelight.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> filelight.all_cpp.final; \
--	for file in settingsdlg.cpp filemap.cpp segmenttip.cpp scanbox.cpp filetree.cpp filelightcanvas.cpp filelight.cpp main.cpp settingsdialog.cpp segmenttip.moc.cpp scanbox.moc.cpp filelightcanvas.moc.cpp filelight.moc.cpp settingsdlg.moc.cpp ; do \
-+	for file in settingsdlg.cpp filemap.cpp segmenttip.cpp scanbox.cpp filetree.cpp filelightcanvas.cpp filelight.cpp main.cpp mntent_compat.cpp settingsdialog.cpp filelightcanvas.moc.cpp settingsdlg.moc.cpp segmenttip.moc.cpp filelight.moc.cpp scanbox.moc.cpp ; do \
+-	for file in canvasevents.cpp canvas.cpp settings.cpp scanthread.cpp settingsdlg.cpp filemap.cpp segmenttip.cpp scanbox.cpp filelight.cpp main.cpp settingsdialog.cpp segmenttip.moc.cpp scanbox.moc.cpp filelight.moc.cpp canvas.moc.cpp settingsdlg.moc.cpp ; do \
++	for file in canvasevents.cpp canvas.cpp settings.cpp scanthread.cpp settingsdlg.cpp filemap.cpp segmenttip.cpp scanbox.cpp filelight.cpp main.cpp mntent_compat.cpp settingsdialog.cpp settingsdlg.moc.cpp canvas.moc.cpp segmenttip.moc.cpp filelight.moc.cpp scanbox.moc.cpp ; do \
  	  echo "#include \"$$file\"" >> filelight.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> filelight.all_cpp.final; \
  	done; \
-@@ -794,12 +796,13 @@
+@@ -800,14 +801,15 @@
  kde-rpo-clean:
  	-rm -f *.rpo
  
--#>+ 9
+-#>+ 11
 -$(srcdir)/filelight.cpp: settingsdialog.h 
 -$(srcdir)/settingsdlg.cpp: settingsdialog.h 
-+#>+ 10
- $(srcdir)/filetree.cpp: settingsdialog.h 
 -$(srcdir)/filemap.cpp: settingsdialog.h 
--$(srcdir)/segmenttip.cpp: settingsdialog.h 
-+$(srcdir)/filelight.cpp: settingsdialog.h 
-+$(srcdir)/mntent_compat.cpp: settingsdialog.h 
- $(srcdir)/scanbox.cpp: settingsdialog.h 
++#>+ 12
+ $(srcdir)/settings.cpp: settingsdialog.h 
 +$(srcdir)/segmenttip.cpp: settingsdialog.h 
+ $(srcdir)/scanthread.cpp: settingsdialog.h 
+-$(srcdir)/scanbox.cpp: settingsdialog.h 
 +$(srcdir)/settingsdlg.cpp: settingsdialog.h 
+ $(srcdir)/canvasevents.cpp: settingsdialog.h 
  $(srcdir)/main.cpp: settingsdialog.h 
+-$(srcdir)/segmenttip.cpp: settingsdialog.h 
 +$(srcdir)/filemap.cpp: settingsdialog.h 
- $(srcdir)/filelightcanvas.cpp: settingsdialog.h 
++$(srcdir)/filelight.cpp: settingsdialog.h 
+ $(srcdir)/canvas.cpp: settingsdialog.h 
++$(srcdir)/mntent_compat.cpp: settingsdialog.h 
++$(srcdir)/scanbox.cpp: settingsdialog.h 
diff -ruN filelight.orig/files/patch-filetree.cpp filelight/files/patch-filetree.cpp
--- filelight.orig/files/patch-filetree.cpp	Sun Sep  7 00:18:06 2003
+++ filelight/files/patch-filetree.cpp	Thu Jan  1 01:00:00 1970
@@ -1,51 +0,0 @@
---- filelight/filetree.cpp.orig	Fri Aug 29 18:06:32 2003
-+++ filelight/filetree.cpp	Fri Aug 29 18:19:06 2003
-@@ -77,7 +77,7 @@
- }
- 
- 
--static int selector( struct dirent64 const *ent )
-+static int selector( struct dirent *ent )
- {
-   if( (strcmp( ent->d_name, "." ) == 0) || (strcmp( ent->d_name, ".." ) == 0) )
-     return 0;
-@@ -93,16 +93,16 @@
-   if( m_haltScan ) return NULL;
- 
-   //the 64bit version lets us support more than 2GB files
--  struct dirent64 **eps;
-+  struct dirent **eps;
-   int n;
- 
-  
--  n = scandir64( path, &eps, selector, /*alphasort*/ NULL );
-+  n = scandir( path, &eps, selector, /*alphasort*/ NULL );
- 
-   if( n >= 0 ) {
- 
-     char *new_path, *new_dirname;
--    struct stat64 statbuf;
-+    struct stat statbuf;
-     unsigned char strlen_path = strlen( path ) + 2; //saves recalculations
-     Directory            *cwd = new Directory( dirname );
-     Filesize          dirsize = 0;
-@@ -121,7 +121,7 @@
- */
-       
-       //get some more detail about the file with lstat            
--      lstat64( new_path, &statbuf );
-+      lstat( new_path, &statbuf );
-       statbuf.st_size /= 1024; //using units of kB as 32bit max is 4GB and 64bit ints are expensive
- 
-       if( S_ISLNK( statbuf.st_mode ) )
-@@ -260,8 +260,9 @@
- 
- #include <fstab.h>
- #include <mntent.h>
-+#ifndef __FreeBSD__
- #include <sys/statfs.h>
--
-+#endif
- 
- #define INFO_PARTITIONS "/proc/partitions"
- #define INFO_MOUNTED_PARTITIONS "/etc/mtab"	/* on Linux... */
diff -ruN filelight.orig/files/patch-scanthread.cpp filelight/files/patch-scanthread.cpp
--- filelight.orig/files/patch-scanthread.cpp	Thu Jan  1 01:00:00 1970
+++ filelight/files/patch-scanthread.cpp	Sun Sep  7 00:36:57 2003
@@ -0,0 +1,19 @@
+--- filelight/scanthread.cpp.orig	Sun Sep  7 00:21:10 2003
++++ filelight/scanthread.cpp	Sun Sep  7 00:24:10 2003
+@@ -29,7 +29,6 @@
+ //readMounts()
+ #include <fstab.h>
+ #include <mntent.h>
+-#include <sys/statfs.h>
+ 
+ #include "scanthread.h"
+ #include "settings.h"
+@@ -113,7 +112,7 @@
+ 
+ 
+ 
+-static int selector( struct dirent64 const *ent )
++static int selector( struct dirent *ent )
+ {
+   if( strcmp( ent->d_name, "." ) == 0 || strcmp( ent->d_name, ".." ) == 0 )
+     return 0;
--- filelight.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list