From tkato@prontomail.com  Fri Jan 31 09:06:26 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8782C37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 31 Jan 2003 09:06:26 -0800 (PST)
Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 73AA643F43
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 31 Jan 2003 09:06:25 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from localhost (localhost [127.0.0.1])
	by socigeog.hmt.toyama-u.ac.jp (Postfix) with SMTP id 58D017C3
	for <FreeBSD-gnats-submit@freebsd.org>; Sat,  1 Feb 2003 02:06:16 +0900 (JST)
Message-Id: <20030201020529.26765191.tkato@prontomail.com>
Date: Sat, 1 Feb 2003 02:05:29 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: sysutils/wmmount

>Number:         47761
>Category:       ports
>Synopsis:       Update port: sysutils/wmmount
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 31 09:10:20 PST 2003
>Closed-Date:    Sun Feb 02 07:04:16 PST 2003
>Last-Modified:  Sun Feb 02 07:04:16 PST 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.7-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Conditionalize libgnugetopt dependencies

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/sysutils/wmmount/Makefile sysutils/wmmount/Makefile
--- /usr/ports/sysutils/wmmount/Makefile	Mon Nov 11 19:01:07 2002
+++ sysutils/wmmount/Makefile	Sun Jan 26 14:23:29 2003
@@ -14,11 +14,16 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
 USE_IMAKE=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+.if !exists(/usr/include/getopt.h)
+LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lgnugetopt
+.endif
 
 post-patch:
 .for file in system.wmmount.eg system.wmmount.sh
diff -urN /usr/ports/sysutils/wmmount/files/patch-ac sysutils/wmmount/files/patch-ac
--- /usr/ports/sysutils/wmmount/files/patch-ac	Tue Jan  9 07:08:29 2001
+++ sysutils/wmmount/files/patch-ac	Sun Jan 26 14:22:44 2003
@@ -5,9 +5,9 @@
  XPMLIB = -lXpm
  
 -LOCAL_LIBRARIES = $(XPMLIB) $(XLIB)
-+LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -lgnugetopt -L${LOCALBASE}/lib
++LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(LDFLAGS)
 +
-+EXTRA_INCLUDES = -I${LOCALBASE}/include
++EXTRA_INCLUDES = $(CPPFLAGS)
  
  SRCS = dockapp.c wmmount.c
  OBJS = dockapp.o wmmount.o
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Sun Feb 2 07:04:07 PST 2003 
State-Changed-Why:  
Committed, thanks! 

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