- Update to 5.3

PR:		ports/67381
Submitted by:	Florent Thoumie <flz@xbsd.org> (maintainer)

10 files changed, 25 insertions, 234 deletions

diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index 605912365472..e78a83d48ac9 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	testdisk
-PORTVERSION=	5.2
-PORTREVISION=	2
+PORTVERSION=	5.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
 
@@ -20,6 +19,8 @@ CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
 
 MAN1=		testdisk.1
+PLIST_FILES=	sbin/testdisk
+PORTDOCS=	*
 
 .if defined(WITH_E2FSPROGS)
 LIB_DEPENDS+=	ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
@@ -33,12 +34,6 @@ LIB_DEPENDS+=	ntfs.5:${PORTSDIR}/sysutils/ntfsprogs
 LIB_DEPENDS+=	reiserfs-0.3.0:${PORTSDIR}/sysutils/progsreiserfs
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500040
-IGNORE=		"Requires FreeBSD 5.x, some defines are missing in sys/disk.h before __FreeBSD_version 500040"
-.endif
-
 .if !defined(WITH_E2FSPROGS) || !defined(WITH_NTFSPROGS) || !defined(WITH_PROGSREISERFS)
 pre-everything::
 	@${ECHO_MSG} ""
@@ -57,6 +52,6 @@ pre-everything::
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)/doc|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/testdisk/distinfo b/sysutils/testdisk/distinfo
index abf9b4430ff1..8d8f5ecd7a97 100644
--- a/sysutils/testdisk/distinfo
+++ b/sysutils/testdisk/distinfo
@@ -1,2 +1,2 @@
-MD5 (testdisk-5.2.tar.gz) = f31ee06d2040e1d610a5891b57a86f65
-SIZE (testdisk-5.2.tar.gz) = 458451
+MD5 (testdisk-5.3.tar.gz) = 63437803dcfe67f3e2ab434c33446723
+SIZE (testdisk-5.3.tar.gz) = 460690
diff --git a/sysutils/testdisk/files/patch-Makefile.in b/sysutils/testdisk/files/patch-Makefile.in
new file mode 100644
index 000000000000..40be88bfd245
--- /dev/null
+++ b/sysutils/testdisk/files/patch-Makefile.in
@@ -0,0 +1,18 @@
+--- Makefile.in.orig	Fri May 21 14:39:05 2004
++++ Makefile.in	Sun May 30 15:59:59 2004
+@@ -508,7 +508,6 @@
+ #	$(SHELL) ./config.status --recheck
+ 
+ install-data-hook:
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc/themes
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc/themes/default
+@@ -516,7 +515,6 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc/themes/default/buttons/en
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc/themes/default/images
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc/themes/default/templates
+-	$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/COPYING $(top_srcdir)/ChangeLog $(top_srcdir)/INSTALL $(top_srcdir)/NEWS $(top_srcdir)/README $(top_srcdir)/THANKS $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/
+ 	$(INSTALL_DATA) $(top_srcdir)/doc/*.html $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc
+ 	$(INSTALL_DATA) $(top_srcdir)/doc/*.gif $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc
+ 	$(INSTALL_DATA) $(top_srcdir)/doc/*.png $(DESTDIR)$(datadir)/doc/$(PACKAGE)-$(VERSION)/doc
diff --git a/sysutils/testdisk/files/patch-config.h.in b/sysutils/testdisk/files/patch-config.h.in
deleted file mode 100644
index b75d8c677dd5..000000000000
--- a/sysutils/testdisk/files/patch-config.h.in
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruw config.h.in config.h.in
---- config.h.in	2004-03-06 19:39:46.000000000 +0100
-+++ config.h.in	2004-03-21 11:33:19.000000000 +0100
-@@ -3,6 +3,9 @@
- /* Define to 1 if you have the `atexit' function. */
- #undef HAVE_ATEXIT
- 
-+/* Define to 1 if you have the <byteswap.h> header file. */
-+#undef HAVE_BYTESWAP_H
-+
- /* Define to 1 if you have the <curses.h> header file. */
- #undef HAVE_CURSES_H
- 
-@@ -128,6 +131,9 @@
- /* Define to 1 if you have the <sys/disk.h> header file. */
- #undef HAVE_SYS_DISK_H
- 
-+/* Define to 1 if you have the <sys/endian.h> header file. */
-+#undef HAVE_SYS_ENDIAN_H
-+
- /* Define to 1 if you have the <sys/ioctl.h> header file. */
- #undef HAVE_SYS_IOCTL_H
- 
diff --git a/sysutils/testdisk/files/patch-configure b/sysutils/testdisk/files/patch-configure
deleted file mode 100644
index 5c98e68dccfb..000000000000
--- a/sysutils/testdisk/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruw configure configure
---- configure	2004-03-06 19:39:27.000000000 +0100
-+++ configure	2004-03-21 11:32:59.000000000 +0100
-@@ -4286,7 +4286,9 @@
- 
- 
- 
--for ac_header in  curses.h dal/file_dal.h dal/file.h fcntl.h features.h linux/hdreg.h locale.h machine/endian.h ncurses.h stdint.h stdlib.h string.h sys/disk.h sys/disklabel.h sys/ioctl.h sys/mount.h sys/param.h sys/time.h unistd.h
-+
-+
-+for ac_header in  byteswap.h curses.h dal/file_dal.h dal/file.h fcntl.h features.h linux/hdreg.h locale.h machine/endian.h ncurses.h stdint.h stdlib.h string.h sys/disk.h sys/disklabel.h sys/endian.h sys/ioctl.h sys/mount.h sys/param.h sys/time.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/sysutils/testdisk/files/patch-src::common.h b/sysutils/testdisk/files/patch-src::common.h
deleted file mode 100644
index 1ff2ced4b9c8..000000000000
--- a/sysutils/testdisk/files/patch-src::common.h
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruw src/common.h src/common.h
---- src/common.h	2004-03-11 08:30:54.000000000 +0100
-+++ src/common.h	2004-03-18 13:47:21.000000000 +0100
-@@ -212,6 +212,9 @@
-     (((x)&0x00ff)<<8))
- #define be16(x)  (x)
- #define be24(x)  (x)
-+#define le24(x) ((((x) & 0x000000ffUL) << 16) | \
-+    ((x) & 0x0000ff00UL)        | \
-+    (((x) & 0x00ff0000UL) >> 16))
- #define le32(x)  ((((x)&0xff000000L)>>24)                | \
-     (((x)&0x00ff0000L)>>8)                  | \
-     (((x)&0x0000ff00L)<<8)                  | \
diff --git a/sysutils/testdisk/files/patch-src::godmode.c b/sysutils/testdisk/files/patch-src::godmode.c
deleted file mode 100644
index d00ff8ee3b10..000000000000
--- a/sysutils/testdisk/files/patch-src::godmode.c
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ruw src/godmode.c src/godmode.c
---- src/godmode.c	2004-03-12 22:36:04.000000000 +0100
-+++ src/godmode.c	2004-04-05 14:20:58.000000000 +0200
-@@ -656,13 +656,6 @@
-     }
-     LBA2CHS(disk_car,deb->part->lba-1,&start);
-     start.sector=1;
--    if(start.head>0)
--      start.head--;
--    else
--    {
--      start.head=disk_car->CHS.head;
--      start.cylinder--;
--    }
-     if(deb->prev && CHS2LBA(disk_car,&start)<=deb->prev->part->lba+deb->prev->part->part_size-1)
-     {
-       LBA2CHS(disk_car,deb->part->lba-1,&start);
diff --git a/sysutils/testdisk/files/patch-src::intrface.c b/sysutils/testdisk/files/patch-src::intrface.c
deleted file mode 100644
index a142ab77a0d8..000000000000
--- a/sysutils/testdisk/files/patch-src::intrface.c
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruw src/intrface.c src/intrface.c
---- src/intrface.c	2004-03-16 11:13:01.000000000 +0100
-+++ src/intrface.c	2004-03-30 17:19:00.000000000 +0200
-@@ -788,9 +788,6 @@
- 		int done=0;
- 		va_list ap;
- 		WINDOW *window;
--		va_start(ap,_format);
--		window=*(WINDOW**)ap;
--		va_end(ap);
- 		struct MenuItem menuBuffer[]=
- 		{
- 		  { 'P', "Previous",""},
-@@ -806,6 +803,9 @@
- 		  { 0, NULL, NULL }
- 		};
- 		char options[20];
-+		va_start(ap,_format);
-+		window=va_arg(ap,WINDOW*);
-+		va_end(ap);
- 		if(nbr_lines<=DUMP_MAX_LINES)
- 		{
- 		  strncpy(options,"Q",sizeof(options));
diff --git a/sysutils/testdisk/files/patch-src::rfs_dir.c b/sysutils/testdisk/files/patch-src::rfs_dir.c
deleted file mode 100644
index a0745ffa7ace..000000000000
--- a/sysutils/testdisk/files/patch-src::rfs_dir.c
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruw src/rfs_dir.c src/rfs_dir.c
---- src/rfs_dir.c	2004-03-03 19:40:05.000000000 +0100
-+++ src/rfs_dir.c	2004-03-18 11:51:37.000000000 +0100
-@@ -275,7 +275,8 @@
- }
- 
- #ifdef HAVE_STRUCT_DAL_OPS_DEV
--int dal_set_block_size(dal_t *dal, unsigned blocksize) {
-+/*int dal_set_block_size(dal_t *dal, unsigned blocksize) { */
-+int dal_set_block_size(dal_t *dal, size_t   blocksize) {
- 
- 	if (!dal) return 0;
- 	
-
diff --git a/sysutils/testdisk/pkg-plist b/sysutils/testdisk/pkg-plist
deleted file mode 100644
index f8a127d800ce..000000000000
--- a/sysutils/testdisk/pkg-plist
+++ /dev/null
@@ -1,118 +0,0 @@
-sbin/testdisk
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/THANKS
-%%DOCSDIR%%/doc/AfterTestdisk.html
-%%DOCSDIR%%/doc/Compile_BSD.html
-%%DOCSDIR%%/doc/Compile_DOS.html
-%%DOCSDIR%%/doc/Compile_Linux.html
-%%DOCSDIR%%/doc/Compile_Win.html
-%%DOCSDIR%%/doc/DOS_BootDisk.html
-%%DOCSDIR%%/doc/GetTestDisk.html
-%%DOCSDIR%%/doc/HomePage.html
-%%DOCSDIR%%/doc/Linux_BootDisk.html
-%%DOCSDIR%%/doc/MenuAdvanced.html
-%%DOCSDIR%%/doc/MenuAnalyse.html
-%%DOCSDIR%%/doc/MenuDelete.html
-%%DOCSDIR%%/doc/MenuGeometry.html
-%%DOCSDIR%%/doc/MenuMBRCode.html
-%%DOCSDIR%%/doc/MenuOptions.html
-%%DOCSDIR%%/doc/RunningTestdisk.html
-%%DOCSDIR%%/doc/TDRUN.gif
-%%DOCSDIR%%/doc/TechnicalNotes.html
-%%DOCSDIR%%/doc/TestDiskCompilation.html
-%%DOCSDIR%%/doc/TestdiskDevelopmentGroup.html
-%%DOCSDIR%%/doc/examples.html
-%%DOCSDIR%%/doc/ext2fsCompil.html
-%%DOCSDIR%%/doc/logo.png
-%%DOCSDIR%%/doc/ntfsCompil.html
-%%DOCSDIR%%/doc/reiserfsCompil.html
-%%DOCSDIR%%/doc/screen01.gif
-%%DOCSDIR%%/doc/screen02.gif
-%%DOCSDIR%%/doc/screen03.gif
-%%DOCSDIR%%/doc/screen04.gif
-%%DOCSDIR%%/doc/screen05.gif
-%%DOCSDIR%%/doc/screen06.gif
-%%DOCSDIR%%/doc/screen07.gif
-%%DOCSDIR%%/doc/screen08.gif
-%%DOCSDIR%%/doc/screen09.gif
-%%DOCSDIR%%/doc/screen10.gif
-%%DOCSDIR%%/doc/screen11.gif
-%%DOCSDIR%%/doc/screen12.gif
-%%DOCSDIR%%/doc/screen13.gif
-%%DOCSDIR%%/doc/screen14.gif
-%%DOCSDIR%%/doc/screen15.gif
-%%DOCSDIR%%/doc/screen16.gif
-%%DOCSDIR%%/doc/screen16.png
-%%DOCSDIR%%/doc/testdisk.html
-%%DOCSDIR%%/doc/testdisk_change_partition.gif
-%%DOCSDIR%%/doc/testdisk_check.gif
-%%DOCSDIR%%/doc/testdisk_recovery_in_progress.gif
-%%DOCSDIR%%/doc/testdisk_start.gif
-%%DOCSDIR%%/doc/testdisk_write.gif
-%%DOCSDIR%%/doc/testdisklogo-clear-100.gif
-%%DOCSDIR%%/doc/testdisklogo2.gif
-%%DOCSDIR%%/doc/themes/default/buttons/RSS.png
-%%DOCSDIR%%/doc/themes/default/buttons/en/Next.gif
-%%DOCSDIR%%/doc/themes/default/buttons/en/Previous.gif
-%%DOCSDIR%%/doc/themes/default/buttons/valid-xhtml10.png
-%%DOCSDIR%%/doc/themes/default/buttons/vcss.gif
-%%DOCSDIR%%/doc/themes/default/buttons/vcss.png
-%%DOCSDIR%%/doc/themes/default/buttons/vxhtml10.gif
-%%DOCSDIR%%/doc/themes/default/images/favicon.ico
-%%DOCSDIR%%/doc/themes/default/images/ftp.png
-%%DOCSDIR%%/doc/themes/default/images/http.png
-%%DOCSDIR%%/doc/themes/default/images/https.png
-%%DOCSDIR%%/doc/themes/default/images/interwiki.png
-%%DOCSDIR%%/doc/themes/default/images/logo.png
-%%DOCSDIR%%/doc/themes/default/images/mailto.png
-%%DOCSDIR%%/doc/themes/default/images/png.png
-%%DOCSDIR%%/doc/themes/default/images/signature.png
-%%DOCSDIR%%/doc/themes/default/images/url.png
-%%DOCSDIR%%/doc/themes/default/phpwiki-heavy.css
-%%DOCSDIR%%/doc/themes/default/phpwiki-modern-heavy.css
-%%DOCSDIR%%/doc/themes/default/phpwiki-modern.css
-%%DOCSDIR%%/doc/themes/default/phpwiki-printer.css
-%%DOCSDIR%%/doc/themes/default/phpwiki-topbottombars.css
-%%DOCSDIR%%/doc/themes/default/phpwiki.css
-%%DOCSDIR%%/doc/themes/default/templates/actionbar.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/blogform.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/body.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/bottom.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/browse-footer.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/browse.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/content.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/debug.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/dialog.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/editpage.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/frame-footer.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/frame-header.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/frameset.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/head.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/homepage.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/html.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/htmldump.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/info.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/login.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/navbar.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/nochanges.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/redirect.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/savepage.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/signin.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/top.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/userprefs.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/viewsource.tmpl
-%%DOCSDIR%%/doc/themes/default/templates/wikiblog.tmpl
-%%DOCSDIR%%/doc/tips.html
-@dirrm %%DOCSDIR%%/doc/themes/default/templates
-@dirrm %%DOCSDIR%%/doc/themes/default/images
-@dirrm %%DOCSDIR%%/doc/themes/default/buttons/en
-@dirrm %%DOCSDIR%%/doc/themes/default/buttons
-@dirrm %%DOCSDIR%%/doc/themes/default
-@dirrm %%DOCSDIR%%/doc/themes
-@dirrm %%DOCSDIR%%/doc
-@dirrm %%DOCSDIR%%