7 files changed, 24 insertions, 19 deletions

diff --git a/misc/ytree/Makefile b/misc/ytree/Makefile
index 2c36dd9152ac..d63ee4d5f020 100644
--- a/misc/ytree/Makefile
+++ b/misc/ytree/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	ytree
-PORTVERSION=	1.73
+PORTVERSION=	1.74
 CATEGORIES=	misc
 MASTER_SITES=	http://www.han.de/~werner/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	olgeni@FreeBSD.org
 
 ALL_TARGET=	ytree
 MAN1=		ytree.1
@@ -24,6 +24,9 @@ do-install:
 .for file in CHANGES README THANKS
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ytree
 .endfor
+	@if [ ! -e ${PREFIX}/etc/ytree.conf ]; then \
+		${INSTALL_DATA} ${WRKSRC}/ytree.conf ${PREFIX}/etc/ytree.conf; \
+	fi
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/ytree/distinfo b/misc/ytree/distinfo
index 5436867d46dd..2596aeffe992 100644
--- a/misc/ytree/distinfo
+++ b/misc/ytree/distinfo
@@ -1 +1 @@
-MD5 (ytree-1.73.tar.gz) = 473c4cc5a94e7722912310e2229377a8
+MD5 (ytree-1.74.tar.gz) = afda1bb58c1af3bd10efce13fec9d365
diff --git a/misc/ytree/files/patch-aa b/misc/ytree/files/patch-aa
index fd3d63eaaf1c..8c75570d0cf0 100644
--- a/misc/ytree/files/patch-aa
+++ b/misc/ytree/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Jul 16 07:01:56 2000
-+++ Makefile	Tue Dec  5 23:30:00 2000
+--- Makefile.orig	Sat Jun 16 23:12:10 2001
++++ Makefile	Sat Jun 16 23:13:07 2001
 @@ -6,7 +6,7 @@
  #
  ############################################################################
@@ -9,9 +9,9 @@
  
  #
  # ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys
-@@ -25,10 +25,10 @@
+@@ -27,10 +27,10 @@
  ###########################
- # LINUX (testet with ncurses 5.0)
+ # LINUX (testet with ncurses 5.2)
  ###########################
 -COLOR       = -DCOLOR_SUPPORT 
 +#COLOR       = -DCOLOR_SUPPORT 
@@ -23,13 +23,13 @@
  
  ###########################
  # LINUX (X11 using PDCurses) thanks to  Mark Hessling
-@@ -43,8 +43,8 @@
+@@ -54,8 +54,8 @@
  ###########################
  # FreeBSD (Thanks to Peter Brevik)
  ###########################
 -#CFLAGS      = -DCOLOR_SUPPORT -DNCURSES
 -#LIBS        = -lncurses -lmytinfo -lcompat
-+CFLAGS      += -DCOLOR_SUPPORT -DNCURSES
++CFLAGS      = -DCOLOR_SUPPORT -DNCURSES
 +LIBS        = -lncurses -lmytinfo -lcompat
  
  ###########################
diff --git a/misc/ytree/files/patch-ab b/misc/ytree/files/patch-ab
index 58f34600aac8..272eb3d1ef87 100644
--- a/misc/ytree/files/patch-ab
+++ b/misc/ytree/files/patch-ab
@@ -1,11 +1,11 @@
---- freesp.c.orig	Wed Dec  9 15:32:51 1998
-+++ freesp.c	Wed Dec  9 15:34:01 1998
+--- freesp.c.orig	Sat Jun 16 23:20:49 2001
++++ freesp.c	Sat Jun 16 23:20:55 2001
 @@ -9,7 +9,7 @@
  
  #include "ytree.h"
  
--#if ( defined( linux ) || defined( sun ) || defined( __NeXT__ )  || defined(hpux) || defined ( __FreeBSD__ ) || defined( __DJGPP__ ) ) && !defined( SVR4 )
-+#if ( defined( linux ) || defined( sun ) || defined( __NeXT__ )  || defined(hpux) || defined( __DJGPP__ ) ) && !defined( SVR4 )
+-#if ( defined( linux ) || defined( sun ) || defined( __NeXT__ )  || defined(hpux) || defined ( __FreeBSD__ ) || defined( __DJGPP__ ) || defined ( __GNU__ ) ) && !defined( SVR4 )
++#if ( defined( linux ) || defined( sun ) || defined( __NeXT__ )  || defined(hpux) || defined( __DJGPP__ ) || defined ( __GNU__ ) ) && !defined( SVR4 )
  
  #include <sys/vfs.h>
  #else
diff --git a/misc/ytree/files/patch-af b/misc/ytree/files/patch-af
index 274f6f78bba8..77e6917955de 100644
--- a/misc/ytree/files/patch-af
+++ b/misc/ytree/files/patch-af
@@ -1,5 +1,5 @@
---- dirwin.c.orig	Sun Jul 16 07:01:56 2000
-+++ dirwin.c	Wed Nov  8 04:03:59 2000
+--- dirwin.c.orig	Sat Jun 16 23:15:01 2001
++++ dirwin.c	Sat Jun 16 23:15:08 2001
 @@ -168,7 +168,7 @@
                                   modify_time
                                   );
diff --git a/misc/ytree/files/patch-ag b/misc/ytree/files/patch-ag
index 931667cf7b37..77aac86429f9 100644
--- a/misc/ytree/files/patch-ag
+++ b/misc/ytree/files/patch-ag
@@ -1,6 +1,6 @@
---- filewin.c.orig	Mon Apr 16 22:35:39 2001
-+++ filewin.c	Thu Apr 26 05:58:49 2001
-@@ -617,7 +617,7 @@
+--- filewin.c.orig	Sat Jun 16 23:16:26 2001
++++ filewin.c	Sat Jun 16 23:17:06 2001
+@@ -626,7 +626,7 @@
  				      sym_link_name
  				    );
  #else
@@ -9,7 +9,7 @@
  				      max_filename_len,
  				      max_linkname_len
  				    );
-@@ -652,7 +652,7 @@
+@@ -661,7 +661,7 @@
  				      modify_time
  				    );
  #else
diff --git a/misc/ytree/pkg-plist b/misc/ytree/pkg-plist
index d3341b285eda..38e814411423 100644
--- a/misc/ytree/pkg-plist
+++ b/misc/ytree/pkg-plist
@@ -1,5 +1,7 @@
 bin/ytree
+@unexec if cmp -s %D/etc/ytree.conf %D/etc/ytree.conf.sample; then rm -f %D/etc/ytree.conf; fi
 etc/ytree.conf.sample
+@exec [ -f %B/ytree.conf ] || cp %B/%f %B/ytree.conf
 %%PORTDOCS%%share/doc/ytree/CHANGES
 %%PORTDOCS%%share/doc/ytree/README
 %%PORTDOCS%%share/doc/ytree/THANKS