Mon Nov 7 13:46:46 2016 UTC ()
Recursive bump for xapian shlib major bump.


(wiz)
diff -r1.17 -r1.18 pkgsrc/mail/neomutt/Makefile
diff -r1.18 -r1.19 pkgsrc/mail/notmuch/Makefile
diff -r1.4 -r1.5 pkgsrc/mail/notmuch/buildlink3.mk
diff -r1.8 -r1.9 pkgsrc/sysutils/baloo/Makefile
diff -r1.8 -r1.9 pkgsrc/sysutils/baloo-widgets/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/libbaloo4/Makefile
diff -r1.25 -r1.26 pkgsrc/textproc/p5-Search-Xapian/Makefile
diff -r1.25 -r1.26 pkgsrc/textproc/xapian/Makefile
diff -r1.6 -r1.7 pkgsrc/textproc/xapian/buildlink3.mk
diff -r1.31 -r1.32 pkgsrc/textproc/xapian-omega/Makefile
diff -r1.37 -r1.38 pkgsrc/x11/kde-baseapps4/Makefile
cvs diff -r1.17 -r1.18 pkgsrc/mail/neomutt/Makefile (switch to unified diff)

--- pkgsrc/mail/neomutt/Makefile 2016/10/29 12:07:40 1.17
+++ pkgsrc/mail/neomutt/Makefile 2016/11/07 13:46:46 1.18
@@ -1,48 +1,49 @@ @@ -1,48 +1,49 @@
1# $NetBSD: Makefile,v 1.17 2016/10/29 12:07:40 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2016/11/07 13:46:46 wiz Exp $
2 2
3DISTNAME= neomutt-20161028 3DISTNAME= neomutt-20161028
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= ${MASTER_SITE_GITHUB:=neomutt/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=neomutt/}
6GITHUB_TAG= ${DISTNAME} 7GITHUB_TAG= ${DISTNAME}
7 8
8MAINTAINER= wiz@NetBSD.org 9MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= http://www.neomutt.org/ 10HOMEPAGE= http://www.neomutt.org/
10COMMENT= Fork of mutt with integrated community patches 11COMMENT= Fork of mutt with integrated community patches
11LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer 12LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer
12 13
13USE_TOOLS+= autoconf automake autoreconf msgfmt gmake 14USE_TOOLS+= autoconf automake autoreconf msgfmt gmake
14 15
15SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551 16SPECIAL_PERMS+= bin/mutt_dotlock ${REAL_ROOT_USER} mail 2551
16GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= --without-included-gettext 18CONFIGURE_ARGS+= --without-included-gettext
18CONFIGURE_ARGS+= --enable-external-dotlock 19CONFIGURE_ARGS+= --enable-external-dotlock
19CONFIGURE_ARGS+= --enable-imap 20CONFIGURE_ARGS+= --enable-imap
20CONFIGURE_ARGS+= --enable-notmuch 21CONFIGURE_ARGS+= --enable-notmuch
21CONFIGURE_ARGS+= --enable-pop 22CONFIGURE_ARGS+= --enable-pop
22#CONFIGURE_ARGS+= CFLAGS="-g -O0" 23#CONFIGURE_ARGS+= CFLAGS="-g -O0"
23 24
24EGDIR= ${PREFIX}/share/examples/mutt 25EGDIR= ${PREFIX}/share/examples/mutt
25CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc 26CONF_FILES= ${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
26CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types 27CONF_FILES+= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
27INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR} 28INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
28INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} 29INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR}
29 30
30.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
31 32
32.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" 33.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
33# Force sendmail to /usr/sbin to avoid postfix's 34# Force sendmail to /usr/sbin to avoid postfix's
34# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which 35# ${LOCALBASE}/sbin/sendmail. Should be enabled on all platforms which
35# support mailwrapper. 36# support mailwrapper.
36CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail 37CONFIGURE_ENV+= SENDMAIL=/usr/sbin/sendmail
37.endif 38.endif
38 39
39.include "options.mk" 40.include "options.mk"
40 41
41pre-configure: 42pre-configure:
42 cd ${WRKSRC} && autoreconf -fiv 43 cd ${WRKSRC} && autoreconf -fiv
43 44
44.include "../../converters/libiconv/buildlink3.mk" 45.include "../../converters/libiconv/buildlink3.mk"
45.include "../../devel/gettext-lib/buildlink3.mk" 46.include "../../devel/gettext-lib/buildlink3.mk"
46.include "../../devel/zlib/buildlink3.mk" 47.include "../../devel/zlib/buildlink3.mk"
47.include "../../mail/notmuch/buildlink3.mk" 48.include "../../mail/notmuch/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/mail/notmuch/Makefile (switch to unified diff)

--- pkgsrc/mail/notmuch/Makefile 2016/10/31 16:17:00 1.18
+++ pkgsrc/mail/notmuch/Makefile 2016/11/07 13:46:45 1.19
@@ -1,45 +1,46 @@ @@ -1,45 +1,46 @@
1# $NetBSD: Makefile,v 1.18 2016/10/31 16:17:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2016/11/07 13:46:45 wiz Exp $
2 2
3DISTNAME= notmuch-0.23.1 3DISTNAME= notmuch-0.23.1
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= http://notmuchmail.org/releases/ 6MASTER_SITES= http://notmuchmail.org/releases/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://notmuchmail.org/ 9HOMEPAGE= http://notmuchmail.org/
9COMMENT= Mail indexer 10COMMENT= Mail indexer
10LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
11 12
12BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 13BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
13 14
14HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_TOOLS+= gmake pkg-config 17USE_TOOLS+= gmake pkg-config
17MAKE_FLAGS+= PYTHON=${PYTHONBIN} 18MAKE_FLAGS+= PYTHON=${PYTHONBIN}
18#TEST_TARGET= check 19#TEST_TARGET= check
19 20
20.include "options.mk" 21.include "options.mk"
21 22
22CONFIGURE_ARGS+= --prefix=${PREFIX} 23CONFIGURE_ARGS+= --prefix=${PREFIX}
23CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 24CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
24CONFIGURE_ARGS+= --without-ruby 25CONFIGURE_ARGS+= --without-ruby
25 26
26SUBST_CLASSES.SunOS+= gnuld 27SUBST_CLASSES.SunOS+= gnuld
27SUBST_STAGE.gnuld= pre-configure 28SUBST_STAGE.gnuld= pre-configure
28SUBST_FILES.gnuld= lib/Makefile.local 29SUBST_FILES.gnuld= lib/Makefile.local
29SUBST_SED.gnuld= -e 's/-Wl,--[^ ]*//g' 30SUBST_SED.gnuld= -e 's/-Wl,--[^ ]*//g'
30 31
31SUBST_CLASSES+= sphinx 32SUBST_CLASSES+= sphinx
32SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX}," 33SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
33SUBST_FILES.sphinx+= bindings/python/docs/Makefile configure doc/Makefile.local 34SUBST_FILES.sphinx+= bindings/python/docs/Makefile configure doc/Makefile.local
34SUBST_STAGE.sphinx= pre-configure 35SUBST_STAGE.sphinx= pre-configure
35SUBST_MESSAGE.sphinx= Fix sphinx command names. 36SUBST_MESSAGE.sphinx= Fix sphinx command names.
36 37
37LDFLAGS.SunOS+= -lnsl 38LDFLAGS.SunOS+= -lnsl
38 39
39.include "../../lang/python/application.mk" 40.include "../../lang/python/application.mk"
40.include "../../mail/gmime/buildlink3.mk" 41.include "../../mail/gmime/buildlink3.mk"
41BUILDLINK_API_DEPENDS.xapian+= xapian>=1.2.6 42BUILDLINK_API_DEPENDS.xapian+= xapian>=1.2.6
42.include "../../textproc/xapian/buildlink3.mk" 43.include "../../textproc/xapian/buildlink3.mk"
43.include "../../devel/talloc/buildlink3.mk" 44.include "../../devel/talloc/buildlink3.mk"
44.include "../../devel/zlib/buildlink3.mk" 45.include "../../devel/zlib/buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/mail/notmuch/buildlink3.mk (switch to unified diff)

--- pkgsrc/mail/notmuch/buildlink3.mk 2015/11/22 23:56:52 1.4
+++ pkgsrc/mail/notmuch/buildlink3.mk 2016/11/07 13:46:45 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.4 2015/11/22 23:56:52 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2016/11/07 13:46:45 wiz Exp $
2 2
3BUILDLINK_TREE+= notmuch 3BUILDLINK_TREE+= notmuch
4 4
5.if !defined(NOTMUCH_BUILDLINK3_MK) 5.if !defined(NOTMUCH_BUILDLINK3_MK)
6NOTMUCH_BUILDLINK3_MK:= 6NOTMUCH_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.notmuch+= notmuch>=0.16 8BUILDLINK_API_DEPENDS.notmuch+= notmuch>=0.16
9BUILDLINK_ABI_DEPENDS.notmuch+= notmuch>=0.21 9BUILDLINK_ABI_DEPENDS.notmuch+= notmuch>=0.23.1nb1
10BUILDLINK_PKGSRCDIR.notmuch?= ../../mail/notmuch 10BUILDLINK_PKGSRCDIR.notmuch?= ../../mail/notmuch
11 11
12.include "../../mail/gmime/buildlink3.mk" 12.include "../../mail/gmime/buildlink3.mk"
13.include "../../textproc/xapian/buildlink3.mk" 13.include "../../textproc/xapian/buildlink3.mk"
14.endif # NOTMUCH_BUILDLINK3_MK 14.endif # NOTMUCH_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -notmuch 16BUILDLINK_TREE+= -notmuch
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/baloo/Makefile (switch to unified diff)

--- pkgsrc/sysutils/baloo/Makefile 2016/10/07 18:26:10 1.8
+++ pkgsrc/sysutils/baloo/Makefile 2016/11/07 13:46:46 1.9
@@ -1,48 +1,48 @@ @@ -1,48 +1,48 @@
1# $NetBSD: Makefile,v 1.8 2016/10/07 18:26:10 adam Exp $ 1# $NetBSD: Makefile,v 1.9 2016/11/07 13:46:46 wiz Exp $
2 2
3DISTNAME= baloo-${_KDE_VERSION} 3DISTNAME= baloo-${_KDE_VERSION}
4PKGREVISION= 5 4PKGREVISION= 6
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6COMMENT= KDE framework for searching and managing user metadata 6COMMENT= KDE framework for searching and managing user metadata
7LICENSE= gnu-gpl-v3 7LICENSE= gnu-gpl-v3
8 8
9.include "../../meta-pkgs/kde4/Makefile.kde4" 9.include "../../meta-pkgs/kde4/Makefile.kde4"
10 10
11USE_TOOLS+= gmake 11USE_TOOLS+= gmake
12 12
13.include "../../meta-pkgs/kde4/kde4.mk" 13.include "../../meta-pkgs/kde4/kde4.mk"
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16
17PLIST_VARS+= polkit 17PLIST_VARS+= polkit
18.if ${OPSYS} != "Darwin" 18.if ${OPSYS} != "Darwin"
19PLIST.polkit= yes 19PLIST.polkit= yes
20INSTALLATION_DIRS+= share/PolicyKit/policy 20INSTALLATION_DIRS+= share/PolicyKit/policy
21.endif 21.endif
22INSTALLATION_DIRS+= share/dbus-1/interfaces share/dbus-1/system-services 22INSTALLATION_DIRS+= share/dbus-1/interfaces share/dbus-1/system-services
23 23
24DEPENDS+= libbaloo4-[0-9]*:../../sysutils/libbaloo4 24DEPENDS+= libbaloo4-[0-9]*:../../sysutils/libbaloo4
25 25
26PATCHDIR= ${.CURDIR}/../../sysutils/libbaloo4/patches 26PATCHDIR= ${.CURDIR}/../../sysutils/libbaloo4/patches
27DISTINFO_FILE= ${.CURDIR}/../../sysutils/libbaloo4/distinfo 27DISTINFO_FILE= ${.CURDIR}/../../sysutils/libbaloo4/distinfo
28 28
29INSTALL_DIRS= _KDE_build/icons _KDE_build/src/tools _KDE_build/src/pim/agent 29INSTALL_DIRS= _KDE_build/icons _KDE_build/src/tools _KDE_build/src/pim/agent
30 30
31post-install: 31post-install:
32 ${INSTALL_PROGRAM} ${WRKSRC}/_KDE_build/src/file/baloo_file ${DESTDIR}${PREFIX}/bin/baloo_file 32 ${INSTALL_PROGRAM} ${WRKSRC}/_KDE_build/src/file/baloo_file ${DESTDIR}${PREFIX}/bin/baloo_file
33 ${INSTALL_PROGRAM} ${WRKSRC}/_KDE_build/src/file/cleaner/baloo_file_cleaner ${DESTDIR}${PREFIX}/bin/baloo_file_cleaner 33 ${INSTALL_PROGRAM} ${WRKSRC}/_KDE_build/src/file/cleaner/baloo_file_cleaner ${DESTDIR}${PREFIX}/bin/baloo_file_cleaner
34 ${INSTALL_PROGRAM} ${WRKSRC}/_KDE_build/src/file/extractor/baloo_file_extractor ${DESTDIR}${PREFIX}/bin/baloo_file_extractor 34 ${INSTALL_PROGRAM} ${WRKSRC}/_KDE_build/src/file/extractor/baloo_file_extractor ${DESTDIR}${PREFIX}/bin/baloo_file_extractor
35 ${INSTALL_DATA} ${WRKSRC}/src/file/org.kde.baloo.file.indexer.xml ${DESTDIR}${PREFIX}/share/dbus-1/interfaces/org.kde.baloo.file.indexer.xml 35 ${INSTALL_DATA} ${WRKSRC}/src/file/org.kde.baloo.file.indexer.xml ${DESTDIR}${PREFIX}/share/dbus-1/interfaces/org.kde.baloo.file.indexer.xml
36 ${INSTALL_DATA} ${WRKSRC}/_KDE_build/src/file/inotify/org.kde.baloo.filewatch.service ${DESTDIR}${PREFIX}/share/dbus-1/system-services/org.kde.baloo.filewatch.service 36 ${INSTALL_DATA} ${WRKSRC}/_KDE_build/src/file/inotify/org.kde.baloo.filewatch.service ${DESTDIR}${PREFIX}/share/dbus-1/system-services/org.kde.baloo.filewatch.service
37.if ${OPSYS} != "Darwin" 37.if ${OPSYS} != "Darwin"
38 ${INSTALL_DATA} ${WRKSRC}/_KDE_build/src/file/inotify/org.kde.baloo.filewatch.policy ${DESTDIR}${PREFIX}/share/PolicyKit/policy/org.kde.baloo.filewatch.policy 38 ${INSTALL_DATA} ${WRKSRC}/_KDE_build/src/file/inotify/org.kde.baloo.filewatch.policy ${DESTDIR}${PREFIX}/share/PolicyKit/policy/org.kde.baloo.filewatch.policy
39.endif 39.endif
40 40
41.include "../../devel/qjson/buildlink3.mk" 41.include "../../devel/qjson/buildlink3.mk"
42.include "../../mail/akonadi/buildlink3.mk" 42.include "../../mail/akonadi/buildlink3.mk"
43.include "../../misc/kdepimlibs4/buildlink3.mk" 43.include "../../misc/kdepimlibs4/buildlink3.mk"
44.include "../../sysutils/kfilemetadata/buildlink3.mk" 44.include "../../sysutils/kfilemetadata/buildlink3.mk"
45.include "../../textproc/xapian/buildlink3.mk" 45.include "../../textproc/xapian/buildlink3.mk"
46.include "../../x11/kdelibs4/buildlink3.mk" 46.include "../../x11/kdelibs4/buildlink3.mk"
47 47
48.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/baloo-widgets/Makefile (switch to unified diff)

--- pkgsrc/sysutils/baloo-widgets/Makefile 2016/10/07 18:26:10 1.8
+++ pkgsrc/sysutils/baloo-widgets/Makefile 2016/11/07 13:46:46 1.9
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.8 2016/10/07 18:26:10 adam Exp $ 1# $NetBSD: Makefile,v 1.9 2016/11/07 13:46:46 wiz Exp $
2 2
3DISTNAME= baloo-widgets-${_KDE_VERSION} 3DISTNAME= baloo-widgets-${_KDE_VERSION}
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= sysutils 5CATEGORIES= sysutils
6COMMENT= The BalooWidgets library 6COMMENT= The BalooWidgets library
7LICENSE= gnu-gpl-v3 7LICENSE= gnu-gpl-v3
8 8
9.include "../../meta-pkgs/kde4/Makefile.kde4" 9.include "../../meta-pkgs/kde4/Makefile.kde4"
10 10
11#USE_TOOLS+= gmake 11#USE_TOOLS+= gmake
12 12
13.include "../../meta-pkgs/kde4/kde4.mk" 13.include "../../meta-pkgs/kde4/kde4.mk"
14 14
15#.include "../../devel/qjson/buildlink3.mk" 15#.include "../../devel/qjson/buildlink3.mk"
16#.include "../../mail/akonadi/buildlink3.mk" 16#.include "../../mail/akonadi/buildlink3.mk"
17#.include "../../misc/kdepimlibs4/buildlink3.mk" 17#.include "../../misc/kdepimlibs4/buildlink3.mk"
18.include "../../sysutils/libbaloo4/buildlink3.mk" 18.include "../../sysutils/libbaloo4/buildlink3.mk"
19.include "../../sysutils/kfilemetadata/buildlink3.mk" 19.include "../../sysutils/kfilemetadata/buildlink3.mk"
20.include "../../textproc/xapian/buildlink3.mk" 20.include "../../textproc/xapian/buildlink3.mk"
21.include "../../x11/kdelibs4/buildlink3.mk" 21.include "../../x11/kdelibs4/buildlink3.mk"
22 22
23.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/libbaloo4/Makefile (switch to unified diff)

--- pkgsrc/sysutils/libbaloo4/Makefile 2016/10/07 18:26:11 1.2
+++ pkgsrc/sysutils/libbaloo4/Makefile 2016/11/07 13:46:46 1.3
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.2 2016/10/07 18:26:11 adam Exp $ 1# $NetBSD: Makefile,v 1.3 2016/11/07 13:46:46 wiz Exp $
2 2
3DISTNAME= baloo-${_KDE_VERSION} 3DISTNAME= baloo-${_KDE_VERSION}
4PKGNAME= libbaloo4-${_KDE_VERSION} 4PKGNAME= libbaloo4-${_KDE_VERSION}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7COMMENT= KDE framework for searching and managing user metadata 7COMMENT= KDE framework for searching and managing user metadata
8LICENSE= gnu-gpl-v3 8LICENSE= gnu-gpl-v3
9 9
10.include "../../meta-pkgs/kde4/Makefile.kde4" 10.include "../../meta-pkgs/kde4/Makefile.kde4"
11 11
12CONFLICTS+= baloo<4.14.3nb4 12CONFLICTS+= baloo<4.14.3nb4
13 13
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
15 15
16.include "../../meta-pkgs/kde4/kde4.mk" 16.include "../../meta-pkgs/kde4/kde4.mk"
17 17
18.include "../../mk/bsd.prefs.mk" 18.include "../../mk/bsd.prefs.mk"
19 19
20post-install: 20post-install:
21 rm -rf ${DESTDIR}${PREFIX}/bin 21 rm -rf ${DESTDIR}${PREFIX}/bin
22 rm -rf ${DESTDIR}${PREFIX}/share/PolicyKit 22 rm -rf ${DESTDIR}${PREFIX}/share/PolicyKit
23 rm -rf ${DESTDIR}${PREFIX}/share/akonadi 23 rm -rf ${DESTDIR}${PREFIX}/share/akonadi
24 rm -rf ${DESTDIR}${PREFIX}/share/dbus-1 24 rm -rf ${DESTDIR}${PREFIX}/share/dbus-1
25 rm -rf ${DESTDIR}${PREFIX}/share/icons 25 rm -rf ${DESTDIR}${PREFIX}/share/icons
26 26
27.include "../../devel/qjson/buildlink3.mk" 27.include "../../devel/qjson/buildlink3.mk"
28.include "../../mail/akonadi/buildlink3.mk" 28.include "../../mail/akonadi/buildlink3.mk"
29.include "../../misc/kdepimlibs4/buildlink3.mk" 29.include "../../misc/kdepimlibs4/buildlink3.mk"
30.include "../../sysutils/kfilemetadata/buildlink3.mk" 30.include "../../sysutils/kfilemetadata/buildlink3.mk"
31.include "../../textproc/xapian/buildlink3.mk" 31.include "../../textproc/xapian/buildlink3.mk"
32.include "../../x11/kdelibs4/buildlink3.mk" 32.include "../../x11/kdelibs4/buildlink3.mk"
33 33
34.include "../../mk/bsd.pkg.mk" 34.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/textproc/p5-Search-Xapian/Makefile (switch to unified diff)

--- pkgsrc/textproc/p5-Search-Xapian/Makefile 2016/11/07 13:03:12 1.25
+++ pkgsrc/textproc/p5-Search-Xapian/Makefile 2016/11/07 13:46:46 1.26
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.25 2016/11/07 13:03:12 schmonz Exp $ 1# $NetBSD: Makefile,v 1.26 2016/11/07 13:46:46 wiz Exp $
2# 
3 2
4DISTNAME= Search-Xapian-1.2.24.0 3DISTNAME= Search-Xapian-1.2.24.0
5PKGNAME= ${DISTNAME:S/^/p5-/} 4PKGNAME= ${DISTNAME:S/^/p5-/}
6CATEGORIES= textproc perl5 5CATEGORIES= textproc perl5
7MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Search/} 6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Search/}
8 7
9MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://xapian.org/docs/bindings/perl/Search/Xapian.html 9HOMEPAGE= http://xapian.org/docs/bindings/perl/Search/Xapian.html
11COMMENT= Perl XS frontend to the Xapian C++ search library 10COMMENT= Perl XS frontend to the Xapian C++ search library
12LICENSE= ${PERL5_LICENSE} 11LICENSE= ${PERL5_LICENSE}
13 12
14USE_LANGUAGES= c++ 13USE_LANGUAGES= c++
15 14
16PERL5_PACKLIST= auto/Search/Xapian/.packlist 15PERL5_PACKLIST= auto/Search/Xapian/.packlist
17 16
18.include "../../textproc/xapian/buildlink3.mk" 17.include "../../textproc/xapian/buildlink3.mk"
19.include "../../lang/perl5/module.mk" 18.include "../../lang/perl5/module.mk"
20.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/textproc/xapian/Makefile (switch to unified diff)

--- pkgsrc/textproc/xapian/Makefile 2016/11/07 13:02:17 1.25
+++ pkgsrc/textproc/xapian/Makefile 2016/11/07 13:46:45 1.26
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.25 2016/11/07 13:02:17 schmonz Exp $ 1# $NetBSD: Makefile,v 1.26 2016/11/07 13:46:45 wiz Exp $
2# 
3 2
4DISTNAME= xapian-core-${VERSION} 3DISTNAME= xapian-core-${VERSION}
5VERSION= 1.4.1 4VERSION= 1.4.1
6PKGNAME= xapian-${VERSION} 5PKGNAME= xapian-${VERSION}
7CATEGORIES= textproc 6CATEGORIES= textproc
8MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/ 7MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/
9EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
10 9
11MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
12HOMEPAGE= http://xapian.org/ 11HOMEPAGE= http://xapian.org/
13COMMENT= Probabilistic Information Retrieval search engine 12COMMENT= Probabilistic Information Retrieval search engine
14LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
15 14
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19 18
20TEST_TARGET= check 19TEST_TARGET= check
21 20
22.include "../../devel/libuuid/buildlink3.mk" 21.include "../../devel/libuuid/buildlink3.mk"
23.include "../../devel/zlib/buildlink3.mk" 22.include "../../devel/zlib/buildlink3.mk"
24.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/textproc/xapian/buildlink3.mk (switch to unified diff)

--- pkgsrc/textproc/xapian/buildlink3.mk 2016/11/07 13:02:17 1.6
+++ pkgsrc/textproc/xapian/buildlink3.mk 2016/11/07 13:46:45 1.7
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.6 2016/11/07 13:02:17 schmonz Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2016/11/07 13:46:45 wiz Exp $
2 2
3BUILDLINK_TREE+= xapian 3BUILDLINK_TREE+= xapian
4 4
5.if !defined(XAPIAN_BUILDLINK3_MK) 5.if !defined(XAPIAN_BUILDLINK3_MK)
6XAPIAN_BUILDLINK3_MK:= 6XAPIAN_BUILDLINK3_MK:=
7 7
8# XXX do these depends change? 
9BUILDLINK_API_DEPENDS.xapian+= xapian>=1.0.7 8BUILDLINK_API_DEPENDS.xapian+= xapian>=1.0.7
10BUILDLINK_ABI_DEPENDS.xapian+= xapian>=1.2.2nb1 9BUILDLINK_ABI_DEPENDS.xapian+= xapian>=1.4.1
11BUILDLINK_PKGSRCDIR.xapian?= ../../textproc/xapian 10BUILDLINK_PKGSRCDIR.xapian?= ../../textproc/xapian
12 11
13.include "../../devel/libuuid/buildlink3.mk" 12.include "../../devel/libuuid/buildlink3.mk"
14.include "../../devel/zlib/buildlink3.mk" 13.include "../../devel/zlib/buildlink3.mk"
15 14
16.endif # XAPIAN_BUILDLINK3_MK 15.endif # XAPIAN_BUILDLINK3_MK
17 16
18BUILDLINK_TREE+= -xapian 17BUILDLINK_TREE+= -xapian
cvs diff -r1.31 -r1.32 pkgsrc/textproc/xapian-omega/Makefile (switch to unified diff)

--- pkgsrc/textproc/xapian-omega/Makefile 2016/11/07 13:02:45 1.31
+++ pkgsrc/textproc/xapian-omega/Makefile 2016/11/07 13:46:46 1.32
@@ -1,51 +1,50 @@ @@ -1,51 +1,50 @@
1# $NetBSD: Makefile,v 1.31 2016/11/07 13:02:45 schmonz Exp $ 1# $NetBSD: Makefile,v 1.32 2016/11/07 13:46:46 wiz Exp $
2# 
3 2
4DISTNAME= xapian-omega-${VERSION} 3DISTNAME= xapian-omega-${VERSION}
5VERSION= 1.4.1 4VERSION= 1.4.1
6CATEGORIES= textproc 5CATEGORIES= textproc
7MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/ 6MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://xapian.org/docs/omega/overview.html 10HOMEPAGE= http://xapian.org/docs/omega/overview.html
12COMMENT= Search engine application for websites using Xapian 11COMMENT= Search engine application for websites using Xapian
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 15CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19USE_TOOLS+= perl:run 18USE_TOOLS+= perl:run
20 19
21TEST_TARGET= check 20TEST_TARGET= check
22 21
23REPLACE_PERL= dbi2omega htdig2omega mbox2omega 22REPLACE_PERL= dbi2omega htdig2omega mbox2omega
24 23
25SUBST_CLASSES+= files 24SUBST_CLASSES+= files
26SUBST_STAGE.files= do-configure 25SUBST_STAGE.files= do-configure
27SUBST_FILES.files= omega.conf 26SUBST_FILES.files= omega.conf
28SUBST_SED.files= -e "s|@VARBASE@|${VARBASE}|g" 27SUBST_SED.files= -e "s|@VARBASE@|${VARBASE}|g"
29SUBST_MESSAGE.files= Fixing configuration files. 28SUBST_MESSAGE.files= Fixing configuration files.
30 29
31OWN_DIRS+= ${VARBASE}/log/${PKGBASE} 30OWN_DIRS+= ${VARBASE}/log/${PKGBASE}
32OWN_DIRS+= ${VARBASE}/${PKGBASE}/cdb 31OWN_DIRS+= ${VARBASE}/${PKGBASE}/cdb
33OWN_DIRS+= ${VARBASE}/${PKGBASE}/data 32OWN_DIRS+= ${VARBASE}/${PKGBASE}/data
34OWN_DIRS+= ${VARBASE}/${PKGBASE}/templates 33OWN_DIRS+= ${VARBASE}/${PKGBASE}/templates
35 34
36EGDIR= ${PREFIX}/share/examples/${PKGBASE} 35EGDIR= ${PREFIX}/share/examples/${PKGBASE}
37 36
38CONF_FILES+= ${EGDIR}/omega.conf ${PKG_SYSCONFDIR}/omega.conf 37CONF_FILES+= ${EGDIR}/omega.conf ${PKG_SYSCONFDIR}/omega.conf
39 38
40INSTALLATION_DIRS= ${EGDIR} 39INSTALLATION_DIRS= ${EGDIR}
41 40
42INSTALL_TARGET= install install-dist_sysconfDATA 41INSTALL_TARGET= install install-dist_sysconfDATA
43INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} 42INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
44 43
45BUILD_DEFS+= VARBASE 44BUILD_DEFS+= VARBASE
46 45
47.include "../../sysutils/file/buildlink3.mk" 46.include "../../sysutils/file/buildlink3.mk"
48.include "../../textproc/xapian/buildlink3.mk" 47.include "../../textproc/xapian/buildlink3.mk"
49.include "../../devel/pcre/buildlink3.mk" 48.include "../../devel/pcre/buildlink3.mk"
50.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.37 -r1.38 pkgsrc/x11/kde-baseapps4/Makefile (switch to unified diff)

--- pkgsrc/x11/kde-baseapps4/Makefile 2016/10/07 18:26:13 1.37
+++ pkgsrc/x11/kde-baseapps4/Makefile 2016/11/07 13:46:46 1.38
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.37 2016/10/07 18:26:13 adam Exp $ 1# $NetBSD: Makefile,v 1.38 2016/11/07 13:46:46 wiz Exp $
2 2
3DISTNAME= kde-baseapps-15.12.0 3DISTNAME= kde-baseapps-15.12.0
4PKGNAME= ${DISTNAME:S/-1/4-1/} 4PKGNAME= ${DISTNAME:S/-1/4-1/}
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= x11 6CATEGORIES= x11
7COMMENT= Base modules for the KDE 4 integrated X11 desktop 7COMMENT= Base modules for the KDE 4 integrated X11 desktop
8MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.12.0/src/} 8MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.12.0/src/}
9 9
10.include "../../meta-pkgs/kde4/Makefile.kde4" 10.include "../../meta-pkgs/kde4/Makefile.kde4"
11 11
12CONFLICTS= konq-plugins-[0-9]* 12CONFLICTS= konq-plugins-[0-9]*
13 13
14# BUILD_MAKE_FLAGS+= VERBOSE=1 14# BUILD_MAKE_FLAGS+= VERBOSE=1
15 15
16REPLACE_RUBY+= dolphin/src/settings/services/servicemenuinstallation 16REPLACE_RUBY+= dolphin/src/settings/services/servicemenuinstallation
17REPLACE_RUBY+= dolphin/src/settings/services/servicemenudeinstallation 17REPLACE_RUBY+= dolphin/src/settings/services/servicemenudeinstallation
18 18
19REPLACE_INTERPRETER+= xdg-open 19REPLACE_INTERPRETER+= xdg-open
20REPLACE.xdg-open.old= .*/bin/env xdg-open 20REPLACE.xdg-open.old= .*/bin/env xdg-open
21REPLACE.xdg-open.new= ${PREFIX}/bin/xdg-open 21REPLACE.xdg-open.new= ${PREFIX}/bin/xdg-open
22REPLACE_FILES.xdg-open= lib/konq/Templates/Program.desktop 22REPLACE_FILES.xdg-open= lib/konq/Templates/Program.desktop
23 23
24CHECK_INTERPRETER_SKIP= share/kde/templates/.source/Program.desktop 24CHECK_INTERPRETER_SKIP= share/kde/templates/.source/Program.desktop
25 25
26.include "../../lang/ruby/replace.mk" 26.include "../../lang/ruby/replace.mk"
27 27
28.include "../../meta-pkgs/kde4/kde4.mk" 28.include "../../meta-pkgs/kde4/kde4.mk"
29 29
30.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 30.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
31.include "../../graphics/qimageblitz/buildlink3.mk" 31.include "../../graphics/qimageblitz/buildlink3.mk"
32.include "../../sysutils/desktop-file-utils/desktopdb.mk" 32.include "../../sysutils/desktop-file-utils/desktopdb.mk"
33.include "../../sysutils/libbaloo4/buildlink3.mk" 33.include "../../sysutils/libbaloo4/buildlink3.mk"
34.include "../../sysutils/baloo-widgets/buildlink3.mk" 34.include "../../sysutils/baloo-widgets/buildlink3.mk"
35.include "../../sysutils/kfilemetadata/buildlink3.mk" 35.include "../../sysutils/kfilemetadata/buildlink3.mk"
36.include "../../textproc/xapian/buildlink3.mk" 36.include "../../textproc/xapian/buildlink3.mk"
37.include "../../x11/libkactivities4/buildlink3.mk" 37.include "../../x11/libkactivities4/buildlink3.mk"
38.include "../../x11/kdelibs4/buildlink3.mk" 38.include "../../x11/kdelibs4/buildlink3.mk"
39.include "../../x11/kde-runtime4/buildlink3.mk" 39.include "../../x11/kde-runtime4/buildlink3.mk"
40.include "../../x11/kde-workspace4/buildlink3.mk" 40.include "../../x11/kde-workspace4/buildlink3.mk"
41.include "../../lang/ruby/buildlink3.mk" 41.include "../../lang/ruby/buildlink3.mk"
42.include "../../www/tidy/buildlink3.mk" 42.include "../../www/tidy/buildlink3.mk"
43 43
44.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"