Date: Tue, 12 Oct 2021 17:44:22 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 25c086d471f0 - main - devel/love*: fix conflicts Message-ID: <202110121744.19CHiMDw011805@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=25c086d471f0b56beaf8f6458c40e313033f6e31 commit 25c086d471f0b56beaf8f6458c40e313033f6e31 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2021-10-12 14:12:54 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2021-10-12 17:37:02 +0000 devel/love*: fix conflicts Make DOCSDIR dependent on PKGNAMESUFFIX for all love* ports to avoid conflicts. While here, sincence a couple of MKDIRs. PR: 257008 Submitted by: dufresnep@zoho.com --- devel/love/Makefile | 1 + devel/love07/Makefile | 2 +- devel/love08/Makefile | 5 +++-- devel/love10/Makefile | 3 ++- devel/love5/Makefile | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/devel/love/Makefile b/devel/love/Makefile index f00d7bab1029..e0fdede67354 100644 --- a/devel/love/Makefile +++ b/devel/love/Makefile @@ -30,6 +30,7 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/love-${PORTVERSION} INSTALL_TARGET= install-strip +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= * OPTIONS_DEFINE= DOCS LUAJIT GME diff --git a/devel/love07/Makefile b/devel/love07/Makefile index 42e5be3f821e..7ae653a98c31 100644 --- a/devel/love07/Makefile +++ b/devel/love07/Makefile @@ -37,7 +37,7 @@ DOS2UNIX_FILES= src/modules/graphics/opengl/GLee.h PLIST_FILES= bin/love07 -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}07 +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= * OPTIONS_DEFINE= DOCS diff --git a/devel/love08/Makefile b/devel/love08/Makefile index 68b17c635cef..a4724ac81787 100644 --- a/devel/love08/Makefile +++ b/devel/love08/Makefile @@ -1,6 +1,6 @@ PORTNAME= love PORTVERSION= 0.8.0 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= devel games MASTER_SITES= http://cdn.bitbucket.org/rude/love/downloads/ \ http://mirror.amdmi3.ru/distfiles/ @@ -35,6 +35,7 @@ DOS2UNIX_FILES= src/modules/graphics/opengl/GLee.h PLIST_FILES= bin/love08 +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= * OPTIONS_DEFINE= DOCS @@ -46,7 +47,7 @@ post-patch: ${WRKSRC}/configure post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in changes.txt readme.md ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor diff --git a/devel/love10/Makefile b/devel/love10/Makefile index b490ea0839db..373463e70523 100644 --- a/devel/love10/Makefile +++ b/devel/love10/Makefile @@ -1,6 +1,6 @@ PORTNAME= love PORTVERSION= 0.10.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel games MASTER_SITES= https://bitbucket.org/rude/love/downloads/ \ http://mirror.amdmi3.ru/distfiles/ @@ -32,6 +32,7 @@ CONFIGURE_ARGS= --program-suffix=${PKGNAMESUFFIX} WRKSRC= ${WRKDIR}/love-${PORTVERSION} INSTALL_TARGET= install-strip +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= * OPTIONS_DEFINE= DOCS LUAJIT diff --git a/devel/love5/Makefile b/devel/love5/Makefile index 3cd696fce0ec..5778dec677a6 100644 --- a/devel/love5/Makefile +++ b/devel/love5/Makefile @@ -26,7 +26,7 @@ DOS2UNIX_FILES= src/system/love_system.cpp PLIST_FILES= bin/love5 -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}5 +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} PORTDOCS= * OPTIONS_DEFINE= DOCS @@ -39,7 +39,7 @@ post-patch: ${WRKSRC}/configure post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in changes.txt readme.txt ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110121744.19CHiMDw011805>