Update to 1.99 release.

Submitted by:	maintainer

4 files changed, 70 insertions, 48 deletions

diff --git a/misc/fortuneit/Makefile b/misc/fortuneit/Makefile
index 703608c1ebd0..5ec624d17f1b 100644
--- a/misc/fortuneit/Makefile
+++ b/misc/fortuneit/Makefile
@@ -6,61 +6,45 @@
 #
 
 PORTNAME=	fortuneit
-PORTVERSION=	1.51
-PORTREVISION=	1
+PORTVERSION=	1.99
 CATEGORIES=	misc
-MASTER_SITES=	http://www.giovannelli.it/~gmarco/files/
-DISTNAME=	fortune.it-${PORTVERSION}
+MASTER_SITES=	http://utenti.gufi.org/~gmarco/files/distfiles/
+DISTNAME=	fortune-it-${PORTVERSION}
 
-MAINTAINER=	gmarco@giovannelli.it
+MAINTAINER=	gmarco@gufi.org
 COMMENT=	A very funny fortune file in Italian
 
-NO_BUILD=	yes
-
 STRCMD=		/usr/games/strfile
 
-.if defined(INSTALL_OFFENSIVE)
-PLIST=		${PKGDIR}/pkg-plist.off
-.endif
+FORTUNEFILES=	adams banner computer definizioni formiche italia itatrek \
+		jackfr leggi luke luttazzi norm paolotedeschi zuse \
+		computer-o definizioni-o film-o italia-o jackfr-o leggi-o \
+		luttazzi-o obsc-o zuse-o
 
-pre-fetch:
-.if !defined(INSTALL_OFFENSIVE)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "If you want to install potentially offensive italian"
-	@${ECHO_MSG} "fortunes \"make INSTALL_OFFENSIVE=yes\""
-	@${ECHO_MSG} ""
-.else
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Potentially offensive fortunes will be installed"
-	@${ECHO_MSG} ""
+pre-build:
+.if !exists(${STRCMD})
+	@${ECHO_MSG} "Please install the games distribution"
+	@exit 1
 .endif
 
+do-build:
+.for f in ${FORTUNEFILES}
+	${STRCMD} ${WRKSRC}/testi/${f}
+.endfor
+
 do-install:
 	@${MKDIR} ${PREFIX}/share/games
 	@${MKDIR} ${PREFIX}/share/games/fortune
-	@${INSTALL_DATA} ${WRKSRC}/italia ${PREFIX}/share/games/fortune
-.if defined(INSTALL_OFFENSIVE)
-	@${INSTALL_DATA} ${WRKSRC}/zozzital ${PREFIX}/share/games/fortune
-.endif
-
-pre-install:
-.if !exists(${STRCMD})
-	@ ${ECHO_MSG}	"Please install the games distribution"
-	@ exit 1
-.endif
+.for f in ${FORTUNEFILES}
+	@${INSTALL_DATA} ${WRKSRC}/testi/${f}* ${PREFIX}/share/games/fortune
+.endfor
 
 post-install:
-	@${STRCMD} ${PREFIX}/share/games/fortune/italia
-.if defined(INSTALL_OFFENSIVE)
-	@${STRCMD} ${PREFIX}/share/games/fortune/zozzital
-.endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Usage:"
-	@${ECHO_MSG} "/usr/games/fortune ${PREFIX}/share/games/fortune/italia"
-.if defined(INSTALL_OFFENSIVE)
-	@${ECHO_MSG} "or"
-	@${ECHO_MSG} "/usr/games/fortune ${PREFIX}/share/games/fortune/zozzital"
-.endif
+	@${ECHO_MSG} "/usr/games/fortune [-aDefilosw] ${PREFIX}/share/games/fortune/"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Please check fortune manual pages for more informations"
 	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/misc/fortuneit/distinfo b/misc/fortuneit/distinfo
index f1390d677c20..e2544ba2a64d 100644
--- a/misc/fortuneit/distinfo
+++ b/misc/fortuneit/distinfo
@@ -1,3 +1,3 @@
-MD5 (fortune.it-1.51.tar.gz) = ddf609be4b7599719e25dfdaf0132619
-SHA256 (fortune.it-1.51.tar.gz) = 2b211a042c56078ac409a385f8c889feae7f3a8c5b75aff97f31bf6725088e44
-SIZE (fortune.it-1.51.tar.gz) = 408734
+MD5 (fortune-it-1.99.tar.gz) = b395af4484a8101a3f92163ab8667d8b
+SHA256 (fortune-it-1.99.tar.gz) = f282626904701671d814411665e42edcd3257df8b6f1244993cc014424fa7e6c
+SIZE (fortune-it-1.99.tar.gz) = 739886
diff --git a/misc/fortuneit/pkg-plist b/misc/fortuneit/pkg-plist
index 092e247b3684..985597b55f6c 100644
--- a/misc/fortuneit/pkg-plist
+++ b/misc/fortuneit/pkg-plist
@@ -1,4 +1,48 @@
+share/games/fortune/adams
+share/games/fortune/adams.dat
+share/games/fortune/banner
+share/games/fortune/banner.dat
+share/games/fortune/computer
+share/games/fortune/computer-o
+share/games/fortune/computer-o.dat
+share/games/fortune/computer.dat
+share/games/fortune/definizioni
+share/games/fortune/definizioni-o
+share/games/fortune/definizioni-o.dat
+share/games/fortune/definizioni.dat
+share/games/fortune/film-o
+share/games/fortune/film-o.dat
+share/games/fortune/formiche
+share/games/fortune/formiche.dat
 share/games/fortune/italia
+share/games/fortune/italia-o
+share/games/fortune/italia-o.dat
 share/games/fortune/italia.dat
+share/games/fortune/itatrek
+share/games/fortune/itatrek.dat
+share/games/fortune/jackfr
+share/games/fortune/jackfr-o
+share/games/fortune/jackfr-o.dat
+share/games/fortune/jackfr.dat
+share/games/fortune/leggi
+share/games/fortune/leggi-o
+share/games/fortune/leggi-o.dat
+share/games/fortune/leggi.dat
+share/games/fortune/luke
+share/games/fortune/luke.dat
+share/games/fortune/luttazzi
+share/games/fortune/luttazzi-o
+share/games/fortune/luttazzi-o.dat
+share/games/fortune/luttazzi.dat
+share/games/fortune/norm
+share/games/fortune/norm.dat
+share/games/fortune/obsc-o
+share/games/fortune/obsc-o.dat
+share/games/fortune/paolotedeschi
+share/games/fortune/paolotedeschi.dat
+share/games/fortune/zuse
+share/games/fortune/zuse-o
+share/games/fortune/zuse-o.dat
+share/games/fortune/zuse.dat
 @dirrm share/games/fortune
 @dirrm share/games
diff --git a/misc/fortuneit/pkg-plist.off b/misc/fortuneit/pkg-plist.off
deleted file mode 100644
index 31657f2158d5..000000000000
--- a/misc/fortuneit/pkg-plist.off
+++ /dev/null
@@ -1,6 +0,0 @@
-share/games/fortune/italia
-share/games/fortune/zozzital
-share/games/fortune/italia.dat
-share/games/fortune/zozzital.dat
-@dirrm share/games/fortune
-@dirrm share/games