Bug 182780 - Port sysutils/ddrescue version 1.17 upgrade [patch]
Summary: Port sysutils/ddrescue version 1.17 upgrade [patch]
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: William Grzybowski
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-07 05:30 UTC by Horia Racoviceanu
Modified: 2013-11-06 22:20 UTC (History)
0 users

See Also:


Attachments
file.diff (1.39 KB, patch)
2013-10-07 05:30 UTC, Horia Racoviceanu
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Horia Racoviceanu 2013-10-07 05:30:00 UTC
ddrescue version 1.17 upgrade

Fix: - Change PORTVERSION to 1.17
- Add EXTRACT_SUFX=.tar.lz
  with corresponding do-extract:
- New distinfo

Build log:
https://redports.org/buildarchive/20131007040007-00567/

Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-07 05:30:07 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-07 05:30:07 UTC
Maintainer of sysutils/ddrescue,

Please note that PR ports/182780 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182780

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 jharris 2013-10-16 13:49:36 UTC
On Mon, Oct 07, 2013 at 04:30:07AM +0000, Edwin Groothuis wrote:
> Maintainer of sysutils/ddrescue,
> 
> Please note that PR ports/182780 has just been submitted.
> 
> The full text of the PR can be found at:
>     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182780


I had tested this release once and found it to compile on
9.1-RELEASE-p7(?), and the patch works, so I approve the update.
Thanks!

However, I can't compile it after a freebsd-update to:

  FreeBSD laptop 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013     root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC  amd64

because it now dies with the following:

===>  Building for ddrescue-1.17
c++ -O2 -pipe -fstack-protector -fno-strict-aliasing -c arg_parser.cc
In file included from /usr/include/c++/4.2/cstring:52,
                 from arg_parser.cc:29:
/usr/include/string.h:137:29: error: xlocale/_string.h: No such file or directory
In file included from /usr/include/c++/4.2/clocale:51,
                 from /usr/include/c++/4.2/bits/c++locale.h:47,
                 from /usr/include/c++/4.2/iosfwd:45,
                 from /usr/include/c++/4.2/bits/stl_algobase.h:70,
                 from /usr/include/c++/4.2/bits/char_traits.h:46,
                 from /usr/include/c++/4.2/string:47,
                 from arg_parser.cc:30:
/usr/include/locale.h:82:29: error: xlocale/_locale.h: No such file or directory
In file included from /usr/include/pthread.h:47,
                 from /usr/include/c++/4.2/bits/gthr-default.h:43,
                 from /usr/include/c++/4.2/bits/gthr.h:114,
                 from /usr/include/c++/4.2/bits/c++io.h:43,
                 from /usr/include/c++/4.2/iosfwd:46,
                 from /usr/include/c++/4.2/bits/stl_algobase.h:70,
                 from /usr/include/c++/4.2/bits/char_traits.h:46,
                 from /usr/include/c++/4.2/string:47,
                 from arg_parser.cc:30:
/usr/include/time.h:189:27: error: xlocale/_time.h: No such file or directory
In file included from /usr/include/c++/4.2/cctype:51,
                 from /usr/include/c++/4.2/iosfwd:47,
                 from /usr/include/c++/4.2/bits/stl_algobase.h:70,
                 from /usr/include/c++/4.2/bits/char_traits.h:46,
                 from /usr/include/c++/4.2/string:47,
                 from arg_parser.cc:30:
/usr/include/ctype.h:83:28: error: xlocale/_ctype.h: No such file or directory
In file included from /usr/include/c++/4.2/cwchar:55,
                 from /usr/include/c++/4.2/bits/postypes.h:46,
                 from /usr/include/c++/4.2/iosfwd:49,
                 from /usr/include/c++/4.2/bits/stl_algobase.h:70,
                 from /usr/include/c++/4.2/bits/char_traits.h:46,
                 from /usr/include/c++/4.2/string:47,
                 from arg_parser.cc:30:
/usr/include/wchar.h:230:28: error: xlocale/_wchar.h: No such file or directory
*** [arg_parser.o] Error code 1
1 error
===> Compilation failed unexpectedly.

-- 
Jason Harris           |  PGP:  This _is_ PGP-signed, isn't it?
jharris@widomaker.com _|_ Got photons? (TM), (C) 2004
Comment 4 Horia Racoviceanu 2013-11-06 17:36:46 UTC
Please check the existence of /usr/include/xlocale/_*.h
They should exist in a correct install.

> /usr/include/wchar.h:230:28: error: xlocale/_wchar.h: No such file or directory
Comment 5 William Grzybowski freebsd_committer freebsd_triage 2013-11-06 22:19:21 UTC
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 6 dfilter service freebsd_committer freebsd_triage 2013-11-06 22:19:26 UTC
Author: wg
Date: Wed Nov  6 22:19:18 2013
New Revision: 333043
URL: http://svnweb.freebsd.org/changeset/ports/333043

Log:
  sysutils/ddrescue: update to 1.17
  
  - Update to 1.17 [1]
  - Allow staging
  
  PR:		ports/182780 [1]
  Submitted by:	Horia Racoviceanu <horia racoviceanu.com>
  Approved by:	maintainer

Modified:
  head/sysutils/ddrescue/Makefile
  head/sysutils/ddrescue/distinfo

Modified: head/sysutils/ddrescue/Makefile
==============================================================================
--- head/sysutils/ddrescue/Makefile	Wed Nov  6 22:03:45 2013	(r333042)
+++ head/sysutils/ddrescue/Makefile	Wed Nov  6 22:19:18 2013	(r333043)
@@ -2,16 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	ddrescue
-PORTVERSION=	1.16
-PORTREVISION=	1
+PORTVERSION=	1.17
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU
+EXTRACT_SUFX=	.tar.lz
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Data recovery tool
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
+
+EXTRACT_DEPENDS=lzip:${PORTSDIR}/archivers/lzip
 
 OPTIONS_DEFINE=	DOCS
 
@@ -19,25 +20,25 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}"
 
-MAN1=		ddrescue.1 ddrescuelog.1
 INFO=		ddrescue
 PORTDOCS=	AUTHORS ChangeLog NEWS README
-PLIST_FILES=	bin/ddrescue bin/ddrescuelog
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PLIST_FILES=	bin/ddrescue \
+		bin/ddrescuelog \
+		man/man1/ddrescue.1.gz \
+		man/man1/ddrescuelog.1.gz
+
+do-extract:
+	@${MKDIR} ${WRKDIR}
+	@${LOCALBASE}/bin/lzip -dc ${DISTDIR}/${DISTFILES} | \
+	${TAR} -x -f - -C ${WRKDIR} --no-same-owner --no-same-permissions
 
 do-install:
 .for i in ddrescue ddrescuelog
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${MAN1PREFIX}/man/man1
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/doc/ddrescue.info ${PREFIX}/${INFO_PATH}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
-.endif
+	${INSTALL_DATA} ${WRKSRC}/doc/ddrescue.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/sysutils/ddrescue/distinfo
==============================================================================
--- head/sysutils/ddrescue/distinfo	Wed Nov  6 22:03:45 2013	(r333042)
+++ head/sysutils/ddrescue/distinfo	Wed Nov  6 22:19:18 2013	(r333043)
@@ -1,2 +1,2 @@
-SHA256 (ddrescue-1.16.tar.gz) = 76b3f2e5fb0306d24f2632c3e168cccb73dc0a348e3a7089cd9230748ff23de6
-SIZE (ddrescue-1.16.tar.gz) = 104691
+SHA256 (ddrescue-1.17.tar.lz) = bef96c181b031cc7de9d02c0aec2e8dbf860d149fa2f35f967448a48ffd2752f
+SIZE (ddrescue-1.17.tar.lz) = 64065
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 7 William Grzybowski freebsd_committer freebsd_triage 2013-11-06 22:19:29 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wg

I'll take it.