Upgrade to 1.07.

Fix bento build errors (USE_IMAKE).
This commit is contained in:
Matthew Hunt 2001-03-12 21:25:46 +00:00
parent 7615b25e21
commit 9a9093b11b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=39695
5 changed files with 220 additions and 228 deletions

View File

@ -6,21 +6,26 @@
#
PORTNAME= xpat2
PORTVERSION= 1.06
PORTVERSION= 1.07
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/solitaires
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
MAINTAINER= mph@freebsd.org
USE_X_PREFIX= yes
USE_IMAKE= yes
USE_XPM= yes
MAN6= xpat2.6
MANCOMPRESSED= no
post-install:
${TOUCH} $(PREFIX)/lib/X11/xpat/xpat.log
${CHOWN} root.games $(PREFIX)/lib/X11/xpat/xpat.log $(PREFIX)/bin/xpat2
${MV} ${PREFIX}/lib/xpat/man/man6/xpat2.6x ${PREFIX}/man/man6/xpat2.6
${RMDIR} ${PREFIX}/lib/xpat/man/man6 ${PREFIX}/lib/xpat/man
${TOUCH} /var/games/xpat.log
${CHOWN} root:games /var/games/xpat.log $(PREFIX)/bin/xpat2
${CHMOD} 2555 $(PREFIX)/bin/xpat2
${CHMOD} 664 $(PREFIX)/lib/X11/xpat/xpat.log
${CHMOD} 664 /var/games/xpat.log
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (xpat2-1.06.tar.gz) = e0621e18a18fc506002b0a196ecb972d
MD5 (xpat2-1.07-src.tar.gz) = fb2c845e3411ce39376da66c7aec2448

View File

@ -1,90 +1,11 @@
*** src/Imakefile.orig Sat May 15 12:02:56 1999
--- src/Imakefile Mon Jun 7 13:03:04 1999
***************
*** 26,34 ****
# 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 */
# the default is to copy an .au-file to /dev/audio
! SOUNDOBJ = X-sound_SUN.o
SOUNDLIB =
# uncomment this if you're using the NAS audio system:
# SOUNDOBJ = X-sound_NAS.o
--- 26,34 ----
# 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 */
# the default is to copy an .au-file to /dev/audio
! SOUNDOBJ =
SOUNDLIB =
# uncomment this if you're using the NAS audio system:
# SOUNDOBJ = X-sound_NAS.o
***************
*** 49,61 ****
# 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.
--- 49,61 ----
# 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.
***************
*** 65,71 ****
# xpat2 needs to know where the xpm library resides (if needed)
XPMLIB = -L$(USRLIBDIR) -lXpm
! XPMINCLUDE = -I $(INCDIR)
# for the Qt interface, the following paths are needed
QTDIR = /usr/local/qt
--- 65,73 ----
# xpat2 needs to know where the xpm library resides (if needed)
XPMLIB = -L$(USRLIBDIR) -lXpm
! XPMINCLUDE = -I$(INCDIR)/X11
!
! CFLAGS += -DNO_CUSERID
# for the Qt interface, the following paths are needed
QTDIR = /usr/local/qt
***************
*** 217,224 ****
chmod 755 $(XPATLIBDIR)/$$f; \
done
mkdirhier $(XPATMANDIR)
! cp xpat2.man $(XPATMANDIR)/xpat2.6x
! chmod 644 $(XPATMANDIR)/xpat2.6x
ComplexProgramTarget($(MYPROG))
InstallAppDefaults(XPat)
--- 219,226 ----
chmod 755 $(XPATLIBDIR)/$$f; \
done
mkdirhier $(XPATMANDIR)
! cp xpat2.man $(XPATMANDIR)/xpat2.6
! chmod 644 $(XPATMANDIR)/xpat2.6
ComplexProgramTarget($(MYPROG))
InstallAppDefaults(XPat)
--- Imakefile.orig Mon Mar 12 12:22:10 2001
+++ Imakefile Mon Mar 12 12:22:25 2001
@@ -188,7 +188,7 @@
r_Calculatio.o r_Michaels.o r_Royal.o r_Canfield.o \
r_mdCanfield.o r_Bakers.o r_Oonsoo.o r_BlueMoon.o
-OBJS = $(STDOBJS) $(XOBJS) $(KIT_OBJS)
+OBJS = $(STDOBJS) $(XOBJS) $(KIT_OBJS) -lcompat
MYPROG = xpat2

View File

@ -0,0 +1,41 @@
--- Xpat.tmpl.orig Mon Mar 12 12:14:02 2001
+++ Xpat.tmpl Mon Mar 12 12:16:19 2001
@@ -40,9 +40,9 @@
XCOMM 1. Specify User Interface (_exactly_ one of the interfaces below)
#undef useXlib /* similar to xpat version 1.x, not all features */
-#undef useXaw /* the classic Athena based interface for xpat2 */
+#define useXaw /* the classic Athena based interface for xpat2 */
#undef useXview /* Xview / OpenLook interface */
-#define useXQt /* Qt widgets, playable, but NOT YET FINISHED */
+#undef useXQt /* Qt widgets, playable, but NOT YET FINISHED */
/* advice on Qt improvements from experienced
programmers welcome at Michael.Bischoff@gmx.net */
#undef useXm1 /* Motif based interface (first variant) */
@@ -57,7 +57,7 @@
XCOMM 4. Specify, if you want sound (must copy the appropriate sound module).
XCOMM Doesn't harm if you don't have a sound card.
-#define USE_SOUND
+#undef USE_SOUND
XCOMM SOUNDOBJ must be one module of X-sound_*.o.
XCOMM Ignored if USE_SOUND is OFF.
XCOMM Note: The default is to copy an .au-file to /dev/audio,
@@ -74,7 +74,7 @@
XCOMM 4.) Specify, if you want sound (must copy the appropriate sound module)
XCOMM SOUNDOBJ should be one module of X-sound_*.o if USE_SOUND is on, else empty
XCOMM 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 */
+#undef USE_SOUND /* doesn't harm if you don't have a sound card */
XCOMM the default is to copy an .au-file to /dev/audio
SOUNDOBJ = X-sound_SUN.o
@@ -161,7 +161,7 @@
XCOMM #########################################################################
XCOMM Root directory of xpat2 installation
-XPATROOT = /usr/games/lib/xpat
+XPATROOT = $(PREFIX)/lib/xpat
XCOMM XPATROOT = /usr/local/lib/xpat
XCOMM XPATROOT = /opt/XPat2

View File

@ -1,134 +1,159 @@
bin/xpat2
lib/X11/app-defaults/XPat
lib/X11/xpat/PySol-large/COPYRIGHT
lib/X11/xpat/PySol-large/Makefile
lib/X11/xpat/PySol-large/README
lib/X11/xpat/PySol-large/Cards.conf
lib/X11/xpat/PySol-large/Empty.Clubs.xpm
lib/X11/xpat/PySol-large/Empty.Diamonds.xpm
lib/X11/xpat/PySol-large/Empty.Hearts.xpm
lib/X11/xpat/PySol-large/Empty.Spades.xpm
lib/X11/xpat/PySol-medium/COPYRIGHT
lib/X11/xpat/PySol-medium/Cards.conf
lib/X11/xpat/PySol-medium/Empty.Clubs.xpm
lib/X11/xpat/PySol-medium/Empty.Diamonds.xpm
lib/X11/xpat/PySol-medium/Empty.Hearts.xpm
lib/X11/xpat/PySol-medium/Empty.Spades.xpm
lib/X11/xpat/PySol-medium/Makefile
lib/X11/xpat/PySol-medium/README
lib/X11/xpat/PySol-small/COPYRIGHT
lib/X11/xpat/PySol-small/Cards.conf
lib/X11/xpat/PySol-small/Empty.Clubs.xpm
lib/X11/xpat/PySol-small/Empty.Diamonds.xpm
lib/X11/xpat/PySol-small/Empty.Hearts.xpm
lib/X11/xpat/PySol-small/Empty.Spades.xpm
lib/X11/xpat/PySol-small/Makefile
lib/X11/xpat/PySol-small/README
lib/X11/xpat/XPat.ad.XQt
lib/X11/xpat/XPat.ad.Xaw
lib/X11/xpat/XPat.ad.Xlib
lib/X11/xpat/XPat.ad.Xm
lib/X11/xpat/XPat.ad.Xview
lib/X11/xpat/audio/cannotsave.au
lib/X11/xpat/audio/giveup.au
lib/X11/xpat/audio/goodbye.au
lib/X11/xpat/audio/success.au
lib/X11/xpat/audio/cannotsave.wav
lib/X11/xpat/audio/giveup.wav
lib/X11/xpat/audio/goodbye.wav
lib/X11/xpat/audio/success.wav
lib/X11/xpat/default/Background.xpm
lib/X11/xpat/default/Cardback1.xpm
lib/X11/xpat/default/Cardback2.xpm
lib/X11/xpat/default/Cardback3.xpm
lib/X11/xpat/default/Cardback4.xpm
lib/X11/xpat/default/Cardback5.xpm
lib/X11/xpat/default/Pictures.xpm
lib/X11/xpat/default/Ranks.xpm
lib/X11/xpat/default/Suits.xpm
lib/X11/xpat/default/Cards.conf
lib/X11/xpat/default/Cardback6.xpm
lib/X11/xpat/default/Cardback0.xpm
lib/X11/xpat/docvt
lib/X11/xpat/dummy.xpm
lib/X11/xpat/fallback/Background.xpm
lib/X11/xpat/fallback/Cardback1.xpm
lib/X11/xpat/fallback/Cards.conf
lib/X11/xpat/fallback/Ranks.xpm
lib/X11/xpat/fallback/Pictures.xpm
lib/X11/xpat/fallback/Suits.xpm
lib/X11/xpat/french/README.french
lib/X11/xpat/french/XPat
lib/X11/xpat/french/aidBakersDozen
lib/X11/xpat/french/aidCalculation
lib/X11/xpat/french/aidMidnightOil
lib/X11/xpat/french/aidMonteCarlo
lib/X11/xpat/french/aide.Canfield
lib/X11/xpat/french/aide.Cotillion
lib/X11/xpat/french/aide.Delight
lib/X11/xpat/french/aide.FreeCell
lib/X11/xpat/french/aide.Gypsy
lib/X11/xpat/french/aide.Klondike
lib/X11/xpat/french/aide.Michaels
lib/X11/xpat/french/aide.Seahaven
lib/X11/xpat/french/aide.Spider
lib/X11/xpat/french/aide.touches
lib/X11/xpat/french/aidmodCanfield
lib/X11/xpat/french/keys
lib/X11/xpat/french/messages
lib/X11/xpat/french.cards
lib/X11/xpat/german/keys
lib/X11/xpat/german/messages
lib/X11/xpat/german/XPat
lib/X11/xpat/help.BlueMoon
lib/X11/xpat/help.Canfield
lib/X11/xpat/help.Cotillion
lib/X11/xpat/help.Delight
lib/X11/xpat/help.FreeCell
lib/X11/xpat/help.Gypsy
lib/X11/xpat/help.Klondike
lib/X11/xpat/help.Michaels
lib/X11/xpat/help.Oonsoo
lib/X11/xpat/help.Seahaven
lib/X11/xpat/help.Spider
lib/X11/xpat/help.keys
lib/X11/xpat/hlpBakersDozen
lib/X11/xpat/hlpCalculation
lib/X11/xpat/hlpMidnightOil
lib/X11/xpat/hlpMonteCarlo
lib/X11/xpat/hlpmodCanfield
lib/X11/xpat/italian/XPat
lib/X11/xpat/italian/keys
lib/X11/xpat/italian/messages
lib/X11/xpat/italian/help.Cotillion
lib/X11/xpat/italian/hlpMidnightOil
lib/X11/xpat/italian/help.Canfield
lib/X11/xpat/italian/help.Delight
lib/X11/xpat/italian/help.Gypsy
lib/X11/xpat/italian/help.Klondike
lib/X11/xpat/italian/help.Michaels
lib/X11/xpat/italian/hlpBakersDozen
lib/X11/xpat/italian/hlpCalculation
lib/X11/xpat/italian/help.Seahaven
lib/X11/xpat/italian/help.Spider
lib/X11/xpat/italian/help.keys
lib/X11/xpat/italian/hlpMonteCarlo
lib/X11/xpat/italian/help.FreeCell
lib/X11/xpat/keys
lib/X11/xpat/russian/XPat
lib/X11/xpat/russian/sq01.bdf
lib/X11/xpat/russian/messages
lib/X11/xpat/russian/keys
lib/X11/xpat/small.cards
lib/X11/xpat/xpat.log
@dirrm lib/X11/xpat/PySol-large
@dirrm lib/X11/xpat/PySol-medium
@dirrm lib/X11/xpat/PySol-small
@dirrm lib/X11/xpat/audio
@dirrm lib/X11/xpat/default
@dirrm lib/X11/xpat/fallback
@dirrm lib/X11/xpat/french
@dirrm lib/X11/xpat/german
@dirrm lib/X11/xpat/italian
@dirrm lib/X11/xpat/russian
@dirrm lib/X11/xpat
lib/xpat/PySol-large/COPYRIGHT
lib/xpat/PySol-large/Cards.conf
lib/xpat/PySol-large/Empty.Clubs.xpm
lib/xpat/PySol-large/Empty.Diamonds.xpm
lib/xpat/PySol-large/Empty.Hearts.xpm
lib/xpat/PySol-large/Empty.Spades.xpm
lib/xpat/PySol-large/Makefile
lib/xpat/PySol-large/README
lib/xpat/PySol-medium/COPYRIGHT
lib/xpat/PySol-medium/Cards.conf
lib/xpat/PySol-medium/Empty.Clubs.xpm
lib/xpat/PySol-medium/Empty.Diamonds.xpm
lib/xpat/PySol-medium/Empty.Hearts.xpm
lib/xpat/PySol-medium/Empty.Spades.xpm
lib/xpat/PySol-medium/Makefile
lib/xpat/PySol-medium/README
lib/xpat/PySol-small/COPYRIGHT
lib/xpat/PySol-small/Cards.conf
lib/xpat/PySol-small/Empty.Clubs.xpm
lib/xpat/PySol-small/Empty.Diamonds.xpm
lib/xpat/PySol-small/Empty.Hearts.xpm
lib/xpat/PySol-small/Empty.Spades.xpm
lib/xpat/PySol-small/Makefile
lib/xpat/PySol-small/README
lib/xpat/XPat.ad.XQt
lib/xpat/XPat.ad.Xaw
lib/xpat/XPat.ad.Xlib
lib/xpat/XPat.ad.Xm1
lib/xpat/XPat.ad.Xm2
lib/xpat/XPat.ad.Xview
lib/xpat/audio/cannotsave.au
lib/xpat/audio/cannotsave.wav
lib/xpat/audio/giveup.au
lib/xpat/audio/giveup.wav
lib/xpat/audio/goodbye.au
lib/xpat/audio/goodbye.wav
lib/xpat/audio/success.au
lib/xpat/audio/success.wav
lib/xpat/default/Background.xpm
lib/xpat/default/Cardback0.xpm
lib/xpat/default/Cardback1.xpm
lib/xpat/default/Cardback2.xpm
lib/xpat/default/Cardback3.xpm
lib/xpat/default/Cardback4.xpm
lib/xpat/default/Cardback5.xpm
lib/xpat/default/Cardback6.lowcol.xpm
lib/xpat/default/Cardback6.xpm
lib/xpat/default/Cards.conf
lib/xpat/default/Pictures.xpm
lib/xpat/default/Ranks.xpm
lib/xpat/default/Suits.xpm
lib/xpat/docvt
lib/xpat/dummy.xpm
lib/xpat/fallback/Background.xpm
lib/xpat/fallback/Cardback1.xpm
lib/xpat/fallback/Cards.conf
lib/xpat/fallback/Pictures.xpm
lib/xpat/fallback/Ranks.xpm
lib/xpat/fallback/Suits.xpm
lib/xpat/french.cards
lib/xpat/french/README.french
lib/xpat/french/XPat
lib/xpat/french/aidBakersDozen
lib/xpat/french/aidCalculation
lib/xpat/french/aidMidnightOil
lib/xpat/french/aidMonteCarlo
lib/xpat/french/aide.Canfield
lib/xpat/french/aide.Cotillion
lib/xpat/french/aide.Delight
lib/xpat/french/aide.FreeCell
lib/xpat/french/aide.Gypsy
lib/xpat/french/aide.Klondike
lib/xpat/french/aide.Michaels
lib/xpat/french/aide.Seahaven
lib/xpat/french/aide.Spider
lib/xpat/french/aide.touches
lib/xpat/french/aidmodCanfield
lib/xpat/french/keys
lib/xpat/french/messages
lib/xpat/german/Notes
lib/xpat/german/XPat
lib/xpat/german/hilf.BakersDozen
lib/xpat/german/hilf.BlueMoon
lib/xpat/german/hilf.Calculation
lib/xpat/german/hilf.Canfield
lib/xpat/german/hilf.Cotillion
lib/xpat/german/hilf.Delight
lib/xpat/german/hilf.FreeCell
lib/xpat/german/hilf.Gypsy
lib/xpat/german/hilf.Klondike
lib/xpat/german/hilf.Michaels
lib/xpat/german/hilf.MidnightOil
lib/xpat/german/hilf.ModCanfield
lib/xpat/german/hilf.MonteCarlo
lib/xpat/german/hilf.Oonsoo
lib/xpat/german/hilf.Seahaven
lib/xpat/german/hilf.Spider
lib/xpat/german/hilf.bedien
lib/xpat/german/hilf.tasten
lib/xpat/german/keys
lib/xpat/german/messages
lib/xpat/help.BlueMoon
lib/xpat/help.Canfield
lib/xpat/help.Cotillion
lib/xpat/help.Delight
lib/xpat/help.FreeCell
lib/xpat/help.Gypsy
lib/xpat/help.Klondike
lib/xpat/help.Michaels
lib/xpat/help.Oonsoo
lib/xpat/help.Seahaven
lib/xpat/help.Spider
lib/xpat/help.keys
lib/xpat/hlpBakersDozen
lib/xpat/hlpCalculation
lib/xpat/hlpMidnightOil
lib/xpat/hlpMonteCarlo
lib/xpat/hlpmodCanfield
lib/xpat/italian/XPat
lib/xpat/italian/help.Canfield
lib/xpat/italian/help.Cotillion
lib/xpat/italian/help.Delight
lib/xpat/italian/help.FreeCell
lib/xpat/italian/help.Gypsy
lib/xpat/italian/help.Klondike
lib/xpat/italian/help.Michaels
lib/xpat/italian/help.Seahaven
lib/xpat/italian/help.Spider
lib/xpat/italian/help.keys
lib/xpat/italian/hlpBakersDozen
lib/xpat/italian/hlpCalculation
lib/xpat/italian/hlpMidnightOil
lib/xpat/italian/hlpMonteCarlo
lib/xpat/italian/keys
lib/xpat/italian/messages
lib/xpat/keys
lib/xpat/russian/XPat
lib/xpat/russian/keys
lib/xpat/russian/messages
lib/xpat/russian/sq01.bdf
lib/xpat/small.cards
lib/xpat/de_DE
lib/xpat/fr_FR
lib/xpat/it_IT
@dirrm lib/xpat/PySol-large
@dirrm lib/xpat/PySol-medium
@dirrm lib/xpat/PySol-small
@dirrm lib/xpat/audio
@dirrm lib/xpat/default
@dirrm lib/xpat/fallback
@dirrm lib/xpat/french
@dirrm lib/xpat/german
@dirrm lib/xpat/italian
@dirrm lib/xpat/russian
@dirrm lib/xpat
@cwd /
var/games/xpat.log