Wed Apr 30 12:28:17 2008 UTC ()
pullup ticket #2357 - requested by cube
rt: fix up dependencies

revisions pulled up:
- pkgsrc/devel/rt3/Makefile	1.31

   Module Name:	pkgsrc
   Committed By:	cube
   Date:		Wed Apr 30 10:13:37 UTC 2008

   Modified Files:
   	pkgsrc/devel/rt3: Makefile

   Log Message:
   Make dependencies match reality (notably for the minimal version of
   critical packages such as DBIx::SearchBuilder), including removing no
   longer needed ones.

   Bump PKGREVISION.


(rtr)
diff -r1.29 -r1.29.2.1 pkgsrc/devel/rt3/Makefile
cvs diff -r1.29 -r1.29.2.1 pkgsrc/devel/rt3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/rt3/Attic/Makefile 2008/03/24 21:55:36 1.29
+++ pkgsrc/devel/rt3/Attic/Makefile 2008/04/30 12:28:17 1.29.2.1
@@ -1,75 +1,72 @@ @@ -1,75 +1,72 @@
1# $NetBSD: Makefile,v 1.29 2008/03/24 21:55:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.29.2.1 2008/04/30 12:28:17 rtr Exp $
2 2
3DISTNAME= rt-3.6.6 3DISTNAME= rt-3.6.6
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ 6MASTER_SITES= http://download.bestpractical.com/pub/rt/release/
7 7
8MAINTAINER= cube@NetBSD.org 8MAINTAINER= cube@NetBSD.org
9HOMEPAGE= http://bestpractical.com/rt/ 9HOMEPAGE= http://bestpractical.com/rt/
10COMMENT= Industrial-grade ticketing system 10COMMENT= Industrial-grade ticketing system
11 11
12.include "options.mk" 12.include "options.mk"
13 13
14USE_TOOLS+= perl:run 14USE_TOOLS+= perl:run
15 15
16# Core dependencies: 16# Core dependencies:
17DEPENDS+= p5-Digest-[0-9]*:../../security/p5-Digest 17DEPENDS+= p5-Digest-[0-9]*:../../security/p5-Digest
18DEPENDS+= p5-Digest-MD5>=2.27:../../security/p5-Digest-MD5 18DEPENDS+= p5-Digest-MD5>=2.27:../../security/p5-Digest-MD5
19DEPENDS+= p5-DBI>=1.37:../../databases/p5-DBI 19DEPENDS+= p5-DBI>=1.37:../../databases/p5-DBI
20DEPENDS+= p5-Test-Inline>=0.15:../../devel/p5-Test-Inline 
21DEPENDS+= p5-Class-ReturnValue>=0.40:../../devel/p5-Class-ReturnValue 20DEPENDS+= p5-Class-ReturnValue>=0.40:../../devel/p5-Class-ReturnValue
22DEPENDS+= p5-DBIx-SearchBuilder>=1.35:../../databases/p5-DBIx-SearchBuilder 21DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 22DEPENDS+= p5-DBIx-SearchBuilder>=1.50:../../databases/p5-DBIx-SearchBuilder
23DEPENDS+= p5-Text-Template>=1.43:../../textproc/p5-Text-Template 23DEPENDS+= p5-Text-Template>=1.43:../../textproc/p5-Text-Template
24DEPENDS+= p5-HTML-Parser>=3.35:../../www/p5-HTML-Parser 24DEPENDS+= p5-HTML-Parser>=3.35:../../www/p5-HTML-Parser
25DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber 25DEPENDS+= p5-HTML-Scrubber>=0.08:../../www/p5-HTML-Scrubber
26DEPENDS+= p5-Net>=1.15:../../net/p5-Net 
27DEPENDS+= p5-Log-Dispatch>=2.0:../../devel/p5-Log-Dispatch 26DEPENDS+= p5-Log-Dispatch>=2.0:../../devel/p5-Log-Dispatch
 27DEPENDS+= p5-Locale-Maketext>=1.06:../../misc/p5-Locale-Maketext
28DEPENDS+= p5-Locale-Maketext-Lexicon>=0.32:../../misc/p5-Locale-Maketext-Lexicon 28DEPENDS+= p5-Locale-Maketext-Lexicon>=0.32:../../misc/p5-Locale-Maketext-Lexicon
29DEPENDS+= p5-Locale-Maketext-Fuzzy>=0.02:../../misc/p5-Locale-Maketext-Fuzzy 29DEPENDS+= p5-Locale-Maketext-Fuzzy>=0.02:../../misc/p5-Locale-Maketext-Fuzzy
30DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools 30DEPENDS+= p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
31DEPENDS+= p5-MailTools>=1.57:../../mail/p5-MailTools 31DEPENDS+= p5-MailTools>=1.57:../../mail/p5-MailTools
 32DEPENDS+= p5-Net>=1.15:../../net/p5-Net
32DEPENDS+= p5-Text-Wrapper>=1.0:../../textproc/p5-Text-Wrapper 33DEPENDS+= p5-Text-Wrapper>=1.0:../../textproc/p5-Text-Wrapper
33DEPENDS+= p5-Time>=101.062101:../../time/p5-Time 34DEPENDS+= p5-Time>=101.062101:../../time/p5-Time
34DEPENDS+= p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey 
35DEPENDS+= p5-Text-Autoformat>=1.04:../../textproc/p5-Text-Autoformat 35DEPENDS+= p5-Text-Autoformat>=1.04:../../textproc/p5-Text-Autoformat
36DEPENDS+= p5-Text-Quoted>=1.5:../../textproc/p5-Text-Quoted 36DEPENDS+= p5-Text-Quoted>=2.02:../../textproc/p5-Text-Quoted
37DEPENDS+= p5-Tree-Simple>=1.04:../../devel/p5-Tree-Simple 37DEPENDS+= p5-Tree-Simple>=1.04:../../devel/p5-Tree-Simple
38DEPENDS+= p5-Module-Versions-Report-[0-9]*:../../devel/p5-Module-Versions-Report 38DEPENDS+= p5-Regexp-Common>=2.113:../../textproc/p5-Regexp-Common
39DEPENDS+= p5-XML-Simple-[0-9]*:../../textproc/p5-XML-Simple 39DEPENDS+= p5-Module-Versions-Report>=1.03:../../devel/p5-Module-Versions-Report
 40DEPENDS+= p5-Cache-Simple-TimedExpiry-[0-9]*:../../devel/p5-Cache-Simple-TimedExpiry
40DEPENDS+= p5-UNIVERSAL-require>=0.11:../../devel/p5-UNIVERSAL-require 41DEPENDS+= p5-UNIVERSAL-require>=0.11:../../devel/p5-UNIVERSAL-require
 42DEPENDS+= p5-Calendar-Simple>=1.00:../../time/p5-Calendar-Simple
 43DEPENDS+= p5-CSS-Squish>=0.07:../../www/p5-CSS-Squish
41 44
42# Mason dependencies: 45# Mason dependencies:
43DEPENDS+= p5-Params-Validate>=0.02:../../devel/p5-Params-Validate 
44DEPENDS+= p5-Cache-Cache>=1.02:../../devel/p5-Cache-Cache 
45DEPENDS+= p5-Exception-Class>=1.14:../../devel/p5-Exception-Class 
46DEPENDS+= p5-HTML-Mason>=1.31:../../www/p5-HTML-Mason 46DEPENDS+= p5-HTML-Mason>=1.31:../../www/p5-HTML-Mason
47DEPENDS+= p5-MLDBM>=2.01:../../databases/p5-MLDBM 
48DEPENDS+= p5-FreezeThaw>=0.43:../../devel/p5-FreezeThaw 
49DEPENDS+= p5-Storable>=2.08:../../devel/p5-Storable 
50DEPENDS+= p5-Apache-Session>=1.53:../../www/p5-Apache-Session 47DEPENDS+= p5-Apache-Session>=1.53:../../www/p5-Apache-Session
51DEPENDS+= p5-XML-RSS>=1.05:../../textproc/p5-XML-RSS 48DEPENDS+= p5-XML-RSS>=1.05:../../textproc/p5-XML-RSS
52DEPENDS+= p5-HTTP-Server-Simple>=0.07:../../www/p5-HTTP-Server-Simple 49DEPENDS+= p5-GD-[0-9]*:../../graphics/p5-GD
53DEPENDS+= p5-HTTP-Server-Simple-Mason>=0.09:../../www/p5-HTTP-Server-Simple-Mason 50DEPENDS+= p5-GDGraph-[0-9]*:../../graphics/p5-GDGraph
54DEPENDS+= p5-Text-WikiFormat>=0.72:../../textproc/p5-Text-WikiFormat 51DEPENDS+= p5-GDTextUtil-[0-9]*:../../graphics/p5-GDTextUtil
55DEPENDS+= p5-CSS-Squish>=0.07:../../www/p5-CSS-Squish 52DEPENDS+= p5-Text-WikiFormat>=0.76:../../textproc/p5-Text-WikiFormat
56DEPENDS+= p5-Calendar-Simple>=1.00:../../time/p5-Calendar-Simple 53DEPENDS+= p5-Module-Refresh>=0.03:../../devel/p5-Module-Refresh
57 54
58# Mailgate dependencies: 55# Mailgate dependencies:
59DEPENDS+= p5-HTML-Tree>=3.18:../../www/p5-HTML-Tree 56DEPENDS+= p5-HTML-Tree>=3.18:../../www/p5-HTML-Tree
60DEPENDS+= p5-HTML-Format>=2.03:../../www/p5-HTML-Format 57DEPENDS+= p5-HTML-Format>=2.03:../../www/p5-HTML-Format
61DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww 58DEPENDS+= p5-libwww>=5.76:../../www/p5-libwww
62DEPENDS+= p5-Module-Refresh>=0.03:../../devel/p5-Module-Refresh 59DEPENDS+= p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey
63 60
64# Front-end dependencies: 61# Front-end dependencies:
65.if !empty(PKG_OPTIONS:Mmodperl1) 62.if !empty(PKG_OPTIONS:Mmodperl1)
66DEPENDS+= p5-libapreq>=1.2:../../www/p5-libapreq 63DEPENDS+= p5-libapreq>=1.2:../../www/p5-libapreq
67DEPENDS+= p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI 64DEPENDS+= p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI
68.elif !empty(PKG_OPTIONS:Mmodperl2) 65.elif !empty(PKG_OPTIONS:Mmodperl2)
69DEPENDS+= p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI 66DEPENDS+= p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI
70.elif !empty(PKG_OPTIONS:Mfastcgi) 67.elif !empty(PKG_OPTIONS:Mfastcgi)
71DEPENDS+= p5-FCGI>=0.67:../../www/p5-FCGI 68DEPENDS+= p5-FCGI>=0.67:../../www/p5-FCGI
72.endif 69.endif
73.if !empty(PKG_OPTIONS:Mspeedycgi) 70.if !empty(PKG_OPTIONS:Mspeedycgi)
74DEPENDS+= SpeedyCGI-[0-9]*:../../www/SpeedyCGI 71DEPENDS+= SpeedyCGI-[0-9]*:../../www/SpeedyCGI
75PLIST_SUBST+= IF_SPEEDYCGI="" 72PLIST_SUBST+= IF_SPEEDYCGI=""
@@ -78,41 +75,36 @@ MAKE_FLAGS+= RT_SPEEDYCGI_HANDLER="" @@ -78,41 +75,36 @@ MAKE_FLAGS+= RT_SPEEDYCGI_HANDLER=""
78PLIST_SUBST+= IF_SPEEDYCGI="@comment " 75PLIST_SUBST+= IF_SPEEDYCGI="@comment "
79 76
80.PHONY: rm-speedycgi 77.PHONY: rm-speedycgi
81post-install: rm-speedycgi 78post-install: rm-speedycgi
82rm-speedycgi: 79rm-speedycgi:
83 rm -f ${PREFIX}/bin/mason_handler.scgi 80 rm -f ${PREFIX}/bin/mason_handler.scgi
84.endif 81.endif
85 82
86# Back-end dependencies 83# Back-end dependencies
87.if !empty(PKG_OPTIONS:Mmysql) 84.if !empty(PKG_OPTIONS:Mmysql)
88DEPENDS+= p5-DBD-mysql>=2.1018:../../databases/p5-DBD-mysql 85DEPENDS+= p5-DBD-mysql>=2.1018:../../databases/p5-DBD-mysql
89_RT_DB_TYPE= mysql 86_RT_DB_TYPE= mysql
90.elif !empty(PKG_OPTIONS:Mpgsql) 87.elif !empty(PKG_OPTIONS:Mpgsql)
91DEPENDS+= p5-DBD-postgresql>=1.41:../../databases/p5-DBD-postgresql 88DEPENDS+= p5-DBD-postgresql>=1.43:../../databases/p5-DBD-postgresql
92_RT_DB_TYPE= Pg 89_RT_DB_TYPE= Pg
93.elif !empty(PKG_OPTIONS:Moracle) 90.elif !empty(PKG_OPTIONS:Moracle)
94DEPENDS+= p5-DBD-Oracle-[0-9]*:../../databases/p5-DBD-Oracle 91DEPENDS+= p5-DBD-Oracle-[0-9]*:../../databases/p5-DBD-Oracle
95_RT_DB_TYPE= Oracle 92_RT_DB_TYPE= Oracle
96.elif !empty(PKG_OPTIONS:Msqlite) 93.elif !empty(PKG_OPTIONS:Msqlite)
97DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite 94DEPENDS+= p5-DBD-SQLite>=1.00:../../databases/p5-DBD-SQLite
98_RT_DB_TYPE= SQLite 95_RT_DB_TYPE= SQLite
99.endif 96.endif
100 97
101# Dev dependencies: 
102DEPENDS+= p5-Regexp-Common>=2.113:../../textproc/p5-Regexp-Common 
103DEPENDS+= p5-WWW-Mechanize>=0.72:../../www/p5-WWW-Mechanize 
104DEPENDS+= p5-Test-WWW-Mechanize-[0-9]*:../../www/p5-Test-WWW-Mechanize 
105 
106USE_PKGLOCALEDIR= yes 98USE_PKGLOCALEDIR= yes
107GNU_CONFIGURE= yes 99GNU_CONFIGURE= yes
108NO_BUILD= yes 100NO_BUILD= yes
109PKG_SYSCONFSUBDIR= rt3 101PKG_SYSCONFSUBDIR= rt3
110 102
111PKG_GROUPS= ${RT_GROUP} 103PKG_GROUPS= ${RT_GROUP}
112PKG_GROUPS_VARS+= RT_GROUP APACHE_GROUP 104PKG_GROUPS_VARS+= RT_GROUP APACHE_GROUP
113PKG_USERS_VARS+= APACHE_USER 105PKG_USERS_VARS+= APACHE_USER
114 106
115CONFIGURE_ARGS+= --enable-layout=pkgsrc 107CONFIGURE_ARGS+= --enable-layout=pkgsrc
116CONFIGURE_ARGS+= --with-rt-group=${RT_GROUP:Q} 108CONFIGURE_ARGS+= --with-rt-group=${RT_GROUP:Q}
117CONFIGURE_ARGS+= --with-db-type=${_RT_DB_TYPE:Q} 109CONFIGURE_ARGS+= --with-db-type=${_RT_DB_TYPE:Q}
118CONFIGURE_ARGS+= --with-web-user=${APACHE_USER:Q} 110CONFIGURE_ARGS+= --with-web-user=${APACHE_USER:Q}