From: Charlie Date: Sat, 16 Jan 2010 14:49:34 +0000 (-0800) Subject: update Sat Jan 16 06:37:00 PST 2010 X-Git-Url: https://gitweb.dragonflybsd.org/pkgsrc.git/commitdiff_plain/9a6a861151d71ee53b155be6f738696762f5d735 update Sat Jan 16 06:37:00 PST 2010 --- diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 9db98373396a..a6fc3080e990 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2009/12/16 14:23:13 adam Exp $ +# $NetBSD: Makefile,v 1.7 2010/01/16 09:30:32 adam Exp $ PKGNAME= postgresql83-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -46,7 +46,7 @@ DL_LIBS+= -lltdl .endif PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql83-server -PKG_SUPPORTED_OPTIONS= pam +PKG_SUPPORTED_OPTIONS= ldap pam .include "../../databases/postgresql83/options.mk" # PGUSER username of the database administrator diff --git a/databases/postgresql83/options.mk b/databases/postgresql83/options.mk index 5284019fe883..63e9278a5f7c 100644 --- a/databases/postgresql83/options.mk +++ b/databases/postgresql83/options.mk @@ -1,9 +1,17 @@ -# $NetBSD: options.mk,v 1.1.1.1 2008/03/04 12:41:36 adam Exp $ +# $NetBSD: options.mk,v 1.2 2010/01/16 09:30:31 adam Exp $ PKG_SUPPORTED_OPTIONS+= # empty .include "../../mk/bsd.options.mk" +### +### LDAP authentication for the PostgreSQL backend. +### +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap-client/buildlink3.mk" +CONFIGURE_ARGS+= --with-ldap +.endif + ### ### PAM authentication for the PostgreSQL backend. ### diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index fa875d7f703c..1c550f590b22 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/12/16 13:30:54 adam Exp $ +# $NetBSD: Makefile,v 1.4 2010/01/16 09:16:49 adam Exp $ PKGNAME= postgresql84-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -46,7 +46,7 @@ DL_LIBS+= -lltdl .endif PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql84-server -PKG_SUPPORTED_OPTIONS= pam +PKG_SUPPORTED_OPTIONS= ldap pam .include "../../databases/postgresql84/options.mk" # PGUSER username of the database administrator diff --git a/databases/postgresql84/options.mk b/databases/postgresql84/options.mk index 60bfe3480ab5..b30f68551f61 100644 --- a/databases/postgresql84/options.mk +++ b/databases/postgresql84/options.mk @@ -1,9 +1,17 @@ -# $NetBSD: options.mk,v 1.1.1.1 2009/07/29 06:26:17 adam Exp $ +# $NetBSD: options.mk,v 1.2 2010/01/16 09:16:12 adam Exp $ PKG_SUPPORTED_OPTIONS+= # empty .include "../../mk/bsd.options.mk" +### +### LDAP authentication for the PostgreSQL backend. +### +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap-client/buildlink3.mk" +CONFIGURE_ARGS+= --with-ldap +.endif + ### ### PAM authentication for the PostgreSQL backend. ### diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile index a0ac1823d21e..9fba672563ff 100644 --- a/devel/nspr/Makefile +++ b/devel/nspr/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.32 2009/11/10 16:48:20 tnn Exp $ +# $NetBSD: Makefile,v 1.33 2010/01/16 14:22:30 tnn Exp $ # .include "../../devel/xulrunner/dist.mk" -PKGNAME= ${DISTNAME:S/firefox/nspr/:S/3.5/${NSPR_RELEASE}/:S/.source//} +PKGNAME= ${DISTNAME:S/firefox-3.5/nspr-${NSPR_RELEASE}/:S/.source//} NSPR_RELEASE= 4.8.2 CATEGORIES= devel diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk index 16e2f1d1c667..5437cf776efc 100644 --- a/devel/nspr/buildlink3.mk +++ b/devel/nspr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/11/10 16:44:06 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/01/16 13:38:08 tnn Exp $ BUILDLINK_TREE+= nspr @@ -11,9 +11,6 @@ BUILDLINK_PKGSRCDIR.nspr?= ../../devel/nspr BUILDLINK_FILES.nspr+= lib/nspr/* BUILDLINK_FILES.nspr+= include/nspr/* -BUILDLINK_INCDIRS.nspr+= include/nspr -BUILDLINK_LIBDIRS.nspr+= lib/nspr -BUILDLINK_RPATHDIRS.nspr+= lib/nspr .endif # NSPR_BUILDLINK3_MK BUILDLINK_TREE+= -nspr diff --git a/devel/p5-CPAN-Checksums/DESCR b/devel/p5-CPAN-Checksums/DESCR new file mode 100644 index 000000000000..922daed9bce0 --- /dev/null +++ b/devel/p5-CPAN-Checksums/DESCR @@ -0,0 +1 @@ +Write a CHECKSUMS file for a directory as on CPAN diff --git a/devel/p5-CPAN-Checksums/Makefile b/devel/p5-CPAN-Checksums/Makefile new file mode 100644 index 000000000000..68b4e0e55732 --- /dev/null +++ b/devel/p5-CPAN-Checksums/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 14:15:52 sno Exp $ + +DISTNAME= CPAN-Checksums-2.04 +PKGNAME= p5-${DISTNAME} +CATEGORIES= devel perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CPAN/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://search.cpan.org/dist/CPAN-Checksums/ +COMMENT= Write a CHECKSUMS file for a directory as on CPAN +LICENSE= ${PERL5_LICENSE} + +PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir + +USE_LANGUAGES= # empty + +DEPENDS+= p5-Compress-Bzip2-[0-9]*:../../archivers/p5-Compress-Bzip2 +DEPENDS+= p5-Data-Compare-[0-9]*:../../devel/p5-Data-Compare + +PERL5_PACKLIST= auto/CPAN/Checksums/.packlist + +.include "../../lang/perl5/module.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-CPAN-Checksums/distinfo b/devel/p5-CPAN-Checksums/distinfo new file mode 100644 index 000000000000..04606ac1a198 --- /dev/null +++ b/devel/p5-CPAN-Checksums/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/01/16 14:15:52 sno Exp $ + +SHA1 (CPAN-Checksums-2.04.tar.gz) = 2e1aa5110006511eb293d581b5e987eca9b4ca4b +RMD160 (CPAN-Checksums-2.04.tar.gz) = b67a711b0ced80817200498e3b507512fcbf28d2 +Size (CPAN-Checksums-2.04.tar.gz) = 16248 bytes diff --git a/devel/p5-CPAN-Inject/DESCR b/devel/p5-CPAN-Inject/DESCR new file mode 100644 index 000000000000..cdbb14de77b8 --- /dev/null +++ b/devel/p5-CPAN-Inject/DESCR @@ -0,0 +1,6 @@ +It takes any arbitrary Perl distribution tarball (open source or otherwise) +and injects it into the local CPAN file cache, smoothing some metadata +files to make it look as if it came from CPAN. + +It makes use the officially blessed "Reserved Local CPAN Author" id "LOCAL" +as the author the distributions are added under. diff --git a/devel/p5-CPAN-Inject/Makefile b/devel/p5-CPAN-Inject/Makefile new file mode 100644 index 000000000000..ee87828cebd7 --- /dev/null +++ b/devel/p5-CPAN-Inject/Makefile @@ -0,0 +1,28 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 14:17:25 sno Exp $ + +DISTNAME= CPAN-Inject-0.11 +PKGNAME= p5-${DISTNAME} +CATEGORIES= devel perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CPAN/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://search.cpan.org/dist/CPAN-Inject/ +COMMENT= Inject a distribution for installation via the CPAN shell +LICENSE= ${PERL5_LICENSE} + +PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_DESTDIR_SUPPORT= user-destdir + +USE_LANGUAGES= # empty + +DEPENDS+= p5-CPAN-Checksums>=1.05:../../devel/p5-CPAN-Checksums +DEPENDS+= p5-File-chmod>=0.30:../../sysutils/p5-File-chmod +DEPENDS+= p5-Params-Util>=0.21:../../devel/p5-Params-Util + +BUILD_DEPENDS+= p5-File-Remove>=0.38:../../sysutils/p5-File-Remove +BUILD_DEPENDS+= p5-Test-Script>=1.02:../../devel/p5-Test-Script + +PERL5_PACKLIST= auto/CPAN/Inject/.packlist + +.include "../../lang/perl5/module.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-CPAN-Inject/distinfo b/devel/p5-CPAN-Inject/distinfo new file mode 100644 index 000000000000..cd3bb54f7265 --- /dev/null +++ b/devel/p5-CPAN-Inject/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/01/16 14:17:25 sno Exp $ + +SHA1 (CPAN-Inject-0.11.tar.gz) = 41ff95c0c8dd1852645a8a3a063b039960a11141 +RMD160 (CPAN-Inject-0.11.tar.gz) = 8b88ebb9890353ea932db79589871aeff64652b5 +Size (CPAN-Inject-0.11.tar.gz) = 54564 bytes diff --git a/devel/p5-ExtUtils-XSpp/DESCR b/devel/p5-ExtUtils-XSpp/DESCR new file mode 100644 index 000000000000..52268a9aee52 --- /dev/null +++ b/devel/p5-ExtUtils-XSpp/DESCR @@ -0,0 +1,5 @@ +XS++ is just a thin layer over plain XS, hence to use it you are supposed +to know, at the very least, C++ and XS. + +This means that you will need typemaps for both the normal XS pre-processor +xsubpp and the XS++ pre-processor xspp. diff --git a/devel/p5-ExtUtils-XSpp/Makefile b/devel/p5-ExtUtils-XSpp/Makefile new file mode 100644 index 000000000000..79c70d4613b9 --- /dev/null +++ b/devel/p5-ExtUtils-XSpp/Makefile @@ -0,0 +1,23 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 14:06:38 sno Exp $ + +DISTNAME= ExtUtils-XSpp-0.05 +PKGNAME= p5-${DISTNAME} +CATEGORIES= devel perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=ExtUtils/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://search.cpan.org/dist/ExtUtils-XSpp/ +COMMENT= XS for C++ +LICENSE= ${PERL5_LICENSE} + +BUILD_DEPENDS+= p5-Test-Base-[0-9]*:../../devel/p5-Test-Base +BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences + +PKG_DESTDIR_SUPPORT= user-destdir + +USE_LANGUAGES= c +PERL5_PACKLIST= auto/ExtUtils/XSpp/.packlist +PERL5_MODULE_TYPE= Module::Build + +.include "../../lang/perl5/module.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-ExtUtils-XSpp/distinfo b/devel/p5-ExtUtils-XSpp/distinfo new file mode 100644 index 000000000000..cd29ce067728 --- /dev/null +++ b/devel/p5-ExtUtils-XSpp/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/01/16 14:06:38 sno Exp $ + +SHA1 (ExtUtils-XSpp-0.05.tar.gz) = 593479da08961be6af7e74142ef9360323753cd5 +RMD160 (ExtUtils-XSpp-0.05.tar.gz) = ee76412424470b65d3616153055b328614043fa5 +Size (ExtUtils-XSpp-0.05.tar.gz) = 87209 bytes diff --git a/devel/p5-Module-Util/DESCR b/devel/p5-Module-Util/DESCR new file mode 100644 index 000000000000..0c1c5d638aa1 --- /dev/null +++ b/devel/p5-Module-Util/DESCR @@ -0,0 +1,4 @@ +This module provides a few useful functions for manipulating module names. +Its main aim is to centralise some of the functions commonly used by +modules that manipulate other modules in some way, like converting module +names to relative paths. diff --git a/devel/p5-Module-Util/Makefile b/devel/p5-Module-Util/Makefile new file mode 100644 index 000000000000..cd54968136e2 --- /dev/null +++ b/devel/p5-Module-Util/Makefile @@ -0,0 +1,21 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 14:19:34 sno Exp $ +# + +DISTNAME= Module-Util-1.07 +PKGNAME= p5-${DISTNAME} +CATEGORIES= devel perl5 +MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Module/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://search.cpan.org/dist/Module-Util/ +COMMENT= Module name tools and transformations +LICENSE= ${PERL5_LICENSE} + +PKG_DESTDIR_SUPPORT= user-destdir + +USE_LANGUAGES= # empty +PERL5_PACKLIST= auto/Module/Util/.packlist +PERL5_MODULE_TYPE= Module::Build + +.include "../../lang/perl5/module.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-Module-Util/distinfo b/devel/p5-Module-Util/distinfo new file mode 100644 index 000000000000..08bf93abd388 --- /dev/null +++ b/devel/p5-Module-Util/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/01/16 14:19:34 sno Exp $ + +SHA1 (Module-Util-1.07.tar.gz) = c6853ef12e0f82af0b133326bebf4297a04d9a0e +RMD160 (Module-Util-1.07.tar.gz) = dda3a921f9f2db25486ca5e718bee6c5935e86ec +Size (Module-Util-1.07.tar.gz) = 9556 bytes diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010 index 55e36b5132db..5cee3e432fad 100644 --- a/doc/CHANGES-2010 +++ b/doc/CHANGES-2010 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2010,v 1.85 2010/01/16 07:12:23 minskim Exp $ +$NetBSD: CHANGES-2010,v 1.94 2010/01/16 14:19:48 sno Exp $ Changes to the packages collection and infrastructure in 2010: @@ -85,6 +85,7 @@ Changes to the packages collection and infrastructure in 2010: Updated games/rftg to 0.6.0 [wiz 2010-01-15] Updated security/pam_ssh_agent_auth to 0.9.2 [agc 2010-01-15] Updated mail/sendmail to 8.14.4 [jnemeth 2010-01-16] + Updated mail/libmilter to 8.14.4 [jnemeth 2010-01-16] Updated devel/libthai to 0.1.13 [obache 2010-01-16] Updated fonts/vlgothic-ttf to 20091214 [obache 2010-01-16] Updated print/kpathsea to 5.0.0nb3 [minskim 2010-01-16] @@ -118,3 +119,11 @@ Changes to the packages collection and infrastructure in 2010: Removed print/tex-bin-dvipsk [minskim 2010-01-16] Removed print/tex-bin-dvipsk-doc [minskim 2010-01-16] Added graphics/tex-dvipng-doc version 1.12 [minskim 2010-01-16] + Updated x11/lesstif to 0.95.2 [adam 2010-01-16] + Added www/py-django-registration version 0.8a1 [abs 2010-01-16] + Updated x11/xf86-video-vmware to 10.16.9 [obache 2010-01-16] + Added x11/wmzcalock version 0.1 [sborrill 2010-01-16] + Added devel/p5-ExtUtils-XSpp version 0.05 [sno 2010-01-16] + Added devel/p5-CPAN-Checksums version 2.04 [sno 2010-01-16] + Added devel/p5-CPAN-Inject version 0.11 [sno 2010-01-16] + Added devel/p5-Module-Util version 1.07 [sno 2010-01-16] diff --git a/doc/TODO b/doc/TODO index a5507f47c751..17b54582c06c 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.8844 2010/01/16 03:31:56 minskim Exp $ +$NetBSD: TODO,v 1.8845 2010/01/16 11:26:12 obache Exp $ Suggested new packages ====================== @@ -1470,7 +1470,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o xf86-video-tga-1.2.1 o xf86-video-tseng-1.2.3 o xf86-video-vesa-2.3.0 - o xf86-video-vmware-10.16.9 o xf86-video-voodoo-1.2.2 o xf86-video-wsfb-0.3.0 o xf86-video-xgi-1.5.1 [unpackaged] diff --git a/mail/libmilter/Makefile b/mail/libmilter/Makefile index 888de1bfca58..84dd1baaa2d3 100644 --- a/mail/libmilter/Makefile +++ b/mail/libmilter/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2009/12/16 09:46:36 jnemeth Exp $ +# $NetBSD: Makefile,v 1.18 2010/01/16 11:33:12 tron Exp $ PKGNAME= libmilter-${DIST_VERS} -PKGREVISION= 1 COMMENT= Mail filter support library for sendmail PKG_DESTDIR_SUPPORT= user-destdir diff --git a/news/inn/Makefile b/news/inn/Makefile index 491a7b2beb14..c982824ee5d5 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.100 2009/12/16 22:10:25 spz Exp $ +# $NetBSD: Makefile,v 1.101 2010/01/16 09:46:16 spz Exp $ DISTNAME= inn-2.5.1 +PKGREVISION= 1 CATEGORIES= news MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \ ftp://ftp.fu-berlin.de/unix/news/inn/ @@ -59,6 +60,7 @@ LDFLAGS.SunOS+= -lsocket -lnsl DEPENDS+= p5-MIME-tools>0:../../mail/p5-MIME-tools DEPENDS+= p5-GD>0:../../graphics/p5-GD +DEPENDS+= gnupg>0:../../security/gnupg ## Please note that USE_DESTDIR=yes only works for this package if the user ## and group already exist diff --git a/news/inn/distinfo b/news/inn/distinfo index 198524de6fb7..874c9986cd15 100644 --- a/news/inn/distinfo +++ b/news/inn/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2009/12/16 22:10:25 spz Exp $ +$NetBSD: distinfo,v 1.25 2010/01/16 09:46:16 spz Exp $ SHA1 (inn-2.5.1.tar.gz) = e49a58a3484bbb7fd230b37ca17cc34eb10c10f1 RMD160 (inn-2.5.1.tar.gz) = 8cb24ac4fcea299b02b2b0b043a4f5506b902c47 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 8ed86de4d20ab8510c7521528a9979c1d3e6d9e8 SHA1 (patch-ab) = c48e442cc710f0655904c10031c2402e9dea7560 SHA1 (patch-ac) = 2b801b9b8c5eae1feacaa3532e78b4c46210f755 SHA1 (patch-ad) = d36131ad21a1d8ea0edb463dfff6f1800dc8291d -SHA1 (patch-ag) = 8041d7d78c26fd7b505d9955dbdb91f2b8cb8ab2 +SHA1 (patch-ag) = ec28feef2392567cbc607e7b27fe85f1acd349a7 SHA1 (patch-ah) = 48c2440ed361668c934194e53dc91fe0fa24dc2f SHA1 (patch-ai) = cf0af9de01dc7e06c5f9f7f1dd91ac2201e8c212 SHA1 (patch-ak) = 1b92f93a78a08b570c2f9b5360982644d6d2d065 diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag index 1854b807ab97..8bd0a0dad74b 100644 --- a/news/inn/patches/patch-ag +++ b/news/inn/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.10 2009/09/22 13:17:00 spz Exp $ +$NetBSD: patch-ag,v 1.11 2010/01/16 09:46:17 spz Exp $ --- control/pgpverify.in.orig 2009-05-21 20:08:33.000000000 +0000 +++ control/pgpverify.in @@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.10 2009/09/22 13:17:00 spz Exp $ # you have INN and the script is able to successfully include your # INN::Config module, the value of $INN::Config::pgp will override this. -$pgp = '/usr/local/bin/pgp'; -+$pgp = ''@_PATH_PGP@'; ++# $pgp = '/usr/local/bin/pgp'; # If you keep your keyring somewhere that is not the default used by pgp, # uncomment the next line and set appropriately. If you have INN and the diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile index 4a4e05e80528..007d83b5ff48 100644 --- a/security/opencdk/Makefile +++ b/security/opencdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2009/05/30 01:57:26 zafer Exp $ +# $NetBSD: Makefile,v 1.32 2010/01/16 11:23:03 tron Exp $ DISTNAME= opencdk-0.6.6 CATEGORIES= security devel @@ -27,6 +27,12 @@ PKGCONFIG_OVERRIDE= src/opencdk.pc.in INSTALLATION_DIRS= ${HTMLDIR} ${EGDIR} +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "SunOS" +LIBS+= -lnsl +.endif + pre-install: ${INSTALL_DATA} ${WRKSRC}/doc/opencdk-api.html ${DESTDIR}${HTMLDIR} cd ${WRKSRC}/tests && ${INSTALL_DATA} *.gpg *.c ${DESTDIR}${EGDIR} diff --git a/time/wmzcalock/DESCR b/time/wmzcalock/DESCR new file mode 100644 index 000000000000..47b06b1775a5 --- /dev/null +++ b/time/wmzcalock/DESCR @@ -0,0 +1,2 @@ +A calendar/clock dock app with a variety of display modes for Window Maker +and other window managers that support dockapps. diff --git a/time/wmzcalock/Makefile b/time/wmzcalock/Makefile new file mode 100644 index 000000000000..d6eab7e39b5b --- /dev/null +++ b/time/wmzcalock/Makefile @@ -0,0 +1,34 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $ +# + +DISTNAME= wmzcalock-0.1 +CATEGORIES= time x11 +MASTER_SITES= http://zapatopi.net/zapatoware/ + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://zapatopi.net/zapatoware/wmzcalock.html +COMMENT= Dockapp calendar clock +LICENSE= gnu-gpl-v2 + +EXTRACT_SUFX= .tgz + +PKG_DESTDIR_SUPPORT= user-destdir + +USE_TOOLS+= pax +INSTALLATION_DIRS= share/wmzcalock/theme + +.include "../../mk/bsd.prefs.mk" + +do-build: + cd ${WRKSRC} && ${CC} -c ${CFLAGS} wmzcalock.c && \ + ${CC} -o wmzcalock wmzcalock.o -lc ${LIBS} ${X11_LDFLAGS} \ + -lX11 -lXext -lm -lXpm + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC:Q}/wmzcalock ${DESTDIR}${PREFIX:Q}/bin + cd ${WRKSRC}/theme; ${PAX} -rw . \ + ${DESTDIR}${PREFIX}/share/wmzcalock/theme + +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/time/wmzcalock/PLIST b/time/wmzcalock/PLIST new file mode 100644 index 000000000000..fd88e6a61259 --- /dev/null +++ b/time/wmzcalock/PLIST @@ -0,0 +1,18 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $ +bin/wmzcalock +share/wmzcalock/theme/mday.charterblack.xpm +share/wmzcalock/theme/mday.charterbold.xpm +share/wmzcalock/theme/mday.comic.xpm +share/wmzcalock/theme/mday.eras.xpm +share/wmzcalock/theme/mday.georgia.xpm +share/wmzcalock/theme/mday.iceage.xpm +share/wmzcalock/theme/mday.ocr.xpm +share/wmzcalock/theme/mday.papyrus.xpm +share/wmzcalock/theme/mday.utopia.xpm +share/wmzcalock/theme/mdaynums.xcf +share/wmzcalock/theme/wday.charter.xpm +share/wmzcalock/theme/wday.comic.xpm +share/wmzcalock/theme/wday.georgia.xpm +share/wmzcalock/theme/wday.lcd.xpm +share/wmzcalock/theme/wday.papyrus.xpm +share/wmzcalock/theme/wdaytxts.xcf diff --git a/time/wmzcalock/distinfo b/time/wmzcalock/distinfo new file mode 100644 index 000000000000..abd33e031acc --- /dev/null +++ b/time/wmzcalock/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $ + +SHA1 (wmzcalock-0.1.tgz) = e18a377464f688140c0388cf7dd29c96ecb27233 +RMD160 (wmzcalock-0.1.tgz) = 902383d9046fe38932ed0e700d678cd5e5e82ed2 +Size (wmzcalock-0.1.tgz) = 47451 bytes +SHA1 (patch-wmzcalock.c) = 55b316964a342248cfa70cf680e61129892303f7 diff --git a/time/wmzcalock/patches/patch-wmzcalock.c b/time/wmzcalock/patches/patch-wmzcalock.c new file mode 100644 index 000000000000..f110a98bbb2c --- /dev/null +++ b/time/wmzcalock/patches/patch-wmzcalock.c @@ -0,0 +1,22 @@ +$NetBSD: patch-wmzcalock.c,v 1.1.1.1 2010/01/16 14:36:56 sborrill Exp $ + +--- wmzcalock.c.orig 2000-07-11 18:11:00.000000000 +0100 ++++ wmzcalock.c 2010-01-14 16:24:40.000000000 +0000 +@@ -645,7 +645,7 @@ + { + gettimeofday(&timeV, NULL); + dday = ((float)hour/24)+((float)min/1440)+ +- ((float)sec/86400)+((float)timeV.tv_usec/86400000000); ++ ((float)sec/86400); + } + + switch (tmmode) +@@ -803,7 +803,7 @@ + { + fprintf(stderr, + "Warning: Couldn't open file '%s', using font instead\n",pixmap_file); +- (int *)the_pixmap = NULL; ++ the_pixmap = (Pixmap)NULL; + } + else + { diff --git a/wip/cyrus-imapd/Makefile b/wip/cyrus-imapd/Makefile index b25a1f726190..7a5dee99755d 100644 --- a/wip/cyrus-imapd/Makefile +++ b/wip/cyrus-imapd/Makefile @@ -51,91 +51,7 @@ CONFIGURE_ARGS+= --enable-murder CONFIGURE_ARGS+= --enable-nntp CONFIGURE_ARGS+= --enable-replication -PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd -PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4 ldap snmp zephyr -PKG_SUPPORTED_OPTIONS+= bdb mysql pgsql sqlite -PKG_SUGGESTED_OPTIONS= bdb - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mkerberos) -. if empty(PKG_OPTIONS:Mgssapi) -PKG_OPTIONS+= gssapi -. endif -.endif - -.if !empty(PKG_OPTIONS:Mkerberos4) -. if exists(/usr/include/kerberosIV/krb.h) -PKG_USE_KERBEROS= yes -CONFIGURE_ARGS+= --with-krb=/usr -. endif -.elif !empty(PKG_OPTIONS:Mgssapi) -. include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} -CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} -GSSIMPL.heimdal= heimdal -GSSIMPL.mit-krb5= mit -CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et -COMERRBASE= ${KRB5BASE} -.else -CONFIGURE_ARGS+= --without-krb -CONFIGURE_ARGS+= --disable-gssapi -.endif - -.if !empty(PKG_OPTIONS:Mldap) -. include "../../databases/openldap-client/buildlink3.mk" -CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} -PLIST_SUBST+= LDAP= -.else -CONFIGURE_ARGS+= --without-ldap -PLIST_SUBST+= LDAP="@comment " -.endif - -.if !empty(PKG_OPTIONS:Msnmp) -. include "../../net/net-snmp/buildlink3.mk" -CONFIGURE_ARGS+= --with-snmp=${BUILDLINK_PREFIX.net-snmp} -USE_TOOLS+= perl:run -.else -CONFIGURE_ARGS+= --without-snmp -.endif - -.if !empty(PKG_OPTIONS:Mzephyr) -. include "../../chat/zephyr/buildlink3.mk" -CONFIGURE_ARGS+= --with-zephyr=${BUILDLINK_PREFIX.zephyr} -.else -CONFIGURE_ARGS+= --without-zephyr -.endif - -.if !empty(PKG_OPTIONS:Mbdb) -BDB_ACCEPTED= db4 db3 -. include "../../mk/bdb.buildlink3.mk" -CONFIGURE_ARGS+= --with-bdb=${BDB_TYPE} -CONFIGURE_ARGS+= --with-bdb-incdir=${BDBBASE}/include/${BDB_TYPE} -CONFIGURE_ARGS+= --with-bdb-libdir=${BDBBASE}/lib -.else -CONFIGURE_ARGS+= --without-bdb -.endif - -.if !empty(PKG_OPTIONS:Mmysql) -. include "../../mk/mysql.buildlink3.mk" -CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} -.else -CONFIGURE_ARGS+= --without-mysql -.endif - -.if !empty(PKG_OPTIONS:Mpgsql) -. include "../../mk/pgsql.buildlink3.mk" -CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} -.else -CONFIGURE_ARGS+= --without-pgsql -.endif - -.if !empty(PKG_OPTIONS:Msqlite) -. include "../../databases/sqlite3/buildlink3.mk" -CONFIGURE_ARGS+= --with-sqlite=${BUILDLINK_PREFIX.sqlite3} -.else -CONFIGURE_ARGS+= --without-sqlite -.endif +.include "options.mk" .if exists(/usr/bin/compile_et) COMERRBASE?= /usr diff --git a/wip/cyrus-imapd/PLIST b/wip/cyrus-imapd/PLIST index 4e9d45ff4844..ccf2eb2a04fc 100644 --- a/wip/cyrus-imapd/PLIST +++ b/wip/cyrus-imapd/PLIST @@ -43,9 +43,9 @@ cyrus/bin/notifyd cyrus/bin/pop3d cyrus/bin/pop3proxyd cyrus/bin/proxyd -${LDAP}cyrus/bin/ptdump -${LDAP}cyrus/bin/ptexpire -${LDAP}cyrus/bin/ptloader +${PLIST.ldap}cyrus/bin/ptdump +${PLIST.ldap}cyrus/bin/ptexpire +${PLIST.ldap}cyrus/bin/ptloader cyrus/bin/quota cyrus/bin/reconstruct cyrus/bin/rehash diff --git a/wip/cyrus-imapd/options.mk b/wip/cyrus-imapd/options.mk new file mode 100644 index 000000000000..7fce0eecacf3 --- /dev/null +++ b/wip/cyrus-imapd/options.mk @@ -0,0 +1,89 @@ +# $NetBSD$ +# + +PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd +PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4 ldap snmp +PKG_SUPPORTED_OPTIONS+= bdb mysql pgsql sqlite +PKG_SUGGESTED_OPTIONS= bdb + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= ldap + +.if !empty(PKG_OPTIONS:Mkerberos) +. if empty(PKG_OPTIONS:Mgssapi) +PKG_OPTIONS+= gssapi +. endif +.endif + +.if !empty(PKG_OPTIONS:Mkerberos4) +. if exists(/usr/include/kerberosIV/krb.h) +PKG_USE_KERBEROS= yes +CONFIGURE_ARGS+= --with-krb=/usr +. endif +.elif !empty(PKG_OPTIONS:Mgssapi) +. include "../../mk/krb5.buildlink3.mk" +CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} +GSSIMPL.heimdal= heimdal +GSSIMPL.mit-krb5= mit +CONFIGURE_ENV+= COMPILE_ET=${KRB5BASE}/bin/compile_et +COMERRBASE= ${KRB5BASE} +.else +CONFIGURE_ARGS+= --without-krb +CONFIGURE_ARGS+= --disable-gssapi +.endif + +.if !empty(PKG_OPTIONS:Mldap) +. include "../../databases/openldap-client/buildlink3.mk" +CONFIGURE_ARGS+= --with-ldap=${BUILDLINK_PREFIX.openldap-client} +PLIST.ldap= yes +.else +CONFIGURE_ARGS+= --without-ldap +.endif + +.if !empty(PKG_OPTIONS:Msnmp) +. include "../../net/net-snmp/buildlink3.mk" +CONFIGURE_ARGS+= --with-snmp=${BUILDLINK_PREFIX.net-snmp} +USE_TOOLS+= perl:run +.else +CONFIGURE_ARGS+= --without-snmp +.endif + +.if !empty(PKG_OPTIONS:Mzephyr) +. include "../../chat/zephyr/buildlink3.mk" +CONFIGURE_ARGS+= --with-zephyr=${BUILDLINK_PREFIX.zephyr} +.else +CONFIGURE_ARGS+= --without-zephyr +.endif + +.if !empty(PKG_OPTIONS:Mbdb) +BDB_ACCEPTED= db4 db3 +. include "../../mk/bdb.buildlink3.mk" +CONFIGURE_ARGS+= --with-bdb=${BDB_TYPE} +CONFIGURE_ARGS+= --with-bdb-incdir=${BDBBASE}/include/${BDB_TYPE} +CONFIGURE_ARGS+= --with-bdb-libdir=${BDBBASE}/lib +.else +CONFIGURE_ARGS+= --without-bdb +.endif + +.if !empty(PKG_OPTIONS:Mmysql) +. include "../../mk/mysql.buildlink3.mk" +CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} +.else +CONFIGURE_ARGS+= --without-mysql +.endif + +.if !empty(PKG_OPTIONS:Mpgsql) +. include "../../mk/pgsql.buildlink3.mk" +CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} +.else +CONFIGURE_ARGS+= --without-pgsql +.endif + +.if !empty(PKG_OPTIONS:Msqlite) +. include "../../databases/sqlite3/buildlink3.mk" +CONFIGURE_ARGS+= --with-sqlite=${BUILDLINK_PREFIX.sqlite3} +.else +CONFIGURE_ARGS+= --without-sqlite +.endif diff --git a/www/Makefile b/www/Makefile index b2973228c321..f4e4eeb1f983 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.679 2010/01/06 11:39:30 wiz Exp $ +# $NetBSD: Makefile,v 1.680 2010/01/16 10:53:54 abs Exp $ # COMMENT= Packages related to the World Wide Web @@ -441,6 +441,7 @@ SUBDIR+= py-beautifulsoup SUBDIR+= py-clearsilver SUBDIR+= py-curl SUBDIR+= py-django +SUBDIR+= py-django-registratio SUBDIR+= py-flup SUBDIR+= py-gdata SUBDIR+= py-genshi diff --git a/www/py-django-registration/DESCR b/www/py-django-registration/DESCR new file mode 100644 index 000000000000..f3b289f19825 --- /dev/null +++ b/www/py-django-registration/DESCR @@ -0,0 +1,8 @@ +django-registratio is a simple application which provides flexible +user registration for Django-based projects. The default setup +implements a fairly common workflow: + + 1. User signs up for account. + 2. User receives an email containing instructions for activating + the account. + 3. User activates and begins using the site. diff --git a/www/py-django-registration/Makefile b/www/py-django-registration/Makefile new file mode 100644 index 000000000000..9e341791d1ed --- /dev/null +++ b/www/py-django-registration/Makefile @@ -0,0 +1,24 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 10:53:26 abs Exp $ +# + +DISTNAME= django-registration-0.8-alpha-1 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S:-alpha-:a:} +CATEGORIES= www python +MASTER_SITES= http://bitbucket.org/ubernostrum/django-registration/downloads/ + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://bitbucket.org/ubernostrum/django-registration/wiki/Home +COMMENT= User-registration application for Django +LICENSE= modified-bsd + +DEPENDS+= ${PYPKGPREFIX}-django>=1:../../www/py-django + +PKG_DESTDIR_SUPPORT= user-destdir + +USE_PKGLOCALEDIR= yes +USE_LANGUAGES= # none + +PYDISTUTILSPKG= # yes + +.include "../../lang/python/extension.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/www/py-django-registration/PLIST b/www/py-django-registration/PLIST new file mode 100644 index 000000000000..b26d778bb93e --- /dev/null +++ b/www/py-django-registration/PLIST @@ -0,0 +1,101 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/16 10:53:26 abs Exp $ +lib/python2.6/site-packages/registration/__init__.py +lib/python2.6/site-packages/registration/__init__.pyc +lib/python2.6/site-packages/registration/__init__.pyo +lib/python2.6/site-packages/registration/admin.py +lib/python2.6/site-packages/registration/admin.pyc +lib/python2.6/site-packages/registration/admin.pyo +lib/python2.6/site-packages/registration/auth_urls.py +lib/python2.6/site-packages/registration/auth_urls.pyc +lib/python2.6/site-packages/registration/auth_urls.pyo +lib/python2.6/site-packages/registration/backends/__init__.py +lib/python2.6/site-packages/registration/backends/__init__.pyc +lib/python2.6/site-packages/registration/backends/__init__.pyo +lib/python2.6/site-packages/registration/backends/default/__init__.py +lib/python2.6/site-packages/registration/backends/default/__init__.pyc +lib/python2.6/site-packages/registration/backends/default/__init__.pyo +lib/python2.6/site-packages/registration/backends/default/urls.py +lib/python2.6/site-packages/registration/backends/default/urls.pyc +lib/python2.6/site-packages/registration/backends/default/urls.pyo +lib/python2.6/site-packages/registration/forms.py +lib/python2.6/site-packages/registration/forms.pyc +lib/python2.6/site-packages/registration/forms.pyo +lib/python2.6/site-packages/registration/locale/ar/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/ar/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/bg/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/bg/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/de/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/de/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/el/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/el/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/en/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/en/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/es/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/es/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/es_AR/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/es_AR/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/fr/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/fr/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/he/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/he/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/is/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/is/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/it/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/it/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/ja/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/ja/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/nl/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/nl/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/pl/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/pl/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/pt_BR/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/pt_BR/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/ru/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/ru/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/sr/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/sr/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/sv/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/sv/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/zh_CN/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/zh_CN/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/locale/zh_TW/LC_MESSAGES/django.mo +lib/python2.6/site-packages/registration/locale/zh_TW/LC_MESSAGES/django.po +lib/python2.6/site-packages/registration/management/__init__.py +lib/python2.6/site-packages/registration/management/__init__.pyc +lib/python2.6/site-packages/registration/management/__init__.pyo +lib/python2.6/site-packages/registration/management/commands/__init__.py +lib/python2.6/site-packages/registration/management/commands/__init__.pyc +lib/python2.6/site-packages/registration/management/commands/__init__.pyo +lib/python2.6/site-packages/registration/management/commands/cleanupregistration.py +lib/python2.6/site-packages/registration/management/commands/cleanupregistration.pyc +lib/python2.6/site-packages/registration/management/commands/cleanupregistration.pyo +lib/python2.6/site-packages/registration/models.py +lib/python2.6/site-packages/registration/models.pyc +lib/python2.6/site-packages/registration/models.pyo +lib/python2.6/site-packages/registration/signals.py +lib/python2.6/site-packages/registration/signals.pyc +lib/python2.6/site-packages/registration/signals.pyo +lib/python2.6/site-packages/registration/tests/__init__.py +lib/python2.6/site-packages/registration/tests/__init__.pyc +lib/python2.6/site-packages/registration/tests/__init__.pyo +lib/python2.6/site-packages/registration/tests/backends.py +lib/python2.6/site-packages/registration/tests/backends.pyc +lib/python2.6/site-packages/registration/tests/backends.pyo +lib/python2.6/site-packages/registration/tests/forms.py +lib/python2.6/site-packages/registration/tests/forms.pyc +lib/python2.6/site-packages/registration/tests/forms.pyo +lib/python2.6/site-packages/registration/tests/models.py +lib/python2.6/site-packages/registration/tests/models.pyc +lib/python2.6/site-packages/registration/tests/models.pyo +lib/python2.6/site-packages/registration/tests/urls.py +lib/python2.6/site-packages/registration/tests/urls.pyc +lib/python2.6/site-packages/registration/tests/urls.pyo +lib/python2.6/site-packages/registration/tests/views.py +lib/python2.6/site-packages/registration/tests/views.pyc +lib/python2.6/site-packages/registration/tests/views.pyo +lib/python2.6/site-packages/registration/urls.py +lib/python2.6/site-packages/registration/urls.pyc +lib/python2.6/site-packages/registration/urls.pyo +lib/python2.6/site-packages/registration/views.py +lib/python2.6/site-packages/registration/views.pyc +lib/python2.6/site-packages/registration/views.pyo diff --git a/www/py-django-registration/distinfo b/www/py-django-registration/distinfo new file mode 100644 index 000000000000..b186c4d48e0a --- /dev/null +++ b/www/py-django-registration/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/01/16 10:53:26 abs Exp $ + +SHA1 (django-registration-0.8-alpha-1.tar.gz) = fea9e444b1edfbb03c91a569f1813c713094d937 +RMD160 (django-registration-0.8-alpha-1.tar.gz) = ca7b5769de4a921a04e3e8974cb12f5199719040 +Size (django-registration-0.8-alpha-1.tar.gz) = 259745 bytes diff --git a/x11/Makefile b/x11/Makefile index 3d5aa58bcd00..040bd960c993 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.606 2009/12/14 00:49:30 snj Exp $ +# $NetBSD: Makefile,v 1.607 2010/01/16 11:44:37 sborrill Exp $ # COMMENT= Packages to support the X window system @@ -350,6 +350,7 @@ SUBDIR+= wmavgload SUBDIR+= wmfire SUBDIR+= wmfstatus SUBDIR+= wmweather +SUBDIR+= wmzcalock SUBDIR+= worker SUBDIR+= wterm SUBDIR+= wxGTK24 diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 479b8386f7dd..d62cc105d75e 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.94 2008/07/14 12:56:18 joerg Exp $ +# $NetBSD: Makefile,v 1.95 2010/01/16 09:15:25 adam Exp $ -DISTNAME= lesstif-0.95.0 -PKGREVISION= 1 +DISTNAME= lesstif-0.95.2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/} EXTRACT_SUFX= .tar.bz2 @@ -18,8 +17,11 @@ USE_LIBTOOL= yes USE_TOOLS+= gmake USE_X11BASE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose -CONFIGURE_ARGS+= --enable-editres --enable-xdnd +CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+= --disable-verbose +CONFIGURE_ARGS+= --enable-editres +CONFIGURE_ARGS+= --enable-production +CONFIGURE_ARGS+= --enable-xdnd # The following forces the build process to use sed as the HTML-to-text # converter. @@ -48,7 +50,6 @@ post-extract: # Change references to {Core,Object,Shell}.3 to X{Core,Object,Shell}.3 to # avoid manpage conflicts with other packages. -# post-patch: cd ${WRKSRC}/doc/lessdox/widgets; \ for name in Core Object Shell; do \ diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk index d3423eaf01ee..16f1fa60bd69 100644 --- a/x11/lesstif/buildlink3.mk +++ b/x11/lesstif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:25:43 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/01/16 09:15:25 adam Exp $ BUILDLINK_TREE+= lesstif @@ -12,7 +12,6 @@ BUILDLINK_PKGSRCDIR.lesstif?= ../../x11/lesstif .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" -.include "../../x11/printproto/buildlink3.mk" .endif # LESSTIF_BUILDLINK3_MK BUILDLINK_TREE+= -lesstif diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo index 3c8bf4d9d872..f2f724667d63 100644 --- a/x11/lesstif/distinfo +++ b/x11/lesstif/distinfo @@ -1,17 +1,14 @@ -$NetBSD: distinfo,v 1.16 2007/06/26 10:39:44 tnn Exp $ +$NetBSD: distinfo,v 1.17 2010/01/16 09:15:25 adam Exp $ -SHA1 (lesstif-0.95.0.tar.bz2) = 2a6f20d3bd525e6066ba2be22d8a47bf4bcd0425 -RMD160 (lesstif-0.95.0.tar.bz2) = 0384f87cd1a71e6aea04b1963d03b4664cb66b50 -Size (lesstif-0.95.0.tar.bz2) = 2459799 bytes -SHA1 (patch-aa) = a9748026f9645f346e2e0486cf975337a3bcabe4 -SHA1 (patch-ab) = 8839488b15ae6a01bb4d6af46e386e894eb2cddf -SHA1 (patch-ac) = 0e7bd9c469d98ea6a4257e734f69e321f8fee442 -SHA1 (patch-am) = 67d89893e806032c23301e6bcbd48bc99d0dd216 -SHA1 (patch-an) = db515a483519f321bbeaec384a1ccd7ed0eb503c -SHA1 (patch-ao) = 43ce04cc679d5181b03ca974edcb6a273370cf46 -SHA1 (patch-ap) = 809d82f12de219eaa7ce174f6b14d4110228f888 -SHA1 (patch-aq) = ccd7a53fed86e07f205d9937f408bd266c70ef3d -SHA1 (patch-ar) = 2b0a55cece6927fd4fcf4347db18ae4625383601 -SHA1 (patch-bm) = f58cd23cb8d93027bbf105ff1bf186ff82313d9e -SHA1 (patch-bn) = 5d16046510d23eb696575c9f9100ef15ea909831 -SHA1 (patch-bo) = 39ca358d90b288b44dd223211feb3d8d477efe82 +SHA1 (lesstif-0.95.2.tar.bz2) = b894e544d529a235a6a665d48ca94a465f44a4e5 +RMD160 (lesstif-0.95.2.tar.bz2) = 643fd81b70b6e8617803ddc4350272ca89b4a71f +Size (lesstif-0.95.2.tar.bz2) = 2481073 bytes +SHA1 (patch-aa) = da781d4ef3c552275848241e538ea452a6c16232 +SHA1 (patch-am) = 52c2a8a84436b0e7c5449b90813deb498a98cc50 +SHA1 (patch-an) = 6eef204e655613bb658aa32b6c2f2954e6f39250 +SHA1 (patch-ao) = ee1f3742804f41b592c7f3921f2353bb3c412393 +SHA1 (patch-ap) = c5b525a8661c4b7541a1f7a1c6ff12c6456103c0 +SHA1 (patch-aq) = a238d0be4d69d16e964651a112c4fcf421b06f2a +SHA1 (patch-ar) = e4aefbc8c31bece408185d6bd9266f11d6852f7c +SHA1 (patch-bm) = b32febe539b375a0ea8adfddeec01588927f9046 +SHA1 (patch-bn) = f96d95358a76db1a371bfc3ea7a3ba6b9d1d536f diff --git a/x11/lesstif/patches/patch-aa b/x11/lesstif/patches/patch-aa index 56ebb60d0a7b..a8645794b6e4 100644 --- a/x11/lesstif/patches/patch-aa +++ b/x11/lesstif/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.25 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-aa,v 1.26 2010/01/16 09:15:25 adam Exp $ ---- Makefile.in.orig 2005-03-31 19:45:07.000000000 +0000 +--- Makefile.in.orig 2009-05-27 14:08:14.000000000 +0000 +++ Makefile.in -@@ -282,7 +282,7 @@ DIST_SUBDIRS = scripts include lib clien +@@ -290,7 +290,7 @@ DIST_SUBDIRS = scripts include lib clien # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # diff --git a/x11/lesstif/patches/patch-ab b/x11/lesstif/patches/patch-ab deleted file mode 100644 index a3c90c925a55..000000000000 --- a/x11/lesstif/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.16 2005/03/10 16:07:27 wiz Exp $ - ---- lib/Xm-2.1/Xpmcreate.c.orig 2004-11-18 22:00:58.000000000 +0100 -+++ lib/Xm-2.1/Xpmcreate.c -@@ -1265,10 +1265,10 @@ PutImagePixels(image, width, height, pix - register char *src; - register char *dst; - register unsigned int *iptr; -- register unsigned int x, y, i; -+ register unsigned int x, y; - register char *data; - Pixel pixel, px; -- int nbytes, depth, ibu, ibpp; -+ int nbytes, depth, ibu, ibpp, i; - - data = image->data; - iptr = pixelindex; diff --git a/x11/lesstif/patches/patch-ac b/x11/lesstif/patches/patch-ac deleted file mode 100644 index 4bc70fd42cc3..000000000000 --- a/x11/lesstif/patches/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ac,v 1.17 2005/03/10 16:07:27 wiz Exp $ - ---- lib/Xm-2.1/Xpmscan.c.orig 2004-11-18 22:00:59.000000000 +0100 -+++ lib/Xm-2.1/Xpmscan.c -@@ -672,8 +672,8 @@ GetImagePixels(image, width, height, pma - char *dst; - unsigned int *iptr; - char *data; -- unsigned int x, y, i; -- int bits, depth, ibu, ibpp, offset; -+ unsigned int x, y; -+ int bits, depth, ibu, ibpp, offset, i; - unsigned long lbt; - Pixel pixel, px; - -@@ -684,6 +684,9 @@ GetImagePixels(image, width, height, pma - ibpp = image->bits_per_pixel; - offset = image->xoffset; - -+ if (image->bitmap_unit < 0) -+ return (XpmNoMemory); -+ - if ((image->bits_per_pixel | image->depth) == 1) { - ibu = image->bitmap_unit; - for (y = 0; y < height; y++) diff --git a/x11/lesstif/patches/patch-am b/x11/lesstif/patches/patch-am index 2fc4c0ad95a2..9ef3f4149825 100644 --- a/x11/lesstif/patches/patch-am +++ b/x11/lesstif/patches/patch-am @@ -1,13 +1,13 @@ -$NetBSD: patch-am,v 1.15 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-am,v 1.16 2010/01/16 09:15:25 adam Exp $ ---- doc/Makefile.in.orig 2005-03-31 19:44:56.000000000 +0000 +--- doc/Makefile.in.orig 2009-05-27 14:08:04.000000000 +0000 +++ doc/Makefile.in -@@ -259,7 +259,7 @@ EXTRA_DIST = $(DATA) +@@ -267,7 +267,7 @@ EXTRA_DIST = $(DATA) # InsideLessTif/ shouldn't be touched: # it has a stand-alone Makefile w/o auto* stuff SUBDIRS = www.lesstif.org lessdox -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc doc_DATA = All.html Clipboard.txt DragAndDrop.txt Form.txt \ GeoUtils.txt Geometry.html SyntheticResources.txt \ + UIL.txt XmStrings.txt thread.html diff --git a/x11/lesstif/patches/patch-an b/x11/lesstif/patches/patch-an index 79db9a1378d0..2bda458450ed 100644 --- a/x11/lesstif/patches/patch-an +++ b/x11/lesstif/patches/patch-an @@ -1,13 +1,13 @@ -$NetBSD: patch-an,v 1.18 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-an,v 1.19 2010/01/16 09:15:25 adam Exp $ ---- doc/lessdox/clients/Makefile.in.orig 2005-03-31 19:44:57.000000000 +0000 +--- doc/lessdox/clients/Makefile.in.orig 2009-05-27 14:08:04.000000000 +0000 +++ doc/lessdox/clients/Makefile.in -@@ -257,7 +257,7 @@ manfivedir = @mandir@/man5 +@@ -265,7 +265,7 @@ manfivedir = @mandir@/man5 manone_DATA = mwm.1 xmbind.1 lesstif.1 uil.1 ltversion.1 manthree_DATA = manfive_DATA = mwmrc.5 VirtualBindings.5 -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc - htmldir = $(docdir)/html html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html uil.html \ + VirtualBindings.html + diff --git a/x11/lesstif/patches/patch-ao b/x11/lesstif/patches/patch-ao index 28d80f3f5a93..70fb57afd003 100644 --- a/x11/lesstif/patches/patch-ao +++ b/x11/lesstif/patches/patch-ao @@ -1,13 +1,13 @@ -$NetBSD: patch-ao,v 1.15 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-ao,v 1.16 2010/01/16 09:15:25 adam Exp $ ---- doc/lessdox/functions/Makefile.in.orig 2005-03-31 19:44:58.000000000 +0000 +--- doc/lessdox/functions/Makefile.in.orig 2009-05-27 14:08:05.000000000 +0000 +++ doc/lessdox/functions/Makefile.in -@@ -257,7 +257,7 @@ manfivedir = @mandir@/man5 +@@ -265,7 +265,7 @@ manfivedir = @mandir@/man5 manone_DATA = manthree_DATA = manfive_DATA = -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc - htmldir = $(docdir)/html html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \ + ${manfive_DATA:.5=.html} + diff --git a/x11/lesstif/patches/patch-ap b/x11/lesstif/patches/patch-ap index 9220c5b7371d..7c76e8d8a697 100644 --- a/x11/lesstif/patches/patch-ap +++ b/x11/lesstif/patches/patch-ap @@ -1,13 +1,13 @@ -$NetBSD: patch-ap,v 1.14 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-ap,v 1.15 2010/01/16 09:15:25 adam Exp $ ---- doc/lessdox/widgets/Makefile.in.orig 2005-03-31 19:44:59.000000000 +0000 +--- doc/lessdox/widgets/Makefile.in.orig 2009-05-27 14:08:05.000000000 +0000 +++ doc/lessdox/widgets/Makefile.in -@@ -282,7 +282,7 @@ manthree_DATA = \ +@@ -290,7 +290,7 @@ manthree_DATA = \ Rect.3 UnNamedObj.3 Constraint.3 VendorShell.3 manfive_DATA = -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc - htmldir = $(docdir)/html html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \ + ${manfive_DATA:.5=.html} + diff --git a/x11/lesstif/patches/patch-aq b/x11/lesstif/patches/patch-aq index e5bf868b57fe..46a16d7308cf 100644 --- a/x11/lesstif/patches/patch-aq +++ b/x11/lesstif/patches/patch-aq @@ -1,13 +1,13 @@ -$NetBSD: patch-aq,v 1.17 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-aq,v 1.18 2010/01/16 09:15:25 adam Exp $ ---- doc/www.lesstif.org/Makefile.in.orig 2005-03-31 19:44:59.000000000 +0000 +--- doc/www.lesstif.org/Makefile.in.orig 2009-05-27 14:08:05.000000000 +0000 +++ doc/www.lesstif.org/Makefile.in -@@ -263,7 +263,7 @@ SUBDIRS = images +@@ -271,7 +271,7 @@ SUBDIRS = images # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc doc_DATA = \ Advocacy.html contents.html misc_frame.html \ + BUG-HUNTING.html core.html news.html \ diff --git a/x11/lesstif/patches/patch-ar b/x11/lesstif/patches/patch-ar index c97891ed4cd5..026eda4d44df 100644 --- a/x11/lesstif/patches/patch-ar +++ b/x11/lesstif/patches/patch-ar @@ -1,13 +1,13 @@ -$NetBSD: patch-ar,v 1.13 2005/06/30 15:28:45 adam Exp $ +$NetBSD: patch-ar,v 1.14 2010/01/16 09:15:25 adam Exp $ ---- doc/www.lesstif.org/images/Makefile.in.orig 2005-03-31 19:44:59.000000000 +0000 +--- doc/www.lesstif.org/images/Makefile.in.orig 2009-05-27 14:08:06.000000000 +0000 +++ doc/www.lesstif.org/images/Makefile.in -@@ -253,7 +253,7 @@ EXTRA_DIST = $(DATA) +@@ -261,7 +261,7 @@ EXTRA_DIST = $(DATA) # Lets put the informational stuff in a sub directory to avoid # polluting /usr/local for default installs. # -rootdir = $(prefix)/LessTif +rootdir = $(prefix)/share/lesstif - docdir = $(rootdir)/doc imagesdir = $(docdir)/images images_DATA = hungry.png \ + lesstif-realsmall.png lesstif-small.png lesstif.png \ diff --git a/x11/lesstif/patches/patch-bm b/x11/lesstif/patches/patch-bm index e9877b0b31cd..680c03866846 100644 --- a/x11/lesstif/patches/patch-bm +++ b/x11/lesstif/patches/patch-bm @@ -1,8 +1,8 @@ -$NetBSD: patch-bm,v 1.7 2004/09/28 12:52:14 adam Exp $ +$NetBSD: patch-bm,v 1.8 2010/01/16 09:15:25 adam Exp $ ---- lib/config/Makefile.in.orig 2004-09-26 14:15:06.000000000 +0000 +--- lib/config/Makefile.in.orig 2009-05-27 14:08:11.000000000 +0000 +++ lib/config/Makefile.in -@@ -251,11 +251,11 @@ xmVer = @xmVer@ +@@ -259,11 +259,11 @@ xmVer = @xmVer@ # MAINTAINERCLEANFILES = Makefile.in bin_SCRIPTS = mxmkmf diff --git a/x11/lesstif/patches/patch-bn b/x11/lesstif/patches/patch-bn index 6e64e7d866f7..965168cb5b30 100644 --- a/x11/lesstif/patches/patch-bn +++ b/x11/lesstif/patches/patch-bn @@ -1,8 +1,8 @@ -$NetBSD: patch-bn,v 1.6 2004/09/28 12:52:14 adam Exp $ +$NetBSD: patch-bn,v 1.7 2010/01/16 09:15:25 adam Exp $ ---- scripts/autoconf/Makefile.in.orig 2004-09-26 14:15:08.000000000 +0000 +--- scripts/autoconf/Makefile.in.orig 2009-05-27 14:08:13.000000000 +0000 +++ scripts/autoconf/Makefile.in -@@ -246,8 +246,8 @@ xmVer = @xmVer@ +@@ -254,8 +254,8 @@ xmVer = @xmVer@ # MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = ac_find_motif.m4 diff --git a/x11/lesstif/patches/patch-bo b/x11/lesstif/patches/patch-bo deleted file mode 100644 index 8858d3ed4e9e..000000000000 --- a/x11/lesstif/patches/patch-bo +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bo,v 1.1 2007/06/26 10:39:44 tnn Exp $ - ---- include/Motif-2.1/Xm/VendorSP.h.orig 2004-08-28 21:23:27.000000000 +0200 -+++ include/Motif-2.1/Xm/VendorSP.h -@@ -28,12 +28,13 @@ - - #include - #include --#include - - #ifdef __cplusplus - extern "C" { - #endif - -+#include -+ - XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources, - Cardinal numResources, - WidgetClass filterClass, diff --git a/x11/wmzcalock/DESCR b/x11/wmzcalock/DESCR new file mode 100644 index 000000000000..47b06b1775a5 --- /dev/null +++ b/x11/wmzcalock/DESCR @@ -0,0 +1,2 @@ +A calendar/clock dock app with a variety of display modes for Window Maker +and other window managers that support dockapps. diff --git a/x11/wmzcalock/Makefile b/x11/wmzcalock/Makefile new file mode 100644 index 000000000000..3bc587452ebc --- /dev/null +++ b/x11/wmzcalock/Makefile @@ -0,0 +1,34 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 11:43:28 sborrill Exp $ +# + +DISTNAME= wmzcalock-0.1 +CATEGORIES= x11 +MASTER_SITES= http://zapatopi.net/zapatoware/ + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://zapatopi.net/zapatoware/wmzcalock.html +COMMENT= Dockapp calendar clock +LICENSE= gnu-gpl-v2 + +EXTRACT_SUFX= .tgz + +PKG_DESTDIR_SUPPORT= user-destdir + +USE_TOOLS+= pax +INSTALLATION_DIRS= share/wmzcalock/theme + +.include "../../mk/bsd.prefs.mk" + +do-build: + cd ${WRKSRC} && ${CC} -c ${CFLAGS} wmzcalock.c && \ + ${CC} -o wmzcalock wmzcalock.o -lc ${LIBS} ${X11_LDFLAGS} \ + -lX11 -lXext -lm -lXpm + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC:Q}/wmzcalock ${DESTDIR}${PREFIX:Q}/bin + cd ${WRKSRC}/theme; ${PAX} -rw . \ + ${DESTDIR}${PREFIX}/share/wmzcalock/theme + +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/x11/wmzcalock/PLIST b/x11/wmzcalock/PLIST new file mode 100644 index 000000000000..74f2859562c8 --- /dev/null +++ b/x11/wmzcalock/PLIST @@ -0,0 +1,18 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/01/16 11:43:28 sborrill Exp $ +bin/wmzcalock +share/wmzcalock/theme/mday.charterblack.xpm +share/wmzcalock/theme/mday.charterbold.xpm +share/wmzcalock/theme/mday.comic.xpm +share/wmzcalock/theme/mday.eras.xpm +share/wmzcalock/theme/mday.georgia.xpm +share/wmzcalock/theme/mday.iceage.xpm +share/wmzcalock/theme/mday.ocr.xpm +share/wmzcalock/theme/mday.papyrus.xpm +share/wmzcalock/theme/mday.utopia.xpm +share/wmzcalock/theme/mdaynums.xcf +share/wmzcalock/theme/wday.charter.xpm +share/wmzcalock/theme/wday.comic.xpm +share/wmzcalock/theme/wday.georgia.xpm +share/wmzcalock/theme/wday.lcd.xpm +share/wmzcalock/theme/wday.papyrus.xpm +share/wmzcalock/theme/wdaytxts.xcf diff --git a/x11/wmzcalock/distinfo b/x11/wmzcalock/distinfo new file mode 100644 index 000000000000..a8011cbe86ef --- /dev/null +++ b/x11/wmzcalock/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/01/16 11:43:28 sborrill Exp $ + +SHA1 (wmzcalock-0.1.tgz) = e18a377464f688140c0388cf7dd29c96ecb27233 +RMD160 (wmzcalock-0.1.tgz) = 902383d9046fe38932ed0e700d678cd5e5e82ed2 +Size (wmzcalock-0.1.tgz) = 47451 bytes +SHA1 (patch-wmzcalock.c) = 55b316964a342248cfa70cf680e61129892303f7 diff --git a/x11/wmzcalock/patches/patch-wmzcalock.c b/x11/wmzcalock/patches/patch-wmzcalock.c new file mode 100644 index 000000000000..88676a383099 --- /dev/null +++ b/x11/wmzcalock/patches/patch-wmzcalock.c @@ -0,0 +1,22 @@ +$NetBSD: patch-wmzcalock.c,v 1.1.1.1 2010/01/16 11:43:28 sborrill Exp $ + +--- wmzcalock.c.orig 2000-07-11 18:11:00.000000000 +0100 ++++ wmzcalock.c 2010-01-14 16:24:40.000000000 +0000 +@@ -645,7 +645,7 @@ + { + gettimeofday(&timeV, NULL); + dday = ((float)hour/24)+((float)min/1440)+ +- ((float)sec/86400)+((float)timeV.tv_usec/86400000000); ++ ((float)sec/86400); + } + + switch (tmmode) +@@ -803,7 +803,7 @@ + { + fprintf(stderr, + "Warning: Couldn't open file '%s', using font instead\n",pixmap_file); +- (int *)the_pixmap = NULL; ++ the_pixmap = (Pixmap)NULL; + } + else + { diff --git a/x11/xf86-video-vmware/Makefile b/x11/xf86-video-vmware/Makefile index 4c4559c80a4f..2ad30a1d3dd8 100644 --- a/x11/xf86-video-vmware/Makefile +++ b/x11/xf86-video-vmware/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2009/08/09 23:01:37 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/01/16 11:25:26 obache Exp $ # -DISTNAME= xf86-video-vmware-10.16.7 +DISTNAME= xf86-video-vmware-10.16.9 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xf86-video-vmware/distinfo b/x11/xf86-video-vmware/distinfo index 90eb1346f1d6..1b3f629d8111 100644 --- a/x11/xf86-video-vmware/distinfo +++ b/x11/xf86-video-vmware/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2009/08/09 23:01:37 wiz Exp $ +$NetBSD: distinfo,v 1.7 2010/01/16 11:25:26 obache Exp $ -SHA1 (xf86-video-vmware-10.16.7.tar.bz2) = 4f3b4942af38e939a4761f1cafca2c2fd6305816 -RMD160 (xf86-video-vmware-10.16.7.tar.bz2) = a865c315bfdd18e3084064db100020399141a6be -Size (xf86-video-vmware-10.16.7.tar.bz2) = 279153 bytes +SHA1 (xf86-video-vmware-10.16.9.tar.bz2) = 4e0e5d193f3e83dce46a7d39d52257629e51f4d3 +RMD160 (xf86-video-vmware-10.16.9.tar.bz2) = ab9f23a98a6624afe930d5e04a98529ffd345bd8 +Size (xf86-video-vmware-10.16.9.tar.bz2) = 275787 bytes