Use qt2 module

This commit is contained in:
espie 2001-08-27 09:46:31 +00:00
parent e5422c70e0
commit 5cd875b42f
4 changed files with 16 additions and 11 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.20 2001/04/09 10:59:40 espie Exp $
# $OpenBSD: Makefile,v 1.21 2001/08/27 09:46:31 espie Exp $
# $FreeBSD: Makefile,v 1.13 1997/12/25 22:29:17 asami Exp $
COMMENT= "dungeon explorin', hackin', game. Piece of cake"
DISTNAME= nethack-3.3.1
CATEGORIES= games
NEED_VERSION= 1.363
NEED_VERSION= 1.447
MASTER_SITES= ftp://ftp.nethack.org/pub/nethack/nh331/src/ \
ftp://ftp.uu.net/pub/games/nethack/sources/ \
${MASTER_SITE_GNU}
@ -35,8 +35,8 @@ NETHACKCONFIG=${FILESDIR}/simple-config
.elif ${FLAVOR:L} == "qt"
SED_PLIST=|sed -e '/^!%%no_x11%%/d'
NETHACKCONFIG=${FILESDIR}/qt-config
PORTPATH=${LOCALBASE}/lib/qt2/bin:/usr/bin:/bin:/usr/sbin:/sbin:${LOCALBASE}/bin
LIB_DEPENDS=qt.2.::x11/qt2
MODULES= qt2
MAKE_ENV+=MODQT_INCDIR=${MODQT_INCDIR} MODQT_LIBDIR=${MODQT_LIBDIR}
.else
NETHACKCONFIG=${FILESDIR}/x-config
USE_X11= Yes

View File

@ -2,8 +2,8 @@
# qt flavor needs qt 2.0 to work
VARDATND = x11tiles pet_mark.xbm rip.xpm
VARDAT = $(VARDATD) $(VARDATND)
CFLAGS+=-DQT_GRAPHICS -I$(LOCALBASE)/include/X11/qt2
LFLAGS =-L$(LOCALBASE)/lib/qt2 -L$(X11BASE)/lib -L$(LOCALBASE)/lib
CFLAGS+=-DQT_GRAPHICS -I$(MODQT_INCDIR)
LFLAGS =-L$(MODQT_LIBDIR) -L$(X11BASE)/lib -L$(LOCALBASE)/lib
WINSRC = $(WINTTYSRC) $(WINQTSRC)
WINOBJ = $(WINTTYOBJ) $(WINQTOBJ)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sys_unix_Makefile_src,v 1.3 2001/03/30 14:28:39 espie Exp $
$OpenBSD: patch-sys_unix_Makefile_src,v 1.4 2001/08/27 09:46:31 espie Exp $
--- sys/unix/Makefile.src.orig Sat Aug 5 12:52:57 2000
+++ sys/unix/Makefile.src Mon Mar 26 04:30:59 2001
+++ sys/unix/Makefile.src Mon Aug 27 11:08:29 2001
@@ -1,6 +1,7 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.src 3.3 97/04/17
@ -46,16 +46,20 @@ $OpenBSD: patch-sys_unix_Makefile_src,v 1.3 2001/03/30 14:28:39 espie Exp $
# any other strange libraries your system needs (for Sysunix only -- the more
# specialized targets should already be right)
#
@@ -445,10 +441,10 @@ objects.o:
@@ -443,12 +439,14 @@ objects.o:
$(CC) $(CFLAGS) -c objects.c
@rm -f $(MAKEDEFS)
+MOC = moc
+
# Qt windowport meta-object-compiler output
qt_kde0.moc: ../include/qt_kde0.h
- $(QTDIR)/bin/moc ../include/qt_kde0.h > qt_kde0.moc
+ moc2 ../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
+ moc2 ../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 \

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.2 2001/08/27 09:46:31 espie Exp $
lib/X11/app-defaults/NetHack
lib/nethackdir/pet_mark.xbm
lib/nethackdir/x11tiles