You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Justin Flude
72517e1cff
Closes: https://trac.macports.org/ticket/69831 Closes: https://trac.macports.org/ticket/69833 Closes: https://trac.macports.org/ticket/73312
69 lines
2.2 KiB
Diff
69 lines
2.2 KiB
Diff
--- NetHack-NetHack-3.6.6_Released.ORIG/sys/unix/hints/macosx10.10 2020-03-08 12:29:31.000000000 -0500
|
|
+++ NetHack-NetHack-3.6.6_Released/sys/unix/hints/macosx10.10 2020-04-25 23:10:10.000000000 -0500
|
|
@@ -19,10 +19,12 @@
|
|
|
|
# 1. Which window system(s) should be included in this binary?
|
|
WANT_WIN_TTY=1
|
|
-#WANT_WIN_X11=1
|
|
+WANT_WIN_X11=1
|
|
#WANT_WIN_QT=1
|
|
#WANT_WIN_CURSES=1
|
|
|
|
+PREFIX:=$(DESTDIR)__PREFIX__
|
|
+
|
|
# 1a. What is the default window system?
|
|
WANT_DEFAULT=tty
|
|
#WANT_DEFAULT=x11
|
|
@@ -111,7 +113,7 @@
|
|
# -x: if built without dlb, some versions of mkfontdir think *.lev are fonts
|
|
POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
|
|
# separate from CFLAGS so that we don't pass it to every file
|
|
-X11CFLAGS = -I/opt/X11/include
|
|
+X11CFLAGS = -I$(PREFIX)/include
|
|
CFLAGS += -DX11_GRAPHICS
|
|
# avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
|
|
X11CFLAGS += -Wno-variadic-macros
|
|
@@ -123,5 +125,5 @@
|
|
WINSRC += $(WINX11SRC)
|
|
WINOBJ += $(WINX11OBJ)
|
|
WINLIB += $(WINX11LIB)
|
|
-LFLAGS=-L/opt/X11/lib
|
|
+LFLAGS=-L$(PREFIX)/lib
|
|
endif # WANT_WIN_X11
|
|
|
|
ifdef WANT_WIN_QT
|
|
--- NetHack-NetHack-3.6.6_Released.ORIG/sys/unix/hints/macosx10.14 2020-03-08 12:29:31.000000000 -0500
|
|
+++ NetHack-NetHack-3.6.6_Released/sys/unix/hints/macosx10.14 2020-04-25 23:10:10.000000000 -0500
|
|
@@ -19,10 +19,12 @@
|
|
|
|
# 1. Which window system(s) should be included in this binary?
|
|
WANT_WIN_TTY=1
|
|
-#WANT_WIN_X11=1
|
|
+WANT_WIN_X11=1
|
|
#WANT_WIN_QT=1
|
|
#WANT_WIN_CURSES=1
|
|
|
|
+PREFIX:=$(DESTDIR)__PREFIX__
|
|
+
|
|
# 1a. What is the default window system?
|
|
WANT_DEFAULT=tty
|
|
#WANT_DEFAULT=x11
|
|
@@ -111,7 +113,7 @@
|
|
# -x: if built without dlb, some versions of mkfontdir think *.lev are fonts
|
|
POSTINSTALL+= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; ( cd $(HACKDIR); mkfontdir -x .lev );
|
|
# separate from CFLAGS so that we don't pass it to every file
|
|
-X11CFLAGS = -I/opt/X11/include
|
|
+X11CFLAGS = -I$(PREFIX)/include
|
|
CFLAGS += -DX11_GRAPHICS
|
|
# avoid repeated complaints about _X_NONNULL(args...) in <X11/Xfuncproto.h>
|
|
X11CFLAGS += -Wno-variadic-macros
|
|
@@ -123,5 +125,5 @@
|
|
WINSRC += $(WINX11SRC)
|
|
WINOBJ += $(WINX11OBJ)
|
|
WINLIB += $(WINX11LIB)
|
|
-LFLAGS=-L/opt/X11/lib
|
|
+LFLAGS=-L$(PREFIX)/lib
|
|
endif # WANT_WIN_X11
|
|
|
|
ifdef WANT_WIN_QT
|