5 files changed, 32 insertions, 48 deletions

diff --git a/devel/libunwind/Makefile b/devel/libunwind/Makefile
index bd8a8d7aa2d3..9ef9a4e3e156 100644
--- a/devel/libunwind/Makefile
+++ b/devel/libunwind/Makefile
@@ -1,21 +1,19 @@
-# New ports collection makefile for:		libunwind
-# Date created:					04/30/2010
-# Whom:						stas
-#
+# Created by: stas@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	libunwind
-PORTVERSION=	20110911	# This is actually official libunwind 1.0.1
+PORTVERSION=	20121006	# This is actually official libunwind 1.1
 CATEGORIES=	devel
 MASTER_SITES=	SAVANNAH
-DISTNAME=	${PORTNAME}-1.0.1
+DISTNAME=	${PORTNAME}-1.1
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A generic stack unwinding library
+MAINTAINER=	danilogondolfo@gmail.com
+COMMENT=	Generic stack unwinding library
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+USES=	pkgconfig pathfix
+PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize libtool
@@ -30,6 +28,7 @@ MAN3=		_U_dyn_cancel.3 \
 		libunwind-ia64.3 \
 		libunwind-ptrace.3 \
 		libunwind-setjmp.3 \
+		unw_backtrace.3 \
 		unw_create_addr_space.3 \
 		unw_destroy_addr_space.3 \
 		unw_flush_cache.3 \
@@ -52,7 +51,7 @@ MAN3=		_U_dyn_cancel.3 \
 		unw_step.3 \
 		unw_strerror.3
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${ARCH} == i386
 PLIST_SUB=	ARCH=x86
@@ -60,17 +59,4 @@ PLIST_SUB=	ARCH=x86
 PLIST_SUB=	ARCH=x86_64
 .endif
 
-#
-# The original ltmain.sh is buggy and hangs sometimes
-#
-pre-configure:
-	@${CP} ${LTMAIN} ${WRKSRC}/aux/
-
-#
-# Get rid of .la and static library files
-#
-post-configure:
-	@${REINPLACE_CMD} -E -e \
-	'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/libunwind/distinfo b/devel/libunwind/distinfo
index 72a0f8b2f9fe..1b655b033dfc 100644
--- a/devel/libunwind/distinfo
+++ b/devel/libunwind/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libunwind-1.0.1.tar.gz) = aa95fd184c0b90d95891c2f3bac2c7df708ff016d2a6ee8b2eabb769f864101f
-SIZE (libunwind-1.0.1.tar.gz) = 1028725
+SHA256 (libunwind-1.1.tar.gz) = 9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a
+SIZE (libunwind-1.1.tar.gz) = 1098603
diff --git a/devel/libunwind/files/patch-configure.in b/devel/libunwind/files/patch-configure.in
deleted file mode 100644
index 93399c47e5f1..000000000000
--- a/devel/libunwind/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2010-05-01 01:45:55.000000000 -0700
-+++ configure.in	2010-05-01 01:46:05.000000000 -0700
-@@ -6,7 +6,7 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(libunwind, mkvers(pkg_major, pkg_minor, pkg_extra), pkg_maintainer)
- AC_CONFIG_SRCDIR(src/mi/backtrace.c)
--AC_CONFIG_AUX_DIR(config)
-+AC_CONFIG_AUX_DIR(aux)
- AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE([1.6 subdir-objects])
- AM_MAINTAINER_MODE
diff --git a/devel/libunwind/files/patch-include_unwind.h b/devel/libunwind/files/patch-include_unwind.h
deleted file mode 100644
index 2d9411f5b105..000000000000
--- a/devel/libunwind/files/patch-include_unwind.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/unwind.h.orig	2011-10-05 10:31:59.000000000 -0700
-+++ include/unwind.h	2011-10-05 10:32:18.000000000 -0700
-@@ -148,7 +148,7 @@
- #endif /* _GNU_SOURCE */
- 
- #ifdef __cplusplus
--};
-+}
- #endif
- 
- #endif /* _UNWIND_H */
diff --git a/devel/libunwind/pkg-plist b/devel/libunwind/pkg-plist
index 8d53b8e034cc..a35a23243857 100644
--- a/devel/libunwind/pkg-plist
+++ b/devel/libunwind/pkg-plist
@@ -1,14 +1,34 @@
 include/libunwind-common.h
+include/libunwind-coredump.h
 include/libunwind-dynamic.h
 include/libunwind-ptrace.h
 include/libunwind-%%ARCH%%.h
 include/libunwind.h
 include/unwind.h
+lib/libunwind-coredump.a
+lib/libunwind-coredump.la
 lib/libunwind-generic.a
+lib/libunwind-coredump.so
+lib/libunwind-coredump.so.0
+lib/libunwind-generic.so
 lib/libunwind-ptrace.a
+lib/libunwind-ptrace.la
+lib/libunwind-ptrace.so
+lib/libunwind-ptrace.so.0
+lib/libunwind-setjmp.a
+lib/libunwind-setjmp.la
 lib/libunwind-setjmp.so
 lib/libunwind-setjmp.so.0
+lib/libunwind-%%ARCH%%.a
+lib/libunwind-%%ARCH%%.la
 lib/libunwind-%%ARCH%%.so
 lib/libunwind-%%ARCH%%.so.8
+lib/libunwind.a
+lib/libunwind.la
 lib/libunwind.so
 lib/libunwind.so.8
+libdata/pkgconfig/libunwind-generic.pc
+libdata/pkgconfig/libunwind.pc
+libdata/pkgconfig/libunwind-ptrace.pc
+libdata/pkgconfig/libunwind-setjmp.pc
+libdata/pkgconfig/libunwind-coredump.pc