From b290b101a00a794ee33d3ab5d8114af42e6b01c5 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Tue, 15 Nov 2005 00:27:48 +0000 Subject: Perform some house^Wportkeeping: - WRKSRC is predefined, no need to redefine it. - Use pre-build instead of post-configure. - Rely on the default do-install target, and use post-install for our additional changes. - $PREFIX/etc/wine.conf and .wine/config are no longer used; remove all references from pkg-message. PR: 88758 Submitted by: Andrew Pantyukhin --- emulators/wine-devel/Makefile | 12 ++++-------- emulators/wine-devel/pkg-message | 7 ------- emulators/wine/Makefile | 12 ++++-------- emulators/wine/pkg-message | 7 ------- 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index ab263669525a..d1d07d4b02c5 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -18,7 +18,6 @@ COMMENT= Microsoft Windows compatibility layer for Unix-like systems LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms -WRKSRC= ${WRKDIR}/wine-${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib LIBS=-Wl,-rpath,${PREFIX}/lib/wine INSTALLS_SHLIB= yes @@ -43,11 +42,10 @@ post-extract: @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/wine.sh \ > ${WRKSRC}/wine.sh -post-configure: +pre-build: cd ${WRKSRC} && make depend -do-install: - cd ${WRKSRC} && ${GMAKE} install +post-install: -@${MKDIR} ${PREFIX}/etc/rc.d ${RM} ${PREFIX}/man/man1/wineg++.1 .if !defined(NOPORTDOCS) @@ -60,11 +58,9 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump .endif - ${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine + @${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine + @${INSTALL_SCRIPT} ${WRKSRC}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh ${ECHO} @${SED} s+%%PREFIX%%+${PREFIX}+g <${PKGMESSAGE} -post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh - .include diff --git a/emulators/wine-devel/pkg-message b/emulators/wine-devel/pkg-message index 05b8d520394e..5a29eb19315e 100644 --- a/emulators/wine-devel/pkg-message +++ b/emulators/wine-devel/pkg-message @@ -1,13 +1,6 @@ Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before FreeBSD 5.3 will generally not work properly. -Wine requires a configuration file .wine/config in the home directory of -every user, where assignments of Unix directories to DOS drive letters and -other options can be set (see "man wine" for details). You may want to copy - %%PREFIX%%/etc/wine.conf -and tweak it accordingly or edit this file and make .wine/config a symlink -there. - The port also installs some of Wine's doc files which describe additional things that are not in the manual pages, see: %%PREFIX%%/share/doc/wine diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index ab263669525a..d1d07d4b02c5 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -18,7 +18,6 @@ COMMENT= Microsoft Windows compatibility layer for Unix-like systems LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms -WRKSRC= ${WRKDIR}/wine-${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS=-I${PREFIX}/include LDFLAGS=-L${PREFIX}/lib LIBS=-Wl,-rpath,${PREFIX}/lib/wine INSTALLS_SHLIB= yes @@ -43,11 +42,10 @@ post-extract: @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/wine.sh \ > ${WRKSRC}/wine.sh -post-configure: +pre-build: cd ${WRKSRC} && make depend -do-install: - cd ${WRKSRC} && ${GMAKE} install +post-install: -@${MKDIR} ${PREFIX}/etc/rc.d ${RM} ${PREFIX}/man/man1/wineg++.1 .if !defined(NOPORTDOCS) @@ -60,11 +58,9 @@ do-install: .endfor ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump .endif - ${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine + @${INSTALL_SCRIPT} ${WRKSRC}/tools/bug_report.pl ${PREFIX}/lib/wine + @${INSTALL_SCRIPT} ${WRKSRC}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh ${ECHO} @${SED} s+%%PREFIX%%+${PREFIX}+g <${PKGMESSAGE} -post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/wine.sh ${PREFIX}/etc/rc.d/000.wine.sh - .include diff --git a/emulators/wine/pkg-message b/emulators/wine/pkg-message index 05b8d520394e..5a29eb19315e 100644 --- a/emulators/wine/pkg-message +++ b/emulators/wine/pkg-message @@ -1,13 +1,6 @@ Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before FreeBSD 5.3 will generally not work properly. -Wine requires a configuration file .wine/config in the home directory of -every user, where assignments of Unix directories to DOS drive letters and -other options can be set (see "man wine" for details). You may want to copy - %%PREFIX%%/etc/wine.conf -and tweak it accordingly or edit this file and make .wine/config a symlink -there. - The port also installs some of Wine's doc files which describe additional things that are not in the manual pages, see: %%PREFIX%%/share/doc/wine -- cgit v1.2.3