From f42def05d5cb4b08da95016e1d9cc839f14610ce Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Mon, 9 Jan 2017 14:45:39 +0000
Subject: [PATCH] popt: drop libtool file, reorder sections. add TEST.

Also update COPYRIGHT years and re-wrap DESCRIPTION.
---
 dev-libs/popt/popt-1.16.recipe | 42 +++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/dev-libs/popt/popt-1.16.recipe b/dev-libs/popt/popt-1.16.recipe
index 56a699f24..6d629be79 100644
--- a/dev-libs/popt/popt-1.16.recipe
+++ b/dev-libs/popt/popt-1.16.recipe
@@ -1,25 +1,23 @@
 SUMMARY="A command line option parsing library"
-DESCRIPTION="
-This is the popt(3) command line option parsing library. While it is similiar \
-to getopt(3), it contains a number of enhancements, including:
+DESCRIPTION="This is the popt(3) command line option parsing library. While it \
+is similiar to getopt(3), it contains a number of enhancements, including:
 - popt is fully reentrant
 - popt can parse arbitrary argv[] style arrays while getopt(3) makes this \
 quite difficult
 - popt allows users to alias command line arguments
 - popt provides convience functions for parsing strings into argv[] style \
-arrays
-"
+arrays"
 LICENSE="MIT"
-COPYRIGHT="1998-2002 Red Hat, Inc."
+COPYRIGHT="1998-2010 Red Hat, Inc."
 HOMEPAGE="http://rpm5.org/files/popt/"
+REVISION="3"
 SOURCE_URI="http://rpm5.org/files/popt/popt-1.16.tar.gz"
 CHECKSUM_SHA256="e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8"
-REVISION="2"
+PATCHES="popt-1.16.patchset"
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
-PATCHES="popt-1.16.patchset"
-
 PROVIDES="
 	popt$secondaryArchSuffix = $portVersion
 	lib:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0
@@ -27,14 +25,23 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
+PROVIDES_devel="
+	popt${secondaryArchSuffix}_devel = $portVersion
+	devel:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0
+	"
+REQUIRES_devel="
+	popt$secondaryArchSuffix == $portVersion base
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:libtoolize$secondaryArchSuffix
 	cmd:autoconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
@@ -51,6 +58,8 @@ INSTALL()
 {
 	make install
 
+	rm $libDir/libpopt.la
+
 	prepareInstalledDevelLibs libpopt
 	fixPkgconfig
 
@@ -60,13 +69,8 @@ INSTALL()
 		$manDir/man3
 }
 
+TEST()
+{
+	make check
+}
 
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	popt${secondaryArchSuffix}_devel = $portVersion
-	devel:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0
-	"
-REQUIRES_devel="
-	popt$secondaryArchSuffix == $portVersion base
-	"