summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/qjackctl/Makefile15
-rw-r--r--audio/qjackctl/PLIST14
-rw-r--r--audio/qjackctl/distinfo13
-rw-r--r--audio/qjackctl/options.mk23
-rw-r--r--audio/qjackctl/patches/patch-aa35
-rw-r--r--audio/qjackctl/patches/patch-src_qjackctlPatchbayRack.cpp12
6 files changed, 65 insertions, 47 deletions
diff --git a/audio/qjackctl/Makefile b/audio/qjackctl/Makefile
index 6b9a0caef63..ae5654a26f6 100644
--- a/audio/qjackctl/Makefile
+++ b/audio/qjackctl/Makefile
@@ -1,28 +1,29 @@
-# $NetBSD: Makefile,v 1.33 2016/04/20 12:10:30 nros Exp $
+# $NetBSD: Makefile,v 1.34 2016/04/23 10:05:18 nros Exp $
#
-DISTNAME= qjackctl-0.3.3
-PKGREVISION= 27
+DISTNAME= qjackctl-0.4.2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qjackctl/}
+EXTRACT_USING= bsdtar
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://qjackctl.sourceforge.net/
-COMMENT= JACK Audio Connection Kit Qt4 GUI
+COMMENT= JACK Audio Connection Kit Qt GUI
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
+USE_TOOLS+= gmake
.include "../../mk/bsd.fast.prefs.mk"
-CONFIGURE_ARGS+= --with-qt=${QTDIR:Q}
.if ${OPSYS} != "Linux"
CONFIGURE_ARGS+= --without-alsa
.endif
+.include "options.mk"
+
.include "../../audio/jack/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/qjackctl/PLIST b/audio/qjackctl/PLIST
index 915c28ae57d..41758cb86f2 100644
--- a/audio/qjackctl/PLIST
+++ b/audio/qjackctl/PLIST
@@ -1,4 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:32:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/04/23 10:05:18 nros Exp $
bin/qjackctl
+man/man1/qjackctl.1
+share/appdata/qjackctl.appdata.xml
share/applications/qjackctl.desktop
-share/pixmaps/qjackctl.png
+share/icons/hicolor/32x32/apps/qjackctl.png
+share/qjackctl/translations/qjackctl_cs.qm
+share/qjackctl/translations/qjackctl_de.qm
+share/qjackctl/translations/qjackctl_es.qm
+share/qjackctl/translations/qjackctl_fr.qm
+share/qjackctl/translations/qjackctl_it.qm
+share/qjackctl/translations/qjackctl_ja.qm
+share/qjackctl/translations/qjackctl_nl.qm
+share/qjackctl/translations/qjackctl_ru.qm
diff --git a/audio/qjackctl/distinfo b/audio/qjackctl/distinfo
index 66aac4d13b7..65372082789 100644
--- a/audio/qjackctl/distinfo
+++ b/audio/qjackctl/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 01:12:48 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/04/23 10:05:18 nros Exp $
-SHA1 (qjackctl-0.3.3.tar.gz) = 27dab9f3603e1970b152dbbc8a1e02340ce8cf9c
-RMD160 (qjackctl-0.3.3.tar.gz) = fa08f02f37fb3a75ecc17471183c9aa0d4ca8e9d
-SHA512 (qjackctl-0.3.3.tar.gz) = 45adf9ddd4a23208cad06e063c92e155473fe0817e10fb53b40b685b7dd3a329ac89d9d84a02963996b8f70eddf974b8ba6455961f7812cb1cbd6bda74e166bd
-Size (qjackctl-0.3.3.tar.gz) = 268722 bytes
-SHA1 (patch-aa) = 87d9e8ba4693474cd820c38ef29999750ba0ce6b
-SHA1 (patch-src_qjackctlPatchbayRack.cpp) = b18ceb077971a7396ac748ce5aa5bb3e84fdd891
+SHA1 (qjackctl-0.4.2.tar.gz) = 6496615d305af476387656f8af869e8a76222db9
+RMD160 (qjackctl-0.4.2.tar.gz) = 7b287af58541654d22d29e7db95fd148af2a8db0
+SHA512 (qjackctl-0.4.2.tar.gz) = 743b8a02fb0b83a4516622aeec054d67f5cda6d8ffcc5727d3709695996c5e0054ba0af77919e43c0288fbb2259395c129d79f89b24bba6d4c0dd5cdbaa5712d
+Size (qjackctl-0.4.2.tar.gz) = 824383 bytes
+SHA1 (patch-aa) = c4e3c79361d623f4db06b5dbe18b82bde28ed854
diff --git a/audio/qjackctl/options.mk b/audio/qjackctl/options.mk
new file mode 100644
index 00000000000..0d3b388a95e
--- /dev/null
+++ b/audio/qjackctl/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2016/04/23 10:05:18 nros Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.qjackctl
+PKG_OPTIONS_REQUIRED_GROUPS= qt
+PKG_OPTIONS_GROUP.qt = qt4 qt5
+PKG_SUGGESTED_OPTIONS= qt4
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mqt5)
+CONFIGURE_ARGS+= --with-qt5=${QTDIR:Q}
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+. include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.endif
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt4)
+CONFIGURE_ARGS+= --with-qt4=${QTDIR:Q}
+.include "../../x11/qt4-libs/buildlink3.mk"
+.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt4-qdbus/buildlink3.mk"
+.endif
diff --git a/audio/qjackctl/patches/patch-aa b/audio/qjackctl/patches/patch-aa
index 012d2444bd5..30d9a831cdb 100644
--- a/audio/qjackctl/patches/patch-aa
+++ b/audio/qjackctl/patches/patch-aa
@@ -1,23 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/05/07 15:00:08 bjs Exp $
-
---- Makefile.in.orig 2007-07-08 12:29:08.000000000 -0400
+$NetBSD: patch-aa,v 1.2 2016/04/23 10:05:18 nros Exp $
+* Use the right arguments to install.
+--- Makefile.in.orig 2016-04-05 15:57:30.000000000 +0000
+++ Makefile.in
-@@ -62,12 +62,12 @@ $(name): $(name).mak $(sources) $(header
- @make -f $(name).mak
+@@ -118,11 +118,10 @@ translations_lrelease: translations_lupd
- install: $(name) icons/$(name).png
-- @install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
-- @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
-- @install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
-- @install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
-- @install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
-- @install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
-+ @$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(prefix)/bin
-+ @$(BSD_INSTALL_DATA_DIR) 0755 $(DESTDIR)$(prefix)/share/pixmaps
-+ @$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/applications
-+ @$(BSD_INSTALL_PROGRAM) $(name) $(DESTDIR)$(prefix)/bin/$(name)
-+ @$(BSD_INSTALL_DATA) icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
-+ @$(BSD_INSTALL_DATA) $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
+ install: $(target) translations_lrelease $(name).1
+ @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak install
+- @install -d -v -m 0755 $(DESTDIR)$(translations_dir)
+- @install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
+- @install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
+- @install -v -m 0644 $(name).1 $(DESTDIR)$(mandir)/man1
+- @gzip -vf $(DESTDIR)$(mandir)/man1/$(name).1
++ @$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(translations_dir)
++ @$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
++ @$(BSD_INSTALL_DATA) $(translations_targets) $(DESTDIR)$(translations_dir)
++ @$(BSD_INSTALL_MAN) $(name).1 $(DESTDIR)$(mandir)/man1
uninstall: $(DESTDIR)$(prefix)/bin/$(name)
- @rm -vf $(DESTDIR)$(prefix)/bin/$(name)
+ @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/audio/qjackctl/patches/patch-src_qjackctlPatchbayRack.cpp b/audio/qjackctl/patches/patch-src_qjackctlPatchbayRack.cpp
deleted file mode 100644
index 4a584eec714..00000000000
--- a/audio/qjackctl/patches/patch-src_qjackctlPatchbayRack.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_qjackctlPatchbayRack.cpp,v 1.1 2011/11/24 14:25:17 joerg Exp $
-
---- src/qjackctlPatchbayRack.cpp.orig 2011-11-24 03:02:27.000000000 +0000
-+++ src/qjackctlPatchbayRack.cpp
-@@ -22,6 +22,7 @@
- #include "qjackctlPatchbayRack.h"
-
- #include <QRegExp>
-+#include <cstdlib>
-
-
- //----------------------------------------------------------------------
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 14:22:03 +0000