I was a bit trigger-happy with X11->no_x11.

Make this actually work...
This commit is contained in:
espie 2001-01-31 22:43:44 +00:00
parent ba7e880e1d
commit f44b4ca69e
4 changed files with 8 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2000/12/26 23:29:26 espie Exp $
# $OpenBSD: Makefile,v 1.15 2001/01/31 22:43:44 espie Exp $
# $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
DISTNAME= nethack-3.3.0
@ -24,7 +24,6 @@ NHDIR= ${DESTDIR}${PREFIX}/lib/nethackdir
MAKE_ENV+= NHDIR=${NHDIR} NETHACKCONFIG=${NETHACKCONFIG}
FLAVORS=no_x11 qt
# Old text interface
FLAVOR?=
.if ${FLAVOR:L} == "no_x11"
@ -50,7 +49,7 @@ post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/util/recover ${PREFIX}/bin
@cd ${WRKSRC}/doc && \
${INSTALL_MAN} nethack.6 recover.6 ${PREFIX}/man/man6
.if ${FLAVOR:U} == "X11"
.if ${FLAVOR:L} == ""
@mkdir -p ${PREFIX}/lib/X11/app-defaults
@cd ${WRKSRC}/win/X11 && cp NetHack.ad NetHack && \
${INSTALL_DATA} NetHack ${PREFIX}/lib/X11/app-defaults

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.4 2000/06/23 15:05:34 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2001/01/31 22:43:44 espie Exp $
@group games
bin/nethack
bin/recover
%%x11%%
!%%no_x11%%
%%qt%%
lib/nethackdir/Arc-fila.lev
lib/nethackdir/Arc-filb.lev

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2000/12/26 23:29:26 espie Exp $
# $OpenBSD: Makefile,v 1.19 2001/01/31 22:43:44 espie Exp $
DISTNAME= slash-e8
PKGNAME= slash-3.2.2-e8
@ -30,7 +30,6 @@ NHDIR= ${DESTDIR}${PREFIX}/lib/slashdir
MAKE_ENV+= NHDIR=${NHDIR} NETHACKCONFIG=${NETHACKCONFIG}
FLAVORS=no_x11
# Old text interface
FLAVOR?=
.if ${FLAVOR:L} == "no_x11"
@ -65,7 +64,7 @@ post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/util/srecover ${PREFIX}/bin
@cd ${WRKSRC}/doc && \
${INSTALL_MAN} slash.6 srecover.6 ${PREFIX}/man/man6
.if ${FLAVOR:U} == "X11"
.if ${FLAVOR:L} == ""
@mkdir -p ${PREFIX}/lib/X11/app-defaults
@cd ${WRKSRC}/win/X11 && \
sed -e "s/^NetHack/Slash/; s/^!NetHack/!Slash/" <NetHack.ad > Slash && \

View File

@ -1,8 +1,8 @@
@comment $OpenBSD: PLIST,v 1.5 2000/06/28 13:28:47 espie Exp $
@comment $OpenBSD: PLIST,v 1.6 2001/01/31 22:43:45 espie Exp $
@group games
bin/slash
bin/srecover
%%x11%%
!%%no_x11%%
lib/slashdir/A-filla.lev
lib/slashdir/A-fillb.lev
lib/slashdir/A-goal.lev