Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2024 15:08:16 GMT
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: eb3e11bd6244 - main - games/xblood: Move man pages to share/man
Message-ID:  <202403161508.42GF8Gou046146@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by naddy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eb3e11bd6244e5c6e2a202358ed2b0f8c23ceb5d

commit eb3e11bd6244e5c6e2a202358ed2b0f8c23ceb5d
Author:     Christian Weisgerber <naddy@FreeBSD.org>
AuthorDate: 2024-03-16 14:54:08 +0000
Commit:     Christian Weisgerber <naddy@FreeBSD.org>
CommitDate: 2024-03-16 14:54:08 +0000

    games/xblood: Move man pages to share/man
    
    Approved by:    portmgr (blanket)
---
 games/xblood/Makefile             | 11 ++++++-----
 games/xblood/files/patch-Makefile | 30 ------------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/games/xblood/Makefile b/games/xblood/Makefile
index e0ebd617034e..43a4f2d9cf34 100644
--- a/games/xblood/Makefile
+++ b/games/xblood/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	xblood
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://kozos.jp/myfreesoft/
 
@@ -11,12 +11,13 @@ WWW=		https://kozos.jp/myfreesoft/
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-MAKE_ENV=	X11BASE=${LOCALBASE}
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" X11BASE="${LOCALBASE}"
 USES=		xorg
 USE_XORG=	x11
-PLIST_FILES=	bin/xblood man/man1/xblood.1.gz
+PLIST_FILES=	bin/xblood share/man/man1/xblood.1.gz
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xblood
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xblood ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xblood.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/games/xblood/files/patch-Makefile b/games/xblood/files/patch-Makefile
deleted file mode 100644
index 11a7325c401b..000000000000
--- a/games/xblood/files/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./Makefile.orig	2000-02-26 19:02:52.000000000 -0200
-+++ ./Makefile	2013-11-12 23:55:39.000000000 -0200
-@@ -1,12 +1,12 @@
--PREFIX  = /usr/X11R6
--X11BASE = /usr/X11R6
-+#PREFIX  = /usr/X11R6
-+#X11BASE = /usr/X11R6
- INCLUDEDIR = $(X11BASE)/include
- LIBDIR     = $(X11BASE)/lib
- BINDIR     = $(PREFIX)/bin
- MANDIR     = $(PREFIX)/man/man1
--CC = gcc
-+#CC = gcc
- RM = rm -f
--CFLAGS = -O
-+#CFLAGS = -O
- LIBS = -lX11
- PKGNAME = xblood-2.0
- VERSION = XBlood-2.0
-@@ -27,8 +27,8 @@
- 		$(RM) xblood.1.gz
- 
- install :
--		cp xblood $(BINDIR)
--		cp xblood.1.gz $(MANDIR)
-+		cp xblood ${DESTDIR}$(BINDIR)
-+		cp xblood.1.gz ${DESTDIR}$(MANDIR)
- 
- uninstall :
- 		$(RM) $(BINDIR)/xblood



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403161508.42GF8Gou046146>