From owner-freebsd-ports  Fri Jul 21 20:50:52 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 2967937B947
	for <freebsd-ports@FreeBSD.org>; Fri, 21 Jul 2000 20:50:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id UAA87378;
	Fri, 21 Jul 2000 20:50:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 884DD37B832; Fri, 21 Jul 2000 20:44:41 -0700 (PDT)
Message-Id: <20000722034441.884DD37B832@hub.freebsd.org>
Date: Fri, 21 Jul 2000 20:44:41 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20100: Update port: games/gcompris
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20100
>Category:       ports
>Synopsis:       Update port: games/gcompris
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 21 20:50:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Use USE_AUTOMAKE
- Remove USE_GMAKE
- Remove redundant LIB_DEPENDS

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/games/gcompris/Makefile games/gcompris/Makefile
--- /usr/ports/games/gcompris/Makefile	Sat Jul 22 01:05:18 2000
+++ games/gcompris/Makefile	Sat Jul 22 10:25:31 2000
@@ -14,24 +14,20 @@
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
+USE_X_PREFIX=	yes
+USE_AUTOMAKE=	yes
+AUTOMAKE=	automake -a -i
 CONFIGURE_ENV=	GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-extract:
-	@${LN} -sf ${LOCALBASE}/share/automake/install-sh ${WRKSRC}/install-sh
-	@${LN} -sf ${LOCALBASE}/share/automake/mkinstalldirs ${WRKSRC}/mkinstalldirs
+	@find ${WRKSRC} -type l -delete
 
 .include <bsd.port.mk>


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


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