- Update to version 20091121, now in UTF8 format

- Make fetchable by using PLD upstream mirrors

4 files changed, 89 insertions, 45 deletions

diff --git a/polish/fortunepl/Makefile b/polish/fortunepl/Makefile
index 8a6c91178a70..096ed35306d2 100644
--- a/polish/fortunepl/Makefile
+++ b/polish/fortunepl/Makefile
@@ -2,19 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	fortunepl
-PORTVERSION=	0.0.20051022
+PORTVERSION=	20091121
 CATEGORIES=	polish
-MASTER_SITES=	http://www.bsdguru.org/fortunes/
-DISTNAME=	fortunes-pl_${PORTVERSION}.orig
-
-PATCH_SITES=	http://bsdguru.org/fortunes/
-PATCHFILES=	fortunes-pl_${PORTVERSION}.freebsd.pl \
-		fortunes-pl_${PORTVERSION}.filozofia
+MASTER_SITES=	ftp://master-ftp.pld-linux.org/${F_SUBDIR}/ \
+		ftp://ftp.atm.pld-linux.org/${F_SUBDIR}/ \
+		ftp://ftp.icm.edu.pl/pub/linux/distributions/pld-linux/${F_SUBDIR}/ \
+		ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/pld/${F_SUBDIR}/ \
+		ftp://ftp.heanet.ie/pub/pld-linux/${F_SUBDIR}/
+F_SUBDIR=	pool/f/fortunes-pl
+DISTFILES=	fortunes-pl-${PORTVERSION}-3.src.rpm
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lot of funny Polish fortune files
 
-BROKEN=		unfetchable
+NO_ARCH=	yes
+WRKSRC=		${WRKDIR}/fortunes-pl-${PORTVERSION}
 
 .if exists(/usr/games/strfile)
 STRCMD=		/usr/games/strfile
@@ -23,35 +25,16 @@ STRCMD=		/usr/bin/strfile
 .else
 IGNORE=		needs strfile command. Please install games distribution of base system
 .endif
-WRKSRC=		${WRKDIR}/fortunes-pl-${PORTVERSION}.orig
-
-FORTUNES=	7thguard advocacy apcoh argante bajki bok cnp cows \
-		dowcipy dowcipy-feministyczne dowcipy-lepper dowcipy-naukowcy \
-		dowcipy-niskopoziomowe dowcipy-szowinistyczne dwimc dzieci \
-		filozofia freebsd.pl gra_polslowek haiku http icpusers imiona \
-		ipv6.pl komputery konikbujany koscielne lcamtuf life matura \
-		microsoft milosc misc nauka ospl ospl-ad perl polish_manpages \
-		pratchett psy1 puchatek radio_maryja rywingate sad sapkowski \
-		seneka sigpl sigvirus slownik spolem sport stachura stirlitz \
-		teleturnieje testnaosobowosc wierszyki wieza-pilot zen \
-		znaki_zodiaku
-
-do-patch:
-	${CP} ${DISTDIR}/fortunes-pl_${PORTVERSION}.freebsd.pl ${WRKSRC}/freebsd.pl
-	${CP} ${DISTDIR}/fortunes-pl_${PORTVERSION}.filozofia ${WRKSRC}/filozofia
+
+post-extract:
+	@(cd ${WRKDIR} && ${TAR} zxf fortunes-pl-${PORTVERSION}.tar.bz2)
 
 do-build:
-.for FILE in ${FORTUNES}
-	@${STRCMD} ${WRKSRC}/${FILE}
-.endfor
+	(cd ${WRKSRC} && ${FIND} . -type f -exec ${STRCMD} {} \;)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/fortune/pl
-.for FILE in ${FORTUNES}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} \
-		${STAGEDIR}${PREFIX}/share/games/fortune/pl
-	${INSTALL_DATA} ${WRKSRC}/${FILE}.dat \
+	${INSTALL_DATA} ${WRKSRC}/* \
 		${STAGEDIR}${PREFIX}/share/games/fortune/pl
-.endfor
 
 .include <bsd.port.mk>
diff --git a/polish/fortunepl/distinfo b/polish/fortunepl/distinfo
index 2927f1c56982..9481e06b387b 100644
--- a/polish/fortunepl/distinfo
+++ b/polish/fortunepl/distinfo
@@ -1,6 +1,3 @@
-SHA256 (fortunes-pl_0.0.20051022.orig.tar.gz) = fa53dde791ade70a9a63f7fc1f3b2e9d0b441d74f8d4ec28f334d777d2315dab
-SIZE (fortunes-pl_0.0.20051022.orig.tar.gz) = 823076
-SHA256 (fortunes-pl_0.0.20051022.freebsd.pl) = 1ec67244a0b1d08e6639d41f25fd11ca61e6de8b54149eefc2b4fa448ca383af
-SIZE (fortunes-pl_0.0.20051022.freebsd.pl) = 149400
-SHA256 (fortunes-pl_0.0.20051022.filozofia) = 8b0dd23d6bb9b08406a0c6304218f478b7229875e45abea34a1cc1ddff7b0cb1
-SIZE (fortunes-pl_0.0.20051022.filozofia) = 4732
+TIMESTAMP = 1480247337
+SHA256 (fortunes-pl-20091121-3.src.rpm) = a1b50fc3f18e020111b12653941e1209f1a8e2cd77c6bcffa2f62cab153a35e8
+SIZE (fortunes-pl-20091121-3.src.rpm) = 741621
diff --git a/polish/fortunepl/pkg-descr b/polish/fortunepl/pkg-descr
index 6531b1e0e82c..4084137dcae5 100644
--- a/polish/fortunepl/pkg-descr
+++ b/polish/fortunepl/pkg-descr
@@ -1,4 +1,2 @@
 Package contains plenty of funny Polish fortunes.
-Collected from many sources, versatile and facetious.
-
-Based on PLD fortunes.
+Collected by PLD maintainers from many sources, versatile and facetious.
diff --git a/polish/fortunepl/pkg-plist b/polish/fortunepl/pkg-plist
index 60ea141d72b5..f72204014adf 100644
--- a/polish/fortunepl/pkg-plist
+++ b/polish/fortunepl/pkg-plist
@@ -1,5 +1,9 @@
+share/games/fortune/pl/10-przykazan-dewelopera-PLD
+share/games/fortune/pl/10-przykazan-dewelopera-PLD.dat
 share/games/fortune/pl/7thguard
 share/games/fortune/pl/7thguard.dat
+share/games/fortune/pl/adamg
+share/games/fortune/pl/adamg.dat
 share/games/fortune/pl/advocacy
 share/games/fortune/pl/advocacy.dat
 share/games/fortune/pl/apcoh
@@ -8,12 +12,24 @@ share/games/fortune/pl/argante
 share/games/fortune/pl/argante.dat
 share/games/fortune/pl/bajki
 share/games/fortune/pl/bajki.dat
+share/games/fortune/pl/baseciq
+share/games/fortune/pl/baseciq.dat
+share/games/fortune/pl/blug
+share/games/fortune/pl/blug.dat
+share/games/fortune/pl/bocian_gate
+share/games/fortune/pl/bocian_gate.dat
 share/games/fortune/pl/bok
 share/games/fortune/pl/bok.dat
+share/games/fortune/pl/chuck-norris
+share/games/fortune/pl/chuck-norris.dat
 share/games/fortune/pl/cnp
 share/games/fortune/pl/cnp.dat
 share/games/fortune/pl/cows
 share/games/fortune/pl/cows.dat
+share/games/fortune/pl/debian.pl
+share/games/fortune/pl/debian.pl.dat
+share/games/fortune/pl/djurban
+share/games/fortune/pl/djurban.dat
 share/games/fortune/pl/dowcipy
 share/games/fortune/pl/dowcipy-feministyczne
 share/games/fortune/pl/dowcipy-feministyczne.dat
@@ -30,10 +46,8 @@ share/games/fortune/pl/dwimc
 share/games/fortune/pl/dwimc.dat
 share/games/fortune/pl/dzieci
 share/games/fortune/pl/dzieci.dat
-share/games/fortune/pl/filozofia
-share/games/fortune/pl/filozofia.dat
-share/games/fortune/pl/freebsd.pl
-share/games/fortune/pl/freebsd.pl.dat
+share/games/fortune/pl/gentoo
+share/games/fortune/pl/gentoo.dat
 share/games/fortune/pl/gra_polslowek
 share/games/fortune/pl/gra_polslowek.dat
 share/games/fortune/pl/haiku
@@ -46,6 +60,14 @@ share/games/fortune/pl/imiona
 share/games/fortune/pl/imiona.dat
 share/games/fortune/pl/ipv6.pl
 share/games/fortune/pl/ipv6.pl.dat
+share/games/fortune/pl/irc
+share/games/fortune/pl/irc.dat
+share/games/fortune/pl/jogger_pl
+share/games/fortune/pl/jogger_pl.dat
+share/games/fortune/pl/kernelcookies
+share/games/fortune/pl/kernelcookies.dat
+share/games/fortune/pl/kloczkish
+share/games/fortune/pl/kloczkish.dat
 share/games/fortune/pl/komputery
 share/games/fortune/pl/komputery.dat
 share/games/fortune/pl/konikbujany
@@ -56,6 +78,14 @@ share/games/fortune/pl/lcamtuf
 share/games/fortune/pl/lcamtuf.dat
 share/games/fortune/pl/life
 share/games/fortune/pl/life.dat
+share/games/fortune/pl/linux
+share/games/fortune/pl/linux.dat
+share/games/fortune/pl/linuxfr
+share/games/fortune/pl/linuxfr.dat
+share/games/fortune/pl/linuxpl
+share/games/fortune/pl/linuxpl.dat
+share/games/fortune/pl/matrymonialne
+share/games/fortune/pl/matrymonialne.dat
 share/games/fortune/pl/matura
 share/games/fortune/pl/matura.dat
 share/games/fortune/pl/microsoft
@@ -64,16 +94,46 @@ share/games/fortune/pl/milosc
 share/games/fortune/pl/milosc.dat
 share/games/fortune/pl/misc
 share/games/fortune/pl/misc.dat
+share/games/fortune/pl/mmazur
+share/games/fortune/pl/mmazur.dat
 share/games/fortune/pl/nauka
 share/games/fortune/pl/nauka.dat
+share/games/fortune/pl/newyear
+share/games/fortune/pl/newyear.dat
+share/games/fortune/pl/nowe
+share/games/fortune/pl/nowe.dat
 share/games/fortune/pl/ospl
 share/games/fortune/pl/ospl-ad
 share/games/fortune/pl/ospl-ad.dat
 share/games/fortune/pl/ospl.dat
+share/games/fortune/pl/pLug
+share/games/fortune/pl/pLug-slc2001
+share/games/fortune/pl/pLug-slc2001.dat
+share/games/fortune/pl/pLug.dat
+share/games/fortune/pl/pamietnik_policjanta
+share/games/fortune/pl/pamietnik_policjanta.dat
+share/games/fortune/pl/pcol
+share/games/fortune/pl/pcol.dat
 share/games/fortune/pl/perl
 share/games/fortune/pl/perl.dat
+share/games/fortune/pl/pingwinaria
+share/games/fortune/pl/pingwinaria.dat
+share/games/fortune/pl/pld
+share/games/fortune/pl/pld-fork
+share/games/fortune/pl/pld-fork.dat
+share/games/fortune/pl/pld-offensive
+share/games/fortune/pl/pld-offensive.dat
+share/games/fortune/pl/pld.dat
+share/games/fortune/pl/pldhelp
+share/games/fortune/pl/pldhelp-offensive
+share/games/fortune/pl/pldhelp-offensive.dat
+share/games/fortune/pl/pldhelp.dat
+share/games/fortune/pl/plug
+share/games/fortune/pl/plug.dat
 share/games/fortune/pl/polish_manpages
 share/games/fortune/pl/polish_manpages.dat
+share/games/fortune/pl/pplug
+share/games/fortune/pl/pplug.dat
 share/games/fortune/pl/pratchett
 share/games/fortune/pl/pratchett.dat
 share/games/fortune/pl/psy1
@@ -84,6 +144,8 @@ share/games/fortune/pl/radio_maryja
 share/games/fortune/pl/radio_maryja.dat
 share/games/fortune/pl/rywingate
 share/games/fortune/pl/rywingate.dat
+share/games/fortune/pl/rzewski
+share/games/fortune/pl/rzewski.dat
 share/games/fortune/pl/sad
 share/games/fortune/pl/sad.dat
 share/games/fortune/pl/sapkowski
@@ -94,6 +156,8 @@ share/games/fortune/pl/sigpl
 share/games/fortune/pl/sigpl.dat
 share/games/fortune/pl/sigvirus
 share/games/fortune/pl/sigvirus.dat
+share/games/fortune/pl/slogany
+share/games/fortune/pl/slogany.dat
 share/games/fortune/pl/slownik
 share/games/fortune/pl/slownik.dat
 share/games/fortune/pl/spolem
@@ -112,6 +176,8 @@ share/games/fortune/pl/wierszyki
 share/games/fortune/pl/wierszyki.dat
 share/games/fortune/pl/wieza-pilot
 share/games/fortune/pl/wieza-pilot.dat
+share/games/fortune/pl/x-avalon
+share/games/fortune/pl/x-avalon.dat
 share/games/fortune/pl/zen
 share/games/fortune/pl/zen.dat
 share/games/fortune/pl/znaki_zodiaku