2 files changed, 71 insertions, 72 deletions

diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index b86dc07e3108..7558022e1676 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -11,8 +11,11 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another little mind game
 
-USES=		gettext gmake pkgconfig tar:bzip2
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gettext gmake pathfix pkgconfig tar:bzip2
+USE_GNOME=	gnomeprefix intlhack libgnomeui
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lm
diff --git a/games/atomix/pkg-plist b/games/atomix/pkg-plist
index 3b0b464223dd..b788f342475b 100644
--- a/games/atomix/pkg-plist
+++ b/games/atomix/pkg-plist
@@ -1,71 +1,71 @@
 bin/atomix
 share/applications/atomix.desktop
-share/atomix/atomix-logo.png
-share/atomix/level/aceticacid.atomix.xml
-share/atomix/level/acetone.atomix.xml
-share/atomix/level/butanol.atomix.xml
-share/atomix/level/cyclobutane.atomix.xml
-share/atomix/level/dimethylether.atomix.xml
-share/atomix/level/ethanal.atomix.xml
-share/atomix/level/ethane.atomix.xml
-share/atomix/level/ethanol.atomix.xml
-share/atomix/level/ethylene.atomix.xml
-share/atomix/level/glycerin.atomix.xml
-share/atomix/level/lactic-acid.atomix.xml
-share/atomix/level/methanal.atomix.xml
-share/atomix/level/methane.atomix.xml
-share/atomix/level/methanol.atomix.xml
-share/atomix/level/propanal.atomix.xml
-share/atomix/level/propylene.atomix.xml
-share/atomix/level/pyran.atomix.xml
-share/atomix/level/sequence
-share/atomix/level/transbutylen.atomix.xml
-share/atomix/level/water.atomix.xml
-share/atomix/themes/default/arrow-bottom.png
-share/atomix/themes/default/arrow-left.png
-share/atomix/themes/default/arrow-right.png
-share/atomix/themes/default/arrow-top.png
-share/atomix/themes/default/atom-c.png
-share/atomix/themes/default/atom-f.png
-share/atomix/themes/default/atom-h.png
-share/atomix/themes/default/atom-n.png
-share/atomix/themes/default/atom-o.png
-share/atomix/themes/default/cursor.png
-share/atomix/themes/default/floor.png
-share/atomix/themes/default/link-bottom-double.png
-share/atomix/themes/default/link-bottom-left.png
-share/atomix/themes/default/link-bottom-right.png
-share/atomix/themes/default/link-bottom.png
-share/atomix/themes/default/link-left-double.png
-share/atomix/themes/default/link-left.png
-share/atomix/themes/default/link-right-double.png
-share/atomix/themes/default/link-right.png
-share/atomix/themes/default/link-top-double.png
-share/atomix/themes/default/link-top-left.png
-share/atomix/themes/default/link-top-right.png
-share/atomix/themes/default/link-top.png
-share/atomix/themes/default/shadow-bottom-right.png
-share/atomix/themes/default/shadow-left-top.png
-share/atomix/themes/default/shadow-left.png
-share/atomix/themes/default/shadow-top-left-both.png
-share/atomix/themes/default/shadow-top-left.png
-share/atomix/themes/default/shadow-top.png
-share/atomix/themes/default/theme
-share/atomix/themes/default/wall-bottom-left.png
-share/atomix/themes/default/wall-bottom-right.png
-share/atomix/themes/default/wall-horizontal-bottomx.png
-share/atomix/themes/default/wall-horizontal-left-end.png
-share/atomix/themes/default/wall-horizontal-right-end.png
-share/atomix/themes/default/wall-horizontal-topx.png
-share/atomix/themes/default/wall-horizontal.png
-share/atomix/themes/default/wall-single.png
-share/atomix/themes/default/wall-top-left.png
-share/atomix/themes/default/wall-top-right.png
-share/atomix/themes/default/wall-vertical-bottom-end.png
-share/atomix/themes/default/wall-vertical-leftx.png
-share/atomix/themes/default/wall-vertical-rightx.png
-share/atomix/themes/default/wall-vertical-top-end.png
-share/atomix/themes/default/wall-vertical.png
+%%DATADIR%%/atomix-logo.png
+%%DATADIR%%/level/aceticacid.atomix.xml
+%%DATADIR%%/level/acetone.atomix.xml
+%%DATADIR%%/level/butanol.atomix.xml
+%%DATADIR%%/level/cyclobutane.atomix.xml
+%%DATADIR%%/level/dimethylether.atomix.xml
+%%DATADIR%%/level/ethanal.atomix.xml
+%%DATADIR%%/level/ethane.atomix.xml
+%%DATADIR%%/level/ethanol.atomix.xml
+%%DATADIR%%/level/ethylene.atomix.xml
+%%DATADIR%%/level/glycerin.atomix.xml
+%%DATADIR%%/level/lactic-acid.atomix.xml
+%%DATADIR%%/level/methanal.atomix.xml
+%%DATADIR%%/level/methane.atomix.xml
+%%DATADIR%%/level/methanol.atomix.xml
+%%DATADIR%%/level/propanal.atomix.xml
+%%DATADIR%%/level/propylene.atomix.xml
+%%DATADIR%%/level/pyran.atomix.xml
+%%DATADIR%%/level/sequence
+%%DATADIR%%/level/transbutylen.atomix.xml
+%%DATADIR%%/level/water.atomix.xml
+%%DATADIR%%/themes/default/arrow-bottom.png
+%%DATADIR%%/themes/default/arrow-left.png
+%%DATADIR%%/themes/default/arrow-right.png
+%%DATADIR%%/themes/default/arrow-top.png
+%%DATADIR%%/themes/default/atom-c.png
+%%DATADIR%%/themes/default/atom-f.png
+%%DATADIR%%/themes/default/atom-h.png
+%%DATADIR%%/themes/default/atom-n.png
+%%DATADIR%%/themes/default/atom-o.png
+%%DATADIR%%/themes/default/cursor.png
+%%DATADIR%%/themes/default/floor.png
+%%DATADIR%%/themes/default/link-bottom-double.png
+%%DATADIR%%/themes/default/link-bottom-left.png
+%%DATADIR%%/themes/default/link-bottom-right.png
+%%DATADIR%%/themes/default/link-bottom.png
+%%DATADIR%%/themes/default/link-left-double.png
+%%DATADIR%%/themes/default/link-left.png
+%%DATADIR%%/themes/default/link-right-double.png
+%%DATADIR%%/themes/default/link-right.png
+%%DATADIR%%/themes/default/link-top-double.png
+%%DATADIR%%/themes/default/link-top-left.png
+%%DATADIR%%/themes/default/link-top-right.png
+%%DATADIR%%/themes/default/link-top.png
+%%DATADIR%%/themes/default/shadow-bottom-right.png
+%%DATADIR%%/themes/default/shadow-left-top.png
+%%DATADIR%%/themes/default/shadow-left.png
+%%DATADIR%%/themes/default/shadow-top-left-both.png
+%%DATADIR%%/themes/default/shadow-top-left.png
+%%DATADIR%%/themes/default/shadow-top.png
+%%DATADIR%%/themes/default/theme
+%%DATADIR%%/themes/default/wall-bottom-left.png
+%%DATADIR%%/themes/default/wall-bottom-right.png
+%%DATADIR%%/themes/default/wall-horizontal-bottomx.png
+%%DATADIR%%/themes/default/wall-horizontal-left-end.png
+%%DATADIR%%/themes/default/wall-horizontal-right-end.png
+%%DATADIR%%/themes/default/wall-horizontal-topx.png
+%%DATADIR%%/themes/default/wall-horizontal.png
+%%DATADIR%%/themes/default/wall-single.png
+%%DATADIR%%/themes/default/wall-top-left.png
+%%DATADIR%%/themes/default/wall-top-right.png
+%%DATADIR%%/themes/default/wall-vertical-bottom-end.png
+%%DATADIR%%/themes/default/wall-vertical-leftx.png
+%%DATADIR%%/themes/default/wall-vertical-rightx.png
+%%DATADIR%%/themes/default/wall-vertical-top-end.png
+%%DATADIR%%/themes/default/wall-vertical.png
 share/gnome-2.0/ui/atomix-ui.xml
 share/pixmaps/atomix-icon.png
 share/locale/am/LC_MESSAGES/atomix.mo
@@ -122,7 +122,3 @@ share/locale/wa/LC_MESSAGES/atomix.mo
 share/locale/zh_CN/LC_MESSAGES/atomix.mo
 share/locale/zh_HK/LC_MESSAGES/atomix.mo
 share/locale/zh_TW/LC_MESSAGES/atomix.mo
-@dirrm share/atomix/themes/default
-@dirrm share/atomix/themes
-@dirrm share/atomix/level
-@dirrm share/atomix