Index: head/databases/yasql/Makefile =================================================================== --- head/databases/yasql/Makefile (revision 366330) +++ head/databases/yasql/Makefile (revision 366331) @@ -1,81 +1,53 @@ # Created by: Thierry Thomas # $FreeBSD$ -PORTNAME= yasql -PORTVERSION= 1.83 -PORTREVISION= 1 -CATEGORIES= databases -MASTER_SITES= SF +PORTNAME= yasql +PORTVERSION= 1.83 +PORTREVISION= 1 +CATEGORIES= databases +MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org -COMMENT= Yet Another SQL*Plus Replacement +MAINTAINER= ports@FreeBSD.org +COMMENT= Yet Another SQL*Plus Replacement -BUILD_DEPENDS= p5-DBD-Oracle>=0:${PORTSDIR}/databases/p5-DBD-Oracle \ - p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu -RUN_DEPENDS:= ${BUILD_DEPENDS} - LICENSE= GPLv2 -# Time::HiRes is used for high resolution benchmarking -.if !defined(WITHOUT_HIRES) -BUILD_DEPENDS+= p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes -.endif +RUN_DEPENDS= p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle \ + p5-ReadLine-Gnu>0:${PORTSDIR}/devel/p5-ReadLine-Gnu -# Text::CSV_XS is required to output CSV or input from CSV files -.if !defined(WITHOUT_CSV) -BUILD_DEPENDS+= p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS -.endif +NO_ARCH= yes -# Term::ReadKey is used for better input and output control -.if !defined(WITHOUT_READKEY) -BUILD_DEPENDS+= p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey -.endif - -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} -USES+= perl5 +USES= perl5 +GNU_CONFIGURE= yes ALL_TARGET= default SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message -PLIST_FILES= bin/yasql etc/yasql.conf.sample +OPTIONS_DEFINE= CSV HIRES READKEY -MAN1= yasql.1 +CSV_DESC= Support for in/out CSV files +CSV_BUILD_DEPENDS= p5-Text-CSV_XS>0:${PORTSDIR}/textproc/p5-Text-CSV_XS +HIRES_DESC= Support for high resolution benchmarking +HIRES_BUILD_DEPENDS= p5-Time-HiRes>0:${PORTSDIR}/devel/p5-Time-HiRes +READKEY_DESC= Better input and output control +READKEY_BUILD_DEPENDS= p5-Term-ReadKey>0:${PORTSDIR}/devel/p5-Term-ReadKey -PORTDOCS= README yasql.html +post-patch: + @${REINPLACE_CMD} -e \ + 's| /bin/more| /usr/bin/more|' ${WRKSRC}/yasql.conf -OPTIONS_DEFINE= DOCS +post-build: + @${LN} -sf yasql.conf ${WRKSRC}/yasql.conf.sample -NO_STAGE= yes -pre-everything:: - @${ECHO_MSG} - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} - @${ECHO_MSG} "WITHOUT_CSV disable support for in/out CSV files" - @${ECHO_MSG} "WITHOUT_HIRES disable support for high resolution benchmarking" - @${ECHO_MSG} "WITHOUT_READKEY disable a better input and output control" - @${ECHO_MSG} - -pre-configure: - ${REINPLACE_CMD} 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/yasql.in - ${PERL} -pi -e 's|/bin/more|/usr/bin/more|' ${WRKSRC}/yasql.conf - -pre-install: - if [ -f ${PREFIX}/etc/yasql.conf ] ; then \ - ${MV} ${PREFIX}/etc/yasql.conf ${PREFIX}/etc/yasql.conf.precious ; \ - fi - -post-install: - ${MV} ${PREFIX}/etc/yasql.conf ${PREFIX}/etc/yasql.conf.sample - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} - @if [ -f ${PREFIX}/etc/yasql.conf.precious ] ; then \ - ${MV} ${PREFIX}/etc/yasql.conf.precious ${PREFIX}/etc/yasql.conf ; \ - else \ - ${ECHO_MSG} ; \ - ${CAT} ${PKGMESSAGE} ; \ - ${ECHO_MSG} ; \ - fi +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) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} README yasql.html \ + ${STAGEDIR}${DOCSDIR}) .include Index: head/databases/yasql/files/patch-yasql.in =================================================================== --- head/databases/yasql/files/patch-yasql.in (revision 366330) +++ head/databases/yasql/files/patch-yasql.in (revision 366331) @@ -1,114 +1,105 @@ --- yasql.in.orig 2005-05-09 18:01:47.000000000 +0200 +++ yasql.in 2010-11-18 15:10:32.000000000 +0100 -@@ -60,7 +60,7 @@ - - select((select(STDOUT), $| = 1)[0]); #unbuffer STDOUT - --$sysconfdir = "/etc"; -+$sysconfdir = "%%LOCALBASE%%/etc"; - $sysconf = "$sysconfdir/yasql.conf"; - - # try to include Time::HiRes for fine grained benchmarking @@ -174,7 +174,7 @@ wrn("Connection lost (timeout: $conf{connection_timeout})"); quit(1); } else { - err("Could not connect to database, timed out. (timeout: " + die("Could not connect to database, timed out. (timeout: " ."$conf{connection_timeout})"); } } @@ -769,7 +769,7 @@ } } unless($found) { - err("Could not find DBD::Oracle... please install. Available drivers: " + die("Could not find DBD::Oracle... please install. Available drivers: " .join(", ", @drivers) . ".\n"); } #print "drivers: [" . join("|", @drivers) . "]\n"; @@ -921,7 +921,7 @@ $connect_string = '' if $connect_string eq 'external'; $dbhandle = db_connect($die_on_error,$ora_session_mode,undef,undef,$connect_string); } elsif($die_on_error) { - err("Could not connect to database: $dberrstr [$dberr]"); + die("Could not connect to database: $dberrstr [$dberr]"); } else { wrn("Could not connect to database: $dberrstr [$dberr]"); return(0); @@ -1010,7 +1010,7 @@ sub check_oracle_home { # This checks for the ORACLE_HOME environment variable and dies if it's # not set - err("Please set your ORACLE_HOME environment variable!") + die("Please set your ORACLE_HOME environment variable!") unless $ENV{ORACLE_HOME}; return(1); } @@ -1416,7 +1416,7 @@ } sub close_csv { - close(CSV) || err("Could not close CSV filehandle: $!"); + close(CSV) || die("Could not close CSV filehandle: $!"); $csv_filehandle_open = 0; $csv_max_lines = 0; } @@ -2404,10 +2404,10 @@ if($op && $op eq '>' || $op eq '>>') { ($op_text) = glob($op_text); debugmsg(3, "Opening file '$op_text' for output redirection using [$op]"); - open(FOUT, $op . $op_text) || do query_err('redirect',"Cannot open file '$op_text' for writing: $!", ''); + open(FOUT, $op . $op_text) || query_err('redirect',"Cannot open file '$op_text' for writing: $!", ''); } elsif($op eq '|') { ($op_text) = glob($op_text); - open(FOUT, $op . $op_text) || do query_err('pipe',"Cannot open pipe '$op_text': $!", ''); + open(FOUT, $op . $op_text) || query_err('pipe',"Cannot open pipe '$op_text': $!", ''); } else { open(FOUT, ">&STDOUT"); } @@ -2873,7 +2873,7 @@ my $newsql = $sql; my $fromstuff; my $wheregrouporder = $sql; - $wheregrouporder =~ s/.*(where|order|group).*/\1/; + $wheregrouporder =~ s/.*(where|order|group).*/$1/; if ($wheregrouporder eq $sql) { $wheregrouporder = ""; } @@ -2887,7 +2887,7 @@ my %column_prefix; foreach my $table (@tlist) { $table =~ s/^ *//; - $table =~ s/([^ ]+)\s+(.*)/\1/; + $table =~ s/([^ ]+)\s+(.*)/$1/; $column_prefix{$table} = $2 ? $2 : $table; $tablelist .= ($tablelist ? "," : "") . $table; } @@ -3644,7 +3644,7 @@ Examples: The following will run the query, then run it again with different settings: user\@ORCL> select * from table;10 - user\@ORCL> \G50 + user\@ORCL> \\G50 Redirection: You can add a shell like redirection operator after a query to pipe the output @@ -3657,7 +3657,7 @@ Examples: user\@ORCL> select * from table; > table.dump - user\@ORCL> select * from table\S > table.csv + user\@ORCL> select * from table \\S > table.csv Input: You can use '<' to grab data from a CSV file. The file must be formatted @@ -4179,7 +4179,7 @@ =item NULL stops printing after table goes into overflow or something -=item extra space in \G... maybe others +=item extra space in \\G... maybe others =item bug: tag completion doesn't work with caps anymore Index: head/databases/yasql/pkg-plist =================================================================== --- head/databases/yasql/pkg-plist (nonexistent) +++ head/databases/yasql/pkg-plist (revision 366331) @@ -0,0 +1,6 @@ +bin/yasql +@sample etc/yasql.conf.sample +man/man1/yasql.1.gz +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/yasql.html +%%PORTDOCS%%@dirrm %%DOCSDIR%% Property changes on: head/databases/yasql/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property