Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 27 Aug 2014 14:55:14 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r366331 - in head/databases/yasql: . files
Message-ID:  <201408271455.s7REtEwo013308@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Wed Aug 27 14:55:14 2014
New Revision: 366331
URL: http://svnweb.freebsd.org/changeset/ports/366331
QAT: https://qat.redports.org/buildarchive/r366331/

Log:
  databases/yasql: support stage
  
  PR:		193028
  Submitted by:	Ports Fury

Added:
  head/databases/yasql/pkg-plist   (contents, props changed)
Modified:
  head/databases/yasql/Makefile
  head/databases/yasql/files/patch-yasql.in

Modified: head/databases/yasql/Makefile
==============================================================================
--- head/databases/yasql/Makefile	Wed Aug 27 14:33:16 2014	(r366330)
+++ head/databases/yasql/Makefile	Wed Aug 27 14:55:14 2014	(r366331)
@@ -1,81 +1,53 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
-PORTNAME=		yasql
-PORTVERSION=		1.83
-PORTREVISION=		1
-CATEGORIES=		databases
-MASTER_SITES=		SF
-
-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}
+PORTNAME=	yasql
+PORTVERSION=	1.83
+PORTREVISION=	1
+CATEGORIES=	databases
+MASTER_SITES=	SF
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Yet Another SQL*Plus Replacement
 
 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
-
-# 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
-
-# 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
-ALL_TARGET=	default
+RUN_DEPENDS=	p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle \
+		p5-ReadLine-Gnu>0:${PORTSDIR}/devel/p5-ReadLine-Gnu
 
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+NO_ARCH=	yes
 
-PLIST_FILES=	bin/yasql etc/yasql.conf.sample
+USES=		perl5
+GNU_CONFIGURE=	yes
+ALL_TARGET=	default
 
-MAN1=		yasql.1
+SUB_FILES=	pkg-message
 
-PORTDOCS=	README yasql.html
+OPTIONS_DEFINE=		CSV HIRES READKEY
 
-OPTIONS_DEFINE=	DOCS
-
-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
+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
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's| /bin/more| /usr/bin/more|' ${WRKSRC}/yasql.conf
+
+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)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README yasql.html \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/databases/yasql/files/patch-yasql.in
==============================================================================
--- head/databases/yasql/files/patch-yasql.in	Wed Aug 27 14:33:16 2014	(r366330)
+++ head/databases/yasql/files/patch-yasql.in	Wed Aug 27 14:55:14 2014	(r366331)
@@ -1,14 +1,5 @@
 --- 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);

Added: head/databases/yasql/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/yasql/pkg-plist	Wed Aug 27 14:55:14 2014	(r366331)
@@ -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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408271455.s7REtEwo013308>