Update to version 2.6

PR: 22810
Submitted by: Ports Fury

10 files changed, 60 insertions, 22 deletions

diff --git a/deskutils/xinvest/Makefile b/deskutils/xinvest/Makefile
index 3c804ec3350a..15fa0364f737 100644
--- a/deskutils/xinvest/Makefile
+++ b/deskutils/xinvest/Makefile
@@ -6,22 +6,19 @@
 #
 
 PORTNAME=	xinvest
-PORTVERSION=	2.5.1
+PORTVERSION=	2.6
 CATEGORIES=	deskutils
-MASTER_SITES=	http://sunsite.auc.dk/xinvest/	\
-		${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES=	http://sunsite.dk/xinvest/
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
-USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/Xinvest
+	@${MKDIR} ${PREFIX}/share/examples/Xinvest
 	${INSTALL_DATA} ${WRKSRC}/samples/*.inv ${PREFIX}/share/examples/Xinvest
 .endif
 
diff --git a/deskutils/xinvest/distinfo b/deskutils/xinvest/distinfo
index 928f47b962fb..245addaa9669 100644
--- a/deskutils/xinvest/distinfo
+++ b/deskutils/xinvest/distinfo
@@ -1 +1 @@
-MD5 (xinvest-2.5.1.tar.gz) = 7805a2b99985907bd32ca4d191a9b461
+MD5 (xinvest-2.6.tar.gz) = 41b3dd9d62a2ed933209eac975d60f7d
diff --git a/deskutils/xinvest/files/patch-ac b/deskutils/xinvest/files/patch-ac
index 1f4ef14afa8e..c2bd0061c0b0 100644
--- a/deskutils/xinvest/files/patch-ac
+++ b/deskutils/xinvest/files/patch-ac
@@ -1,16 +1,16 @@
---- Imakefile.orig	Tue Sep 23 08:50:46 1997
-+++ Imakefile	Thu Oct 26 03:46:58 2000
+--- Imakefile.orig	Sat Feb  5 07:59:08 2000
++++ Imakefile	Sun Nov 12 15:02:20 2000
 @@ -11,7 +11,7 @@
  
  DEFINES = -DSHAPE
  INCLUDES = -I$(INCROOT)/X11
 -SYS_LIBRARIES = -lXm -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm
-+SYS_LIBRARIES = -lXm -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm ${MOTIFLIB}
++SYS_LIBRARIES = ${MOTIFLIB} -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm
  DEPLIBS = 
  
  SRCS =	account.c askuser.c calendar.c color.c drawing.c \
 @@ -25,5 +25,5 @@
- 	util.o xinvest.o xutil.o
+ 	tooltips.o trans.o util.o xinvest.o xutil.o
  
  
 -ComplexProgramTarget(Xinvest)
diff --git a/deskutils/xinvest/files/patch-ad b/deskutils/xinvest/files/patch-ad
new file mode 100644
index 000000000000..618336e63ef9
--- /dev/null
+++ b/deskutils/xinvest/files/patch-ad
@@ -0,0 +1,11 @@
+--- color.c.orig	Sat Feb  5 07:59:05 2000
++++ color.c	Sun Nov 12 15:09:23 2000
+@@ -25,7 +25,7 @@
+ 
+ #include <stdio.h>
+ 
+-#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <values.h>
+ #endif
+ 
diff --git a/deskutils/xinvest/files/patch-ae b/deskutils/xinvest/files/patch-ae
new file mode 100644
index 000000000000..49bccc0f657b
--- /dev/null
+++ b/deskutils/xinvest/files/patch-ae
@@ -0,0 +1,11 @@
+--- portfolio.c.orig	Sat Feb  5 07:59:06 2000
++++ portfolio.c	Sun Nov 12 15:09:56 2000
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <math.h>
+ 
+-#if !defined(NeXT) && !defined(__NetBSD__)
++#if !defined(NeXT) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <values.h>
+ #endif
+ 
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index 3c804ec3350a..15fa0364f737 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -6,22 +6,19 @@
 #
 
 PORTNAME=	xinvest
-PORTVERSION=	2.5.1
+PORTVERSION=	2.6
 CATEGORIES=	deskutils
-MASTER_SITES=	http://sunsite.auc.dk/xinvest/	\
-		${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES=	http://sunsite.dk/xinvest/
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
-USE_XPM=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/Xinvest
+	@${MKDIR} ${PREFIX}/share/examples/Xinvest
 	${INSTALL_DATA} ${WRKSRC}/samples/*.inv ${PREFIX}/share/examples/Xinvest
 .endif
 
diff --git a/finance/xinvest/distinfo b/finance/xinvest/distinfo
index 928f47b962fb..245addaa9669 100644
--- a/finance/xinvest/distinfo
+++ b/finance/xinvest/distinfo
@@ -1 +1 @@
-MD5 (xinvest-2.5.1.tar.gz) = 7805a2b99985907bd32ca4d191a9b461
+MD5 (xinvest-2.6.tar.gz) = 41b3dd9d62a2ed933209eac975d60f7d
diff --git a/finance/xinvest/files/patch-ac b/finance/xinvest/files/patch-ac
index 1f4ef14afa8e..c2bd0061c0b0 100644
--- a/finance/xinvest/files/patch-ac
+++ b/finance/xinvest/files/patch-ac
@@ -1,16 +1,16 @@
---- Imakefile.orig	Tue Sep 23 08:50:46 1997
-+++ Imakefile	Thu Oct 26 03:46:58 2000
+--- Imakefile.orig	Sat Feb  5 07:59:08 2000
++++ Imakefile	Sun Nov 12 15:02:20 2000
 @@ -11,7 +11,7 @@
  
  DEFINES = -DSHAPE
  INCLUDES = -I$(INCROOT)/X11
 -SYS_LIBRARIES = -lXm -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm
-+SYS_LIBRARIES = -lXm -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm ${MOTIFLIB}
++SYS_LIBRARIES = ${MOTIFLIB} -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm
  DEPLIBS = 
  
  SRCS =	account.c askuser.c calendar.c color.c drawing.c \
 @@ -25,5 +25,5 @@
- 	util.o xinvest.o xutil.o
+ 	tooltips.o trans.o util.o xinvest.o xutil.o
  
  
 -ComplexProgramTarget(Xinvest)
diff --git a/finance/xinvest/files/patch-ad b/finance/xinvest/files/patch-ad
new file mode 100644
index 000000000000..618336e63ef9
--- /dev/null
+++ b/finance/xinvest/files/patch-ad
@@ -0,0 +1,11 @@
+--- color.c.orig	Sat Feb  5 07:59:05 2000
++++ color.c	Sun Nov 12 15:09:23 2000
+@@ -25,7 +25,7 @@
+ 
+ #include <stdio.h>
+ 
+-#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <values.h>
+ #endif
+ 
diff --git a/finance/xinvest/files/patch-ae b/finance/xinvest/files/patch-ae
new file mode 100644
index 000000000000..49bccc0f657b
--- /dev/null
+++ b/finance/xinvest/files/patch-ae
@@ -0,0 +1,11 @@
+--- portfolio.c.orig	Sat Feb  5 07:59:06 2000
++++ portfolio.c	Sun Nov 12 15:09:56 2000
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <math.h>
+ 
+-#if !defined(NeXT) && !defined(__NetBSD__)
++#if !defined(NeXT) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <values.h>
+ #endif
+