diff options
| author | wiz <wiz@pkgsrc.org> | 2006-02-26 17:26:32 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-02-26 17:26:32 +0000 |
| commit | 463ee9edfec54277fd2d0aec638c43d8c5307487 (patch) | |
| tree | 9f8cf34ff406280419b0759dada491931651e4a8 /emulators | |
| parent | 2eda8c0a9daa69eaf450b661868040fb9dbfcc4c (diff) | |
| download | pkgsrc-463ee9edfec54277fd2d0aec638c43d8c5307487.tar.gz | |
Simplify installation, correct PLIST, remove BROKEN_IN, use x11.bl3.mk
instead of manual depdending on x11-links.
Bump PKGREVISION.
Ok kent@
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/peace/Makefile | 24 | ||||
| -rw-r--r-- | emulators/peace/PLIST | 6 |
2 files changed, 14 insertions, 16 deletions
diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile index 188ac7aef7a..074a2ccfb18 100644 --- a/emulators/peace/Makefile +++ b/emulators/peace/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.19 2006/02/10 13:52:18 kent Exp $ +# $NetBSD: Makefile,v 1.20 2006/02/26 17:26:32 wiz Exp $ # PEACE_VERSION= 0.0.20060210 DISTNAME= peace-${PEACE_VERSION} SITES_peace-0.0.20060210.tar.gz=http://chiharu.hauN.org/peace/dist/ -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MAINTAINER= kent@NetBSD.org HOMEPAGE= http://chiharu.hauN.org/peace/ -COMMENT= Enable to run Win32 executables - -BROKEN_IN= pkgsrc-2005Q4 +COMMENT= Support running Win32 executables DISTFILES+= peace-${PEACE_VERSION}.tar.gz MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=peace/} @@ -22,7 +20,6 @@ DEPENDS+= icu>=2.4nb1:../../textproc/icu BUILD_DEPENDS+= cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe BUILD_DEPENDS+= w32api>=2.5:../../devel/w32api -BUILD_DEPENDS+= x11-links-*:../../pkgtools/x11-links LDFLAGS+= -L${WRKSRC}/lib PECOFFDIR= ${PREFIX}/emul/pecoff @@ -31,13 +28,18 @@ MAKE_FLAGS+= PECOFFDIR=${PECOFFDIR:Q} \ CROSSBASE=${CROSSBASE:Q} \ X11BASE=${X11BASE:Q} \ CHECK_DEPENDENTS=NO -MAKE_COMMAND= ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -do-install: +INSTALL_DIRS= libexec/ld.pe_so dll bin + +pre-install: ${INSTALL_PROGRAM_DIR} ${PECOFFDIR}/usr/libexec - cd ${WRKSRC}/libexec/ld.pe_so && ${MAKE_COMMAND} install ${INSTALL_DATA_DIR} ${PECOFFDIR}/usr/lib - ${_PKG_SILENT}cd ${WRKSRC}/dll && ${MAKE_COMMAND} install - ${_PKG_SILENT}cd ${WRKSRC}/bin && ${MAKE_COMMAND} install +post-install: + ${RMDIR} ${PREFIX}/emul/pecoff/usr/share/man/cat1 + ${RMDIR} ${PREFIX}/emul/pecoff/usr/share/man/man1 + ${RMDIR} ${PREFIX}/emul/pecoff/usr/share/man + ${RMDIR} ${PREFIX}/emul/pecoff/usr/share + +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/peace/PLIST b/emulators/peace/PLIST index 59a9ec5484e..0445247942a 100644 --- a/emulators/peace/PLIST +++ b/emulators/peace/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2003/08/28 15:23:57 kent Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/02/26 17:26:32 wiz Exp $ emul/pecoff/usr/bin/peace-setup emul/pecoff/usr/bin/regcomserver emul/pecoff/usr/bin/regimport @@ -27,10 +27,6 @@ emul/pecoff/usr/lib/winmm.dll emul/pecoff/usr/lib/winspool.drv emul/pecoff/usr/lib/wsock32.dll emul/pecoff/usr/libexec/ld.so.dll -@dirrm emul/pecoff/usr/share/man/cat1 -@dirrm emul/pecoff/usr/share/man/man1 -@dirrm emul/pecoff/usr/share/man -@dirrm emul/pecoff/usr/share @dirrm emul/pecoff/usr/libexec @dirrm emul/pecoff/usr/lib @dirrm emul/pecoff/usr/bin |