Attachment 146326 Details for Bug 193028 – databases/yasql: Support STAGEDIR

[patch] databases/yasql: Support STAGEDIR

databases_yasql.diff (text/plain), 4.88 KB, created by tkato432 on 2014-08-26 18:32:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-08-26 18:32:35 UTC

Size: 4.88 KB

patch

obsolete

>diff -urN /usr/ports/databases/yasql/Makefile databases/yasql/Makefile
>--- /usr/ports/databases/yasql/Makefile	2014-07-05 16:13:57.000000000 +0900
>+++ databases/yasql/Makefile	2014-08-27 00:00:00.000000000 +0900
>@@ -1,81 +1,53 @@
> # Created by: Thierry Thomas <thierry@pompo.net>
> # $FreeBSD: head/databases/yasql/Makefile 360690 2014-07-04 23:46:52Z adamw $
> 
>-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>
>diff -urN /usr/ports/databases/yasql/files/patch-yasql.in databases/yasql/files/patch-yasql.in
>--- /usr/ports/databases/yasql/files/patch-yasql.in	2014-06-21 17:46:03.000000000 +0900
>+++ databases/yasql/files/patch-yasql.in	2014-08-27 00:00:00.000000000 +0900
>@@ -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);
>diff -urN /usr/ports/databases/yasql/pkg-plist databases/yasql/pkg-plist
>--- /usr/ports/databases/yasql/pkg-plist	1970-01-01 09:00:00.000000000 +0900
>+++ databases/yasql/pkg-plist	2014-08-27 00:00:00.000000000 +0900
>@@ -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%%

Actions: View | Diff

Attachments on bug 193028: 146326