Attachment #125763 for bug #169422

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

Lines 6-14 Link Here

(-)sysutils/ddrescue/Makefile (-2 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= ddrescue	8	PORTNAME= ddrescue
9	PORTVERSION= 1.15	9	PORTVERSION= 1.16
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= GNU	11	MASTER_SITES= GNU
		12	EXTRACT_SUFX= .tar.lz
12		13
13	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Data recovery tool	15	COMMENT= Data recovery tool
Lines 16-21 Link Here
16	LICENSE= GPLv3	17	LICENSE= GPLv3
17	LICENSE_FILE= ${WRKSRC}/COPYING	18	LICENSE_FILE= ${WRKSRC}/COPYING
18		19
		20	EXTRACT_DEPENDS=lzip:${PORTSDIR}/archivers/lzip
		21
		22	EXTRACT_CMD= ${LOCALBASE}/bin/lzip
		23
		24	OPTIONS_DEFINE= DOCS
		25
19	HAS_CONFIGURE= yes	26	HAS_CONFIGURE= yes
20	CONFIGURE_ARGS= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \	27	CONFIGURE_ARGS= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
21	CXXFLAGS="${CXXFLAGS}"	28	CXXFLAGS="${CXXFLAGS}"
Lines 26-31 Link Here
26	PORTDOCS= AUTHORS ChangeLog NEWS README	33	PORTDOCS= AUTHORS ChangeLog NEWS README
27	PLIST_FILES= bin/ddrescue bin/ddrescuelog	34	PLIST_FILES= bin/ddrescue bin/ddrescuelog
28		35
		36	.include <bsd.port.options.mk>
		37
29	do-install:	38	do-install:
30	.for i in ddrescue ddrescuelog	39	.for i in ddrescue ddrescuelog
31	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin	40	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
Lines 34-40 Link Here
34	.for i in ddrescue	43	.for i in ddrescue
35	${INSTALL_DATA} ${WRKSRC}/doc/${i}.info ${PREFIX}/${INFO_PATH}	44	${INSTALL_DATA} ${WRKSRC}/doc/${i}.info ${PREFIX}/${INFO_PATH}
36	.endfor	45	.endfor
37	.if !defined(NOPORTDOCS)	46	.if ${PORT_OPTIONS:MDOCS}
38	@${MKDIR} ${DOCSDIR}	47	@${MKDIR} ${DOCSDIR}
39	.for file in ${PORTDOCS}	48	.for file in ${PORTDOCS}
40	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	49	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}

Lines 1-2 Link Here

(-)sysutils/ddrescue/distinfo (-2 / +2 lines)
1	SHA256 (ddrescue-1.15.tar.gz) = 75e01362005ba5b59a275edd9d012229b43e0b56533c2abb89d40a44d7ec2d78	1	SHA256 (ddrescue-1.16.tar.lz) = 47ff778de4ff75a7e796c717e68fcef2000fe3ca25f824d3063259ebf930a65e
2	SIZE (ddrescue-1.15.tar.gz) = 99082	2	SIZE (ddrescue-1.16.tar.lz) = 61763




--- Makefile.in.orig	2011-11-22 22:09:38.000000000 +0900
+++ Makefile.in	2012-01-07 05:34:41.000000000 +0900
@@ -18,16 +18,16 @@
 all : $(progname) ddrescuelog
 
 $(progname) : $(objs)
-	$(CXX) $(LDFLAGS) -o $@ $^
+	$(CXX) $(LDFLAGS) -o $@ $(objs)
 
 $(progname)_profiled : $(objs)
-	$(CXX) $(LDFLAGS) -pg -o $@ $^
+	$(CXX) $(LDFLAGS) -pg -o $@ $(objs)
 
 ddrescuelog : $(logobjs)
-	$(CXX) $(LDFLAGS) -o $@ $^
+	$(CXX) $(LDFLAGS) -o $@ $(logobjs)
 
 static_$(progname) : $(objs)
-	$(CXX) $(LDFLAGS) -static -o $@ $^
+	$(CXX) $(LDFLAGS) -static -o $@ $(objs)
 
 main.o : main.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<

Return to bug 169422

Lines 1-23 Link Here

(-)sysutils/ddrescue/files/patch-Makefile.in (-23 lines)
1	--- Makefile.in.orig 2011-11-22 22:09:38.000000000 +0900
2	+++ Makefile.in 2012-01-07 05:34:41.000000000 +0900
3	@@ -18,16 +18,16 @@
4	all : $(progname) ddrescuelog
5
6	$(progname) : $(objs)
7	- $(CXX) $(LDFLAGS) -o $@ $^
8	+ $(CXX) $(LDFLAGS) -o $@ $(objs)
9
10	$(progname)_profiled : $(objs)
11	- $(CXX) $(LDFLAGS) -pg -o $@ $^
12	+ $(CXX) $(LDFLAGS) -pg -o $@ $(objs)
13
14	ddrescuelog : $(logobjs)
15	- $(CXX) $(LDFLAGS) -o $@ $^
16	+ $(CXX) $(LDFLAGS) -o $@ $(logobjs)
17
18	static_$(progname) : $(objs)
19	- $(CXX) $(LDFLAGS) -static -o $@ $^
20	+ $(CXX) $(LDFLAGS) -static -o $@ $(objs)
21
22	main.o : main.cc
23	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<