Date: Sun, 11 Sep 2016 09:01:48 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421810 - in head/databases/yasql: . files Message-ID: <201609110901.u8B91mfh095427@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Sep 11 09:01:48 2016 New Revision: 421810 URL: https://svnweb.freebsd.org/changeset/ports/421810 Log: - Fix LICENSE - Add LICENSE_FILE - Switch to options helpers - Simplify installation Modified: head/databases/yasql/Makefile head/databases/yasql/files/patch-yasql.in Modified: head/databases/yasql/Makefile ============================================================================== --- head/databases/yasql/Makefile Sun Sep 11 09:00:17 2016 (r421809) +++ head/databases/yasql/Makefile Sun Sep 11 09:01:48 2016 (r421810) @@ -10,20 +10,21 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Yet Another SQL*Plus Replacement -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= p5-DBD-Oracle>0:databases/p5-DBD-Oracle \ p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu -NO_ARCH= yes - USES= perl5 GNU_CONFIGURE= yes ALL_TARGET= default +NO_ARCH= yes + SUB_FILES= pkg-message -OPTIONS_DEFINE= CSV HIRES READKEY +OPTIONS_DEFINE= CSV HIRES READKEY DOCS CSV_DESC= Support for in/out CSV files CSV_BUILD_DEPENDS= p5-Text-CSV_XS>0:textproc/p5-Text-CSV_XS @@ -40,14 +41,13 @@ post-build: @${LN} -sf yasql.conf ${WRKSRC}/yasql.conf.sample do-install: - (cd ${WRKSRC} && ${INSTALL_SCRIPT} yasql \ - ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC} && ${INSTALL_MAN} yasql.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1) - (cd ${WRKSRC} && ${INSTALL_MAN} yasql.conf.sample \ - ${STAGEDIR}${PREFIX}/etc) + ${INSTALL_SCRIPT} ${WRKSRC}/yasql ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/yasql.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_DATA} ${WRKSRC}/yasql.conf.sample ${STAGEDIR}${PREFIX}/etc + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC} && ${INSTALL_DATA} README yasql.html \ - ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/yasql.html \ + ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/databases/yasql/files/patch-yasql.in ============================================================================== --- head/databases/yasql/files/patch-yasql.in Sun Sep 11 09:00:17 2016 (r421809) +++ head/databases/yasql/files/patch-yasql.in Sun Sep 11 09:01:48 2016 (r421810) @@ -1,6 +1,6 @@ ---- yasql.in.orig 2005-05-09 18:01:47.000000000 +0200 -+++ yasql.in 2010-11-18 15:10:32.000000000 +0100 -@@ -174,7 +174,7 @@ +--- yasql.in.orig 2005-05-09 16:01:47 UTC ++++ yasql.in +@@ -174,7 +174,7 @@ sub sighandle { wrn("Connection lost (timeout: $conf{connection_timeout})"); quit(1); } else { @@ -9,7 +9,7 @@ ."$conf{connection_timeout})"); } } -@@ -769,7 +769,7 @@ +@@ -769,7 +769,7 @@ sub db_connect { } } unless($found) { @@ -18,7 +18,7 @@ .join(", ", @drivers) . ".\n"); } #print "drivers: [" . join("|", @drivers) . "]\n"; -@@ -921,7 +921,7 @@ +@@ -921,7 +921,7 @@ sub db_connect { $connect_string = '' if $connect_string eq 'external'; $dbhandle = db_connect($die_on_error,$ora_session_mode,undef,undef,$connect_string); } elsif($die_on_error) { @@ -27,7 +27,7 @@ } else { wrn("Could not connect to database: $dberrstr [$dberr]"); return(0); -@@ -1010,7 +1010,7 @@ +@@ -1010,7 +1010,7 @@ sub get_up { sub check_oracle_home { # This checks for the ORACLE_HOME environment variable and dies if it's # not set @@ -36,7 +36,7 @@ unless $ENV{ORACLE_HOME}; return(1); } -@@ -1416,7 +1416,7 @@ +@@ -1416,7 +1416,7 @@ sub get_csv_file { } sub close_csv { @@ -45,7 +45,7 @@ $csv_filehandle_open = 0; $csv_max_lines = 0; } -@@ -2404,10 +2404,10 @@ +@@ -2404,10 +2404,10 @@ sub describe { if($op && $op eq '>' || $op eq '>>') { ($op_text) = glob($op_text); debugmsg(3, "Opening file '$op_text' for output redirection using [$op]"); @@ -58,7 +58,7 @@ } else { open(FOUT, ">&STDOUT"); } -@@ -2873,7 +2873,7 @@ +@@ -2873,7 +2873,7 @@ sub wildcard_expand { my $newsql = $sql; my $fromstuff; my $wheregrouporder = $sql; @@ -67,7 +67,7 @@ if ($wheregrouporder eq $sql) { $wheregrouporder = ""; } -@@ -2887,7 +2887,7 @@ +@@ -2887,7 +2887,7 @@ sub wildcard_expand { my %column_prefix; foreach my $table (@tlist) { $table =~ s/^ *//; @@ -76,7 +76,7 @@ $column_prefix{$table} = $2 ? $2 : $table; $tablelist .= ($tablelist ? "," : "") . $table; } -@@ -3644,7 +3644,7 @@ +@@ -3644,7 +3644,7 @@ Return limit: Examples: The following will run the query, then run it again with different settings: user\@ORCL> select * from table;10 @@ -85,7 +85,7 @@ Redirection: You can add a shell like redirection operator after a query to pipe the output -@@ -3657,7 +3657,7 @@ +@@ -3657,7 +3657,7 @@ Redirection: Examples: user\@ORCL> select * from table; > table.dump @@ -94,7 +94,7 @@ Input: You can use '<' to grab data from a CSV file. The file must be formatted -@@ -4179,7 +4179,7 @@ +@@ -4179,7 +4179,7 @@ Foundation, Inc., 59 Temple Place - Suit =item NULL stops printing after table goes into overflow or something
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609110901.u8B91mfh095427>