Date: Tue, 24 May 2011 00:36:45 +0400 From: Pan Tsu <inyaoo@gmail.com> To: Gerald Pfeifer <gerald@FreeBSD.org> Cc: cvs-ports@FreeBSD.org, David Naylor <naylor.b.david@gmail.com>, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/emulators Makefile ports/emulators/wine-gecko Makefile distinfo pkg-descr pkg-plist Message-ID: <864o4lb1cy.fsf@gmail.com> In-Reply-To: <201105151529.p4FFTU8x067633__20240.4801188552$1305473416$gmane$org@repoman.freebsd.org> (Gerald Pfeifer's message of "Sun, 15 May 2011 15:29:30 %2B0000 (UTC)") References: <201105151529.p4FFTU8x067633__20240.4801188552$1305473416$gmane$org@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Gerald Pfeifer <gerald@FreeBSD.org> writes:
> gerald 2011-05-15 15:29:30 UTC
>
> FreeBSD ports repository
>
> Modified files:
> emulators Makefile
> Added files:
> emulators/wine-gecko Makefile distinfo pkg-descr pkg-plist
> Log:
> Add the new wine-gecko port, that complements the existing wine port.
>
> Wine implements its own version of Internet Explorer which is based on
> a custom version of Mozilla's Gecko Layout Engine. This engine is down-
> loaded automatically the first time a web page is loaded unless, as done
> by this port, the engine is pre-installed on the user's system.
>
> PR: 156001
> Submitted by: David Naylor <naylor.b.david@gmail.com>
Does wine find gecko with DATADIR != PREFIX/share/wine ? Please, either
document it in the pkg-message that .msi file should be copied/symlinked
from PREFIX/wine-gecko/wine/gecko/*.msi or redefine DATADIR properly.
%%
Index: emulators/wine-gecko/Makefile
===================================================================
RCS file: /a/.cvsup/ports/emulators/wine-gecko/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- emulators/wine-gecko/Makefile 15 May 2011 15:29:30 -0000 1.1
+++ emulators/wine-gecko/Makefile 23 May 2011 20:27:04 -0000
@@ -18,12 +18,15 @@ COMMENT= Gecko Layout Engine for Wine (H
NO_BUILD= yes
PLIST_SUB+= GECKO_VERSION="${DISTVERSION}"
+DATADIR= ${PREFIX}/share/wine
+PLIST_FILES= %%DATADIR%%/gecko/wine_gecko-%%GECKO_VERSION%%-x86.msi
+PLIST_DIRSTRY= %%DATADIR%%/gecko %%DATADIR%%
LICENSE= MPL GPLv2 GPLv3 LGPL21 LGPL3
LICENSE_COMB= multi
do-install:
- ${MKDIR} ${DATADIR}/wine/gecko
- ${INSTALL_DATA} ${DISTDIR}/wine_gecko-${DISTVERSION}-x86.msi ${DATADIR}/wine/gecko
+ ${MKDIR} ${DATADIR}/gecko
+ ${INSTALL_DATA} ${DISTDIR}/wine_gecko-${DISTVERSION}-x86.msi ${DATADIR}/gecko
.include <bsd.port.mk>
Index: emulators/wine-gecko/pkg-plist
===================================================================
RCS file: emulators/wine-gecko/pkg-plist
diff -N emulators/wine-gecko/pkg-plist
--- emulators/wine-gecko/pkg-plist 15 May 2011 15:29:30 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-%%DATADIR%%/wine/gecko/wine_gecko-%%GECKO_VERSION%%-x86.msi
-@dirrm %%DATADIR%%/wine/gecko
-@dirrmtry %%DATADIR%%/wine
-@dirrmtry %%DATADIR%%
%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?864o4lb1cy.fsf>