Tue Nov 1 06:50:29 2011 UTC ()
Recursive bump for archivers/libarchive buildlink addition.


(sbd)
diff -r1.4 -r1.5 pkgsrc/archivers/libarchive/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/archivers/ruby-libarchive/Makefile
diff -r1.60 -r1.61 pkgsrc/devel/cmake/Makefile
diff -r1.3 -r1.4 pkgsrc/filesystems/fuse-archivemount/Makefile
diff -r1.16 -r1.17 pkgsrc/mail/claws-mail-archive/Makefile
diff -r1.25 -r1.26 pkgsrc/misc/kdeutils4/Makefile
diff -r1.19 -r1.20 pkgsrc/pkgtools/pkgin/Makefile
diff -r1.12 -r1.13 pkgsrc/sysutils/ftwin/Makefile
diff -r1.36 -r1.37 pkgsrc/sysutils/gvfs/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/archivers/libarchive/buildlink3.mk (switch to unified diff)

--- pkgsrc/archivers/libarchive/buildlink3.mk 2011/11/01 06:43:16 1.4
+++ pkgsrc/archivers/libarchive/buildlink3.mk 2011/11/01 06:50:28 1.5
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: buildlink3.mk,v 1.4 2011/11/01 06:43:16 sbd Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2011/11/01 06:50:28 sbd Exp $
2 2
3BUILDLINK_TREE+= libarchive 3BUILDLINK_TREE+= libarchive
4 4
5.if !defined(LIBARCHIVE_BUILDLINK3_MK) 5.if !defined(LIBARCHIVE_BUILDLINK3_MK)
6LIBARCHIVE_BUILDLINK3_MK:= 6LIBARCHIVE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.2 8BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.2
 9BUILDLINK_ABI_DEPENDS.libarchive?= libarchive>=2.8.4nb1
9BUILDLINK_PKGSRCDIR.libarchive?= ../../archivers/libarchive 10BUILDLINK_PKGSRCDIR.libarchive?= ../../archivers/libarchive
10 11
11.include "../../archivers/bzip2/buildlink3.mk" 12.include "../../archivers/bzip2/buildlink3.mk"
12.include "../../archivers/xz/buildlink3.mk" 13.include "../../archivers/xz/buildlink3.mk"
13.include "../../devel/zlib/buildlink3.mk" 14.include "../../devel/zlib/buildlink3.mk"
14.endif # LIBARCHIVE_BUILDLINK3_MK 15.endif # LIBARCHIVE_BUILDLINK3_MK
15 16
16BUILDLINK_TREE+= -libarchive 17BUILDLINK_TREE+= -libarchive
cvs diff -r1.2 -r1.3 pkgsrc/archivers/ruby-libarchive/Makefile (switch to unified diff)

--- pkgsrc/archivers/ruby-libarchive/Makefile 2011/02/21 16:01:10 1.2
+++ pkgsrc/archivers/ruby-libarchive/Makefile 2011/11/01 06:50:28 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2011/02/21 16:01:10 taca Exp $ 1# $NetBSD: Makefile,v 1.3 2011/11/01 06:50:28 sbd Exp $
2 2
3DISTNAME= libarchive-0.1.1 3DISTNAME= libarchive-0.1.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= archivers 5CATEGORIES= archivers
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://libarchive.rubyforge.org 8HOMEPAGE= http://libarchive.rubyforge.org
9COMMENT= Ruby bindings for Libarchive 9COMMENT= Ruby bindings for Libarchive
10LICENSE= modified-bsd 10LICENSE= modified-bsd
11 11
12.include "../../lang/ruby/gem.mk" 12.include "../../lang/ruby/gem.mk"
13.include "../../archivers/libarchive/buildlink3.mk" 13.include "../../archivers/libarchive/buildlink3.mk"
14.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.60 -r1.61 pkgsrc/devel/cmake/Makefile (switch to unified diff)

--- pkgsrc/devel/cmake/Makefile 2011/10/15 07:24:30 1.60
+++ pkgsrc/devel/cmake/Makefile 2011/11/01 06:50:28 1.61
@@ -1,69 +1,70 @@ @@ -1,69 +1,70 @@
1# $NetBSD: Makefile,v 1.60 2011/10/15 07:24:30 adam Exp $ 1# $NetBSD: Makefile,v 1.61 2011/11/01 06:50:28 sbd Exp $
2 2
3DISTNAME= cmake-${CMAKE_API}.6 3DISTNAME= cmake-${CMAKE_API}.6
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= http://www.cmake.org/files/v2.8/ 6MASTER_SITES= http://www.cmake.org/files/v2.8/
6 7
7CMAKE_API= 2.8 8CMAKE_API= 2.8
8 9
9MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
10HOMEPAGE= http://www.cmake.org/ 11HOMEPAGE= http://www.cmake.org/
11COMMENT= Cross platform make 12COMMENT= Cross platform make
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16USE_TOOLS+= gmake 17USE_TOOLS+= gmake
17USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
18# wants wsyncup and wcursyncup 19# wants wsyncup and wcursyncup
19USE_NCURSES= yes 20USE_NCURSES= yes
20HAS_CONFIGURE= yes 21HAS_CONFIGURE= yes
21CONFIGURE_SCRIPT= bootstrap 22CONFIGURE_SCRIPT= bootstrap
22 23
23BUILD_TARGET= default_target 24BUILD_TARGET= default_target
24 25
25CONFIGURE_HAS_MANDIR= no 26CONFIGURE_HAS_MANDIR= no
26CONFIGURE_ARGS+= --mandir=/${PKGMANDIR} 27CONFIGURE_ARGS+= --mandir=/${PKGMANDIR}
27CONFIGURE_ARGS+= --docdir=/share/doc/cmake-${CMAKE_API} 28CONFIGURE_ARGS+= --docdir=/share/doc/cmake-${CMAKE_API}
28CONFIGURE_ARGS+= --prefix=${PREFIX} 29CONFIGURE_ARGS+= --prefix=${PREFIX}
29CONFIGURE_ARGS+= --system-libs 30CONFIGURE_ARGS+= --system-libs
30 31
31.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
32 33
33.if !empty(MAKE_JOBS) 34.if !empty(MAKE_JOBS)
34CONFIGURE_ARGS+= --parallel=${MAKE_JOBS:Q} 35CONFIGURE_ARGS+= --parallel=${MAKE_JOBS:Q}
35.endif 36.endif
36 37
37PLIST_SUBST+= CMAKE_API=${CMAKE_API} 38PLIST_SUBST+= CMAKE_API=${CMAKE_API}
38 39
39# for Source/cmDependsJavaParser.cxx 40# for Source/cmDependsJavaParser.cxx
40UNLIMIT_RESOURCES= datasize 41UNLIMIT_RESOURCES= datasize
41 42
42# as of 2.4.6, x11 and fortran tests fail in pkgsrc 43# as of 2.4.6, x11 and fortran tests fail in pkgsrc
43TEST_TARGET= test 44TEST_TARGET= test
44 45
45SUBST_CLASSES+= cmake 46SUBST_CLASSES+= cmake
46SUBST_STAGE.cmake= pre-configure 47SUBST_STAGE.cmake= pre-configure
47SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths. 48SUBST_MESSAGE.cmake= Fixing LOCALBASE and X11 paths.
48SUBST_FILES.cmake+= Modules/FindX11.cmake 49SUBST_FILES.cmake+= Modules/FindX11.cmake
49SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake 50SUBST_FILES.cmake+= Modules/Platform/UnixPaths.cmake
50SUBST_VARS.cmake= LOCALBASE X11BASE 51SUBST_VARS.cmake= LOCALBASE X11BASE
51 52
52SUBST_CLASSES+= flags 53SUBST_CLASSES+= flags
53SUBST_STAGE.flags= pre-configure 54SUBST_STAGE.flags= pre-configure
54SUBST_MESSAGE.flags= Fixing compiler flags. 55SUBST_MESSAGE.flags= Fixing compiler flags.
55SUBST_FILES.flags= Modules/Compiler/*.cmake 56SUBST_FILES.flags= Modules/Compiler/*.cmake
56SUBST_SED.flags= -e 's,-O.,,' 57SUBST_SED.flags= -e 's,-O.,,'
57 58
58pre-configure: 59pre-configure:
59 ${RM} ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig 60 ${RM} ${WRKSRC}/Modules/*.orig ${WRKSRC}/Modules/Platform/*.orig
60 61
61BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.8.4 62BUILDLINK_API_DEPENDS.libarchive+= libarchive>=2.8.4
62.include "../../archivers/libarchive/buildlink3.mk" 63.include "../../archivers/libarchive/buildlink3.mk"
63.include "../../devel/ncurses/buildlink3.mk" 64.include "../../devel/ncurses/buildlink3.mk"
64.include "../../devel/zlib/buildlink3.mk" 65.include "../../devel/zlib/buildlink3.mk"
65.include "../../textproc/expat/buildlink3.mk" 66.include "../../textproc/expat/buildlink3.mk"
66.include "../../textproc/xmlrpc-c/buildlink3.mk" 67.include "../../textproc/xmlrpc-c/buildlink3.mk"
67.include "../../www/curl/buildlink3.mk" 68.include "../../www/curl/buildlink3.mk"
68 69
69.include "../../mk/bsd.pkg.mk" 70.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/filesystems/fuse-archivemount/Makefile (switch to unified diff)

--- pkgsrc/filesystems/fuse-archivemount/Makefile 2008/03/03 19:31:31 1.3
+++ pkgsrc/filesystems/fuse-archivemount/Makefile 2011/11/01 06:50:28 1.4
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: Makefile,v 1.3 2008/03/03 19:31:31 jlam Exp $ 1# $NetBSD: Makefile,v 1.4 2011/11/01 06:50:28 sbd Exp $
2# 2#
3 3
4DISTNAME= archivemount-0.5.3 4DISTNAME= archivemount-0.5.3
5PKGNAME= fuse-${DISTNAME} 5PKGNAME= fuse-${DISTNAME}
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= filesystems 7CATEGORIES= filesystems
8MASTER_SITES= http://www.cybernoia.de/software/archivemount/ 8MASTER_SITES= http://www.cybernoia.de/software/archivemount/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.cybernoia.de/software/archivemount/ 11HOMEPAGE= http://www.cybernoia.de/software/archivemount/
12COMMENT= FUSE gateway to libarchive 12COMMENT= FUSE gateway to libarchive
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17NO_CONFIGURE= yes 17NO_CONFIGURE= yes
18 18
19.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
20 20
21.if exists(/usr/include/sys/statvfs.h) 21.if exists(/usr/include/sys/statvfs.h)
22CPPFLAGS+= -DHAVE_STATVFS 22CPPFLAGS+= -DHAVE_STATVFS
23.endif 23.endif
24 24
25INSTALLATION_DIRS= bin 25INSTALLATION_DIRS= bin
26 26
27do-install: 27do-install:
28 ${INSTALL_PROGRAM} ${WRKSRC}/archivemount ${DESTDIR}${PREFIX}/bin 28 ${INSTALL_PROGRAM} ${WRKSRC}/archivemount ${DESTDIR}${PREFIX}/bin
29 29
30.include "../../archivers/libarchive/buildlink3.mk" 30.include "../../archivers/libarchive/buildlink3.mk"
31.include "../../mk/fuse.buildlink3.mk" 31.include "../../mk/fuse.buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/mail/claws-mail-archive/Makefile (switch to unified diff)

--- pkgsrc/mail/claws-mail-archive/Makefile 2011/11/01 06:01:57 1.16
+++ pkgsrc/mail/claws-mail-archive/Makefile 2011/11/01 06:50:28 1.17
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.16 2011/11/01 06:01:57 sbd Exp $ 1# $NetBSD: Makefile,v 1.17 2011/11/01 06:50:28 sbd Exp $
2# 2#
3 3
4DISTNAME= archive-0.6.10 4DISTNAME= archive-0.6.10
5PKGNAME= claws-mail-archive-0.6.10 5PKGNAME= claws-mail-archive-0.6.10
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= http://claws-mail.org/downloads/plugins/ 8MASTER_SITES= http://claws-mail.org/downloads/plugins/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11COMMENT= Adds archiving to Claws-Mail 11COMMENT= Adds archiving to Claws-Mail
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail 15DEPENDS+= claws-mail-${CLAWS_VERSION}{,nb[0-9]*}:../../mail/claws-mail
16 16
17.include "../../mk/bsd.prefs.mk" 17.include "../../mk/bsd.prefs.mk"
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_TOOLS+= pkg-config 21USE_TOOLS+= pkg-config
22USE_LANGUAGES+= c 22USE_LANGUAGES+= c
23 23
24.include "../../archivers/libarchive/buildlink3.mk" 24.include "../../archivers/libarchive/buildlink3.mk"
25.include "../../mail/claws-mail/Makefile.vers" 25.include "../../mail/claws-mail/Makefile.vers"
26.include "../../mail/claws-mail/buildlink3.mk" 26.include "../../mail/claws-mail/buildlink3.mk"
27.include "../../security/gnutls/buildlink3.mk" 27.include "../../security/gnutls/buildlink3.mk"
28.include "../../x11/gtk2/buildlink3.mk" 28.include "../../x11/gtk2/buildlink3.mk"
29.include "../../devel/glib2/buildlink3.mk" 29.include "../../devel/glib2/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/misc/kdeutils4/Attic/Makefile (switch to unified diff)

--- pkgsrc/misc/kdeutils4/Attic/Makefile 2011/11/01 06:02:07 1.25
+++ pkgsrc/misc/kdeutils4/Attic/Makefile 2011/11/01 06:50:28 1.26
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.25 2011/11/01 06:02:07 sbd Exp $ 1# $NetBSD: Makefile,v 1.26 2011/11/01 06:50:28 sbd Exp $
2 2
3DISTNAME= kdeutils-${_KDE_VERSION} 3DISTNAME= kdeutils-${_KDE_VERSION}
4PKGREVISION= 5 4PKGREVISION= 6
5CATEGORIES= misc 5CATEGORIES= misc
6COMMENT= Utilities for the KDE integrated X11 desktop 6COMMENT= Utilities for the KDE integrated X11 desktop
7 7
8.include "../../meta-pkgs/kde4/Makefile.kde4" 8.include "../../meta-pkgs/kde4/Makefile.kde4"
9 9
10PYTHON_VERSIONS_ACCEPTED= 27 26 25 10PYTHON_VERSIONS_ACCEPTED= 27 26 25
11#make sure cmake picks up the same Python version as pkgsrc 11#make sure cmake picks up the same Python version as pkgsrc
12CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} 12CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
13CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include 13CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
14CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so 14CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
15 15
16# BUILD_MAKE_FLAGS+= VERBOSE=1 16# BUILD_MAKE_FLAGS+= VERBOSE=1
17 17
18REPLACE_PYTHON+= printer-applet/*.py 18REPLACE_PYTHON+= printer-applet/*.py
19 19
20.include "options.mk" 20.include "options.mk"
21 21
22BUILDLINK_DEPMETHOD.qt4-tools= full 22BUILDLINK_DEPMETHOD.qt4-tools= full
23.include "../../meta-pkgs/kde4/kde4.mk" 23.include "../../meta-pkgs/kde4/kde4.mk"
24 24
25.include "../../archivers/libarchive/buildlink3.mk" 25.include "../../archivers/libarchive/buildlink3.mk"
26.include "../../archivers/libzip/buildlink3.mk" 26.include "../../archivers/libzip/buildlink3.mk"
27.include "../../archivers/xz/buildlink3.mk" 27.include "../../archivers/xz/buildlink3.mk"
28.include "../../devel/gmp/buildlink3.mk" 28.include "../../devel/gmp/buildlink3.mk"
29.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 29.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
30.include "../../graphics/qimageblitz/buildlink3.mk" 30.include "../../graphics/qimageblitz/buildlink3.mk"
31.include "../../lang/python/application.mk" 31.include "../../lang/python/application.mk"
32.include "../../misc/kdepimlibs4/buildlink3.mk" 32.include "../../misc/kdepimlibs4/buildlink3.mk"
33.include "../../security/qca2/buildlink3.mk" 33.include "../../security/qca2/buildlink3.mk"
34.include "../../sysutils/desktop-file-utils/desktopdb.mk" 34.include "../../sysutils/desktop-file-utils/desktopdb.mk"
35.include "../../x11/kdelibs4/buildlink3.mk" 35.include "../../x11/kdelibs4/buildlink3.mk"
36.include "../../x11/kdebase4/buildlink3.mk" 36.include "../../x11/kdebase4/buildlink3.mk"
37.include "../../x11/kdebase-runtime4/buildlink3.mk" 37.include "../../x11/kdebase-runtime4/buildlink3.mk"
38.include "../../x11/kdebase-workspace4/buildlink3.mk" 38.include "../../x11/kdebase-workspace4/buildlink3.mk"
39.include "../../x11/kdebindings4-python/buildlink3.mk" 39.include "../../x11/kdebindings4-python/buildlink3.mk"
40 40
41.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/pkgtools/pkgin/Makefile (switch to unified diff)

--- pkgsrc/pkgtools/pkgin/Makefile 2011/10/29 14:25:47 1.19
+++ pkgsrc/pkgtools/pkgin/Makefile 2011/11/01 06:50:29 1.20
@@ -1,66 +1,67 @@ @@ -1,66 +1,67 @@
1# $NetBSD: Makefile,v 1.19 2011/10/29 14:25:47 imil Exp $ 1# $NetBSD: Makefile,v 1.20 2011/11/01 06:50:29 sbd Exp $
2# 2#
3 3
4DISTNAME= pkgin-0.5.2.1 4DISTNAME= pkgin-0.5.2.1
 5PKGREVISION= 1
5CATEGORIES= pkgtools 6CATEGORIES= pkgtools
6MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/ 7MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/imil/
7 8
8MAINTAINER= imil@NetBSD.org 9MAINTAINER= imil@NetBSD.org
9HOMEPAGE= http://pkgin.net/ 10HOMEPAGE= http://pkgin.net/
10COMMENT= Apt / yum like tool for managing pkgsrc binary packages 11COMMENT= Apt / yum like tool for managing pkgsrc binary packages
11LICENSE= modified-bsd 12LICENSE= modified-bsd
12 13
13PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
14 15
15EGDIR= ${PREFIX}/share/examples/${PKGBASE} 16EGDIR= ${PREFIX}/share/examples/${PKGBASE}
16CONF_FILES= ${EGDIR}/repositories.conf.example \ 17CONF_FILES= ${EGDIR}/repositories.conf.example \
17 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf 18 ${PKG_SYSCONFDIR}/${PKGBASE}/repositories.conf
18 19
19OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE} 20OWN_DIRS+= ${PKG_SYSCONFDIR}/${PKGBASE}
20INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${EGDIR} 21INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${EGDIR}
21 22
22WRKSRC= ${WRKDIR}/pkgin 23WRKSRC= ${WRKDIR}/pkgin
23 24
24SUBST_CLASSES+= path 25SUBST_CLASSES+= path
25SUBST_STAGE.path= pre-configure 26SUBST_STAGE.path= pre-configure
26SUBST_MESSAGE.path= Adjusting path. 27SUBST_MESSAGE.path= Adjusting path.
27SUBST_FILES.path= Makefile.in actions.c pkgin.1 28SUBST_FILES.path= Makefile.in actions.c pkgin.1
28SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g" 29SUBST_SED.path= -e "s|/usr/pkg/etc|${PKG_SYSCONFDIR}|g"
29SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g" 30SUBST_SED.path+= -e "s|/usr/sbin|${PKG_TOOLS_BIN}|g"
30SUBST_SED.path+= -e "s|/var|${VARBASE}|g" 31SUBST_SED.path+= -e "s|/var|${VARBASE}|g"
31SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g" 32SUBST_SED.path+= -e "s|/usr/pkg|${PREFIX}|g"
32 33
33GNU_CONFIGURE= yes 34GNU_CONFIGURE= yes
34USE_FEATURES= nbcompat 35USE_FEATURES= nbcompat
35 36
36DEPENDS+= pkg_install>=20110215:../../pkgtools/pkg_install 37DEPENDS+= pkg_install>=20110215:../../pkgtools/pkg_install
37 38
38.include "../../mk/bsd.prefs.mk" 39.include "../../mk/bsd.prefs.mk"
39 40
40# those have official repositories 41# those have official repositories
41.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix" 42.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Minix"
42pre-install: 43pre-install:
43 ${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> \ 44 ${GREP} -i ${OPSYS} ${WRKSRC}/REPOSITORIES >> \
44 ${WRKSRC}/repositories.conf 45 ${WRKSRC}/repositories.conf
45.endif 46.endif
46 47
47do-install: 48do-install:
48 ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin 49 ${INSTALL_PROGRAM} ${WRKSRC}/pkgin ${DESTDIR}${PREFIX}/bin
49 ${INSTALL_MAN} ${WRKSRC}/pkgin.1 \ 50 ${INSTALL_MAN} ${WRKSRC}/pkgin.1 \
50 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 51 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
51 ${INSTALL_DATA} ${WRKSRC}/repositories.conf \ 52 ${INSTALL_DATA} ${WRKSRC}/repositories.conf \
52 ${DESTDIR}${EGDIR}/repositories.conf.example 53 ${DESTDIR}${EGDIR}/repositories.conf.example
53 54
54# libfetch has no builtin.mk and is included in NetBSD>=5 55# libfetch has no builtin.mk and is included in NetBSD>=5
55.if ${OPSYS} != "NetBSD" || \ 56.if ${OPSYS} != "NetBSD" || \
56 (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*)) 57 (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-4].*))
57. include "../../net/libfetch/buildlink3.mk" 58. include "../../net/libfetch/buildlink3.mk"
58.endif 59.endif
59 60
60# Only MINIX doesn't compile SQLite Amalgation source 61# Only MINIX doesn't compile SQLite Amalgation source
61.if ${OPSYS} == "Minix" 62.if ${OPSYS} == "Minix"
62. include "../../databases/sqlite3/buildlink3.mk" 63. include "../../databases/sqlite3/buildlink3.mk"
63.endif 64.endif
64 65
65.include "../../archivers/libarchive/buildlink3.mk" 66.include "../../archivers/libarchive/buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 67.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/sysutils/ftwin/Makefile (switch to unified diff)

--- pkgsrc/sysutils/ftwin/Makefile 2011/11/01 06:02:32 1.12
+++ pkgsrc/sysutils/ftwin/Makefile 2011/11/01 06:50:29 1.13
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.12 2011/11/01 06:02:32 sbd Exp $ 1# $NetBSD: Makefile,v 1.13 2011/11/01 06:50:29 sbd Exp $
2# 2#
3 3
4DISTNAME= ftwin-0.8.5 4DISTNAME= ftwin-0.8.5
5PKGREVISION= 7 5PKGREVISION= 8
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= http://download.meroware.org/ftwin/ 7MASTER_SITES= http://download.meroware.org/ftwin/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= imil@gcu.info 10MAINTAINER= imil@gcu.info
11HOMEPAGE= http://jok.is-a-geek.net/ftwin.php 11HOMEPAGE= http://jok.is-a-geek.net/ftwin.php
12COMMENT= Ftwin finds duplicate files according to their content 12COMMENT= Ftwin finds duplicate files according to their content
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15 15
16DOCDIR= ${PREFIX}/share/doc/ftwin 16DOCDIR= ${PREFIX}/share/doc/ftwin
17 17
18PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
19 19
20INSTALLATION_DIRS+= ${DOCDIR} ${PKGMANDIR}/man8 20INSTALLATION_DIRS+= ${DOCDIR} ${PKGMANDIR}/man8
21 21
22post-install: 22post-install:
23 ${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${DESTDIR}${DOCDIR} 23 ${INSTALL_DATA} ${WRKSRC}/EXAMPLES ${DESTDIR}${DOCDIR}
24 ${INSTALL_DATA} ${WRKSRC}/KNOWN_BUGS ${DESTDIR}${DOCDIR} 24 ${INSTALL_DATA} ${WRKSRC}/KNOWN_BUGS ${DESTDIR}${DOCDIR}
25 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR} 25 ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${DOCDIR}
26 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR} 26 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
27 27
28TEST_TARGET= check 28TEST_TARGET= check
29 29
30.include "../../archivers/libarchive/buildlink3.mk" 30.include "../../archivers/libarchive/buildlink3.mk"
31.include "../../textproc/expat/buildlink3.mk" 31.include "../../textproc/expat/buildlink3.mk"
32BUILDLINK_DEPMETHOD.check= build 32BUILDLINK_DEPMETHOD.check= build
33.include "../../devel/check/buildlink3.mk" 33.include "../../devel/check/buildlink3.mk"
34.include "../../devel/apr/buildlink3.mk" 34.include "../../devel/apr/buildlink3.mk"
35.include "../../devel/apr-util/buildlink3.mk" 35.include "../../devel/apr-util/buildlink3.mk"
36.include "../../devel/pcre/buildlink3.mk" 36.include "../../devel/pcre/buildlink3.mk"
37.include "../../graphics/libpuzzle/buildlink3.mk" 37.include "../../graphics/libpuzzle/buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.36 -r1.37 pkgsrc/sysutils/gvfs/Makefile (switch to unified diff)

--- pkgsrc/sysutils/gvfs/Makefile 2011/11/01 06:02:34 1.36
+++ pkgsrc/sysutils/gvfs/Makefile 2011/11/01 06:50:29 1.37
@@ -1,81 +1,81 @@ @@ -1,81 +1,81 @@
1# $NetBSD: Makefile,v 1.36 2011/11/01 06:02:34 sbd Exp $ 1# $NetBSD: Makefile,v 1.37 2011/11/01 06:50:29 sbd Exp $
2# 2#
3 3
4DISTNAME= gvfs-1.6.6 4DISTNAME= gvfs-1.6.6
5PKGREVISION= 5 5PKGREVISION= 6
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.6/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gvfs/1.6/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.gnome.org/ 11HOMEPAGE= http://www.gnome.org/
12COMMENT= Userspace virtual filesystem 12COMMENT= Userspace virtual filesystem
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= intltool gmake pkg-config msgfmt 18USE_TOOLS+= intltool gmake pkg-config msgfmt
19CONFIGURE_ARGS+= --enable-http 19CONFIGURE_ARGS+= --enable-http
20CONFIGURE_ARGS+= --disable-bash-completion 20CONFIGURE_ARGS+= --disable-bash-completion
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
24PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs 24PKG_OPTIONS_VAR= PKG_OPTIONS.gvfs
25PKG_SUPPORTED_OPTIONS+= avahi hal fuse samba 25PKG_SUPPORTED_OPTIONS+= avahi hal fuse samba
26PKG_SUGGESTED_OPTIONS+= hal samba 26PKG_SUGGESTED_OPTIONS+= hal samba
27PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} 27PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
28 28
29# XXX fuse.bl3.mk will fail if we include it and fuse is not available 29# XXX fuse.bl3.mk will fail if we include it and fuse is not available
30.if ${OPSYS} == "Linux" #|| (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h)) 30.if ${OPSYS} == "Linux" #|| (${OPSYS} == "NetBSD" && exists(/usr/include/fuse.h))
31PKG_SUGGESTED_OPTIONS+= fuse 31PKG_SUGGESTED_OPTIONS+= fuse
32.endif 32.endif
33 33
34.include "../../mk/bsd.options.mk" 34.include "../../mk/bsd.options.mk"
35 35
36.if !empty(PKG_OPTIONS:Mavahi) 36.if !empty(PKG_OPTIONS:Mavahi)
37.include "../../net/avahi/buildlink3.mk" 37.include "../../net/avahi/buildlink3.mk"
38CONFIGURE_ARGS+= --enable-avahi 38CONFIGURE_ARGS+= --enable-avahi
39PLIST.avahi= yes 39PLIST.avahi= yes
40.else 40.else
41CONFIGURE_ARGS+= --disable-avahi 41CONFIGURE_ARGS+= --disable-avahi
42.endif 42.endif
43 43
44.if !empty(PKG_OPTIONS:Msamba) 44.if !empty(PKG_OPTIONS:Msamba)
45CONFIGURE_ARGS+= --with-samba-includes=${LOCALBASE}/include 45CONFIGURE_ARGS+= --with-samba-includes=${LOCALBASE}/include
46CONFIGURE_ARGS+= --with-samba-libs=${LOCALBASE}/lib/samba 46CONFIGURE_ARGS+= --with-samba-libs=${LOCALBASE}/lib/samba
47.include "../../net/samba/buildlink3.mk" 47.include "../../net/samba/buildlink3.mk"
48PLIST.samba= yes 48PLIST.samba= yes
49.else 49.else
50CONFIGURE_ARGS+= --disable-samba 50CONFIGURE_ARGS+= --disable-samba
51.endif 51.endif
52 52
53.if !empty(PKG_OPTIONS:Mhal) 53.if !empty(PKG_OPTIONS:Mhal)
54.include "../../misc/libcdio/buildlink3.mk" 54.include "../../misc/libcdio/buildlink3.mk"
55.include "../../sysutils/hal/buildlink3.mk" 55.include "../../sysutils/hal/buildlink3.mk"
56CONFIGURE_ARGS+= --enable-hal 56CONFIGURE_ARGS+= --enable-hal
57CONFIGURE_ARGS+= --enable-cdda 57CONFIGURE_ARGS+= --enable-cdda
58PLIST.hal= yes 58PLIST.hal= yes
59.else 59.else
60CONFIGURE_ARGS+= --disable-hal 60CONFIGURE_ARGS+= --disable-hal
61CONFIGURE_ARGS+= --disable-cdda 61CONFIGURE_ARGS+= --disable-cdda
62.endif 62.endif
63 63
64.if !empty(PKG_OPTIONS:Mfuse) 64.if !empty(PKG_OPTIONS:Mfuse)
65.include "../../mk/fuse.buildlink3.mk" 65.include "../../mk/fuse.buildlink3.mk"
66CONFIGURE_ARGS+= --enable-fuse 66CONFIGURE_ARGS+= --enable-fuse
67PLIST.fuse= yes 67PLIST.fuse= yes
68.else 68.else
69CONFIGURE_ARGS+= --disable-fuse 69CONFIGURE_ARGS+= --disable-fuse
70.endif 70.endif
71 71
72BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.6 72BUILDLINK_API_DEPENDS.glib2+= glib2>=2.17.6
73.include "../../devel/glib2/modules.mk" 73.include "../../devel/glib2/modules.mk"
74.include "../../sysutils/dbus/buildlink3.mk" 74.include "../../sysutils/dbus/buildlink3.mk"
75.include "../../archivers/libarchive/buildlink3.mk" 75.include "../../archivers/libarchive/buildlink3.mk"
76BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.25.1 76BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.25.1
77.include "../../net/libsoup24/buildlink3.mk" 77.include "../../net/libsoup24/buildlink3.mk"
78.include "../../textproc/libxml2/buildlink3.mk" 78.include "../../textproc/libxml2/buildlink3.mk"
79.include "../../devel/GConf/buildlink3.mk" 79.include "../../devel/GConf/buildlink3.mk"
80.include "../../security/libgnome-keyring/buildlink3.mk" 80.include "../../security/libgnome-keyring/buildlink3.mk"
81.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"