- Update to 0.1.2

- Remove LICENSE_FILE for well-known licenses
- Convert to new LIB_DEPENDS format
- Convert to new options framework
- Add EXPAT, LIBXML2 and TEST options [1]
- Strip shared library
- Remove unnecessary post-patch:
- Support STAGEDIR
- Take maintainership

Changes:	http://bazaar.launchpad.net/~metalink-dev/libmetalink/trunk/view/head:/NEWS
PR:		ports/176891 [1], ports/181522
Submitted by:	Andrew Romanenko <melanhit@gmail.com> [1]
		sunpoet (myself)

3 files changed, 52 insertions, 41 deletions

diff --git a/misc/libmetalink/Makefile b/misc/libmetalink/Makefile
index 09bd9927826..25894b1a55c 100644
--- a/misc/libmetalink/Makefile
+++ b/misc/libmetalink/Makefile
@@ -2,54 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	libmetalink
-PORTVERSION=	0.0.3
-PORTREVISION=	1
+PORTVERSION=	0.1.2
 CATEGORIES=	misc
-MASTER_SITES=	http://launchpad.net/libmetalink/trunk/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpadlibrarian.net/113836499/ \
+		LOCAL/sunpoet
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Metalink library written in C language
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
-
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_BZIP2=	yes
-USE_GCC=	yes
+OPTIONS_DEFINE=	EXAMPLES TEST
+OPTIONS_SINGLE=	XML
+OPTIONS_SINGLE_XML=	EXPAT LIBXML2
+OPTIONS_DEFAULT=EXPAT
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	\
-		--with-libexpat-prefix="${LOCALBASE}" \
-		--with-libxml2="no"
+LDFLAGS+=	-L${LOCALBASE}/lib
+USE_BZIP2=	yes
 USE_LDCONFIG=	yes
+USES=		pathfix
 
-# Examples to install
-EXAMPLES_FILES=	\
-	doc/sample.c \
-	doc/ubuntu-7_10-server-i386_iso.metalink
-
-.ifndef(NOPORTEXAMPLES)
-PORTEXAMPLES=	*
-.endif
-
-NO_STAGE=	yes
-post-patch:
-# do not automagically install either documents or examples
-	@${REINPLACE_CMD} -E \
-		-e 's|^(install:).*|\1|' \
-		${WRKSRC}/doc/Makefile.in
-# fix pkgconfig install destination
-	@${REINPLACE_CMD} -E \
-		-e 's|^(pkgconfigdir[[:space:]]*=).*$$|\1${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/lib/Makefile.in
+PORTEXAMPLES=	LibO_3.5.4_Win_x86_install_multi.msi.meta4 \
+		metalinkcat.c \
+		ubuntu-12.04-server-amd64.metalink
+
+EXPAT_CONFIGURE_WITH=	libexpat
+EXPAT_CPPFLAGS=		-I${LOCALBASE}/include
+EXPAT_LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIBXML2_CONFIGURE_WITH=	libxml2
+LIBXML2_CPPFLAGS=	-I${LOCALBASE}/include/libxml2
+LIBXML2_USE=		GNOME=libxml2
+TEST_BUILD_DEPENDS=	cunit>=2.1:${PORTSDIR}/devel/cunit
+TEST_CONFIGURE_ENV=	CUNIT_CFLAGS=-I${LOCALBASE}/include CUNIT_LIBS="-L${LOCALBASE}/lib -lcunit -L${LIBDIR} -lncurses"
+
+post-build:
+	@${STRIP_CMD} ${WRKSRC}/lib/.libs/libmetalink.so.3
 
 post-install:
-# examples
-.ifndef(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-.for file in ${EXAMPLES_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
-.endfor
-.endif
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/doc/examples/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
+
+regression-test test: build
+	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
 
 .include <bsd.port.mk>
diff --git a/misc/libmetalink/distinfo b/misc/libmetalink/distinfo
index be3484102f0..0b1bc9002d9 100644
--- a/misc/libmetalink/distinfo
+++ b/misc/libmetalink/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmetalink-0.0.3.tar.bz2) = 0bdc2cc0366b2b7bcf16eff31a5edc4d39b41430856afce04ad9dd9bbcc8c42c
-SIZE (libmetalink-0.0.3.tar.bz2) = 267023
+SHA256 (libmetalink-0.1.2.tar.bz2) = cbed9121bf550ef14a434d6ed3d8806ded7a339db16b698cfa2f39fdc3d48bf6
+SIZE (libmetalink-0.1.2.tar.bz2) = 324431
diff --git a/misc/libmetalink/pkg-plist b/misc/libmetalink/pkg-plist
index 417f66e11a3..478855ffc7e 100644
--- a/misc/libmetalink/pkg-plist
+++ b/misc/libmetalink/pkg-plist
@@ -1,9 +1,26 @@
+include/metalink/metalink.h
 include/metalink/metalink_error.h
 include/metalink/metalink_parser.h
 include/metalink/metalink_types.h
+include/metalink/metalinkver.h
 lib/libmetalink.a
 lib/libmetalink.la
 lib/libmetalink.so
-lib/libmetalink.so.1
+lib/libmetalink.so.3
 libdata/pkgconfig/libmetalink.pc
+man/man3/metalink_checksum_t.3.gz
+man/man3/metalink_chunk_checksum_t.3.gz
+man/man3/metalink_delete.3.gz
+man/man3/metalink_file_t.3.gz
+man/man3/metalink_parse_fd.3.gz
+man/man3/metalink_parse_file.3.gz
+man/man3/metalink_parse_final.3.gz
+man/man3/metalink_parse_fp.3.gz
+man/man3/metalink_parse_memory.3.gz
+man/man3/metalink_parse_update.3.gz
+man/man3/metalink_parser_context_delete.3.gz
+man/man3/metalink_parser_context_new.3.gz
+man/man3/metalink_piece_hash_t.3.gz
+man/man3/metalink_resource_t.3.gz
+man/man3/metalink_t.3.gz
 @dirrm include/metalink