From 65220f2154c120394d29f7e4573b9926b5588a9c Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Thu, 21 Jun 2012 07:16:47 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- devel/equeue/Makefile | 4 ++-- devel/p5-VCP/Makefile | 3 ++- devel/p5-VCP/distinfo | 3 ++- devel/p5-VCP/patches/patch-Makefile.PL | 18 ++++++++++++++++++ doc/CHANGES-2012 | 3 ++- doc/TODO | 3 +-- misc/epm/Makefile | 3 ++- multimedia/dvb-apps/Makefile | 6 +++++- net/arla/Makefile | 5 ++++- print/tcl-pdflib/Makefile | 4 +++- security/opendnssec/Makefile | 5 ++--- security/opendnssec/distinfo | 8 ++++---- www/ap-rpaf/Makefile | 5 ++++- www/ap-scgi/Makefile | 6 +++++- 14 files changed, 56 insertions(+), 20 deletions(-) create mode 100644 devel/p5-VCP/patches/patch-Makefile.PL diff --git a/devel/equeue/Makefile b/devel/equeue/Makefile index 24ad011cd04..f297f12d304 100644 --- a/devel/equeue/Makefile +++ b/devel/equeue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/03/04 09:49:04 asau Exp $ +# $NetBSD: Makefile,v 1.7 2012/06/02 19:28:05 dholland Exp $ DISTNAME= equeue-2.1.4 CATEGORIES= devel @@ -18,7 +18,7 @@ HAS_CONFIGURE= yes USE_TOOLS+= gmake BUILD_TARGET= all opt PLIST_SRC= PLIST.opt PLIST -BUILD_ENV+= PACKAGES= +MAKE_ENV+= PACKAGES= INSTALLATION_DIRS+= lib/ocaml/site-lib diff --git a/devel/p5-VCP/Makefile b/devel/p5-VCP/Makefile index 1c1b2e96a2d..e7a40157557 100644 --- a/devel/p5-VCP/Makefile +++ b/devel/p5-VCP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/08/14 12:26:48 obache Exp $ +# $NetBSD: Makefile,v 1.8 2012/01/03 01:06:29 dholland Exp $ DISTNAME= VCP-autrijus-snapshot-0.9-${SNAPSHOT_VERS} SNAPSHOT_VERS= 20050110 @@ -11,6 +11,7 @@ AUTHOR_DIR= authors/id/A/AU/AUTRIJUS MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Versioned Copy, copying hierarchies of versioned files +LICENSE= modified-bsd PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/p5-VCP/distinfo b/devel/p5-VCP/distinfo index 5040f742eed..f4cfe0a6f3e 100644 --- a/devel/p5-VCP/distinfo +++ b/devel/p5-VCP/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2005/02/23 22:24:25 agc Exp $ +$NetBSD: distinfo,v 1.1.1.1 2006/05/02 01:53:35 jlam Exp $ SHA1 (VCP-autrijus-snapshot-0.9-20050110.tar.gz) = ecbf8322e17fb5b4ee236b1de0d0116602cfd0a1 RMD160 (VCP-autrijus-snapshot-0.9-20050110.tar.gz) = c88ac4470bc5a711b01755d0a5ee62b1d162353f Size (VCP-autrijus-snapshot-0.9-20050110.tar.gz) = 318457 bytes +SHA1 (patch-Makefile.PL) = 503d8b95f07d83bb4d12b1c3c3a5bd86d2595a84 diff --git a/devel/p5-VCP/patches/patch-Makefile.PL b/devel/p5-VCP/patches/patch-Makefile.PL new file mode 100644 index 00000000000..979c13673fe --- /dev/null +++ b/devel/p5-VCP/patches/patch-Makefile.PL @@ -0,0 +1,18 @@ +$NetBSD$ + +* This patch to p5-VCP-autrijus disables the unneccessary + run of bin/gentrevml before "make", because it is time + consuming and is not used at all. + (taken from FreeBSD ports/devel/p5-VCP-autrijus) + +--- Makefile.PL.orig 2005-01-10 12:39:47.000000000 +0000 ++++ Makefile.PL +@@ -212,7 +212,7 @@ sub MY::postamble { + my $self = shift ; + return join( + "", +- "\npure_all :: $io_test_files\n", ++ "\n#pure_all :: $io_test_files\n", + map( + "\n$_ : bin/gentrevml\n$io_scheme_revmls{$_}", + sort keys %io_scheme_revmls diff --git a/doc/CHANGES-2012 b/doc/CHANGES-2012 index 64f3f65c91d..c7e9faf5bc8 100644 --- a/doc/CHANGES-2012 +++ b/doc/CHANGES-2012 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2012,v 1.2032 2012/06/20 21:07:24 wiz Exp $ +$NetBSD: CHANGES-2012,v 1.2033 2012/06/20 23:27:45 wiz Exp $ ***************************************************************************** PLEASE NOTE THAT PKGSRC IS NOW IN A FREEZE FOR INFRASTRUCTURE CHANGES AND @@ -3197,3 +3197,4 @@ Changes to the packages collection and infrastructure in 2012: Updated sysutils/xenkernel41 to 4.1.2nb2 [bouyer 2012-06-12] Updated graphics/tiff to 4.0.2 [wiz 2012-06-20] Updated textproc/mdoclint to 1.16 [wiz 2012-06-20] + Updated security/opendnssec to 1.3.9 [pettai 2012-06-21] diff --git a/doc/TODO b/doc/TODO index 3829e3b4477..43226de62bd 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.11304 2012/06/19 11:55:35 wiz Exp $ +$NetBSD: TODO,v 1.11305 2012/06/20 21:07:24 wiz Exp $ Suggested new packages ====================== @@ -958,7 +958,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o open-vm-tools-2010.09.19.301124 o openafs-1.7.2 o opendkim-2.6.0 - o opendnssec-1.3.9 o opengrok-0.11.1 o openh323-1.19.1 o openldap-client-2.4.31 diff --git a/misc/epm/Makefile b/misc/epm/Makefile index ce771e69d1b..edd85009355 100644 --- a/misc/epm/Makefile +++ b/misc/epm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/10/09 10:02:46 cheusov Exp $ +# $NetBSD: Makefile,v 1.3 2012/01/21 14:04:33 cheusov Exp $ # DISTNAME= epm-4.2-source @@ -15,6 +15,7 @@ COMMENT= ESP generates software packages from a list of files LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir +MAKE_JOBS_SAFE= no USE_TOOLS+= autoconf gzip:run tar:run diff --git a/multimedia/dvb-apps/Makefile b/multimedia/dvb-apps/Makefile index efeabd0eaff..8b7bf1836b9 100644 --- a/multimedia/dvb-apps/Makefile +++ b/multimedia/dvb-apps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2011/07/13 23:42:16 jmcneill Exp $ +# $NetBSD: Makefile,v 1.2 2011/07/15 22:59:20 jmcneill Exp $ # PKGNAME= dvb-apps-20110713 @@ -14,6 +14,10 @@ COMMENT= Digital Video Broadcasting (DVB) applications PKG_DESTDIR_SUPPORT= user-destdir +# netbsd-5 does not have dev/dtv/dtvio.h or its associated functionality. +# (allow 5.99.* as relatively recent 5.99 may still be in use and should work) +NOT_FOR_PLATFORM+= NetBSD-5.[0-8]* + USE_TOOLS+= gmake perl WRKSRC= ${WRKDIR}/dvb-apps-148ede2a6809 diff --git a/net/arla/Makefile b/net/arla/Makefile index a54bc2708bc..81a30749e6e 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2008/11/10 17:21:37 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2009/08/25 12:32:55 wiz Exp $ DISTNAME= arla-0.43 PKGREVISION= 2 @@ -15,6 +15,9 @@ CONFLICTS+= openafs-[0-9]* CONFLICTS+= rx-[0-9]* CONFLICTS+= kth-krb4-[0-9]* +# use net/openafs on netbsd 5+ +NOT_FOR_PLATFORM+= NetBSD-[5-9]* + OSVERSION_SPECIFIC= yes INFO_FILES= yes diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile index f45648ae2b3..2402eb7f5e9 100644 --- a/print/tcl-pdflib/Makefile +++ b/print/tcl-pdflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2011/01/13 13:39:15 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2012/02/06 12:41:24 wiz Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -8,6 +8,8 @@ PKGNAME= tcl-pdflib-${PDFLIB_BASE_VERS} PKGREVISION= 12 COMMENT= Tcl interface to PDFlib for generating PDF files +MAKE_JOBS_SAFE= no + BUILDLINK_API_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS} CONFIGURE_ARGS+= --with-tcl=${TCLSH:Q} diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile index 008ce0ec4d8..c23ed16787e 100644 --- a/security/opendnssec/Makefile +++ b/security/opendnssec/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2012/05/23 10:09:21 pettai Exp $ +# $NetBSD: Makefile,v 1.23 2012/06/14 07:45:29 sbd Exp $ # -DISTNAME= opendnssec-1.3.8 -PKGREVISION= 1 +DISTNAME= opendnssec-1.3.9 CATEGORIES= security net MASTER_SITES= http://www.opendnssec.org/files/source/ diff --git a/security/opendnssec/distinfo b/security/opendnssec/distinfo index adc92f881b9..3b0c97696ee 100644 --- a/security/opendnssec/distinfo +++ b/security/opendnssec/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.13 2012/03/18 17:38:46 pettai Exp $ +$NetBSD: distinfo,v 1.14 2012/05/23 10:09:21 pettai Exp $ -SHA1 (opendnssec-1.3.8.tar.gz) = fb6f60efadbe1cd4aa34dce0b00d732f40ef6fdc -RMD160 (opendnssec-1.3.8.tar.gz) = 3acc493c65febf042c3ac58104c3a35efdffd4e4 -Size (opendnssec-1.3.8.tar.gz) = 1152294 bytes +SHA1 (opendnssec-1.3.9.tar.gz) = ca1f9156c30a4eb4fa1dd2b272b0cca6e89e47b6 +RMD160 (opendnssec-1.3.9.tar.gz) = a4e1d31f55b2b45c3ce45b83d23e9990c954b97f +Size (opendnssec-1.3.9.tar.gz) = 1153929 bytes SHA1 (patch-aa) = 84fe2562e845d733a3f9152b383d2c2fac81e98f diff --git a/www/ap-rpaf/Makefile b/www/ap-rpaf/Makefile index d1a06e711a3..205e58a03db 100644 --- a/www/ap-rpaf/Makefile +++ b/www/ap-rpaf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2007/03/19 16:35:51 tv Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/20 14:58:45 joerg Exp $ # DISTNAME= mod_rpaf-0.5 @@ -17,6 +17,9 @@ CONFLICTS= ap-rpaf-[0-9]* APACHE_MODULE= yes INSTALLATION_DIRS= share/doc +# does not compile with apache24 +PKG_APACHE_ACCEPTED= apache13 apache2 apache22 + .include "../../mk/apache.mk" APACHE_MODULE_NAME= mod_rpaf.${MODULE_EXT} diff --git a/www/ap-scgi/Makefile b/www/ap-scgi/Makefile index 583d24a3067..1fd5a61bffc 100644 --- a/www/ap-scgi/Makefile +++ b/www/ap-scgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/02/20 14:58:45 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2012/03/15 11:53:42 obache Exp $ # PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME} @@ -11,6 +11,10 @@ COMMENT= Simple Common Gateway Interface for Apache DEPENDS+= ${PYPKGPREFIX}-scgi-[0-9]*:../../www/py-scgi APACHE_MODULE= yes + +# does not compile with apache24 +PKG_APACHE_ACCEPTED= apache13 apache2 apache22 + .include "../../mk/apache.mk" .include "../../www/apache/module.mk" -- 2.41.0