Page MenuHomeFreeBSD
Files F131554477

D3996.id9691.diff
No OneTemporary
Actions

D3996.id9691.diff
View Options

Index: ports-mgmt/portscout/Makefile
===================================================================
--- ports-mgmt/portscout/Makefile
+++ ports-mgmt/portscout/Makefile
@@ -3,17 +3,33 @@
PORTNAME= portscout
PORTVERSION= 0.8.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= ports-mgmt
-MASTER_SITES= http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ \
- http://www.atarininja.org/~wxs/distfiles/ \
+MASTER_SITES= http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ \
+ http://www.atarininja.org/~wxs/distfiles/ \
http://www.inerd.com/software/${PORTNAME}/
MAINTAINER= shaun@FreeBSD.org
COMMENT= Tool to scan for new versions of FreeBSD ports
-OPTIONS_DEFINE= SQLITE3 DOCS
-SQLITE3_DESC= Use SQLite backend instead of PostgreSQL
+LICENSE= BSD2CLAUSE
+
+RUN_DEPENDS= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
+ p5-Proc-Queue>=0:${PORTSDIR}/devel/p5-Proc-Queue \
+ p5-Net>=0:${PORTSDIR}/net/p5-Net \
+ p5-URI>=0:${PORTSDIR}/net/p5-URI \
+ p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
+ p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
+ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+ p5-JSON>0:${PORTSDIR}/converters/p5-JSON
+
+OPTIONS_DEFINE= DOCS
+OPTIONS_DEFAULT= PGSQL
+
+OPTIONS_MULTI= DATABASE
+OPTIONS_MULTI_DATABASE= SQLITE PGSQL
+
+DATABASE_DESC= Database Backends
USES= perl5 shebangfix
NO_BUILD= yes
@@ -21,26 +37,16 @@
PORTDOCS= UPDATING portscout-portconfig.txt xml-datasrc-example.xml
-RUN_DEPENDS= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
- p5-Proc-Queue>=0:${PORTSDIR}/devel/p5-Proc-Queue \
- p5-Net>=0:${PORTSDIR}/net/p5-Net \
- p5-URI>=0:${PORTSDIR}/net/p5-URI \
- p5-XML-XPath>=0:${PORTSDIR}/textproc/p5-XML-XPath \
- p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+SQLITE_USE= SQLITE=3
+SQLITE_RUN_DEPENDS= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
-.include <bsd.port.options.mk>
+PGSQL_USES= pgsql
+PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-.if ${PORT_OPTIONS:MSQLITE3}
-#USE_SQLITE= 3
-#RUN_DEPENDS+= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
-.elif !defined(WITHOUT_PGSQL)
-#USES+= pgsql
-#RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-.endif
+.include <bsd.port.options.mk>
pre-everything::
-.if ${PORT_OPTIONS:MSQLITE3}
+.if ${PORT_OPTIONS:MSQLITE}
@${ECHO_MSG} "+-------------------------------------------------------------+"
@${ECHO_MSG} "| Warning! although SQLite is supported, portscout will only |"
@${ECHO_MSG} "| operate in non-forking mode with this database backend. It |"
@@ -48,8 +54,12 @@
@${ECHO_MSG} "+-------------------------------------------------------------+"
.endif
+post-extract:
+ @${CP} ${FILESDIR}/files-Portscout-SiteHandler-GitHub.pm ${WRKSRC}/Portscout/SiteHandler/GitHub.pm
+ @${CP} ${FILESDIR}/files-Portscout-SiteHandler-PyPI.pm ${WRKSRC}/Portscout/SiteHandler/PyPI.pm
+
post-patch:
-.if ${PORT_OPTIONS:MSQLITE3}
+.if ${PORT_OPTIONS:MSQLITE}
@${REINPLACE_CMD} 's/^\([^#]*DBI:Pg.*\)$$/#\1/g' ${WRKSRC}/portscout.conf
@${REINPLACE_CMD} 's/^#\(.*DBI:SQLite.*\)$$/\1/g' ${WRKSRC}/portscout.conf
.endif
@@ -96,7 +106,7 @@
test:
${PERL} ${WRKSRC}/t/00-use.t
${PERL} ${WRKSRC}/t/01-vercompare.t
-.if ${PORT_OPTIONS:MSQLITE3}
+.if ${PORT_OPTIONS:MSQLITE}
${PERL} ${WRKSRC}/t/10-sqlite.t
#.else
# ${PERL} ${WRKSRC}/10-postgresql.t
Index: ports-mgmt/portscout/pkg-plist
===================================================================
--- ports-mgmt/portscout/pkg-plist
+++ ports-mgmt/portscout/pkg-plist
@@ -14,19 +14,21 @@
%%DATADIR%%/sql/sqlite_init.sql
%%DATADIR%%/sql/sqlite_destroy.sql
%%DATADIR%%/sql/sqlite_upgrade_0.8_to_0.8.1.sql
-%%SITE_PERL%%/Portscout/SQL/SQLite.pm
-%%SITE_PERL%%/Portscout/SQL/Pg.pm
-%%SITE_PERL%%/Portscout/SiteHandler/SourceForge.pm
+%%SITE_PERL%%/Portscout.pm
+%%SITE_PERL%%/Portscout/API.pm
+%%SITE_PERL%%/Portscout/Config.pm
+%%SITE_PERL%%/Portscout/Const.pm
+%%SITE_PERL%%/Portscout/DataSrc.pm
%%SITE_PERL%%/Portscout/DataSrc/Ports.pm
%%SITE_PERL%%/Portscout/DataSrc/XML.pm
-%%SITE_PERL%%/Portscout/SiteHandler.pm
-%%SITE_PERL%%/Portscout/SQL.pm
%%SITE_PERL%%/Portscout/Make.pm
-%%SITE_PERL%%/Portscout/Const.pm
-%%SITE_PERL%%/Portscout/DataSrc.pm
+%%SITE_PERL%%/Portscout/SQL.pm
+%%SITE_PERL%%/Portscout/SQL/Pg.pm
+%%SITE_PERL%%/Portscout/SQL/SQLite.pm
+%%SITE_PERL%%/Portscout/SiteHandler.pm
+%%SITE_PERL%%/Portscout/SiteHandler/GitHub.pm
+%%SITE_PERL%%/Portscout/SiteHandler/PyPI.pm
+%%SITE_PERL%%/Portscout/SiteHandler/SourceForge.pm
%%SITE_PERL%%/Portscout/Template.pm
%%SITE_PERL%%/Portscout/Util.pm
-%%SITE_PERL%%/Portscout/API.pm
-%%SITE_PERL%%/Portscout/Config.pm
-%%SITE_PERL%%/Portscout.pm
%%SITE_PERL%%/portscout.pod

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 10, 5:24 AM (20 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23520041
Default Alt Text
D3996.id9691.diff (4 KB)

Event Timeline