pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Combine the common bits between cockatrice and cockatrice-server
Module Name: pkgsrc-wip
Committed By: Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By: cfkoch
Date: Sun Aug 14 14:22:28 2022 -0700
Changeset: ebf017ccb2542c94127679e99e9ed08dc4eb3da6
Modified Files:
cockatrice-server/Makefile
cockatrice/Makefile
Added Files:
cockatrice/common.mk
Log Message:
Combine the common bits between cockatrice and cockatrice-server
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ebf017ccb2542c94127679e99e9ed08dc4eb3da6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
cockatrice-server/Makefile | 14 ++------------
cockatrice/Makefile | 18 ++++++------------
cockatrice/common.mk | 16 ++++++++++++++++
3 files changed, 24 insertions(+), 24 deletions(-)
diffs:
diff --git a/cockatrice-server/Makefile b/cockatrice-server/Makefile
index cb0efd0173..1ab2954670 100644
--- a/cockatrice-server/Makefile
+++ b/cockatrice-server/Makefile
@@ -1,28 +1,18 @@
# $NetBSD$
PKGNAME= cockatrice-server-2.8.0
-DISTNAME= cockatrice-${PKGVERSION_NOREV}
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GITHUB:=Cockatrice/}
-GITHUB_TAG= 2021-01-26-Release-${PKGVERSION_NOREV}
+
+.include "../../wip/cockatrice/common.mk"
MAINTAINER= charlotte%NetBSD.org@localhost
HOMEPAGE= https://cockatrice.github.io/
COMMENT= Virtual tabletop for multiplayer card games (server only)
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
-USE_LANGUAGES= c c++
-
-WRKSRC= ${WRKDIR}/Cockatrice-${GITHUB_TAG}
-
CMAKE_ARGS+= -DWITH_CLIENT=0
CMAKE_ARGS+= -DWITH_DBCONVERTER=0
CMAKE_ARGS+= -DWITH_ORACLE=0
CMAKE_ARGS+= -DWITH_SERVER=1
.include "../../databases/mysql57-client/buildlink3.mk"
-.include "../../devel/protobuf/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtwebsockets/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cockatrice/Makefile b/cockatrice/Makefile
index b6b537e8ce..bb449b6cf3 100644
--- a/cockatrice/Makefile
+++ b/cockatrice/Makefile
@@ -1,25 +1,19 @@
# $NetBSD$
-DISTNAME= cockatrice-2.8.0
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_GITHUB:=Cockatrice/}
-GITHUB_TAG= 2021-01-26-Release-${PKGVERSION_NOREV}
+PKGNAME= cockatrice-2.8.0
+
+.include "../../wip/cockatrice/common.mk"
MAINTAINER= charlotte%NetBSD.org@localhost
HOMEPAGE= https://cockatrice.github.io/
COMMENT= Virtual tabletop for multiplayer card games
LICENSE= gnu-gpl-v2
-USE_CMAKE= yes
-USE_LANGUAGES= c c++
-
-WRKSRC= ${WRKDIR}/Cockatrice-${GITHUB_TAG}
-
+CMAKE_ARGS+= -DWITH_CLIENT=1
+CMAKE_ARGS+= -DWITH_DBCONVERTER=1
+CMAKE_ARGS+= -DWITH_ORACLE=1
CMAKE_ARGS+= -DWITH_SERVER=0
-.include "../../devel/protobuf/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
.include "../../x11/qt5-qtsvg/buildlink3.mk"
-.include "../../x11/qt5-qtwebsockets/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cockatrice/common.mk b/cockatrice/common.mk
new file mode 100644
index 0000000000..2b948405eb
--- /dev/null
+++ b/cockatrice/common.mk
@@ -0,0 +1,16 @@
+# $NetBSD$
+
+DISTNAME= cockatrice-${PKGVERSION_NOREV}
+CATEGORIES= games
+MASTER_SITES= ${MASTER_SITE_GITHUB:=Cockatrice/}
+GITHUB_TAG= 2021-01-26-Release-${PKGVERSION_NOREV}
+
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+
+WRKSRC= ${WRKDIR}/Cockatrice-${GITHUB_TAG}
+
+.include "../../devel/protobuf/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtwebsockets/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index