This commit is contained in:
angelos 2000-04-12 19:12:43 +00:00
parent 1c3c8d57a4
commit 58d01bb1ad
2 changed files with 60 additions and 95 deletions

View File

@ -1,6 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2000/04/12 18:43:59 turan Exp $
BROKEN= does not build
# $OpenBSD: Makefile,v 1.10 2000/04/12 19:12:43 angelos Exp $
DISTNAME= xpat2-1.04
CATEGORIES= games
@ -19,10 +17,11 @@ PERMIT_DISTFILES_FTP= YES
USE_X11= yes
post-install:
@touch $(PREFIX)/lib/X11/xpat/xpat.log
@${CHOWN} root.games $(PREFIX)/lib/X11/xpat/xpat.log $(PREFIX)/bin/xpat2
@${CHMOD} 2555 $(PREFIX)/bin/xpat2
@${CHMOD} 664 $(PREFIX)/lib/X11/xpat/xpat.log
@touch ${PREFIX}/lib/X11/xpat/xpat.log
@${CHOWN} root.games ${PREFIX}/lib/X11/xpat/xpat.log ${PREFIX}/bin/xpat2
@${CHMOD} 2555 ${PREFIX}/bin/xpat2
@${CHMOD} 664 ${PREFIX}/lib/X11/xpat/xpat.log
@${CHMOD} 755 ${PREFIX}/lib/X11/xpat/audio ${PREFIX}/lib/X11/xpat/default
.include <bsd.port.mk>

View File

@ -1,88 +1,54 @@
*** src/Imakefile.orig Sat Nov 25 12:55:35 1995
--- src/Imakefile Wed Mar 5 16:18:39 1997
***************
*** 22,29 ****
# 4.) specify, if you want sound (must copy the appropriate sound module)
# SOUNDOBJ should be one module of X-sound_*.o if USE_SOUND is on, else empty
# Note: for X-sound_SUN.o, /dev/audio must have 666 permissions */
! #define USE_SOUND /* doesn't harm if you don't have a sound card */
! SOUNDOBJ = X-sound_SUN.o
# 5.) specify, if you want the antialiased card construction set (SLOW!)
#define USE_CARD_CONSTRUCTION
--- 22,29 ----
# 4.) specify, if you want sound (must copy the appropriate sound module)
# SOUNDOBJ should be one module of X-sound_*.o if USE_SOUND is on, else empty
# Note: for X-sound_SUN.o, /dev/audio must have 666 permissions */
! #undef USE_SOUND /* doesn't harm if you don't have a sound card */
! SOUNDOBJ =
# 5.) specify, if you want the antialiased card construction set (SLOW!)
#define USE_CARD_CONSTRUCTION
***************
*** 37,49 ****
# BINDIR and LIBDIR should be predefined by the templates
# BINDIR = /usr/bin/X11
# LIBDIR = /usr/lib/X11
! XPATLIBDIR = /usr/games/lib/xpat
APPDEFSDIR = $(LIBDIR)
! XPATMANDIR = /usr/man/man6
# This is the name of the log-file, where solved games are stored:
# an alternative path would be $(XPATLIBDIR)/xpat.log
! SCOREFILE = /var/games/xpat.log
# paths for installation in user's home-directory.
--- 37,49 ----
# BINDIR and LIBDIR should be predefined by the templates
# BINDIR = /usr/bin/X11
# LIBDIR = /usr/lib/X11
! XPATLIBDIR = $(LIBDIR)/xpat
APPDEFSDIR = $(LIBDIR)
! XPATMANDIR = $(PREFIX)/man/man6
# This is the name of the log-file, where solved games are stored:
# an alternative path would be $(XPATLIBDIR)/xpat.log
! SCOREFILE = $(XPATLIBDIR)/xpat.log
# paths for installation in user's home-directory.
***************
*** 53,59 ****
# xpat2 needs to know where the xpm library resides (if needed)
XPMLIB = -L$(USRLIBDIR) -lXpm
! XPMINCLUDE = -I $(INCDIR)
# *****************************************************************************
# I hope you don't need to change anything below this point
--- 53,61 ----
# xpat2 needs to know where the xpm library resides (if needed)
XPMLIB = -L$(USRLIBDIR) -lXpm
! XPMINCLUDE = -I$(INCDIR)/X11
!
! CFLAGS += -DNO_CUSERID
# *****************************************************************************
# I hope you don't need to change anything below this point
***************
*** 181,188 ****
chmod 755 $(XPATLIBDIR)/$$f; \
done
mkdirhier $(XPATMANDIR)
! cp xpat2.man $(XPATMANDIR)/xpat2.6x
! chmod 644 $(XPATMANDIR)/xpat2.6x
ComplexProgramTarget($(MYPROG))
InstallAppDefaults(XPat)
--- 183,190 ----
chmod 755 $(XPATLIBDIR)/$$f; \
done
mkdirhier $(XPATMANDIR)
! cp xpat2.man $(XPATMANDIR)/xpat2.6
! chmod 644 $(XPATMANDIR)/xpat2.6
ComplexProgramTarget($(MYPROG))
InstallAppDefaults(XPat)
--- src/Imakefile.orig Sat Nov 25 12:55:35 1995
+++ src/Imakefile Wed Apr 12 14:57:16 2000
@@ -22,8 +22,8 @@
# 4.) specify, if you want sound (must copy the appropriate sound module)
# SOUNDOBJ should be one module of X-sound_*.o if USE_SOUND is on, else empty
# Note: for X-sound_SUN.o, /dev/audio must have 666 permissions */
-#define USE_SOUND /* doesn't harm if you don't have a sound card */
-SOUNDOBJ = X-sound_SUN.o
+#undef USE_SOUND /* doesn't harm if you don't have a sound card */
+SOUNDOBJ =
# 5.) specify, if you want the antialiased card construction set (SLOW!)
#define USE_CARD_CONSTRUCTION
@@ -37,13 +37,15 @@
# BINDIR and LIBDIR should be predefined by the templates
# BINDIR = /usr/bin/X11
# LIBDIR = /usr/lib/X11
-XPATLIBDIR = /usr/games/lib/xpat
+BINDIR = /usr/local/bin
+LIBDIR = /usr/local/lib/X11
+XPATLIBDIR = $(LIBDIR)/xpat
APPDEFSDIR = $(LIBDIR)
-XPATMANDIR = /usr/man/man6
+XPATMANDIR = $(PREFIX)/man/man6
# This is the name of the log-file, where solved games are stored:
# an alternative path would be $(XPATLIBDIR)/xpat.log
-SCOREFILE = /var/games/xpat.log
+SCOREFILE = $(XPATLIBDIR)/xpat.log
# paths for installation in user's home-directory.
@@ -53,7 +55,9 @@
# xpat2 needs to know where the xpm library resides (if needed)
XPMLIB = -L$(USRLIBDIR) -lXpm
-XPMINCLUDE = -I $(INCDIR)
+XPMINCLUDE = -I$(INCDIR)/X11
+
+CFLAGS += -DNO_CUSERID
# *****************************************************************************
# I hope you don't need to change anything below this point
@@ -181,8 +185,8 @@
chmod 755 $(XPATLIBDIR)/$$f; \
done
mkdirhier $(XPATMANDIR)
- cp xpat2.man $(XPATMANDIR)/xpat2.6x
- chmod 644 $(XPATMANDIR)/xpat2.6x
+ cp xpat2.man $(XPATMANDIR)/xpat2.6
+ chmod 644 $(XPATMANDIR)/xpat2.6
ComplexProgramTarget($(MYPROG))
InstallAppDefaults(XPat)