Index: head/games/sol/Makefile =================================================================== --- head/games/sol/Makefile (revision 440714) +++ head/games/sol/Makefile (revision 440715) @@ -1,37 +1,39 @@ # Created by: Andrey Zakhvatov # $FreeBSD$ PORTNAME= sol -PORTVERSION= 1.0.7 -PORTREVISION= 5 +PORTVERSION= 1.0.8 CATEGORIES= games MASTER_SITES= http://shh.thathost.com/pub-unix/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Solitaire card game for X Window System -LIB_DEPENDS= libshhopt.so.1:devel/libshhopt \ - libshhmsg.so.1:devel/libshhmsg \ - libxalloc.so.1:devel/libxalloc \ - libshhcards.so.1:games/libshhcards +LICENSE= ART10 +LIB_DEPENDS= libXaw.so:x11-toolkits/libXaw \ + libshhcards.so:games/libshhcards \ + libshhmsg.so:devel/libshhmsg \ + libshhopt.so:devel/libshhopt \ + libxalloc.so:devel/libxalloc + CONFLICTS= gnome-games-* USES= gmake -USE_XORG= xpm x11 xaw +USE_XORG= ice sm x11 xext xmu xpm xt OPTIONS_DEFINE= DOCS pre-build: (cd ${WRKSRC} && ${MAKE_CMD} readme.var) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sol ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/sol.6 ${STAGEDIR}${PREFIX}/man/man6 @${MKDIR} ${STAGEDIR}${PREFIX}/share/sol ${INSTALL_DATA} ${WRKSRC}/sol.score ${STAGEDIR}${PREFIX}/share/sol @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/sol ${INSTALL_DATA} ${WRKSRC}/CREDITS ${STAGEDIR}${PREFIX}/share/doc/sol ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/sol .include Index: head/games/sol/distinfo =================================================================== --- head/games/sol/distinfo (revision 440714) +++ head/games/sol/distinfo (revision 440715) @@ -1,2 +1,3 @@ -SHA256 (sol-1.0.7.tar.gz) = ad8eebf93408b2bded3a68440e98dcb8a05434532fe3301d7a18136ec4819607 -SIZE (sol-1.0.7.tar.gz) = 32597 +TIMESTAMP = 1494621752 +SHA256 (sol-1.0.8.tar.gz) = 2e1e8bf4b8636e77e63db956d6da0da873f024059ec0273615940470af94bf10 +SIZE (sol-1.0.8.tar.gz) = 34499 Index: head/games/sol/files/patch-Makefile =================================================================== --- head/games/sol/files/patch-Makefile (revision 440714) +++ head/games/sol/files/patch-Makefile (revision 440715) @@ -1,56 +1,57 @@ ---- Makefile.old Mon Aug 26 10:37:17 2002 -+++ Makefile Mon Aug 26 10:39:35 2002 -@@ -13,9 +13,8 @@ +--- Makefile.orig 2017-04-29 20:57:57 UTC ++++ Makefile +@@ -13,10 +13,8 @@ COMPILED_BY = `whoami` # Where are shhmsg, shhopt, xalloc, shhcards, Xpm and X11? # GNU/Linux at home -INCDIR = -I/usr/local/include -I/usr/X11R6/include \ -- -I/usr/local/include/X11 --LIBDIR = -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11 -+INCDIR = -I${LOCALBASE}/include -+LIBDIR = -L${LOCALBASE}/lib +- -I/usr/local/include/X11 -I/opt/X11/include +-LIBDIR = -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11 \ +- -L/opt/X11/lib ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib EXTRA_LIBS = -lSM -lICE # Irix at Ifi -@@ -54,18 +53,18 @@ +@@ -55,18 +53,18 @@ EXTRA_LIBS = -liberty endif # DEC Alpha at USIT -ifeq ($(HOSTTYPE),alpha) -INCDIR = -I$$HOME/include -I/usr/include/X11 \ - -I/usr/local/X11R5/include -LIBDIR = -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib -endif +#ifeq ($(HOSTTYPE),alpha) +#INCDIR = -I$$HOME/include -I/usr/include/X11 \ +# -I/usr/local/X11R5/include +#LIBDIR = -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib +#endif ########################################################################### # Where do you want to install the program and the highscore file? -INSTLIBDIR = /var/local/lib/games -INSTBINDIR = /usr/local/games -INSTMANDIR = /usr/local/man/man6 +INSTLIBDIR = ${PREFIX}/lib/games +INSTBINDIR = ${PREFIX}/games +INSTMANDIR = ${PREFIX}/man/man6 #INSTLIBDIR = /hom/sverrehu/lib #INSTBINDIR = /hom/sverrehu/bin/$$HOSTTYPE #INSTMANDIR = /hom/sverrehu/man/man6 -@@ -85,11 +84,11 @@ +@@ -86,11 +84,11 @@ DEFINES = -DVERSION=\"$(VERSION)\" \ ########################################################################### -CC = gcc +#CC = gcc OPTIM = -s -O2 -CCOPT = -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS) -LDOPT = -s $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT) +CCOPT = $(INCDIR) $(DEFINES) $(CFLAGS) +LDOPT = $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT) LIBS = -lshhopt -lshhmsg -lxalloc -lshhcards \ -lXaw -lXt -lXpm -lXext -lXmu -lX11 $(EXTRA_LIBS)