From tkato432@yahoo.com  Tue Jun 12 18:00:22 2012
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DC4E91065674
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 12 Jun 2012 18:00:21 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165])
	by mx1.freebsd.org (Postfix) with ESMTP id A14858FC08
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 12 Jun 2012 18:00:21 +0000 (UTC)
Received: from localhost.localdomain (ZT037127.ppp.dion.ne.jp [59.128.37.127])
	by msa102lp.auone-net.jp (au one net msa) with ESMTP id 1227F4AC036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 13 Jun 2012 03:00:13 +0900 (JST)
Message-Id: <20120613024425.03d3b958.tkato432@yahoo.com>
Date: Wed, 13 Jun 2012 02:44:25 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: audio/libmtp: Fix build on 7-stable

>Number:         168991
>Category:       ports
>Synopsis:       audio/libmtp: Fix build on 7-stable
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sylvio
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 12 18:10:09 UTC 2012
>Closed-Date:    Sun Jun 17 20:10:25 UTC 2012
>Last-Modified:  Sun Jun 17 20:10:25 UTC 2012
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Fix build on 7-stable

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/audio/libmtp/Makefile audio/libmtp/Makefile
--- /usr/ports/audio/libmtp/Makefile	2012-06-11 00:38:20.000000000 +0900
+++ audio/libmtp/Makefile	2012-06-11 06:09:42.000000000 +0900
@@ -7,6 +7,7 @@
 
 PORTNAME=	libmtp
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
@@ -19,7 +20,7 @@
 OPTIONS_DEFAULT=	MTPZ
 MTPZ_DESC=	Enable functionality to connect to MTPZ devices
 
-USE_GNOME=	gnomehack
+USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -31,7 +32,7 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMTPZ}
-LIB_DEPENDS+=	gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 .else
 CONFIGURE_ARGS+=--disable-mtpz
 .endif
@@ -41,7 +42,6 @@
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
 CONFIGURE_ENV+=	ac_cv_lib_openusb_openusb_init=no
-BROKEN=		does not link on FreeBSD 7.X
 .else
 CONFIGURE_ENV+=	LIBUSB_CFLAGS="-I/usr/include" LIBUSB_LIBS="-lusb" LIBS="-lusb"
 .endif
@@ -50,7 +50,8 @@
 	@${REINPLACE_CMD} -e \
 		'/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
-		'/LIBUSB_REQUIRES/s|libusb-1.0||' ${WRKSRC}/configure
+		'/if test/s|==|=| ; \
+		 /LIBUSB_REQUIRES/s|libusb-1.0||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|<libusb-1.0/|<|' ${WRKSRC}/src/libusb-glue.h
 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sylvio 
Responsible-Changed-By: sylvio 
Responsible-Changed-When: Tue Jun 12 20:41:29 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168991 
State-Changed-From-To: open->closed 
State-Changed-By: sylvio 
State-Changed-When: Sun Jun 17 20:10:24 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168991 
>Unformatted:
