From owner-freebsd-ports  Mon May 15 18:50: 7 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 47BCB37B5E4
	for <freebsd-ports@FreeBSD.org>; Mon, 15 May 2000 18:50:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id SAA24299;
	Mon, 15 May 2000 18:50:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from doit.wsl.sinica.edu.tw (doit.wsl.sinica.edu.tw [140.109.7.80])
	by hub.freebsd.org (Postfix) with ESMTP id E0BF937B5E4
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 15 May 2000 18:44:52 -0700 (PDT)
	(envelope-from ycheng@doit.wsl.sinica.edu.tw)
Received: (from ycheng@localhost)
	by doit.wsl.sinica.edu.tw (8.9.3/8.9.3) id JAA04697;
	Tue, 16 May 2000 09:45:04 +0800 (CST)
	(envelope-from ycheng)
Message-Id: <200005160145.JAA04697@doit.wsl.sinica.edu.tw>
Date: Tue, 16 May 2000 09:45:04 +0800 (CST)
From: ycheng@sinica.edu.tw
Reply-To: ycheng@sinica.edu.tw
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: ports/18577: Upgrade to version 1.5
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         18577
>Category:       ports
>Synopsis:       Upgrade to version 1.5
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 15 18:50:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Unprivileged user
>Release:        FreeBSD 4.0-20000406-STABLE i386
>Organization:
ASCC
>Environment:

	

>Description:

	upgrade to version 1.5
	submit by tkato@prontomail.ne.jp and review by maintainer (me)

>How-To-Repeat:

	

>Fix:

	

the following patch:


diff -urN popt.orig/Makefile popt/Makefile
--- popt.orig/Makefile	Tue May 16 09:25:02 2000
+++ popt/Makefile	Tue May 16 09:28:59 2000
@@ -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>
diff -urN popt.orig/files/md5 popt/files/md5
--- popt.orig/files/md5	Tue May 16 09:25:02 2000
+++ popt/files/md5	Tue May 16 09:26:09 2000
@@ -1 +1 @@
-MD5 (popt-1.4-1.src.rpm) = a4a87c369b0d7aa7cfa5ee575efeccfd
+MD5 (popt-1.5.tar.gz) = 13f88aa5db9fa21aa164afdec9c7cfea
diff -urN popt.orig/patches/patch-aa popt/patches/patch-aa
--- popt.orig/patches/patch-aa	Thu Jan  1 08:00:00 1970
+++ popt/patches/patch-aa	Tue May 16 09:31:05 2000
@@ -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

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message