From 05118c0a0bc6e0f9603d10d2d067090733f80126 Mon Sep 17 00:00:00 2001 From: rfreeman Date: Fri, 23 Mar 2012 09:05:22 +0000 Subject: [PATCH] Games data directory now ${PREFIX}/share/doom, to fit with where other game ports put their data. Coincides with chocolate-doom update. OK weerd@ (MAINTAINER) and phessler@ --- games/doomdata/doom1/Makefile | 8 ++++---- games/doomdata/doom1/pkg/PLIST | 7 +++---- games/doomdata/doom2/Makefile | 8 ++++---- games/doomdata/doom2/pkg/PLIST | 7 +++---- games/doomdata/shareware/Makefile | 8 ++++---- games/doomdata/shareware/pkg/PLIST | 7 +++---- 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/games/doomdata/doom1/Makefile b/games/doomdata/doom1/Makefile index 75268407de9..b6b7259ce04 100644 --- a/games/doomdata/doom1/Makefile +++ b/games/doomdata/doom1/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/06/05 22:31:44 phessler Exp $ +# $OpenBSD: Makefile,v 1.2 2012/03/23 09:05:22 rfreeman Exp $ COMMENT = DOOM I data files DISTFILES = doom.wad PKGNAME = doom1data-1.0 +REVISION = 0 CATEGORIES = games EXTRACT_ONLY = @@ -27,8 +28,7 @@ FETCH_MANUALLY += "${FULLDISTDIR}." do-build: do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/games/doom/ - ${INSTALL_DATA} ${FULLDISTDIR}/doom.wad \ - ${PREFIX}/share/games/doom/doom.wad + ${INSTALL_DATA_DIR} ${PREFIX}/share/doom/ + ${INSTALL_DATA} ${FULLDISTDIR}/doom.wad ${PREFIX}/share/doom/doom.wad .include diff --git a/games/doomdata/doom1/pkg/PLIST b/games/doomdata/doom1/pkg/PLIST index d5e0c0ec0de..15c58e0160d 100644 --- a/games/doomdata/doom1/pkg/PLIST +++ b/games/doomdata/doom1/pkg/PLIST @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/05 22:31:44 phessler Exp $ -share/games/ -share/games/doom/ -share/games/doom/doom.wad +@comment $OpenBSD: PLIST,v 1.2 2012/03/23 09:05:22 rfreeman Exp $ +share/doom/ +share/doom/doom.wad diff --git a/games/doomdata/doom2/Makefile b/games/doomdata/doom2/Makefile index 60d9bd041be..39bcbab1732 100644 --- a/games/doomdata/doom2/Makefile +++ b/games/doomdata/doom2/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/06/05 22:31:44 phessler Exp $ +# $OpenBSD: Makefile,v 1.2 2012/03/23 09:05:23 rfreeman Exp $ COMMENT = DOOM II data files DISTFILES = doom2.wad PKGNAME = doom2data-1.0 +REVISION = 0 CATEGORIES = games EXTRACT_ONLY = @@ -27,8 +28,7 @@ FETCH_MANUALLY += "${FULLDISTDIR}." do-build: do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/games/doom/ - ${INSTALL_DATA} ${FULLDISTDIR}/doom2.wad \ - ${PREFIX}/share/games/doom/doom2.wad + ${INSTALL_DATA_DIR} ${PREFIX}/share/doom/ + ${INSTALL_DATA} ${FULLDISTDIR}/doom2.wad ${PREFIX}/share/doom/doom2.wad .include diff --git a/games/doomdata/doom2/pkg/PLIST b/games/doomdata/doom2/pkg/PLIST index a327db0dba8..87f34befe10 100644 --- a/games/doomdata/doom2/pkg/PLIST +++ b/games/doomdata/doom2/pkg/PLIST @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/05 22:31:44 phessler Exp $ -share/games/ -share/games/doom/ -share/games/doom/doom2.wad +@comment $OpenBSD: PLIST,v 1.2 2012/03/23 09:05:23 rfreeman Exp $ +share/doom/ +share/doom/doom2.wad diff --git a/games/doomdata/shareware/Makefile b/games/doomdata/shareware/Makefile index ce8a03b652a..5b5e0722f71 100644 --- a/games/doomdata/shareware/Makefile +++ b/games/doomdata/shareware/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/06/05 22:31:44 phessler Exp $ +# $OpenBSD: Makefile,v 1.2 2012/03/23 09:05:23 rfreeman Exp $ COMMENT = DOOM I Shareware data files DISTNAME = doom19s PKGNAME = doomdata-1.9 +REVISION = 0 EXTRACT_SUFX = .zip CATEGORIES = games @@ -29,8 +30,7 @@ do-build: cd ${WRKBUILD} && unzip DOOMS_19.ZIP do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/games/doom/ - ${INSTALL_DATA} ${WRKBUILD}/DOOM1.WAD \ - ${PREFIX}/share/games/doom/doom1.wad + ${INSTALL_DATA_DIR} ${PREFIX}/share/doom/ + ${INSTALL_DATA} ${WRKBUILD}/DOOM1.WAD ${PREFIX}/share/doom/doom1.wad .include diff --git a/games/doomdata/shareware/pkg/PLIST b/games/doomdata/shareware/pkg/PLIST index e9c156e8ee5..ef42ad04dd7 100644 --- a/games/doomdata/shareware/pkg/PLIST +++ b/games/doomdata/shareware/pkg/PLIST @@ -1,4 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/05 22:31:44 phessler Exp $ -share/games/ -share/games/doom/ -share/games/doom/doom1.wad +@comment $OpenBSD: PLIST,v 1.2 2012/03/23 09:05:23 rfreeman Exp $ +share/doom/ +share/doom/doom1.wad