From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 12 19:18:19 2004 Return-Path: Delivered-To: freebsd-ports-bugs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D18E216A4CF; Thu, 12 Feb 2004 19:18:19 -0800 (PST) Received: from doom.homeunix.org (8-236.dialup.comset.net [213.172.8.236]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A21743D1F; Thu, 12 Feb 2004 19:18:14 -0800 (PST) (envelope-from igor@doom.homeunix.org) Received: from doom.homeunix.org (localhost [127.0.0.1]) by doom.homeunix.org (8.12.10/8.12.10) with ESMTP id i1D3IB7g000546; Fri, 13 Feb 2004 06:18:11 +0300 (MSK) (envelope-from igor@doom.homeunix.org) Received: (from igor@localhost) by doom.homeunix.org (8.12.10/8.12.10/Submit) id i1CEXMrM010801; Thu, 12 Feb 2004 17:33:22 +0300 (MSK) (envelope-from igor) Date: Thu, 12 Feb 2004 17:33:21 +0300 From: Igor Pokrovsky To: freebsd-ports-bugs@freebsd.org Message-ID: <20040212143321.GA10774@doom.homeunix.org> References: <200402102056.i1AKu9O3037958@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline In-Reply-To: <200402102056.i1AKu9O3037958@freefall.freebsd.org> User-Agent: Mutt/1.4.1i cc: Mark Linimon Subject: Re: ports/62512: Update port: graphics/xrml bento fix X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Feb 2004 03:18:20 -0000 --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Feb 10, 2004 at 12:56:09PM -0800, Mark Linimon wrote: > Synopsis: Update port: graphics/xrml bento fix > > State-Changed-From-To: open->feedback > State-Changed-By: linimon > State-Changed-When: Tue Feb 10 12:54:19 PST 2004 > State-Changed-Why: > Committed, thanks. But I am going to leave the PR open because > on my machine (4.9-PRERELEASE), I couldn't get either the patched > nor the unpatched version to de-install cleanly. Submitter, can > you investigate? Here are the files that are left: I've fixed installation problem and made some cosmetic changes. -ip --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="xrml.diff" diff -ruN /usr/ports/graphics/xrml/Makefile xrml/Makefile --- /usr/ports/graphics/xrml/Makefile Tue Feb 10 23:57:22 2004 +++ xrml/Makefile Thu Feb 12 17:26:22 2004 @@ -16,11 +16,11 @@ MAINTAINER= tiamat@comset.net COMMENT= Extensible scene graph library based on VRML'97 -WRKSRC= ${WRKDIR}/XRML +WRKSRC= ${WRKDIR}/${PORTNAME:U} USE_GMAKE= yes USE_X_PREFIX= yes -USE_MESA= yes +USE_GL= yes USE_MOTIF= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes @@ -58,16 +58,11 @@ do-install: @${MKDIR} ${PREFIX}/include/xrml - ${INSTALL_DATA} ${WRKSRC}/include/*.H ${PREFIX}/include/xrml - ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/xrml - @${MKDIR} ${PREFIX}/include/xrml/cso - ${INSTALL_DATA} ${WRKSRC}/include/cso/* ${PREFIX}/include/xrml/cso - @${MKDIR} ${PREFIX}/include/xrml/mgf - ${INSTALL_DATA} ${WRKSRC}/include/mgf/* ${PREFIX}/include/xrml/mgf - @${MKDIR} ${PREFIX}/include/xrml/nff - ${INSTALL_DATA} ${WRKSRC}/include/nff/* ${PREFIX}/include/xrml/nff - @${MKDIR} ${PREFIX}/include/xrml/vrml2_utf8 - ${INSTALL_DATA} ${WRKSRC}/include/vrml2_utf8/* ${PREFIX}/include/xrml/vrml2_utf8 + ${INSTALL_DATA} ${WRKSRC}/include/*.[hH] ${PREFIX}/include/xrml +.for i in cso mgf nff vrml2_utf8 + @${MKDIR} ${PREFIX}/include/xrml/${i} + ${INSTALL_DATA} ${WRKSRC}/include/${i}/* ${PREFIX}/include/xrml/${i} +.endfor ${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/lib/libxrml.so.0.5 ${PREFIX}/lib/libxrml.so.0 @@ -77,10 +72,9 @@ .ifdef (WITH_EXAMPLES) @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/TEST/*.wrl ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/TEST/*.ppm ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/TEST/*.gz ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/TEST/*.mgf ${EXAMPLESDIR} +.for i in wrl ppm gz mgf + ${INSTALL_DATA} ${WRKSRC}/TEST/*.${i} ${EXAMPLESDIR} +.endfor ${INSTALL_DATA} ${WRKSRC}/TEST/plotfunc.c ${EXAMPLESDIR} .endif @@ -97,10 +91,14 @@ @${MKDIR} ${DOCSDIR}/VRML97 ${INSTALL_DATA} ${WRKSRC}/DOC/VRML97/*.html ${DOCSDIR}/VRML97 @${MKDIR} ${DOCSDIR}/VRML97/Images - ${INSTALL_DATA} ${WRKSRC}/DOC/VRML97/Images/* ${DOCSDIR}/VRML97/Images +.for i in gif jpg + ${INSTALL_DATA} ${WRKSRC}/DOC/VRML97/Images/*.${i} ${DOCSDIR}/VRML97/Images +.endfor @${MKDIR} ${DOCSDIR}/VRML97/part1 - ${INSTALL_DATA} ${WRKSRC}/DOC/VRML97/part1/* ${DOCSDIR}/VRML97/part1 - ${LN} -s VRML97 ${DOCSDIR}/VRML +.for i in html wrl wav + ${INSTALL_DATA} ${WRKSRC}/DOC/VRML97/part1/*.${i} ${DOCSDIR}/VRML97/part1 +.endfor + ${LN} -sf VRML97 ${DOCSDIR}/VRML .endif .include --6TrnltStXW4iwmi0--