From igor@doom.homeunix.org  Sun Nov 28 19:22:56 2004
Return-Path: <igor@doom.homeunix.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 348C516A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Nov 2004 19:22:56 +0000 (GMT)
Received: from voodoo.oberon.net (voodoo.oberon.net [212.118.165.100])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DA64543D45
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Nov 2004 19:22:55 +0000 (GMT)
	(envelope-from igor@doom.homeunix.org)
Received: from dialup84125-101.ip.peterstar.net ([84.204.125.101] helo=doom.homeunix.org)
	by voodoo.oberon.net with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.43 (FreeBSD))
	id 1CYUd6-0000Lv-A5
	for FreeBSD-gnats-submit@freebsd.org; Sun, 28 Nov 2004 20:22:43 +0100
Received: from doom.homeunix.org (localhost [127.0.0.1])
	by doom.homeunix.org (8.13.1/8.13.1) with ESMTP id iASJMNuC003785
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Nov 2004 22:22:23 +0300 (MSK)
	(envelope-from igor@doom.homeunix.org)
Received: (from igor@localhost)
	by doom.homeunix.org (8.13.1/8.13.1/Submit) id iASJMNCi003784;
	Sun, 28 Nov 2004 22:22:23 +0300 (MSK)
	(envelope-from igor)
Message-Id: <200411281922.iASJMNCi003784@doom.homeunix.org>
Date: Sun, 28 Nov 2004 22:22:23 +0300 (MSK)
From: Igor Pokrovsky <ip@doom.homeunix.org>
Reply-To: Igor Pokrovsky <ip@doom.homeunix.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: graphics/xrml fix build on alpha 4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         74483
>Category:       ports
>Synopsis:       Update port: graphics/xrml fix build on alpha 4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 28 19:30:17 GMT 2004
>Closed-Date:    Thu Jan 20 14:44:26 GMT 2005
>Last-Modified:  Thu Jan 20 14:44:26 GMT 2005
>Originator:     Igor Pokrovsky
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Mon Nov 22 09:16:46 MSK 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386


	
>Description:
1. Added clean-up for stale object file (caused problems on non-x86 platforms).
2. Some s/xrml/\${PORTNAME}/g changes.
	
>How-To-Repeat:
	
>Fix:

	

--- xrml.diff begins here ---
diff -ru /usr/ports/graphics/xrml/Makefile xrml/Makefile
--- /usr/ports/graphics/xrml/Makefile	Sun Aug  1 21:23:26 2004
+++ xrml/Makefile	Sun Nov 28 22:12:44 2004
@@ -54,19 +54,21 @@
 pre-build:
 	${GMAKE} -C ${WRKSRC}/FILTERS link_includes
 	${GMAKE} -C ${WRKSRC}/XRML link_includes
-	@${RM} -f ${WRKSRC}/PROGS/vrmldump/deps
+	${GMAKE} -C ${WRKSRC}/PROGS/vrmldump clean
 
 do-install:
-	@${MKDIR} ${PREFIX}/include/xrml
-	${INSTALL_DATA} ${WRKSRC}/include/*.[hH] ${PREFIX}/include/xrml
+	@${MKDIR} ${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/include/*.[hH] ${PREFIX}/include/${PORTNAME}
 .for i in cso mgf nff vrml2_utf8
-	@${MKDIR} ${PREFIX}/include/xrml/${i}
-	${INSTALL_DATA} ${WRKSRC}/include/${i}/* ${PREFIX}/include/xrml/${i}
+	@${MKDIR} ${PREFIX}/include/${PORTNAME}/${i}
+	${INSTALL_DATA} ${WRKSRC}/include/${i}/* \
+		${PREFIX}/include/${PORTNAME}/${i}
 .endfor
 
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/libxrml.so.0.5 ${PREFIX}/lib/libxrml.so.0
-	${LN} -fs libxrml.so.0 ${PREFIX}/lib/libxrml.so
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${PORTNAME}.so.0.5 \
+		${PREFIX}/lib/lib${PORTNAME}.so.0
+	${LN} -fs lib${PORTNAME}.so.0 ${PREFIX}/lib/lib${PORTNAME}.so
 	@${STRIP_CMD} ${WRKSRC}/lib/*.a
 	${INSTALL_DATA} ${WRKSRC}/lib/*.a ${PREFIX}/lib
 
--- xrml.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: vs 
State-Changed-When: Thu Jan 20 14:44:14 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

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