summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/qsynth/Makefile25
-rw-r--r--audio/qsynth/PLIST12
-rw-r--r--audio/qsynth/distinfo11
-rw-r--r--audio/qsynth/options.mk22
-rw-r--r--audio/qsynth/patches/patch-Makefile.in20
5 files changed, 65 insertions, 25 deletions
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index 3ba39f49acc..2f0e37e4548 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2016/04/20 12:10:30 nros Exp $
+# $NetBSD: Makefile,v 1.31 2016/04/23 12:32:47 nros Exp $
-DISTNAME= qsynth-0.2.4
-PKGREVISION= 21
+DISTNAME= qsynth-0.4.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qsynth/}
+EXTRACT_USING= bsdtar
MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://qsynth.sourceforge.net/
@@ -12,26 +12,15 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
PTHREAD_AUTO_VARS= yes
-# a fix for qt-3.3.5, please remove if qt-3.3.6 (or newer) solves the problem
-SUBST_CLASSES+= hints
-SUBST_STAGE.hints= post-patch
-SUBST_MESSAGE.hints= Fix includehints.
-SUBST_FILES.hints= src/*.ui
-SUBST_FILTER_CMD.hints= ${GREP} -v includehint
-
-INSTALLATION_DIRS= bin
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/qsynth ${DESTDIR}${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons
- ${INSTALL_DATA} ${WRKSRC}/icons/qsynth.png \
- ${DESTDIR}${PREFIX}/share/icons
+.include "options.mk"
.include "../../audio/fluidsynth/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/qsynth/PLIST b/audio/qsynth/PLIST
index 055df4e3ecd..e3d7e07b341 100644
--- a/audio/qsynth/PLIST
+++ b/audio/qsynth/PLIST
@@ -1,3 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/19 15:13:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/04/23 12:32:47 nros Exp $
bin/qsynth
-share/icons/qsynth.png
+man/man1/qsynth.1
+share/appdata/qsynth.appdata.xml
+share/applications/qsynth.desktop
+share/icons/hicolor/32x32/apps/qsynth.png
+share/qsynth/translations/qsynth_cs.qm
+share/qsynth/translations/qsynth_de.qm
+share/qsynth/translations/qsynth_fr.qm
+share/qsynth/translations/qsynth_ru.qm
+share/qsynth/translations/qsynth_sr.qm
diff --git a/audio/qsynth/distinfo b/audio/qsynth/distinfo
index ee2c667b3b9..a4b74fbd762 100644
--- a/audio/qsynth/distinfo
+++ b/audio/qsynth/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 01:12:48 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/04/23 12:32:47 nros Exp $
-SHA1 (qsynth-0.2.4.tar.gz) = 280ce73c6f3d3f127dd14201eb190edfb7eabcaf
-RMD160 (qsynth-0.2.4.tar.gz) = eb048cb1a8d46cdb4c2ac44a30803f9b2067fa20
-SHA512 (qsynth-0.2.4.tar.gz) = 53ddd605c590e6ee0361a7bf9738ba36abde83bfddbd68e78dfd04b6a58a5a8da71ec07d122f47649288e210f264ffc398b04e181f4fa55ec88772268ee7f7f3
-Size (qsynth-0.2.4.tar.gz) = 127895 bytes
+SHA1 (qsynth-0.4.1.tar.gz) = 7b394dab4182136cdd9dd6e314b9976582f0113c
+RMD160 (qsynth-0.4.1.tar.gz) = ac79db014c9282fc8735b1c8cb270f7b762d1f45
+SHA512 (qsynth-0.4.1.tar.gz) = 0a4e2dacc9116a9c52a50af39f0838a0c97d0e2f0ba75f8c3f07a219810299c5dd650ad7cd5ba337e497f83537b7cb94a181c9e3a5ba641febe1a0179d6c8620
+Size (qsynth-0.4.1.tar.gz) = 251821 bytes
+SHA1 (patch-Makefile.in) = 3f2d0e2883327de7fa0dabb25524287d04552db3
diff --git a/audio/qsynth/options.mk b/audio/qsynth/options.mk
new file mode 100644
index 00000000000..075be40f233
--- /dev/null
+++ b/audio/qsynth/options.mk
@@ -0,0 +1,22 @@
+# $NetBSD: options.mk,v 1.1 2016/04/23 12:32:47 nros Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.qsynth
+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"
+.endif
diff --git a/audio/qsynth/patches/patch-Makefile.in b/audio/qsynth/patches/patch-Makefile.in
new file mode 100644
index 00000000000..98fd9c4d9c3
--- /dev/null
+++ b/audio/qsynth/patches/patch-Makefile.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-Makefile.in,v 1.1 2016/04/23 12:32:47 nros Exp $
+* pkgsrc install does not have -v
+--- Makefile.in.orig 2016-04-05 15:57:45.000000000 +0000
++++ Makefile.in
+@@ -104,11 +104,10 @@ translations_lrelease: translations_lupd
+
+ 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)
+ @$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall