Index: head/games/nethack33/Makefile =================================================================== --- head/games/nethack33/Makefile (revision 407604) +++ head/games/nethack33/Makefile (revision 407605) @@ -1,107 +1,107 @@ # Created by: asami # $FreeBSD$ PORTNAME= nethack33 PORTVERSION= 3.3.1 PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SF/${TRUEPORTNAME}/${TRUEPORTNAME}/${PORTVERSION} DISTNAME= ${TRUEPORTNAME}-${PORTVERSION:S/.//g} MAINTAINER= glewis@FreeBSD.org COMMENT= Dungeon explorin', slashin', hackin' game WRKSRC= ${WRKDIR}/${TRUEPORTNAME}-${PORTVERSION} -USES= gmake tar:tgz +USES= gmake ncurses tar:tgz MAKE_ENV= GRAPHICS="${GRAPHICS}" PLIST_SUB= HACKNAME="${HACKNAME}" \ HACKEXT="${HACKEXT}" MAKE_JOBS_UNSAFE= yes TRUEPORTNAME= nethack HACKEXT?= 33 HACKNAME?= ${TRUEPORTNAME}${HACKEXT} HACKDIR?= share/${HACKNAME} HACKLINK= ${TRUEPORTNAME} DATADIR= ${PREFIX}/${HACKDIR} DOCSDIR= ${PREFIX}/share/doc/${HACKNAME} PKGDEINSTALL= ${WRKDIR}/pkg-deinstall .if !defined(PKGNAMESUFFIX) USE_XORG= xaw xpm GRAPHICS= X11_GRAPHICS .else .if ${PKGNAMESUFFIX} == "-nox11" GRAPHICS= # none .endif .endif OPTIONS_DEFINE= DOCS .include .include .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK} PLIST_SUB+= HACKLINK="" .else PLIST_SUB+= HACKLINK="@comment " .endif pre-everything:: .if defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11) @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} " You cannot install nethack and ${PKGBASE} in parallel " @${ECHO_MSG} " But ${PKGBASE} reads your prior nethack scores " @${ECHO_MSG} " Don't forget to backup your nethack libdir if it's " @${ECHO_MSG} " important for you " @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" .else @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} " You may use the following build options: " @${ECHO_MSG} " WITH_TTY_GRAPHICS=yes build with no GUI " @${ECHO_MSG} " WITHOUT_X11=yes same as above " @${ECHO_MSG} " " @${ECHO_MSG} " By default, nethack port is built with X11 GUI. " @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" .endif post-patch: @${REINPLACE_CMD} -e \ 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h @${REINPLACE_CMD} -e \ 's|||g' ${WRKSRC}/win/Qt/qt_win.cpp .for f in include/config.h sys/unix/Makefile.top sys/unix/Makefile.doc @${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \ -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \ -e 's|%%HACKEXT%%|${HACKEXT}|g' \ ${WRKSRC}/${f} .endfor .for f in dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6 @${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g' \ -e 's|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' \ -e 's|%%HACKEXT%%|${HACKEXT}|g' \ ${WRKSRC}/doc/${f} .endfor do-configure: @cd ${WRKSRC}/sys/unix; ${SH} setup.sh pre-install: @${CAT} ${FILESDIR}/pkg-deinstall.in | ${SED} \ -e 's|%%HACKDIR%%|${HACKDIR}|g' > ${PKGDEINSTALL} post-install: .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK} @${LN} -s -f ${PREFIX}/bin/${HACKNAME} ${STAGEDIR}${PREFIX}/bin/${HACKLINK} .endif @cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} manpages @${MKDIR} ${STAGEDIR}${DATADIR}/save .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${STAGEDIR}${DOCSDIR} .endif .include Index: head/games/nethack33/files/patch-sys-unix-Makefile.src =================================================================== --- head/games/nethack33/files/patch-sys-unix-Makefile.src (revision 407604) +++ head/games/nethack33/files/patch-sys-unix-Makefile.src (revision 407605) @@ -1,114 +1,128 @@ ---- sys/unix/Makefile.src.orig Sat Aug 5 19:52:57 2000 -+++ sys/unix/Makefile.src Sat May 18 01:19:31 2002 -@@ -139,19 +139,28 @@ +--- sys/unix/Makefile.src.orig 2000-08-05 10:52:57 UTC ++++ sys/unix/Makefile.src +@@ -139,19 +139,28 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o un # directories. The ones given below is the usual spot for linux systems. # The paths are for glibconfig.h and gnomesupport.h respectively. # -GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome +GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui) # flags for debugging: # CFLAGS = -g -I../include +CFLAGS += -I../include +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +CFLAGS += -DQT_GRAPHICS +endif +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +CFLAGS += -DGNOME_GRAPHICS +endif -CFLAGS = -O -I../include LFLAGS = # The Qt and Be window systems are written in C++, while the rest of # NetHack is standard C. If using Qt, uncomment the LD line here to get # the C++ libraries linked in. -CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include -CXX=g++ +CXXFLAGS += -I. -I../include ${QTCPPFLAGS} +#CXX=g++ #LD=g++ # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired -@@ -204,7 +213,26 @@ +@@ -204,7 +213,26 @@ WINBEOBJ = # # WINSRC = $(WINTTYSRC) +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +WINSRC += $(WINX11SRC) +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +WINSRC += $(WINQTSRC) +endif +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +WINSRC += $(WINGNOMESRC) +endif + WINOBJ = $(WINTTYOBJ) +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +WINOBJ += $(WINX11OBJ) +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +WINOBJ += $(WINQTOBJ) +endif +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +WINOBJ += $(WINGNOMEOBJ) +endif # on some systems the termcap library is in -ltermcap or -lcurses # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead -@@ -224,19 +252,19 @@ +@@ -220,23 +248,23 @@ WINOBJ = $(WINTTYOBJ) + # WINTTYLIB = -lcurses + # WINTTYLIB = -lcurses16 + # WINTTYLIB = -lncurses +-WINTTYLIB = -ltermlib ++WINTTYLIB = -lncurses # # libraries for X11 # If USE_XPM is defined in config.h, you will also need -lXpm here. -WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 +WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib # WINX11LIB = -lXaw -lXmu -lXt -lX11 # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 # # libraries for Qt -WINQTLIB = -L$(QTDIR)/lib -lqt +WINQTLIB = ${QTCFGLIBS} ${LIBQT} # # libraries for KDE (with Qt) WINKDELIB = -lkdecore -lkdeui -lXext # # libraries for Gnome -WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt +WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) ${LDFLAGS} # # libraries for Gem port WINGEMLIB = -le_gem -lgem -@@ -245,6 +273,15 @@ +@@ -245,6 +273,15 @@ WINGEMLIB = -le_gem -lgem WINBELIB = -lbe WINLIB = $(WINTTYLIB) +ifeq ("$(GRAPHICS)","X11_GRAPHICS") +WINLIB += $(WINX11LIB) +endif +ifeq ("$(GRAPHICS)","QT_GRAPHICS") +WINLIB += $(WINQTLIB) +endif +ifeq ("$(GRAPHICS)","GNOME_GRAPHICS") +WINLIB += $(WINGNOMELIB) +endif # any other strange libraries your system needs (for Sysunix only -- the more # specialized targets should already be right) -@@ -445,10 +482,10 @@ +@@ -376,7 +413,7 @@ $(GAME): $(SYSTEM) + + Sysunix: $(HOBJ) Makefile + @echo "Loading ..." +- @$(CC) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) ++ @$(CC) $(LFLAGS) -o $(GAME) $(HOBJ) $(LDFLAGS) $(WINLIB) $(LIBS) + @touch Sysunix + + Sys3B2: $(HOBJ) Makefile +@@ -445,10 +482,10 @@ objects.o: # Qt windowport meta-object-compiler output qt_kde0.moc: ../include/qt_kde0.h - $(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc + ${MOC} ../include/qt_kde0.h > qt_kde0.moc qt_win.moc: ../include/qt_win.h - $(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc + ${MOC} ../include/qt_win.h > qt_win.moc $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \ ../include/objclass.h ../include/monsym.h \