pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: nia
Date: Sat Dec 14 17:53:39 UTC 2019
Modified Files:
pkgsrc/audio/suil: Makefile
pkgsrc/converters/sratom: Makefile options.mk
pkgsrc/textproc/serd: Makefile options.mk
pkgsrc/textproc/sord: Makefile options.mk
Log Message:
Convert some drobilla.net packages to waf.mk.
This removes a lot of do-X: targets and redundant python runtime deps.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/suil/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/converters/sratom/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/converters/sratom/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/serd/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/serd/options.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/sord/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/sord/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/suil/Makefile
diff -u pkgsrc/audio/suil/Makefile:1.14 pkgsrc/audio/suil/Makefile:1.15
--- pkgsrc/audio/suil/Makefile:1.14 Sat Dec 14 17:28:29 2019
+++ pkgsrc/audio/suil/Makefile Sat Dec 14 17:53:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/12/14 17:28:29 nia Exp $
+# $NetBSD: Makefile,v 1.15 2019/12/14 17:53:39 nia Exp $
DISTNAME= suil-0.10.6
CATEGORIES= audio
@@ -13,42 +13,18 @@ LICENSE= isc
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-PKGCONFIG_OVERRIDE+= suil.pc.in
-
-WAF_ENV+= CC=${CC:Q}
-WAF_ENV+= CFLAGS=${CFLAGS:Q}
-WAF_ENV+= CXX=${CXX:Q}
-WAF_ENV+= CXXFLAGS=${CXXFLAGS:Q}
-WAF_ENV+= DESTDIR=${DESTDIR}
-WAF_ENV+= LINKFLAGS=${LDFLAGS:Q}
-WAF_ENV+= PATH=${PATH:Q}
-WAF_ENV+= PREFIX=${PREFIX}
-.if defined(MAKE_JOBS)
-WAF_ENV+= JOBS=${MAKE_JOBS}
-.endif
-
# Kludge to support rst2man on Mac OS X, PR pkg/49921
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin"
WAF_ENV+= LC_ALL="en_US.UTF-8"
.endif
-WAF_ARGS= --mandir=${PREFIX}/${PKGMANDIR}
-
-do-configure:
- cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} ${WAF_CONFIGURE_ARGS} configure
-
-do-build:
- cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS}
-
-do-install:
- cd ${WRKSRC} && ${SETENV} ${WAF_ENV} ./waf ${WAF_ARGS} install
-
PYTHON_FOR_BUILD_ONLY= tool
+PKGCONFIG_OVERRIDE+= suil.pc.in
+.include "../../devel/waf/waf.mk"
BUILDLINK_API_DEPENDS.lv2+= lv2>=1.12.0
.include "../../audio/lv2/buildlink3.mk"
-.include "../../lang/python/tool.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/converters/sratom/Makefile
diff -u pkgsrc/converters/sratom/Makefile:1.15 pkgsrc/converters/sratom/Makefile:1.16
--- pkgsrc/converters/sratom/Makefile:1.15 Sat Dec 14 17:35:31 2019
+++ pkgsrc/converters/sratom/Makefile Sat Dec 14 17:53:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/12/14 17:35:31 nia Exp $
+# $NetBSD: Makefile,v 1.16 2019/12/14 17:53:39 nia Exp $
DISTNAME= sratom-0.6.4
CATEGORIES= converters
@@ -13,28 +13,15 @@ LICENSE= isc
USE_LANGUAGES= c99
USE_TOOLS+= gsed pkg-config
+PYTHON_FOR_BUILD_ONLY= tool
PKGCONFIG_OVERRIDE+= sratom.pc.in
.include "options.mk"
-
-BUILD_OPTIONS= ${BUILD_DEBUG} ${BUILD_DOC} ${BUILD_TESTS}
-
-do-configure:
- cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
- --destdir=${DESTDIR} --mandir=${PREFIX}/${PKGMANDIR} \
- ${BUILD_OPTIONS}
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./waf build
-
-do-install:
- cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} ./waf install
-
+.include "../../devel/waf/waf.mk"
BUILDLINK_API_DEPENDS.sord+= sord>=0.14.0
.include "../../textproc/sord/buildlink3.mk"
BUILDLINK_API_DEPENDS.serd+= serd>=0.30.0
.include "../../textproc/serd/buildlink3.mk"
BUILDLINK_API_DEPENDS.lv2+= lv2>=1.10.0
.include "../../audio/lv2/buildlink3.mk"
-.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/converters/sratom/options.mk
diff -u pkgsrc/converters/sratom/options.mk:1.1 pkgsrc/converters/sratom/options.mk:1.2
--- pkgsrc/converters/sratom/options.mk:1.1 Sun Apr 19 23:45:06 2015
+++ pkgsrc/converters/sratom/options.mk Sat Dec 14 17:53:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/19 23:45:06 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2019/12/14 17:53:39 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sratom
PKG_SUPPORTED_OPTIONS= debug doc tests
@@ -8,22 +8,16 @@ PLIST_VARS+= doc
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
-BUILD_DEBUG= --debug
-.else
-BUILD_DEBUG= # blank
+WAF_ARGS+= --debug
.endif
.if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DOC= --docs
+WAF_ARGS+= --docs
BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
BUILD_DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz
PLIST.doc= yes
-.else
-BUILD_DOC= # blank
.endif
.if !empty(PKG_OPTIONS:Mtests)
-BUILD_TESTS= --test
-.else
-BUILD_TESTS= # blank
+WAF_ARGS+= --test
.endif
Index: pkgsrc/textproc/serd/Makefile
diff -u pkgsrc/textproc/serd/Makefile:1.6 pkgsrc/textproc/serd/Makefile:1.7
--- pkgsrc/textproc/serd/Makefile:1.6 Sat Dec 14 17:31:12 2019
+++ pkgsrc/textproc/serd/Makefile Sat Dec 14 17:53:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/12/14 17:31:12 nia Exp $
+# $NetBSD: Makefile,v 1.7 2019/12/14 17:53:39 nia Exp $
DISTNAME= serd-0.30.2
CATEGORIES= textproc
@@ -13,22 +13,9 @@ LICENSE= isc
USE_LANGUAGES= c99
USE_TOOLS+= gsed pkg-config
+PYTHON_FOR_BUILD_ONLY= tool
PKGCONFIG_OVERRIDE+= serd.pc.in
.include "options.mk"
-
-BUILD_OPTIONS= ${BUILD_DEBUG} ${BUILD_DOC} ${BUILD_TESTS} ${BUILD_VALGRIND}
-
-do-configure:
- cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
- --destdir=${DESTDIR} --mandir=${PREFIX}/${PKGMANDIR} \
- ${BUILD_OPTIONS}
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./waf build
-
-do-install:
- cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} ./waf install
-
-.include "../../lang/python/application.mk"
+.include "../../devel/waf/waf.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/serd/options.mk
diff -u pkgsrc/textproc/serd/options.mk:1.1 pkgsrc/textproc/serd/options.mk:1.2
--- pkgsrc/textproc/serd/options.mk:1.1 Sun Apr 19 23:10:52 2015
+++ pkgsrc/textproc/serd/options.mk Sat Dec 14 17:53:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/19 23:10:52 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2019/12/14 17:53:39 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.serd
PKG_SUPPORTED_OPTIONS= debug doc tests valgrind
@@ -8,28 +8,20 @@ PLIST_VARS+= doc
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
-BUILD_DEBUG= --debug
-.else
-BUILD_DEBUG= # blank
+WAF_ARGS+= --debug
.endif
.if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DOC= --docs
+WAF_ARGS+= --docs
BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
PLIST.doc= yes
-.else
-BUILD_DOC= # blank
.endif
.if !empty(PKG_OPTIONS:Mtests)
-BUILD_TESTS= --test
-.else
-BUILD_TESTS= # blank
+WAF_ARGS+= --test
.endif
.if !empty(PKG_OPTIONS:Mvalgrind)
-BUILD_VALGRIND= --grind
+WAF_ARGS+= --grind
BUILD_DEPENDS+= valgrind-[0-9]*:../../devel/valgrind
-.else
-BUILD_VALGRIND= # blank
.endif
Index: pkgsrc/textproc/sord/Makefile
diff -u pkgsrc/textproc/sord/Makefile:1.5 pkgsrc/textproc/sord/Makefile:1.6
--- pkgsrc/textproc/sord/Makefile:1.5 Sat Dec 14 17:33:04 2019
+++ pkgsrc/textproc/sord/Makefile Sat Dec 14 17:53:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/12/14 17:33:04 nia Exp $
+# $NetBSD: Makefile,v 1.6 2019/12/14 17:53:39 nia Exp $
DISTNAME= sord-0.16.4
CATEGORIES= textproc
@@ -13,23 +13,11 @@ LICENSE= isc
USE_LANGUAGES= c c++
USE_TOOLS+= gsed pkg-config
+PYTHON_FOR_BUILD_ONLY= tool
PKGCONFIG_OVERRIDE+= sord.pc.in
.include "options.mk"
-
-BUILD_OPTIONS= ${BUILD_DEBUG} ${BUILD_DOC} ${BUILD_TESTS} ${BUILD_VALGRIND}
-
-do-configure:
- cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
- --destdir=${DESTDIR} --mandir=${PREFIX}/${PKGMANDIR} \
- ${BUILD_OPTIONS}
-do-build:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./waf build
-
-do-install:
- cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${PYTHONBIN} ./waf install
-
+.include "../../devel/waf/waf.mk"
.include "../../devel/pcre/buildlink3.mk"
BUILDLINK_API_DEPENDS.serd+= serd>=0.30.0
.include "../../textproc/serd/buildlink3.mk"
Index: pkgsrc/textproc/sord/options.mk
diff -u pkgsrc/textproc/sord/options.mk:1.1 pkgsrc/textproc/sord/options.mk:1.2
--- pkgsrc/textproc/sord/options.mk:1.1 Sun Apr 19 23:23:10 2015
+++ pkgsrc/textproc/sord/options.mk Sat Dec 14 17:53:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/04/19 23:23:10 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2019/12/14 17:53:39 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sord
PKG_SUPPORTED_OPTIONS= debug doc tests valgrind
@@ -8,29 +8,21 @@ PLIST_VARS+= doc
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdebug)
-BUILD_DEBUG= --debug
-.else
-BUILD_DEBUG= # blank
+WAF_ARGS+= --debug
.endif
.if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DOC= --docs
+WAF_ARGS+= --docs
BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
BUILD_DEPENDS+= graphviz-[0-9]*:../../graphics/graphviz
PLIST.doc= yes
-.else
-BUILD_DOC= # blank
.endif
.if !empty(PKG_OPTIONS:Mtests)
-BUILD_TESTS= --test
-.else
-BUILD_TESTS= # blank
+WAF_ARGS+= --test
.endif
.if !empty(PKG_OPTIONS:Mvalgrind)
-BUILD_VALGRIND= --grind
+WAF_ARGS= --grind
BUILD_DEPENDS+= valgrind-[0-9]*:../../devel/valgrind
-.else
-BUILD_VALGRIND= # blank
.endif
Home |
Main Index |
Thread Index |
Old Index