From owner-svn-ports-head@FreeBSD.ORG Tue Jul 22 21:00:21 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3A883E1; Tue, 22 Jul 2014 21:00:21 +0000 (UTC) Received: from mail-yk0-x234.google.com (mail-yk0-x234.google.com [IPv6:2607:f8b0:4002:c07::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C27DB25D0; Tue, 22 Jul 2014 21:00:20 +0000 (UTC) Received: by mail-yk0-f180.google.com with SMTP id 200so180939ykr.11 for ; Tue, 22 Jul 2014 14:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=EFcKLnc0o+BRefRujtj6GNG3JIAEwQ/3F/6hNmQ3FmU=; b=GxNMykqZ97YrzP4nqfqkhuelntrr0C8qBp1e7zMw2c6m72in0f/oHb0g56AfRC3AjS awU7AxE7UEEl9rlYtJE2QqDDDstL5jMHeyCAPbCTLSdjG2gyy/RycYwfVXAos01YW5+w dl18zcItHFB9W8YhCAPXW08COd1zhhG7ILMmUMNPJZF7SN28e/IpdjYtkHu3x297ZBKI t2oKUTPu6AIeJrTyWcAVG7yHeSEbc6suacgIBDKKZ0Y0gtJRcIXKsQOftun2P0C9C0H4 K/n3T21Oz/SuVGp4NzSNRYHhLY0/7wYCRZXUy8c/zyvyx/YI097sOT+7elANDUgvOVN8 UtCQ== MIME-Version: 1.0 X-Received: by 10.236.206.115 with SMTP id k79mr54369921yho.1.1406062819569; Tue, 22 Jul 2014 14:00:19 -0700 (PDT) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.170.164.197 with HTTP; Tue, 22 Jul 2014 14:00:19 -0700 (PDT) In-Reply-To: <201407222051.s6MKpn4o097250@svn.freebsd.org> References: <201407222051.s6MKpn4o097250@svn.freebsd.org> Date: Tue, 22 Jul 2014 23:00:19 +0200 X-Google-Sender-Auth: OYu1jkW93uO---B3AN5QVhrS88M Message-ID: Subject: Re: svn commit: r362578 - head/databases/linux-oracle-instantclient-basic From: Antoine Brodin To: Rene Ladan Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jul 2014 21:00:21 -0000 On Tue, Jul 22, 2014 at 10:51 PM, Rene Ladan wrote: > Author: rene > Date: Tue Jul 22 20:51:49 2014 > New Revision: 362578 > URL: http://svnweb.freebsd.org/changeset/ports/362578 > QAT: https://qat.redports.org/buildarchive/r362578/ > > Log: > - Stage support > - Enable usage on amd64 > - Clean up Makefile (especially the IGNORE message) > > PR: 191993 > Submitted by: papowell@astart.com > > Modified: > head/databases/linux-oracle-instantclient-basic/Makefile > head/databases/linux-oracle-instantclient-basic/pkg-plist > > Modified: head/databases/linux-oracle-instantclient-basic/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/databases/linux-oracle-instantclient-basic/Makefile Tue Jul 2= 2 20:27:54 2014 (r362577) > +++ head/databases/linux-oracle-instantclient-basic/Makefile Tue Jul 2= 2 20:51:49 2014 (r362578) > @@ -3,7 +3,7 @@ > > PORTNAME=3D instantclient > PORTVERSION=3D ${ORACLEVERSION}.${DISTDATE} > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D databases > MASTER_SITES=3D #http://www.oracle.com/technology/software/tech= /oci/instantclient/ > PKGNAMEPREFIX=3D linux-oracle- > @@ -12,11 +12,11 @@ DISTNAME=3D ${PORTNAME}${PKGNAMESUFFIX}-$ > DIST_SUBDIR=3D oracle > > MAINTAINER=3D ports@FreeBSD.org > -COMMENT=3D Oracle 10 InstantClient basics. Works with Orac= le RDBMS 8.1.2+ > +COMMENT=3D Oracle 10 32Bit Linux InstantClient basics for = RDBMS 8.1.2+ > > -ONLY_FOR_ARCHS=3D i386 # amd64(not yet on own) > +ONLY_FOR_ARCHS=3D i386 amd64 > NO_BUILD=3D yes > -DISTINFO_FILE=3D ${MASTERDIR}/distinfo.${ARCH} > +DISTINFO_FILE=3D ${MASTERDIR}/distinfo.i386 > > RESTRICTED=3D Packaging prohibited by Oracle license > > @@ -37,50 +37,35 @@ LIBS_LIST=3D libclntsh.so.10.1 \ > > WRKSRC=3D ${WRKDIR}/instantclient_10_2 > > -INSTBINSDIR=3D ${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/clien= t/bin > -INSTLIBSDIR=3D ${PREFIX}/usr/lib/oracle/${ORACLEVERSION}/clien= t/lib > +INSTBINSDIR=3D ${STAGEDIR}${PREFIX}/usr/bin > +INSTLIBSDIR=3D ${STAGEDIR}${PREFIX}/usr/lib/oracle/${ORACLEVER= SION}/client/lib > + > +USE_LDCONFIG=3D${INSTLIBSDIR} Hi, USE_LDCONFIG pointing to inside STAGEDIR looks bad. Cheers, Antoine > PLIST_SUB=3D ORACLEVERSION=3D${ORACLEVERSION} > > -NO_STAGE=3D yes > .include > > -.if ${ARCH} =3D=3D "i386" > +#.if ${ARCH} =3D=3D "i386" > LINUXARCH=3D linux32 > DISTDATE=3D 20061115 > -.elif ${ARCH} =3D=3D "amd64" > -LINUXARCH=3D linux-x86-64 > -DISTDATE=3D 20070103 > -.endif > +#.elif ${ARCH} =3D=3D "amd64" > +#LINUXARCH=3D linux-x86-64 > +#DISTDATE=3D 20070103 > +#.endif > > .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}) > -ECHO_MSG=3D ${PRINTF} %b > - > -IGNORE+=3D \n\n-=3D< MARKED AS IGNORED: >=3D-\n > -IGNORE+=3D \n > -IGNORE+=3D Due to Oracle license restrictions, you must fe= tch the source \n > -IGNORE+=3D distribution manually. Please access \n > -IGNORE+=3D http://www.oracle.com/technology/software/tech/= oci/instantclient/index.html \n > -IGNORE+=3D with a web browser and follow the link for the = \n > -IGNORE+=3D "${DISTFILES}". \n > -IGNORE+=3D You will be required to register and log in, \n > -IGNORE+=3D but you can create an account on that page. \n > -IGNORE+=3D After registration and accepting the Oracle Lic= ense, \n > -IGNORE+=3D download the distribution file, \n ${DISTFILES}= , \n > -IGNORE+=3D into ${DISTDIR}/${DIST_SUBDIR}/ \n > -IGNORE+=3D and then restart this installation\n\n > +IGNORE+=3D due to Oracle license restrictions, you must fetch the = source distribution manually from http://www.oracle.com/technology/software= /tech/oci/instantclient/index.html , follow the link for ${DISTFILES} and p= lace them in ${DISTDIR}/${DIST_SUBDIR}/ > .endif > > do-install: > - @${MKDIR} -m 0755 ${INSTBINSDIR} > - @${MKDIR} -m 0755 ${INSTLIBSDIR} > + @${MKDIR} -m 0755 ${INSTBINSDIR} > + @${MKDIR} -m 0755 ${INSTLIBSDIR} > .for i in ${BINS_LIST} > - ${INSTALL_DATA} ${WRKSRC}/${i} ${INSTBINSDIR}/${i= } > + ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${INSTBINSDIR}/${i} > .endfor > .for i in ${LIBS_LIST} > - ${INSTALL_DATA} ${WRKSRC}/${i} ${INSTLIBSDIR}/${i= } > + ${INSTALL_DATA} ${WRKSRC}/${i} ${INSTLIBSDIR}/${i} > .endfor > - ${ECHO_CMD} "${INSTLIBSDIR:S,${PREFIX},,}" >> ${P= REFIX}/etc/ld.so.conf > - ${PREFIX}/sbin/ldconfig > > .include > > Modified: head/databases/linux-oracle-instantclient-basic/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/databases/linux-oracle-instantclient-basic/pkg-plist Tue Jul 2= 2 20:27:54 2014 (r362577) > +++ head/databases/linux-oracle-instantclient-basic/pkg-plist Tue Jul 2= 2 20:51:49 2014 (r362578) > @@ -1,17 +1,11 @@ > -usr/lib/oracle/%%ORACLEVERSION%%/client/bin/genezi > +usr/bin/genezi > usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libclntsh.so.10.1 > usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libnnz10.so > usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocci.so.10.1 > usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libociei.so > usr/lib/oracle/%%ORACLEVERSION%%/client/lib/libocijdbc10.so > usr/lib/oracle/%%ORACLEVERSION%%/client/lib/ojdbc14.jar > -@dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/bin > -@dirrm usr/lib/oracle/%%ORACLEVERSION%%/client/lib > -@dirrm usr/lib/oracle/%%ORACLEVERSION%%/client > -@dirrm usr/lib/oracle/%%ORACLEVERSION%% > -@dirrm usr/lib/oracle > -@dirrmtry usr/lib > -@dirrmtry usr > -@unexec cp %D/etc/ld.so.conf %D/etc/ld.so.conf.bak && sed "/\/usr\/lib\/= oracle\/%%ORACLEVERSION%%\/client\/lib/d" %D/etc/ld.so.conf.bak > %D/etc/ld= .so.conf && rm %D/etc/ld.so.conf.bak > -@exec echo /usr/lib/oracle/%%ORACLEVERSION%%/client/lib >> %D/etc/ld.so.= conf > -@exec %D/sbin/ldconfig > +@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client/lib > +@dirrmtry usr/lib/oracle/%%ORACLEVERSION%%/client > +@dirrmtry usr/lib/oracle/%%ORACLEVERSION%% > +@dirrmtry usr/lib/oracle >