aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2026-03-31 16:30:32 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2026-03-31 16:31:03 +0000
commit58393940ce08e1c0f11ed36952badb7c25c1bd80 (patch)
tree38672292fee94e2c45d21011f2041730f2031efd
parente53e8ebaa5b7aa135d430d491276ba5b9508a033 (diff)
games/xpuzzles: merge ports and update to 8.9.4
-rw-r--r--MOVED11
-rw-r--r--games/Makefile12
-rw-r--r--games/xcubes/Makefile24
-rw-r--r--games/xcubes/distinfo2
-rw-r--r--games/xcubes/pkg-descr3
-rw-r--r--games/xdino/Makefile24
-rw-r--r--games/xdino/distinfo2
-rw-r--r--games/xdino/pkg-descr4
-rw-r--r--games/xhexagons/Makefile24
-rw-r--r--games/xhexagons/distinfo2
-rw-r--r--games/xhexagons/pkg-descr4
-rw-r--r--games/xmball/Makefile24
-rw-r--r--games/xmball/distinfo2
-rw-r--r--games/xmball/pkg-descr6
-rw-r--r--games/xmlink/Makefile24
-rw-r--r--games/xmlink/distinfo2
-rw-r--r--games/xmlink/pkg-descr4
-rw-r--r--games/xoct/Makefile24
-rw-r--r--games/xoct/distinfo2
-rw-r--r--games/xoct/pkg-descr16
-rw-r--r--games/xpanex/Makefile24
-rw-r--r--games/xpanex/distinfo2
-rw-r--r--games/xpanex/pkg-descr11
-rw-r--r--games/xpuzzles/Makefile93
-rw-r--r--games/xpuzzles/distinfo3
-rw-r--r--games/xpuzzles/pkg-descr6
-rw-r--r--games/xpuzzles/pkg-plist138
-rw-r--r--games/xpyraminx/Makefile24
-rw-r--r--games/xpyraminx/distinfo2
-rw-r--r--games/xpyraminx/pkg-descr20
-rw-r--r--games/xrubik/Makefile20
-rw-r--r--games/xrubik/distinfo2
-rw-r--r--games/xrubik/pkg-descr6
-rw-r--r--games/xrubik/pkg-plist3
-rw-r--r--games/xskewb/Makefile24
-rw-r--r--games/xskewb/distinfo2
-rw-r--r--games/xskewb/pkg-descr10
-rw-r--r--games/xtriangles/Makefile25
-rw-r--r--games/xtriangles/distinfo2
-rw-r--r--games/xtriangles/pkg-descr3
40 files changed, 252 insertions, 384 deletions
diff --git a/MOVED b/MOVED
index 529bb51c91f9..7f80b69f4334 100644
--- a/MOVED
+++ b/MOVED
@@ -5195,3 +5195,14 @@ filesystems/moosefs2-cli||2026-03-31|Has expired: 2.x reached EoL 2017-12-31, us
filesystems/moosefs2-client||2026-03-31|Has expired: 2.x reached EoL 2017-12-31, use filesystems/moosefs-* 4.x instead
multimedia/gstreamer1-plugins-svt-hevc||2026-03-31|Has expired: SVT-HEVC project discontinued by Intel on 2024-07-29
filesystems/moosefs2-master||2026-03-31|Has expired: 2.x reached EoL 2017-12-31, use filesystems/moosefs-* 4.x instead
+games/xcubes|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xdino|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xhexagons|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xmball|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xmlink|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xoct|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xpanex|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xpyraminx|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xrubik|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xskewb|games/xpuzzles|2026-03-31|Merged into xpuzzles
+games/xtriangles|games/xpuzzles|2026-03-31|Merged into xpuzzles
diff --git a/games/Makefile b/games/Makefile
index 7772c2b303b4..509558d4ef1a 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1074,12 +1074,10 @@
SUBDIR += xchomp
SUBDIR += xconq
SUBDIR += xcowsay
- SUBDIR += xcubes
SUBDIR += xdeblock
SUBDIR += xdemineur
SUBDIR += xdesktopwaves
SUBDIR += xdigger
- SUBDIR += xdino
SUBDIR += xemeraldia
SUBDIR += xeyesplus
SUBDIR += xfce4-eyes-plugin
@@ -1089,7 +1087,6 @@
SUBDIR += xgalaga++
SUBDIR += xgalaga-sdl
SUBDIR += xglk
- SUBDIR += xhexagons
SUBDIR += xhime
SUBDIR += xinfocom
SUBDIR += xinvaders
@@ -1105,32 +1102,28 @@
SUBDIR += xlogical
SUBDIR += xmahjongg
SUBDIR += xmastermind
- SUBDIR += xmball
SUBDIR += xmemory
SUBDIR += xmille
SUBDIR += xmine
SUBDIR += xminehunter
SUBDIR += xmines
- SUBDIR += xmlink
SUBDIR += xmoto
SUBDIR += xmris
SUBDIR += xmulti
SUBDIR += xneko
SUBDIR += xnethack
- SUBDIR += xoct
SUBDIR += xoids
SUBDIR += xoj
SUBDIR += xonotic
SUBDIR += xorgramana
SUBDIR += xosmulti
- SUBDIR += xpanex
SUBDIR += xpat2
SUBDIR += xpilot
SUBDIR += xpilot-ng-server
SUBDIR += xpipeman
SUBDIR += xpired
+ SUBDIR += xpuzzles
SUBDIR += xpuzzletama
- SUBDIR += xpyraminx
SUBDIR += xrally
SUBDIR += xray-16
SUBDIR += xray_re-tools
@@ -1139,14 +1132,12 @@
SUBDIR += xroach
SUBDIR += xrobots
SUBDIR += xrot
- SUBDIR += xrubik
SUBDIR += xsc
SUBDIR += xscavenger
SUBDIR += xscrabble
SUBDIR += xshisen
SUBDIR += xshogi
SUBDIR += xskat
- SUBDIR += xskewb
SUBDIR += xsokoban
SUBDIR += xsoldier
SUBDIR += xspacewarp
@@ -1155,7 +1146,6 @@
SUBDIR += xtet42
SUBDIR += xtgyoretsu
SUBDIR += xtic
- SUBDIR += xtriangles
SUBDIR += xtrojka
SUBDIR += xtron
SUBDIR += xtruco
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
deleted file mode 100644
index d4ebcabf15c3..000000000000
--- a/games/xcubes/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xcubes
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Cube puzzle for X11
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xcubes \
- share/man/man1/xcubes.1.gz \
- lib/X11/app-defaults/Cubes
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xcubes ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Cubes.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Cubes
- ${INSTALL_MAN} ${WRKSRC}/xcubes.man ${STAGEDIR}${PREFIX}/share/man/man1/xcubes.1
-
-.include <bsd.port.mk>
diff --git a/games/xcubes/distinfo b/games/xcubes/distinfo
deleted file mode 100644
index 6187846c1fc7..000000000000
--- a/games/xcubes/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xcubes-5.5.2.tar.gz) = 7ae1ba2f68f68a38247b53333e7f0523a9330ce4898a0cf8b5309da469e4819d
-SIZE (xcubes-5.5.2.tar.gz) = 61106
diff --git a/games/xcubes/pkg-descr b/games/xcubes/pkg-descr
deleted file mode 100644
index b1ac4c6a11a0..000000000000
--- a/games/xcubes/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-XCubes is a puzzle for X Window System.
-
-Your goal is to exchange the numbered panels to be in order.
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
deleted file mode 100644
index 7ea9f2463327..000000000000
--- a/games/xdino/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xdino
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Dino puzzle game for X11
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xdino \
- share/man/man1/xdino.1.gz \
- lib/X11/app-defaults/Dino
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xdino ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Dino.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Dino
- ${INSTALL_MAN} ${WRKSRC}/xdino.man ${STAGEDIR}${PREFIX}/share/man/man1/xdino.1
-
-.include <bsd.port.mk>
diff --git a/games/xdino/distinfo b/games/xdino/distinfo
deleted file mode 100644
index e209873e149f..000000000000
--- a/games/xdino/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xdino-5.5.2.tar.gz) = cafe8fcc6f97aaea8621091777691f73bb97c816baeb892545c3707f8ac78869
-SIZE (xdino-5.5.2.tar.gz) = 68736
diff --git a/games/xdino/pkg-descr b/games/xdino/pkg-descr
deleted file mode 100644
index 046fe54fd412..000000000000
--- a/games/xdino/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-XDino, dino puzzle game for X11.
-
-XDino is the puzzle game like as a rubik's cube, not 9 but 4 pieces
-on a surface.
diff --git a/games/xhexagons/Makefile b/games/xhexagons/Makefile
deleted file mode 100644
index 59edb48d0807..000000000000
--- a/games/xhexagons/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xhexagons
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Hexagons puzzle (similar to Fifteen Puzzle) for X Window System
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/xhexagons
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xhexagons \
- share/man/man1/xhexagons.1.gz \
- lib/X11/app-defaults/Hexagons
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xhexagons ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Hexagons.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Hexagons
- ${INSTALL_MAN} ${WRKSRC}/xhexagons.man ${STAGEDIR}${PREFIX}/share/man/man1/xhexagons.1
-
-.include <bsd.port.mk>
diff --git a/games/xhexagons/distinfo b/games/xhexagons/distinfo
deleted file mode 100644
index e5362ce3154b..000000000000
--- a/games/xhexagons/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xhexagons-5.5.2.tar.gz) = 45d87115924ccde963e6bf9e8670b7705b19cb81e7222c35e7968f120c33f452
-SIZE (xhexagons-5.5.2.tar.gz) = 64309
diff --git a/games/xhexagons/pkg-descr b/games/xhexagons/pkg-descr
deleted file mode 100644
index 19e9791c4a24..000000000000
--- a/games/xhexagons/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Hexagons is a puzzle similar in nature to the Fifteen Puzzle.
-
-By building from the source and editing its Imakefile before the
-``build'' phase, you may be able to use Motif or LessTif with this port.
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
deleted file mode 100644
index eceab3114f9e..000000000000
--- a/games/xmball/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xmball
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Masterball puzzle for X Window System
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xmball \
- share/man/man1/xmball.1.gz \
- lib/X11/app-defaults/Mball
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xmball ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Mball.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Mball
- ${INSTALL_MAN} ${WRKSRC}/xmball.man ${STAGEDIR}${PREFIX}/share/man/man1/xmball.1
-
-.include <bsd.port.mk>
diff --git a/games/xmball/distinfo b/games/xmball/distinfo
deleted file mode 100644
index e29c3192a13a..000000000000
--- a/games/xmball/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xmball-5.5.2.tar.gz) = 45948e782000f924d5b92003f99485d0baf2558dcb7a0701cbfd0ee466d57ccf
-SIZE (xmball-5.5.2.tar.gz) = 64252
diff --git a/games/xmball/pkg-descr b/games/xmball/pkg-descr
deleted file mode 100644
index 0b974d264d1a..000000000000
--- a/games/xmball/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Masterball is a puzzle similar in nature to the famous Rubik's Cube.
-The original puzzle has 8 sectors on a sphere (longitudinal cuts),
-with each sector divided into 4 segments (latitudinal cuts).
-
-By building from the source and editing its Imakefile before the
-``build'' phase, you may be able to use Motif or LessTif with this port.
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
deleted file mode 100644
index 1592444d6e4c..000000000000
--- a/games/xmlink/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xmlink
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Missing Link puzzle for X Window System
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xmlink \
- share/man/man1/xmlink.1.gz \
- lib/X11/app-defaults/Mlink
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xmlink ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Mlink.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Mlink
- ${INSTALL_MAN} ${WRKSRC}/xmlink.man ${STAGEDIR}${PREFIX}/share/man/man1/xmlink.1
-
-.include <bsd.port.mk>
diff --git a/games/xmlink/distinfo b/games/xmlink/distinfo
deleted file mode 100644
index 327322581e2c..000000000000
--- a/games/xmlink/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xmlink-5.5.2.tar.gz) = 8749c61ff31f19c966ee71067a1d8af63ee6058daeb7064341a8e51bc998b70a
-SIZE (xmlink-5.5.2.tar.gz) = 60812
diff --git a/games/xmlink/pkg-descr b/games/xmlink/pkg-descr
deleted file mode 100644
index 971219eeaa39..000000000000
--- a/games/xmlink/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ideal's The Missing Link, a 4x4 puzzle, riding on the wave of Rubik's
-Cube craze. There are many variations on this theme, including the "6x6"
-puzzle and Babylon Tower. What makes the Missing Link a harder puzzle to
-solve is that the 2 center positions rotate together.
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
deleted file mode 100644
index 0c1a19ffeb52..000000000000
--- a/games/xoct/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xoct
-PORTVERSION= 5.5.2
-PORTREVISION= 2
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Oct puzzle for X Window System
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xoct \
- lib/X11/app-defaults/Oct \
- share/man/man1/xoct.1.gz
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xoct ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Oct.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Oct
- ${INSTALL_MAN} ${WRKSRC}/xoct.man ${STAGEDIR}${PREFIX}/share/man/man1/xoct.1
-
-.include <bsd.port.mk>
diff --git a/games/xoct/distinfo b/games/xoct/distinfo
deleted file mode 100644
index da678d221866..000000000000
--- a/games/xoct/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xoct-5.5.2.tar.gz) = abd753eb430c7719ecd2aa2157fd247a3ec083dc395ff3b749019b136cf62a57
-SIZE (xoct-5.5.2.tar.gz) = 66319
diff --git a/games/xoct/pkg-descr b/games/xoct/pkg-descr
deleted file mode 100644
index 862abb6c415f..000000000000
--- a/games/xoct/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
- The original puzzle has 9 triangles per face (size = 3)
-and has period 4 turning (i.e. the face or points turn with
-90 degree intervals). The puzzle was designed by Uwe Meffert
-and called the Magic Octahedron (or Star Puzzler). The
-puzzle was not widely distributed but not exactly rare. This
-puzzle has some analogies to the Rubik's Cube and the
-solving techniques are the same to that of the Pyraminx.
-Christoph's Magic Jewel is similar except there are no
-trivial corners to solve. This has 2^22*12! or
-2,009,078,326,886,400 different combinations.
- Uwe Meffert also noticed that there could be an alternate
-twisting for the octahedron where it has period 3 turning
-(i.e. faces turn with 120 degree intervals).
- One is able to simulate a Trajber's Octahedron (period 3
-turning and sticky mode). Also one is able to simulate one
-with variant turning (period 4 turning and sticky mode).
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
deleted file mode 100644
index 967d1e8d07a1..000000000000
--- a/games/xpanex/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xpanex
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Panex puzzle for X Window System
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xpanex \
- share/man/man1/xpanex.1.gz \
- lib/X11/app-defaults/Panex
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xpanex ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Panex.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Panex
- ${INSTALL_MAN} ${WRKSRC}/xpanex.man ${STAGEDIR}${PREFIX}/share/man/man1/xpanex.1
-
-.include <bsd.port.mk>
diff --git a/games/xpanex/distinfo b/games/xpanex/distinfo
deleted file mode 100644
index df85825772eb..000000000000
--- a/games/xpanex/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xpanex-5.5.2.tar.gz) = 115b13935979af9c68e285f8d103734379241aa38e5440c81bc2b25ba56fd4af
-SIZE (xpanex-5.5.2.tar.gz) = 60007
diff --git a/games/xpanex/pkg-descr b/games/xpanex/pkg-descr
deleted file mode 100644
index 20d90760112d..000000000000
--- a/games/xpanex/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
- The original Panex puzzle is from the Japanese Magic Company
-from the 1980's. Mathematicians at Bell Laboratories estimated
-the number of moves to swap 2 columns of order 10 to be
-27,564 <= N <= 31,537. It came in two varieties: one with a
-blue and a yellow pyramid of order 10 on silver tiles; in the
-gold version pieces of each color look alike i.e. no pyramid
-is drawn on them), this is a little harder.
- The original Tower of Hanoi puzzle is the invention of
-Edouard Lucas and was sold as a toy in France in 1883. The
-legend of 64 disks in the great temple of Benares of the god
-Brahma is also his invention.
diff --git a/games/xpuzzles/Makefile b/games/xpuzzles/Makefile
new file mode 100644
index 000000000000..0f2e712cfa98
--- /dev/null
+++ b/games/xpuzzles/Makefile
@@ -0,0 +1,93 @@
+PORTNAME= xpuzzles
+PORTVERSION= 8.9.4
+PORTREVISION= 0
+CATEGORIES= games
+MASTER_SITES= https://www.sillycycle.com/puzzles/
+
+MAINTAINER= dinoex@FreeBSD.org
+COMMENT= Collection of puzzles for X
+WWW= https://www.sillycycle.com/puzzles.html
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/rubik/COPYING
+
+LIB_DEPENDS= libXaw3d.so:x11-toolkits/libXaw3d
+RUN_DEPENDS= aplay:audio/alsa-utils
+
+USES= tar:xz xorg gl localbase desktop-file-utils
+USE_GL= gl glu
+USE_XORG= xt sm ice xext x11 xmu xpm
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-def-play=aplay
+
+XPUZZLES= rubik skewb dino bevel pyraminx oct mball \
+ cubes triangles hexagons panex mlink barrel
+
+pre-configure:
+.for dir in ${XPUZZLES}
+ ${REINPLACE_CMD} \
+ -e 's|^#prefix = @prefix@|prefix = @prefix@|' \
+ -e 's|^prefix = /usr$$|#prefix = /usr|' \
+ -e 's|^gamesdir = /usr/games|gamesdir = @bindir@|' \
+ -e 's|^#xapploaddir = @libdir@/X11/app-defaults|xapploaddir = @libdir@/X11/app-defaults|' \
+ -e 's|^xapploaddir = /etc/X11/app-defaults|#xapploaddir = /etc/X11/app-defaults|' \
+ -e 's|chmod 775 .(scoredir)|chmod 775 \$$\(DESTDIR\)\$$\(scoredir\)|' \
+ -e 's|.(INSTALL_PROGRAM) .(srcdir)/.(NAME).scores|\$$\(INSTALL_DATA\) \$$\(srcdir\)/\$$\(NAME\).scores|' \
+ -e "s|sed 's;.READ_PATH;.(DESTDIR)|sed 's;.READ_PATH;|" \
+ ${CONFIGURE_WRKSRC}/${dir}/Makefile.in
+.endfor
+
+do-configure:
+.for dir in ${XPUZZLES}
+ @CONFIG_GUESS_DIRS=$$(${FIND} ${WRKDIR} -name config.guess -o -name config.sub \
+ | ${XARGS} -n 1 ${DIRNAME}); \
+ for _D in $${CONFIG_GUESS_DIRS}; do \
+ ${RM} $${_D}/config.guess; \
+ ${CP} ${TEMPLATES}/config.guess $${_D}/config.guess; \
+ ${CHMOD} a+rx $${_D}/config.guess; \
+ ${RM} $${_D}/config.sub; \
+ ${CP} ${TEMPLATES}/config.sub $${_D}/config.sub; \
+ ${CHMOD} a+rx $${_D}/config.sub; \
+ done
+ @${MKDIR} ${CONFIGURE_WRKSRC}/${dir}
+ @(cd ${CONFIGURE_WRKSRC}/${dir} && \
+ ${SET_LATE_CONFIGURE_ARGS} \
+ if ! ${SETENVI} ${WRK_ENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \
+ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \
+ INSTALL="/usr/bin/install -c" \
+ INSTALL_DATA="${INSTALL_DATA}" \
+ INSTALL_LIB="${INSTALL_LIB}" \
+ INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+ INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+ ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS}; then \
+ ${ECHO_MSG} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
+ (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT_80} ; \
+ ${FALSE}; \
+ fi)
+.endfor
+
+do-build:
+.for dir in ${XPUZZLES}
+ @(cd ${BUILD_WRKSRC}/${dir}; if ! ${DO_MAKE_BUILD} ${ALL_TARGET}; then \
+ if [ -n "${BUILD_FAIL_MESSAGE}" ] ; then \
+ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \
+ (${ECHO_CMD} "${BUILD_FAIL_MESSAGE}") | ${FMT_80} ; \
+ fi; \
+ ${FALSE}; \
+ fi)
+.endfor
+
+do-install:
+ ${MKDIR} ${STAGEDIR}/var/games/xpuzzles
+.for dir in ${XPUZZLES}
+ @(cd ${INSTALL_WRKSRC}/${dir} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${FAKEROOT} \
+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+.endfor
+ ${RM} ${STAGEDIR}${PREFIX}/bin/play.sh
+.for dir in ${XPUZZLES}
+ ${MV} ${STAGEDIR}/var/games/xpuzzles/${dir}.scores \
+ ${STAGEDIR}/var/games/xpuzzles/${dir}.scores.sample
+.endfor
+
+.include <bsd.port.mk>
diff --git a/games/xpuzzles/distinfo b/games/xpuzzles/distinfo
new file mode 100644
index 000000000000..6c5dea8dc468
--- /dev/null
+++ b/games/xpuzzles/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1774945500
+SHA256 (xpuzzles-8.9.4.tar.xz) = 2e1d65daf9ccdbb930325e6ca7ee50ac7667a98aba0c0413b9a5d972ccad7fbf
+SIZE (xpuzzles-8.9.4.tar.xz) = 810568
diff --git a/games/xpuzzles/pkg-descr b/games/xpuzzles/pkg-descr
new file mode 100644
index 000000000000..2fe5a66dbc12
--- /dev/null
+++ b/games/xpuzzles/pkg-descr
@@ -0,0 +1,6 @@
+collection of puzzles for X (plain X version)
+The following puzzles are included:
+ - Rotational 3D Puzzles: xrubik, xpyraminx, xoct, xskewb, xdino,
+ xmball, xbevel
+ - Sliding Block Puzzles: xcubes, xtriangles, xhexagons, xpanex
+ - Combination Puzzles: xbarrel, xmlink
diff --git a/games/xpuzzles/pkg-plist b/games/xpuzzles/pkg-plist
new file mode 100644
index 000000000000..8b2a0796bfee
--- /dev/null
+++ b/games/xpuzzles/pkg-plist
@@ -0,0 +1,138 @@
+bin/xbarrel
+bin/xbevel
+bin/xcubes
+bin/xdino
+bin/xhexagons
+bin/xmball
+bin/xmlink
+bin/xoct
+bin/xpanex
+bin/xpyraminx
+bin/xrubik
+bin/xskewb
+bin/xtriangles
+lib/X11/app-defaults/XBarrel
+lib/X11/app-defaults/XBevel
+lib/X11/app-defaults/XCubes
+lib/X11/app-defaults/XDino
+lib/X11/app-defaults/XHexagons
+lib/X11/app-defaults/XMball
+lib/X11/app-defaults/XMlink
+lib/X11/app-defaults/XOct
+lib/X11/app-defaults/XPanex
+lib/X11/app-defaults/XPyraminx
+lib/X11/app-defaults/XRubik
+lib/X11/app-defaults/XSkewb
+lib/X11/app-defaults/XTriangles
+share/applications/xbarrel.desktop
+share/applications/xbevel.desktop
+share/applications/xcubes.desktop
+share/applications/xdino.desktop
+share/applications/xhexagons.desktop
+share/applications/xmball.desktop
+share/applications/xmlink.desktop
+share/applications/xoct.desktop
+share/applications/xpanex.desktop
+share/applications/xpyraminx.desktop
+share/applications/xrubik.desktop
+share/applications/xskewb.desktop
+share/applications/xtriangles.desktop
+share/games/xpuzzles/bump.au
+share/games/xpuzzles/drip.au
+share/games/xpuzzles/mandrill.xbm
+share/games/xpuzzles/mandrill.xpm
+share/games/xpuzzles/move.au
+share/icons/hicolor/16x16/apps/barrel.png
+share/icons/hicolor/16x16/apps/bevel.png
+share/icons/hicolor/16x16/apps/cubes.png
+share/icons/hicolor/16x16/apps/dino.png
+share/icons/hicolor/16x16/apps/hexagons.png
+share/icons/hicolor/16x16/apps/mball.png
+share/icons/hicolor/16x16/apps/mlink.png
+share/icons/hicolor/16x16/apps/oct.png
+share/icons/hicolor/16x16/apps/panex.png
+share/icons/hicolor/16x16/apps/pyraminx.png
+share/icons/hicolor/16x16/apps/rubik.png
+share/icons/hicolor/16x16/apps/skewb.png
+share/icons/hicolor/16x16/apps/triangles.png
+share/icons/hicolor/22x22/apps/barrel.png
+share/icons/hicolor/22x22/apps/bevel.png
+share/icons/hicolor/22x22/apps/cubes.png
+share/icons/hicolor/22x22/apps/dino.png
+share/icons/hicolor/22x22/apps/hexagons.png
+share/icons/hicolor/22x22/apps/mball.png
+share/icons/hicolor/22x22/apps/mlink.png
+share/icons/hicolor/22x22/apps/oct.png
+share/icons/hicolor/22x22/apps/panex.png
+share/icons/hicolor/22x22/apps/pyraminx.png
+share/icons/hicolor/22x22/apps/rubik.png
+share/icons/hicolor/22x22/apps/skewb.png
+share/icons/hicolor/22x22/apps/triangles.png
+share/icons/hicolor/24x24/apps/barrel.png
+share/icons/hicolor/24x24/apps/bevel.png
+share/icons/hicolor/24x24/apps/cubes.png
+share/icons/hicolor/24x24/apps/dino.png
+share/icons/hicolor/24x24/apps/hexagons.png
+share/icons/hicolor/24x24/apps/mball.png
+share/icons/hicolor/24x24/apps/mlink.png
+share/icons/hicolor/24x24/apps/oct.png
+share/icons/hicolor/24x24/apps/panex.png
+share/icons/hicolor/24x24/apps/pyraminx.png
+share/icons/hicolor/24x24/apps/rubik.png
+share/icons/hicolor/24x24/apps/skewb.png
+share/icons/hicolor/24x24/apps/triangles.png
+share/icons/hicolor/32x32/apps/barrel.png
+share/icons/hicolor/32x32/apps/bevel.png
+share/icons/hicolor/32x32/apps/cubes.png
+share/icons/hicolor/32x32/apps/dino.png
+share/icons/hicolor/32x32/apps/hexagons.png
+share/icons/hicolor/32x32/apps/mball.png
+share/icons/hicolor/32x32/apps/mlink.png
+share/icons/hicolor/32x32/apps/oct.png
+share/icons/hicolor/32x32/apps/panex.png
+share/icons/hicolor/32x32/apps/pyraminx.png
+share/icons/hicolor/32x32/apps/rubik.png
+share/icons/hicolor/32x32/apps/skewb.png
+share/icons/hicolor/32x32/apps/triangles.png
+share/icons/hicolor/48x48/apps/barrel.png
+share/icons/hicolor/48x48/apps/bevel.png
+share/icons/hicolor/48x48/apps/cubes.png
+share/icons/hicolor/48x48/apps/dino.png
+share/icons/hicolor/48x48/apps/hexagons.png
+share/icons/hicolor/48x48/apps/mball.png
+share/icons/hicolor/48x48/apps/mlink.png
+share/icons/hicolor/48x48/apps/oct.png
+share/icons/hicolor/48x48/apps/panex.png
+share/icons/hicolor/48x48/apps/pyraminx.png
+share/icons/hicolor/48x48/apps/rubik.png
+share/icons/hicolor/48x48/apps/skewb.png
+share/icons/hicolor/48x48/apps/triangles.png
+share/man/man6/xbarrel.6.gz
+share/man/man6/xbevel.6.gz
+share/man/man6/xcubes.6.gz
+share/man/man6/xdino.6.gz
+share/man/man6/xhexagons.6.gz
+share/man/man6/xmball.6.gz
+share/man/man6/xmlink.6.gz
+share/man/man6/xoct.6.gz
+share/man/man6/xpanex.6.gz
+share/man/man6/xpyraminx.6.gz
+share/man/man6/xrubik.6.gz
+share/man/man6/xskewb.6.gz
+share/man/man6/xtriangles.6.gz
+@owner games
+@group games
+@dir(games,games,775) /var/games/xpuzzles
+@sample /var/games/xpuzzles/barrel.scores.sample
+@sample /var/games/xpuzzles/bevel.scores.sample
+@sample /var/games/xpuzzles/cubes.scores.sample
+@sample /var/games/xpuzzles/dino.scores.sample
+@sample /var/games/xpuzzles/hexagons.scores.sample
+@sample /var/games/xpuzzles/mball.scores.sample
+@sample /var/games/xpuzzles/mlink.scores.sample
+@sample /var/games/xpuzzles/oct.scores.sample
+@sample /var/games/xpuzzles/panex.scores.sample
+@sample /var/games/xpuzzles/pyraminx.scores.sample
+@sample /var/games/xpuzzles/rubik.scores.sample
+@sample /var/games/xpuzzles/skewb.scores.sample
+@sample /var/games/xpuzzles/triangles.scores.sample
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
deleted file mode 100644
index 0e813df25c11..000000000000
--- a/games/xpyraminx/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xpyraminx
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Pyraminx puzzle for X Window System
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xpyraminx \
- lib/X11/app-defaults/Pyraminx \
- share/man/man1/xpyraminx.1.gz
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xpyraminx ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Pyraminx.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Pyraminx
- ${INSTALL_MAN} ${WRKSRC}/xpyraminx.man ${STAGEDIR}${PREFIX}/share/man/man1/xpyraminx.1
-
-.include <bsd.port.mk>
diff --git a/games/xpyraminx/distinfo b/games/xpyraminx/distinfo
deleted file mode 100644
index 416258fa9650..000000000000
--- a/games/xpyraminx/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xpyraminx-5.5.2.tar.gz) = 605c5d679d9ae750a590d5eee7961d2b369416ad684397a5fdb7162fcc8f7028
-SIZE (xpyraminx-5.5.2.tar.gz) = 66845
diff --git a/games/xpyraminx/pkg-descr b/games/xpyraminx/pkg-descr
deleted file mode 100644
index c91007cc9363..000000000000
--- a/games/xpyraminx/pkg-descr
+++ /dev/null
@@ -1,20 +0,0 @@
- The original puzzle has 9 triangles per face (size = 3) and
-has period 3 turning (i.e. the face or points turn in 120 degree
-intervals). The puzzle was designed by Uwe Meffert and called
-the Pyraminx. This has 2^5*3^8*6!/2 or 75,582,720 different
-combinations.
- Another puzzle Senior Pyraminx 3x3x3 exists only on paper, it
-has period 2 turning (i.e. edges turn with 180 degree intervals)
-but the corners would fall off unless it had some tricky
-mechanism. (This may be the same as the Master Pyraminx which
-has 446,965,972,992,000 different combinations).
- Another puzzle (which was not widely distributed), the Junior
-Pyraminx (and similarly the Junior Pyraminx Star, a octahedron
-formed by two tetrahedra, this has 7!*3^6 or 3,674,160 different
-combinations), has 4 triangles (size = 2) per face and at the
-time I designed this computer puzzle thought that it had only
-period 2 turning (i.e the edges rotate). It turns out the puzzle
-has a period 4 turning (edges turn with 90 degree intervals)
-which makes it analogous to the 2x2x2 Rubik's cube. This puzzle
-makes various non-tetrahedral shapes. The puzzle contained here
-has no period 4 turning flexability.
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
deleted file mode 100644
index 9115eab216aa..000000000000
--- a/games/xrubik/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-PORTNAME= xrubik
-PORTVERSION= 5.5.2
-PORTREVISION= 2
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= X-based rubik's cube(tm)
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/xrubik
-USES= imake xorg
-USE_XORG= xt sm ice xext x11
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xrubik ${STAGEDIR}${PREFIX}/bin/
- ${INSTALL_DATA} ${WRKSRC}/Rubik.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Rubik
- ${INSTALL_MAN} ${WRKSRC}/xrubik.man ${STAGEDIR}${PREFIX}/share/man/man1/xrubik.1
-
-.include <bsd.port.mk>
diff --git a/games/xrubik/distinfo b/games/xrubik/distinfo
deleted file mode 100644
index 3aef1b68e927..000000000000
--- a/games/xrubik/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xrubik-5.5.2.tar.gz) = d5ea4e160e6dca109fe72c2971adc761e99f7729ab29b79dc409fe633624c078
-SIZE (xrubik-5.5.2.tar.gz) = 77397
diff --git a/games/xrubik/pkg-descr b/games/xrubik/pkg-descr
deleted file mode 100644
index 79db899e51aa..000000000000
--- a/games/xrubik/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Xrubik, X-based rubik's cube(tm)
-
-Rubik's cube is a puzzle that you put same color pieces to
-the same faces on a cube.
-
-LICENSE: Permission to use, copy, modify, and distribute
diff --git a/games/xrubik/pkg-plist b/games/xrubik/pkg-plist
deleted file mode 100644
index 225cb8f0d988..000000000000
--- a/games/xrubik/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/xrubik
-lib/X11/app-defaults/Rubik
-share/man/man1/xrubik.1.gz
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
deleted file mode 100644
index b9b9f5cac66c..000000000000
--- a/games/xskewb/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME= xskewb
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Skewb puzzle (similar to Rubik's Cube) for X Window
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xskewb \
- lib/X11/app-defaults/Skewb \
- share/man/man1/xskewb.1.gz
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xskewb ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Skewb.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Skewb
- ${INSTALL_MAN} ${WRKSRC}/xskewb.man ${STAGEDIR}${PREFIX}/share/man/man1/xskewb.1
-
-.include <bsd.port.mk>
diff --git a/games/xskewb/distinfo b/games/xskewb/distinfo
deleted file mode 100644
index 807f883980ab..000000000000
--- a/games/xskewb/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xskewb-5.5.2.tar.gz) = 0814a58e717247585e733a6a030c30abd89f39fcadb0ec6069927b8e2f4a7bac
-SIZE (xskewb-5.5.2.tar.gz) = 71248
diff --git a/games/xskewb/pkg-descr b/games/xskewb/pkg-descr
deleted file mode 100644
index 1e72a9631774..000000000000
--- a/games/xskewb/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Xskewb is a puzzle similar in nature to the famous Rubik's Cube.
-Its variations on the inspiration include using 5 blocks per side,
-including a large distinct diamond block, and optionally requiring
-correct block "orientation". This is similar to other puzzles
-such as the "Creative Puzzle Ball", "Meffert's Challenge", and Disney's
-"Mickey's Challenge". The original design was by Uwe Meffert
-("Pyraminx Cube") and coined Skewb by Douglas Hofstadter.
-
-By building from the source and editing its Imakefile before the
-``build'' phase, you may be able to use Motif or LessTif with this port.
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
deleted file mode 100644
index 011a6544956b..000000000000
--- a/games/xtriangles/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-PORTNAME= xtriangles
-PORTVERSION= 5.5.2
-PORTREVISION= 3
-CATEGORIES= games
-MASTER_SITES= XCONTRIB/games/xpuzzles
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Triangles puzzle
-WWW= http://www.tux.org/~bagleyd/puzzles.html
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= imake xorg
-USE_XORG= x11 xext xt sm ice
-
-PLIST_FILES= bin/xtriangles \
- lib/X11/app-defaults/Triangles \
- share/man/man1/xtriangles.1.gz
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xtriangles ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/Triangles.ad \
- ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/Triangles
- ${INSTALL_MAN} ${WRKSRC}/xtriangles.man ${STAGEDIR}${PREFIX}/share/man/man1/xtriangles.1
-
-.include <bsd.port.mk>
diff --git a/games/xtriangles/distinfo b/games/xtriangles/distinfo
deleted file mode 100644
index 102ab1459973..000000000000
--- a/games/xtriangles/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xtriangles-5.5.2.tar.gz) = c5d00705845e5fc4250e1444fa788477bb0e4cfee757c372472f0f2f5738b039
-SIZE (xtriangles-5.5.2.tar.gz) = 61097
diff --git a/games/xtriangles/pkg-descr b/games/xtriangles/pkg-descr
deleted file mode 100644
index de159e06850a..000000000000
--- a/games/xtriangles/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-XTriangles, triangle puzzle for X-Window
-
-Your goal is to exchange the triangle panels to be in order.