3 files changed, 129 insertions, 16 deletions

diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index a2dd41a0c8ee..47a3b5687cbf 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	testdisk
-PORTVERSION=	5.1
+PORTVERSION=	5.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
 
 MAINTAINER=	flz@xbsd.org
 COMMENT=	Tool to check and undelete partitions
 
-WRKSRC=		${WRKDIR}/${PORTNAME}/src
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-PLIST_FILES=	bin/testdisk
+MAN1=		testdisk.1
+
+CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" \
+		LDFLAGS="-L${PREFIX}/lib"
 
 .if defined(WITH_E2FSPROGS)
 BUILD_DEPENDS+=	ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
@@ -39,16 +42,8 @@ pre-everything::
 .endif
 
 post-patch:
-.if defined(WITH_E2FSPROGS)
-	@${REINPLACE_CMD} -e 's|-DHAVE_PROGSREISERFS31.*||' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|^\(LIBS=\).*|\1${PREFIX}/lib/libext2fs.a|' ${WRKSRC}/Makefile
-.else
-	@${REINPLACE_CMD} -e 's|-DHAVE_E2FSPROGS.*||' ${WRKSRC}/Makefile
-.endif
-	@${REINPLACE_CMD} -e 's|^bsd:|all:|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|^\(LIBSA=\).*|\1|' ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/testdisk ${PREFIX}/bin
+	${REINPLACE_CMD} -e 's|^transform.*||' ${WRKSRC}/Makefile.in \
+					       ${WRKSRC}/src/Makefile.in
+	${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/testdisk/distinfo b/sysutils/testdisk/distinfo
index 1c8f78fa7712..abf9b4430ff1 100644
--- a/sysutils/testdisk/distinfo
+++ b/sysutils/testdisk/distinfo
@@ -1,2 +1,2 @@
-MD5 (testdisk-5.1.tar.gz) = c86eb08730a52a113ae572de75ff9c9e
-SIZE (testdisk-5.1.tar.gz) = 618498
+MD5 (testdisk-5.2.tar.gz) = f31ee06d2040e1d610a5891b57a86f65
+SIZE (testdisk-5.2.tar.gz) = 458451
diff --git a/sysutils/testdisk/pkg-plist b/sysutils/testdisk/pkg-plist
new file mode 100644
index 000000000000..f8a127d800ce
--- /dev/null
+++ b/sysutils/testdisk/pkg-plist
@@ -0,0 +1,118 @@
+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%%