View | Details | Raw Unified | Return to bug 67381
Collapse All | Expand All

(-)testdisk.new/Makefile (-10 / +5 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	testdisk
8
PORTNAME=	testdisk
9
PORTVERSION=	5.2
9
PORTVERSION=	5.3
10
PORTREVISION=	2
11
CATEGORIES=	sysutils
10
CATEGORIES=	sysutils
12
MASTER_SITES=	http://www.cgsecurity.org/
11
MASTER_SITES=	http://www.cgsecurity.org/
13
12
Lines 19-25 Link Here
19
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
18
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
20
CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
19
CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
21
20
21
PORTDOCS=	*
22
MAN1=		testdisk.1
22
MAN1=		testdisk.1
23
PLIST_FILES=	sbin/testdisk
23
24
24
.if defined(WITH_E2FSPROGS)
25
.if defined(WITH_E2FSPROGS)
25
LIB_DEPENDS+=	ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
26
LIB_DEPENDS+=	ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
Lines 33-44 Link Here
33
LIB_DEPENDS+=	reiserfs-0.3.0:${PORTSDIR}/sysutils/progsreiserfs
34
LIB_DEPENDS+=	reiserfs-0.3.0:${PORTSDIR}/sysutils/progsreiserfs
34
.endif
35
.endif
35
36
36
.include <bsd.port.pre.mk>
37
38
.if ${OSVERSION} < 500040
39
IGNORE=		"Requires FreeBSD 5.x, some defines are missing in sys/disk.h before __FreeBSD_version 500040"
40
.endif
41
42
.if !defined(WITH_E2FSPROGS) || !defined(WITH_NTFSPROGS) || !defined(WITH_PROGSREISERFS)
37
.if !defined(WITH_E2FSPROGS) || !defined(WITH_NTFSPROGS) || !defined(WITH_PROGSREISERFS)
43
pre-everything::
38
pre-everything::
44
	@${ECHO_MSG} ""
39
	@${ECHO_MSG} ""
Lines 57-62 Link Here
57
.endif
52
.endif
58
53
59
post-patch:
54
post-patch:
60
	${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in
55
	${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)/doc|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in
61
56
62
.include <bsd.port.post.mk>
57
.include <bsd.port.mk>
(-)testdisk.new/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (testdisk-5.2.tar.gz) = f31ee06d2040e1d610a5891b57a86f65
1
MD5 (testdisk-5.3.tar.gz) = 63437803dcfe67f3e2ab434c33446723
2
SIZE (testdisk-5.2.tar.gz) = 458451
2
SIZE (testdisk-5.3.tar.gz) = 460690
(-)testdisk.new/files/patch-config.h.in (-23 lines)
Lines 1-23 Link Here
1
diff -ruw config.h.in config.h.in
2
--- config.h.in	2004-03-06 19:39:46.000000000 +0100
3
+++ config.h.in	2004-03-21 11:33:19.000000000 +0100
4
@@ -3,6 +3,9 @@
5
 /* Define to 1 if you have the `atexit' function. */
6
 #undef HAVE_ATEXIT
7
 
8
+/* Define to 1 if you have the <byteswap.h> header file. */
9
+#undef HAVE_BYTESWAP_H
10
+
11
 /* Define to 1 if you have the <curses.h> header file. */
12
 #undef HAVE_CURSES_H
13
 
14
@@ -128,6 +131,9 @@
15
 /* Define to 1 if you have the <sys/disk.h> header file. */
16
 #undef HAVE_SYS_DISK_H
17
 
18
+/* Define to 1 if you have the <sys/endian.h> header file. */
19
+#undef HAVE_SYS_ENDIAN_H
20
+
21
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
22
 #undef HAVE_SYS_IOCTL_H
23
 
(-)testdisk.new/files/patch-configure (-14 lines)
Lines 1-14 Link Here
1
diff -ruw configure configure
2
--- configure	2004-03-06 19:39:27.000000000 +0100
3
+++ configure	2004-03-21 11:32:59.000000000 +0100
4
@@ -4286,7 +4286,9 @@
5
 
6
 
7
 
8
-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
9
+
10
+
11
+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
12
 do
13
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
14
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
(-)testdisk.new/files/patch-src::common.h (-13 lines)
Lines 1-13 Link Here
1
diff -ruw src/common.h src/common.h
2
--- src/common.h	2004-03-11 08:30:54.000000000 +0100
3
+++ src/common.h	2004-03-18 13:47:21.000000000 +0100
4
@@ -212,6 +212,9 @@
5
     (((x)&0x00ff)<<8))
6
 #define be16(x)  (x)
7
 #define be24(x)  (x)
8
+#define le24(x) ((((x) & 0x000000ffUL) << 16) | \
9
+    ((x) & 0x0000ff00UL)        | \
10
+    (((x) & 0x00ff0000UL) >> 16))
11
 #define le32(x)  ((((x)&0xff000000L)>>24)                | \
12
     (((x)&0x00ff0000L)>>8)                  | \
13
     (((x)&0x0000ff00L)<<8)                  | \
(-)testdisk.new/files/patch-src::godmode.c (-17 lines)
Lines 1-17 Link Here
1
diff -ruw src/godmode.c src/godmode.c
2
--- src/godmode.c	2004-03-12 22:36:04.000000000 +0100
3
+++ src/godmode.c	2004-04-05 14:20:58.000000000 +0200
4
@@ -656,13 +656,6 @@
5
     }
6
     LBA2CHS(disk_car,deb->part->lba-1,&start);
7
     start.sector=1;
8
-    if(start.head>0)
9
-      start.head--;
10
-    else
11
-    {
12
-      start.head=disk_car->CHS.head;
13
-      start.cylinder--;
14
-    }
15
     if(deb->prev && CHS2LBA(disk_car,&start)<=deb->prev->part->lba+deb->prev->part->part_size-1)
16
     {
17
       LBA2CHS(disk_car,deb->part->lba-1,&start);
(-)testdisk.new/files/patch-src::intrface.c (-23 lines)
Lines 1-23 Link Here
1
diff -ruw src/intrface.c src/intrface.c
2
--- src/intrface.c	2004-03-16 11:13:01.000000000 +0100
3
+++ src/intrface.c	2004-03-30 17:19:00.000000000 +0200
4
@@ -788,9 +788,6 @@
5
 		int done=0;
6
 		va_list ap;
7
 		WINDOW *window;
8
-		va_start(ap,_format);
9
-		window=*(WINDOW**)ap;
10
-		va_end(ap);
11
 		struct MenuItem menuBuffer[]=
12
 		{
13
 		  { 'P', "Previous",""},
14
@@ -806,6 +803,9 @@
15
 		  { 0, NULL, NULL }
16
 		};
17
 		char options[20];
18
+		va_start(ap,_format);
19
+		window=va_arg(ap,WINDOW*);
20
+		va_end(ap);
21
 		if(nbr_lines<=DUMP_MAX_LINES)
22
 		{
23
 		  strncpy(options,"Q",sizeof(options));
(-)testdisk.new/files/patch-src::rfs_dir.c (-14 lines)
Lines 1-14 Link Here
1
diff -ruw src/rfs_dir.c src/rfs_dir.c
2
--- src/rfs_dir.c	2004-03-03 19:40:05.000000000 +0100
3
+++ src/rfs_dir.c	2004-03-18 11:51:37.000000000 +0100
4
@@ -275,7 +275,8 @@
5
 }
6
 
7
 #ifdef HAVE_STRUCT_DAL_OPS_DEV
8
-int dal_set_block_size(dal_t *dal, unsigned blocksize) {
9
+/*int dal_set_block_size(dal_t *dal, unsigned blocksize) { */
10
+int dal_set_block_size(dal_t *dal, size_t   blocksize) {
11
 
12
 	if (!dal) return 0;
13
 	
14
(-)testdisk.new/pkg-plist (-118 lines)
Lines 1-118 Link Here
1
sbin/testdisk
2
%%DOCSDIR%%/AUTHORS
3
%%DOCSDIR%%/COPYING
4
%%DOCSDIR%%/ChangeLog
5
%%DOCSDIR%%/INSTALL
6
%%DOCSDIR%%/NEWS
7
%%DOCSDIR%%/README
8
%%DOCSDIR%%/THANKS
9
%%DOCSDIR%%/doc/AfterTestdisk.html
10
%%DOCSDIR%%/doc/Compile_BSD.html
11
%%DOCSDIR%%/doc/Compile_DOS.html
12
%%DOCSDIR%%/doc/Compile_Linux.html
13
%%DOCSDIR%%/doc/Compile_Win.html
14
%%DOCSDIR%%/doc/DOS_BootDisk.html
15
%%DOCSDIR%%/doc/GetTestDisk.html
16
%%DOCSDIR%%/doc/HomePage.html
17
%%DOCSDIR%%/doc/Linux_BootDisk.html
18
%%DOCSDIR%%/doc/MenuAdvanced.html
19
%%DOCSDIR%%/doc/MenuAnalyse.html
20
%%DOCSDIR%%/doc/MenuDelete.html
21
%%DOCSDIR%%/doc/MenuGeometry.html
22
%%DOCSDIR%%/doc/MenuMBRCode.html
23
%%DOCSDIR%%/doc/MenuOptions.html
24
%%DOCSDIR%%/doc/RunningTestdisk.html
25
%%DOCSDIR%%/doc/TDRUN.gif
26
%%DOCSDIR%%/doc/TechnicalNotes.html
27
%%DOCSDIR%%/doc/TestDiskCompilation.html
28
%%DOCSDIR%%/doc/TestdiskDevelopmentGroup.html
29
%%DOCSDIR%%/doc/examples.html
30
%%DOCSDIR%%/doc/ext2fsCompil.html
31
%%DOCSDIR%%/doc/logo.png
32
%%DOCSDIR%%/doc/ntfsCompil.html
33
%%DOCSDIR%%/doc/reiserfsCompil.html
34
%%DOCSDIR%%/doc/screen01.gif
35
%%DOCSDIR%%/doc/screen02.gif
36
%%DOCSDIR%%/doc/screen03.gif
37
%%DOCSDIR%%/doc/screen04.gif
38
%%DOCSDIR%%/doc/screen05.gif
39
%%DOCSDIR%%/doc/screen06.gif
40
%%DOCSDIR%%/doc/screen07.gif
41
%%DOCSDIR%%/doc/screen08.gif
42
%%DOCSDIR%%/doc/screen09.gif
43
%%DOCSDIR%%/doc/screen10.gif
44
%%DOCSDIR%%/doc/screen11.gif
45
%%DOCSDIR%%/doc/screen12.gif
46
%%DOCSDIR%%/doc/screen13.gif
47
%%DOCSDIR%%/doc/screen14.gif
48
%%DOCSDIR%%/doc/screen15.gif
49
%%DOCSDIR%%/doc/screen16.gif
50
%%DOCSDIR%%/doc/screen16.png
51
%%DOCSDIR%%/doc/testdisk.html
52
%%DOCSDIR%%/doc/testdisk_change_partition.gif
53
%%DOCSDIR%%/doc/testdisk_check.gif
54
%%DOCSDIR%%/doc/testdisk_recovery_in_progress.gif
55
%%DOCSDIR%%/doc/testdisk_start.gif
56
%%DOCSDIR%%/doc/testdisk_write.gif
57
%%DOCSDIR%%/doc/testdisklogo-clear-100.gif
58
%%DOCSDIR%%/doc/testdisklogo2.gif
59
%%DOCSDIR%%/doc/themes/default/buttons/RSS.png
60
%%DOCSDIR%%/doc/themes/default/buttons/en/Next.gif
61
%%DOCSDIR%%/doc/themes/default/buttons/en/Previous.gif
62
%%DOCSDIR%%/doc/themes/default/buttons/valid-xhtml10.png
63
%%DOCSDIR%%/doc/themes/default/buttons/vcss.gif
64
%%DOCSDIR%%/doc/themes/default/buttons/vcss.png
65
%%DOCSDIR%%/doc/themes/default/buttons/vxhtml10.gif
66
%%DOCSDIR%%/doc/themes/default/images/favicon.ico
67
%%DOCSDIR%%/doc/themes/default/images/ftp.png
68
%%DOCSDIR%%/doc/themes/default/images/http.png
69
%%DOCSDIR%%/doc/themes/default/images/https.png
70
%%DOCSDIR%%/doc/themes/default/images/interwiki.png
71
%%DOCSDIR%%/doc/themes/default/images/logo.png
72
%%DOCSDIR%%/doc/themes/default/images/mailto.png
73
%%DOCSDIR%%/doc/themes/default/images/png.png
74
%%DOCSDIR%%/doc/themes/default/images/signature.png
75
%%DOCSDIR%%/doc/themes/default/images/url.png
76
%%DOCSDIR%%/doc/themes/default/phpwiki-heavy.css
77
%%DOCSDIR%%/doc/themes/default/phpwiki-modern-heavy.css
78
%%DOCSDIR%%/doc/themes/default/phpwiki-modern.css
79
%%DOCSDIR%%/doc/themes/default/phpwiki-printer.css
80
%%DOCSDIR%%/doc/themes/default/phpwiki-topbottombars.css
81
%%DOCSDIR%%/doc/themes/default/phpwiki.css
82
%%DOCSDIR%%/doc/themes/default/templates/actionbar.tmpl
83
%%DOCSDIR%%/doc/themes/default/templates/blogform.tmpl
84
%%DOCSDIR%%/doc/themes/default/templates/body.tmpl
85
%%DOCSDIR%%/doc/themes/default/templates/bottom.tmpl
86
%%DOCSDIR%%/doc/themes/default/templates/browse-footer.tmpl
87
%%DOCSDIR%%/doc/themes/default/templates/browse.tmpl
88
%%DOCSDIR%%/doc/themes/default/templates/content.tmpl
89
%%DOCSDIR%%/doc/themes/default/templates/debug.tmpl
90
%%DOCSDIR%%/doc/themes/default/templates/dialog.tmpl
91
%%DOCSDIR%%/doc/themes/default/templates/editpage.tmpl
92
%%DOCSDIR%%/doc/themes/default/templates/frame-footer.tmpl
93
%%DOCSDIR%%/doc/themes/default/templates/frame-header.tmpl
94
%%DOCSDIR%%/doc/themes/default/templates/frameset.tmpl
95
%%DOCSDIR%%/doc/themes/default/templates/head.tmpl
96
%%DOCSDIR%%/doc/themes/default/templates/homepage.tmpl
97
%%DOCSDIR%%/doc/themes/default/templates/html.tmpl
98
%%DOCSDIR%%/doc/themes/default/templates/htmldump.tmpl
99
%%DOCSDIR%%/doc/themes/default/templates/info.tmpl
100
%%DOCSDIR%%/doc/themes/default/templates/login.tmpl
101
%%DOCSDIR%%/doc/themes/default/templates/navbar.tmpl
102
%%DOCSDIR%%/doc/themes/default/templates/nochanges.tmpl
103
%%DOCSDIR%%/doc/themes/default/templates/redirect.tmpl
104
%%DOCSDIR%%/doc/themes/default/templates/savepage.tmpl
105
%%DOCSDIR%%/doc/themes/default/templates/signin.tmpl
106
%%DOCSDIR%%/doc/themes/default/templates/top.tmpl
107
%%DOCSDIR%%/doc/themes/default/templates/userprefs.tmpl
108
%%DOCSDIR%%/doc/themes/default/templates/viewsource.tmpl
109
%%DOCSDIR%%/doc/themes/default/templates/wikiblog.tmpl
110
%%DOCSDIR%%/doc/tips.html
111
@dirrm %%DOCSDIR%%/doc/themes/default/templates
112
@dirrm %%DOCSDIR%%/doc/themes/default/images
113
@dirrm %%DOCSDIR%%/doc/themes/default/buttons/en
114
@dirrm %%DOCSDIR%%/doc/themes/default/buttons
115
@dirrm %%DOCSDIR%%/doc/themes/default
116
@dirrm %%DOCSDIR%%/doc/themes
117
@dirrm %%DOCSDIR%%/doc
118
@dirrm %%DOCSDIR%%

Return to bug 67381