Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Nov 2000 00:50:16 +0100 (CET)
From:      Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
To:        Trevor Johnson <trevor@jpj.net>
Cc:        <ports@freebsd.org>
Subject:   Re: Patch for Re: Wine 2000.10.26 fails to install
Message-ID:  <Pine.BSF.4.30.0011100048370.45946-100000@deneb.dbai.tuwien.ac.at>
In-Reply-To: <Pine.BSI.4.21.0011090432030.5188-100000@blues.jpj.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 9 Nov 2000, Trevor Johnson wrote:
> I made a mistake in the changes that I offered you.  The Porter's Handbook
> implies that installation of man pages should happen regardless of the
> setting of NOPORTDOCS:

Okay, than I think the following patch should be installed instead, which
should fix this and the original problem as well.

Index: Makefile
===================================================================
RCS file: /sw/FreeBSD/CVSUP/ports/emulators/wine/Makefile,v
retrieving revision 1.96
diff -u -3 -p -r1.96 Makefile
--- Makefile	2000/11/02 15:05:13	1.96
+++ Makefile	2000/11/09 23:05:01
@@ -67,10 +66,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.sample
 	[ -f ${PREFIX}/etc/wine.conf ] \
 		|| ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
-.if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.man ${PREFIX}/man/man1/wine.1
 	${INSTALL_DATA} ${WRKSRC}/documentation/wine.conf.man ${PREFIX}/man/man5/wine.conf.5
-	-@${MKDIR} ${PREFIX}/lib/wine/documentation ${PREFIX}/lib/wine/reg 2>/dev/null
+.if !defined(NOPORTDOCS)
+	-@${MKDIR} ${PREFIX}/lib/wine/documentation
 .for i in README ANNOUNCE AUTHORS LICENSE WARRANTY documentation/psdrv.reg
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/lib/wine/documentation
 .endfor
@@ -81,6 +80,7 @@ do-install:
 .endif
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl \
 		${PREFIX}/lib/wine
+	-@${MKDIR} ${PREFIX}/lib/wine/reg 2>/dev/null
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/programs/regapi/regFixer.pl \
 		${WRKSRC}/programs/regapi/regRestorer.pl \

Gerald
-- 
Gerald "Jerry" pfeifer@dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/
"Well, we have Haider, but you cannot become president with less than 50%
of the votes, let alone less votes than your competitors, here in Austria."



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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.30.0011100048370.45946-100000>