Date: Sun, 22 Mar 2009 14:08:15 GMT From: Florian Smeets <flo@kasimir.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/132935: [PATCH] [MAINTAINER UPDATE] games/crafty really fix plist issues, games/crafty-open-* take Maintainership , register conflicts with crafty for WITH_BOOK case Message-ID: <200903221408.n2ME8FRT071416@www.freebsd.org> Resent-Message-ID: <200903221410.n2MEA2t8055116@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132935
>Category: ports
>Synopsis: [PATCH] [MAINTAINER UPDATE] games/crafty really fix plist issues, games/crafty-open-* take Maintainership , register conflicts with crafty for WITH_BOOK case
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Mar 22 14:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Florian Smeets
>Release: FreeBSD 7.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD mail.solomo.de 7.1-STABLE FreeBSD 7.1-STABLE #6: Sun Mar 1 16:30:44 CET
>Description:
after the last update crafty dependent ports fail like this:
=== Checking filesystem state
list of files present before this port was installed but missing after it was deinstalled)
./usr/local/lib/crafty/book.bin missing
================================================================
build of /usr/ports/games/crafty-open-medium ended at Sat Mar 14 14:45:17 UTC 2009
>How-To-Repeat:
>Fix:
Fix this by adding a knew knob to crafty, off by default. Only if this knob is set install book.bin and add conflicts to dependent ports for this case based on the PKGNAMESUFFIX which is set by the knob.
Patch attached with submission follows:
diff -Nur games.orig/crafty/Makefile games/crafty/Makefile
--- games.orig/crafty/Makefile 2009-03-22 13:37:58.000000000 +0000
+++ games/crafty/Makefile 2009-03-22 13:46:22.000000000 +0000
@@ -24,7 +24,7 @@
USE_ZIP= yes
USE_GMAKE= yes
-BOOKS= book.bin books.bin
+BOOKS= books.bin
DISTFILES+= ${BOOKS:S/$/:books/}
.if !defined(NOPORTDOCS)
@@ -58,11 +58,23 @@
BROKEN= Does not compile on sparc64
.endif
+.if defined(WITH_BOOK)
+BOOKS+= book.bin
+DISTFILES+= ${BOOKS:S/$/:books/}
+PKGNAMESUFFIX= -open-default
+CONFLICTS+= crafty-open-enormous-* crafty-open-large-* crafty-open-medium-*
+PLIST_SUB+= BOOK=""
+.else
+PLIST_SUB+= BOOK="@comment "
+.endif
+
MAKE_ENV+= opt="${OPT}" target=${OPSYS} CXFLAGS="${CXXFLAGS}"
post-extract:
${CP} ${DISTDIR}/${DIST_SUBDIR}/start.pgn ${WRKSRC}/start.pgn
+.if defined(WITH_BOOK)
${CP} ${DISTDIR}/${DIST_SUBDIR}/book.bin ${WRKSRC}/book.bin
+.endif
${CP} ${DISTDIR}/${DIST_SUBDIR}/books.bin ${WRKSRC}/books.bin
post-build:
@@ -75,7 +87,9 @@
${MKDIR} ${PREFIX}/lib/crafty/cpf
${CHOWN} -R root:nogroup ${PREFIX}/lib/crafty
${CHMOD} 775 ${PREFIX}/lib/crafty ${PREFIX}/lib/crafty/cpf
+.if defined(WITH_BOOK)
${INSTALL_DATA} ${WRKSRC}/book.bin ${PREFIX}/lib/crafty/book.bin
+.endif
${INSTALL_DATA} ${WRKSRC}/books.bin ${PREFIX}/lib/crafty/books.bin
${INSTALL_DATA} ${WRKSRC}/crafty.hlp ${PREFIX}/lib/crafty/crafty.hlp
${CHOWN} root:nogroup ${PREFIX}/lib/crafty/book*
diff -Nur games.orig/crafty/pkg-plist games/crafty/pkg-plist
--- games.orig/crafty/pkg-plist 2009-03-22 13:37:58.000000000 +0000
+++ games/crafty/pkg-plist 2009-03-22 13:46:22.000000000 +0000
@@ -1,5 +1,5 @@
bin/crafty
-lib/crafty/book.bin
+%%BOOK%%lib/crafty/book.bin
lib/crafty/books.bin
lib/crafty/crafty.hlp
%%PORTDOCS%%share/doc/crafty/crafty.doc.ascii
diff -Nur games.orig/crafty-open-enormous/Makefile games/crafty-open-enormous/Makefile
--- games.orig/crafty-open-enormous/Makefile 2009-03-22 13:38:00.000000000 +0000
+++ games/crafty-open-enormous/Makefile 2009-03-22 13:46:50.000000000 +0000
@@ -13,7 +13,7 @@
DISTFILES= enormous.zip
EXTRACT_ONLY= ${DISTFILES}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= flo@kasimir.com
COMMENT= The enormous opening book (about 85-90 MByte) for crafty
BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty
@@ -23,7 +23,7 @@
USE_ZIP= yes
NO_WRKSUBDIR= yes
NO_PACKAGE= Package is way too big
-CONFLICTS= crafty-open-large-* crafty-open-medium-*
+CONFLICTS= crafty-open-large-* crafty-open-medium-* crafty-open-default-*
.include <bsd.port.pre.mk>
diff -Nur games.orig/crafty-open-large/Makefile games/crafty-open-large/Makefile
--- games.orig/crafty-open-large/Makefile 2009-03-22 13:37:58.000000000 +0000
+++ games/crafty-open-large/Makefile 2009-03-22 13:47:00.000000000 +0000
@@ -13,7 +13,7 @@
MASTER_SITE_SUBDIR= dd/crafty
DISTFILES= large1.zip large2.zip large3.zip large4.zip
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= flo@kasimir.com
COMMENT= The large opening book for crafty
BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty
@@ -22,7 +22,7 @@
DIST_SUBDIR= crafty
USE_ZIP= yes
NO_WRKSUBDIR= yes
-CONFLICTS= crafty-open-enormous-* crafty-open-medium-*
+CONFLICTS= crafty-open-enormous-* crafty-open-medium-* crafty-open-default-*
post-extract:
@${ECHO_MSG} '================================================================'
diff -Nur games.orig/crafty-open-medium/Makefile games/crafty-open-medium/Makefile
--- games.orig/crafty-open-medium/Makefile 2009-03-22 13:38:02.000000000 +0000
+++ games/crafty-open-medium/Makefile 2009-03-22 13:47:10.000000000 +0000
@@ -13,7 +13,7 @@
MASTER_SITE_SUBDIR= dd/crafty
DISTNAME= medium
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= flo@kasimir.com
COMMENT= The medium opening book (about 1.9 MByte) for crafty
BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty
@@ -22,7 +22,7 @@
DIST_SUBDIR= crafty
USE_ZIP= yes
NO_WRKSUBDIR= yes
-CONFLICTS= crafty-open-enormous-* crafty-open-large-*
+CONFLICTS= crafty-open-enormous-* crafty-open-large-* crafty-open-default-*
do-build:
@${ECHO_MSG} '================================================================'
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903221408.n2ME8FRT071416>