- Update to 3.24

- Unbreak

PR:		ports/76085
Submitted by:	Nils Vogels <nivo(at)yuckfou.org>
Approved by:	maintainer

6 files changed, 57 insertions, 66 deletions

diff --git a/misc/moviedb/Makefile b/misc/moviedb/Makefile
index cb7bed576220..246802e9e92c 100644
--- a/misc/moviedb/Makefile
+++ b/misc/moviedb/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	moviedb
-PORTVERSION=	3.8
+PORTVERSION=	3.24
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.imdb.com/pub/interfaces/ \
-		ftp://ftp.fu-berlin.de/pub/misc/movies/database/ \
+MASTER_SITES=	ftp://ftp.fu-berlin.de/pub/misc/movies/database/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.imdb.com/pub/interfaces/ \
 		ftp://ftp.sunet.se/pub/tv+movies/imdb/
 DISTFILES=	tools/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} ${IGNOREFILES}
@@ -19,10 +18,6 @@ EXTRACT_ONLY=	tools/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	user@unknown.nu
 COMMENT=	The Internet Movie Database package
 
-BROKEN=		Does not build
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
-
 IGNOREFILES=	actors.list.gz actresses.list.gz aka-names.list.gz \
 	aka-titles.list.gz alternate-versions.list.gz biographies.list.gz \
 	business.list.gz certificates.list.gz cinematographers.list.gz \
@@ -55,7 +50,7 @@ pre-fetch:
 	@${ECHO}
 
 post-patch:
-	cd $(DISTDIR)/$(DIST_SUBDIR);cp -v $(IGNOREFILES) $(WRKSRC)/lists/
+	cd ${DISTDIR}/${DIST_SUBDIR};cp -v ${IGNOREFILES} ${WRKSRC}/lists/
 
 pre-install:
 	[ -d ${PREFIX}/lib/moviedb/ ] \
@@ -81,4 +76,5 @@ template templist title
 .endfor
 .endif
 
+MAKE_ENV+=	WRKSRC=${WRKSRC}
 .include <bsd.port.mk>
diff --git a/misc/moviedb/distinfo b/misc/moviedb/distinfo
index 528bf69322fe..5245d3815bc6 100644
--- a/misc/moviedb/distinfo
+++ b/misc/moviedb/distinfo
@@ -1,5 +1,5 @@
-MD5 (moviedb/tools/moviedb-3.8.tar.gz) = 7667dfdcebf354ea47b522e53b5a5029
-SIZE (moviedb/tools/moviedb-3.8.tar.gz) = 307820
+MD5 (moviedb/tools/moviedb-3.24.tar.gz) = e1cef8d84e1edb459610adc79626d9b2
+SIZE (moviedb/tools/moviedb-3.24.tar.gz) = 314722
 MD5 (moviedb/actors.list.gz) = IGNORE
 MD5 (moviedb/actresses.list.gz) = IGNORE
 MD5 (moviedb/aka-names.list.gz) = IGNORE
diff --git a/misc/moviedb/files/patch-ab b/misc/moviedb/files/patch-ab
index 9a79d19b455c..c68db25c7496 100644
--- a/misc/moviedb/files/patch-ab
+++ b/misc/moviedb/files/patch-ab
@@ -1,16 +1,5 @@
 --- etc/lfetch.orig	Sun Mar  7 20:23:33 1999
 +++ etc/lfetch	Sun Aug 13 19:33:32 2000
-@@ -80,8 +80,8 @@
- #
- ftpcmd=ftp                           # ftp command (eg ftp, gate-ftp)
- ftpopts="-i -n -v"                   # ftp options 
--ftphost=uiarchive.cso.uiuc.edu       # ftp host
--ftpdir=pub/info/imdb                 # lists directory on host
-+ftphost=ftp.imdb.com                 # ftp host
-+ftpdir=pub/interfaces                # lists directory on host
- ftpuser=anonymous                    # ftp userid
- #
- #-----------------------------------------------------------------------------
 @@ -91,7 +91,7 @@
  # temporary files
  if [ -z "$MOVIESTMPDIR" ]; then
diff --git a/misc/moviedb/files/patch-ac b/misc/moviedb/files/patch-ac
index 2344040f5916..8be0c473af2a 100644
--- a/misc/moviedb/files/patch-ac
+++ b/misc/moviedb/files/patch-ac
@@ -1,28 +1,10 @@
---- src/moviedb.h.orig	Mon Mar  8 14:01:42 1999
-+++ src/moviedb.h	Mon Aug 14 22:57:35 2000
-@@ -28,8 +28,8 @@
- #define   FSEP                    '|'
- #define   MAXZCATARGS              10
- #define   MAXLSEEN              65534
--#define   MAXTITLES            300000
--#define   MAXATTRS             100000
-+#define   MAXTITLES            600000
-+#define   MAXATTRS             200000
- #define   MAXFILMOGRAPHIES       1023
- #define   MAXWITHATTRS           4095
- #define   MAXTITLERESULTS        4095
-@@ -46,11 +46,11 @@
- #define   MAXBUSENTRIES         20000
- #define   MAXBIOENTRIES        150000
- #define   MAXMRRENTRIES         40000
--#define   MAXAKAENTRIES        100000
--#define   MAXNAKAENTRIES        50000
-+#define   MAXAKAENTRIES        200000
-+#define   MAXNAKAENTRIES       100000
- #define   MAXTITLEINFO         300000
- #define   MAXPOS                  255
--#define   MAXLINKS             200000
-+#define   MAXLINKS             400000
- #define   MAXLINKSPERMOVIE        250
- 
- #ifndef DBDIR
+--- dbs/Makefile.orig	Mon Mar  8 14:26:31 1999
++++ dbs/Makefile	Tue Aug 15 01:25:10 2000
+@@ -328,6 +328,7 @@
+ 	-[ -s genres.data ] && $(ZDBSCOMPRESS) genres.data	
+ 	-[ -s keywords.data ] && $(ZDBSCOMPRESS) keywords.data	
+ 	-[ -s goofs.data ] && $(ZDBSCOMPRESS) goofs.data	
++	-[ -s language.data ] && $(ZDBSCOMPRESS) language.data
+ 	-[ -s laserdisc.data ] && $(ZDBSCOMPRESS) laserdisc.data	
+ 	-[ -s literature.data ] && $(ZDBSCOMPRESS) literature.data	
+ 	-[ -s locations.data ] && $(ZDBSCOMPRESS) locations.data	
diff --git a/misc/moviedb/files/patch-ad b/misc/moviedb/files/patch-ad
index 8be0c473af2a..e3961f5a5eff 100644
--- a/misc/moviedb/files/patch-ad
+++ b/misc/moviedb/files/patch-ad
@@ -1,10 +1,34 @@
---- dbs/Makefile.orig	Mon Mar  8 14:26:31 1999
-+++ dbs/Makefile	Tue Aug 15 01:25:10 2000
-@@ -328,6 +328,7 @@
- 	-[ -s genres.data ] && $(ZDBSCOMPRESS) genres.data	
- 	-[ -s keywords.data ] && $(ZDBSCOMPRESS) keywords.data	
- 	-[ -s goofs.data ] && $(ZDBSCOMPRESS) goofs.data	
-+	-[ -s language.data ] && $(ZDBSCOMPRESS) language.data
- 	-[ -s laserdisc.data ] && $(ZDBSCOMPRESS) laserdisc.data	
- 	-[ -s literature.data ] && $(ZDBSCOMPRESS) literature.data	
- 	-[ -s locations.data ] && $(ZDBSCOMPRESS) locations.data	
+--- Makefile.orig       Tue Jan 11 09:09:03 2005
++++ Makefile    Tue Jan 11 09:09:47 2005
+@@ -144,7 +144,7 @@
+
+ # Where are the source lists?
+ #RAWDIR = ../lists/
+-RAWDIR = `pwd`/lists/
++RAWDIR = ${WRKSRC}/lists/
+
+ # Where will the databases be?
+ #DBDIR = ../dbs/
+@@ -156,7 +156,7 @@
+
+ # Source files
+ #SRCDIR = ../src/
+-SRCDIR = `pwd`/src/
++SRCDIR = ${WRKSRC}/src/
+
+ # Executable files
+ #BINDIR = ../bin/
+@@ -168,11 +168,11 @@
+
+ # Main directory
+ #MAINDIR = ./
+-MAINDIR = `pwd`/
++MAINDIR = ${WRKSRC}/
+
+ # Documentation directory
+ #DOCDIR = ../docs/
+-DOCDIR = `pwd`/docs/
++DOCDIR = ${WRKSRC}/docs/
+
+ # --------------------------------------------------------------------------
+ #
diff --git a/misc/moviedb/pkg-plist b/misc/moviedb/pkg-plist
index 16d9ac056289..6f4a5aa8fd26 100644
--- a/misc/moviedb/pkg-plist
+++ b/misc/moviedb/pkg-plist
@@ -118,12 +118,12 @@ libexec/moviedb/lfetch
 libexec/moviedb/make-base
 libexec/moviedb/mkdb
 libexec/moviedb/recompress
-share/doc/moviedb/ADDS-GUIDE
-share/doc/moviedb/ChangeLog
-share/doc/moviedb/FAQ
-share/doc/moviedb/FUTURES
-share/doc/moviedb/INSTRUCTIONS
-share/doc/moviedb/manual.tex
+%%PORTDOCS%%%%DOCSDIR%%/ADDS-GUIDE
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/FUTURES
+%%PORTDOCS%%%%DOCSDIR%%/INSTRUCTIONS
+%%PORTDOCS%%%%DOCSDIR%%/manual.tex
 @dirrm lib/moviedb
 @dirrm libexec/moviedb
-@dirrm share/doc/moviedb
+%%PORTDOCS%%@dirrm %%DOCSDIR%%