Update to version 1.5

PR:		18577
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
Reviewed by:	maintainer

devel/popt/Makefile

@@ -6,28 +6,18 @@
 #
 
 PORTNAME=	popt
-PORTVERSION=	1.4
+PORTVERSION=	1.5
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.redhat.com/redhat/current/SRPMS/SRPMS/ \
-		ftp://ftp.freesoftware.com/pub/linux/redhat/current/SRPMS/SRPMS/
-EXTRACT_SUFX=	-1.src.rpm
+MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
 
 MAINTAINER=	ycheng@sinica.edu.tw
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/rpm2cpio:${PORTSDIR}/misc/rpm
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-shared
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN3=		popt.3
-MANCOMPRESSED=	no
-
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@${LOCALBASE}/bin/rpm2cpio ${_DISTDIR}${DISTFILES} | (cd ${WRKDIR}; cpio -i)
-	@tar -xzf ${WRKDIR}/${DISTNAME}.tar.gz -C ${WRKDIR}
 
 .include <bsd.port.mk>

devel/popt/distinfo

@@ -1 +1 @@
-MD5 (popt-1.4-1.src.rpm) = a4a87c369b0d7aa7cfa5ee575efeccfd
+MD5 (popt-1.5.tar.gz) = 13f88aa5db9fa21aa164afdec9c7cfea

devel/popt/files/patch-aa

@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	Thu Sep 30 06:12:45 1999
++++ po/Makefile.in.in	Tue May  9 21:18:58 2000
+@@ -18,7 +18,7 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-datadir = $(prefix)/@DATADIRNAME@
++datadir = @datadir@
+ localedir = $(datadir)/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po