Re: flash10 vs f10

From: Boris Samorodov <bsam_at_ipt.ru>
Date: Sun, 28 Jun 2009 02:36:02 +0400
Juergen Lock <nox_at_jelal.kn-bremen.de> writes:
> On Sat, Jun 27, 2009 at 08:10:10PM +0400, Boris Samorodov wrote:
>> Juergen Lock <nox_at_jelal.kn-bremen.de> writes:

>> > X# New ports collection makefile for:	net/linux-f10-openldap
>> > X# Date created:				2009-06-07
>> > X# Whom:					peter
>> > X#
>> > X# $FreeBSD$
>> > X#
>> > X
>> > XPORTNAME=	openldap
>> > XPORTVERSION=	2.4.12
>> > XCATEGORIES=	net linux
>> > XPKGNAMEPREFIX=	linux-f10-
>> > XDISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
>> > X
>> > X.if defined(PACKAGE_BUILDING)
>> > XSRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.src.rpm
>> > XALWAYS_KEEP_DISTFILES=	YES
>> > X.endif
>> 
>> Well, those <.if, .endif> actually are not needed as bsd.linux-rpm.mk
>> should itself take care of the case. If it doesn't, please tell me.
>> 
>  Ah, then a bunch of other ports can be changed too...  (I guess Peter
> just went by existing examples :)

I should have been more verbose here. The whole if-endif case was
not needed because SRC_DISTFILES=${DISTNAME}.src.rpm. This is true for
net/linux-f10-openldap. But for security/linux-f10-cyrus-sasl2 it is not
true and SRC_DISTFILES should be defined at Makefile.

>> > X
>> > XMAINTAINER=	emulation_at_FreeBSD.org
>> > XCOMMENT=	Lightweight Directory Access Protocol libraries (Linux Fedora 10)
>> > X
>> > X#CONFLICTS=
>> > X
>> > XUSE_LINUX_RPM=	yes
>> > XLINUX_DIST_VER=	10
>> > XRPMVERSION=	1.fc10
>> > XUSE_LDCONFIG=	yes
>> > XDESCR=	${.CURDIR}/../openldap24-server/pkg-descr
>> > X
>> > XPLIST_DIRS=	etc/openldap/cacerts etc/openldap
>> 
>> I'd say only etc/openldap is needed (see below).
>> 
>> > XPLIST_FILES=	etc/openldap/ldap.conf usr/lib/liblber-2.4.so.2 usr/lib/liblber-2.4.so.2.2.0 usr/lib/libldap-2.4.so.2 usr/lib/libldap-2.4.so.2.2.0 usr/lib/libldap_r-2.4.so.2 usr/lib/libldap_r-2.4.so.2.2.0
>> > XDOCSDIR=	usr/share/doc/${PORTNAME}-${PORTVERSION}
>> > XPORTDOCS=	ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README
>> > XMANPREFIX=	${PREFIX}/usr/share
>> > XMAN5=		ldap.conf.5 ldif.5
>> > XMANCOMPRESSED=	yes
>> 
>> At my port's propotype I have this:
>> -----
>> # do not install any openldap configuration directories/files
>> post-extract:
>> 		${RM} -rf ${WRKSRC}/etc
>> 
>> # use a native openldap configuration directories/files
>> post-install:
>> 		${LN} -sf ${LOCALBASE}/etc/openldap ${PREFIX}/etc
>> -----
>> 
>> This should work for managing the port via ports system but not with
>> packages.
>> 
>  Good idea, but actually the post-install target isn't really needed
> since the linuxolator /compat/linux search magic should already dtrt
> here.  (I.e. if the dir doesn't exits it should fall back to the one
> outside of /compat/linux.)

The linuxulator magic will work if a linux program search not
only at /etc/openldap but also at /usr/local/etc/openldap.
I guess it won't happen.

The linuxulator do a search for a /some/path/file at:
. /compat/linux/some/path/file, if not found
. /some/path/file, if not found
. /compat/linux/some/path/file.

Anyway, we are talking here about correct linux openldap work.
But for the sake of linux-f10-flashplugin10 imho it's not
critical.

>> > X
>> > X.include <bsd.port.mk>
>> > 17a12d65b66950d2cbc504ac86a37255
>> > echo x - net/linux-f10-openldap/distinfo.i386
>> > sed 's/^X//' >net/linux-f10-openldap/distinfo.i386 << 'f422178bbd4668750265f4e584e91c0e'
>> > XMD5 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = e3ea12058a8cdc54d6f270c802c92a00
>> > XSHA256 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 2a71dcfdbfb1dc9b4e056c951518474d5958147c033f3584dc06e784fd67d567
>> > XSIZE (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.i386.rpm) = 323504
>> 
>> The following commands would do the right thing (no src distinfo for
>> now):
>> -----
>> % cd <the port directory>
>> % sudo make fetch PACKAGE_BUILDING=YES
>> % sudo make makesum PACKAGE_BUILDING=YES
>> -----
>> 
>  Done.  (Actually makesum depends on fetch :)

Yea, but I usually fetch with sudo (to /usr/ports/distfiles)
but do a makesum without it (at my home work directory). ;-)

>  New patch and shar below:
>
> Index: Mk/bsd.linux-apps.mk
> _at__at_ -70,7 +70,8 _at__at_
>  _LINUX_APPS_ALL+=
>  
>  # 2.6.16 components
> -_LINUX_26_APPS=		libidn libssh2 nspr nss sqlite3 tcl84 tk84
> +_LINUX_26_APPS=		cyrus-sasl2 libidn libssh2 nspr nss openldap \
> +			sqlite3 tcl84 tk84
>  
>  _LINUX_APPS_ALL+=	${_LINUX_26_APPS}
>  
> _at__at_ -136,6 +137,14 _at__at_
>  curl_f10_FILE=		${LINUXBASE}/usr/lib/libcurl.so.4.1.1
>  curl_DETECT=		${curl${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
>  curl_PORT=		${PORTSDIR}/ftp/linux${LINUX_DIST_SUFFIX}-curl
> +.  if ${LINUX_DIST_SUFFIX} == "-f10"
> +curl_DEPENDS=		cyrus-sasl2 openldap
> +.  endif
> +
> +# no cyrus-sasl2_FILE, cyrus-sasl2_f8_FILE
> +cyrus-sasl2_f10_FILE=	${LINUXBASE}/usr/lib/libsasl2.so.2.0.22
> +cyrus-sasl2_DETECT=	${cyrus-sasl2${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> +cyrus-sasl2_PORT=	${PORTSDIR}/security/linux${LINUX_DIST_SUFFIX}-cyrus-sasl2
>  
>  dri_FILE=		${LINUXBASE}/usr/X11R6/lib/libGL.so.1
>  dri_f8_FILE=		${LINUXBASE}/usr/lib/libGL.so.1
> _at__at_ -307,6 +316,11 _at__at_
>  mikmod_DETECT=		${mikmod${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
>  mikmod_PORT=		${PORTSDIR}/audio/linux${LINUX_DIST_SUFFIX}-mikmod
>  
> +# no openldap_FILE, openldap_f8_FILE
> +openldap_f10_FILE=	${LINUXBASE}/usr/lib/libldap-2.4.so.2.2.0
> +openldap_DETECT=	${openldap${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
> +openldap_PORT=		${PORTSDIR}/net/linux${LINUX_DIST_SUFFIX}-openldap
> +
>  openmotif_FILE=		${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
>  openmotif_f8_FILE=	${LINUXBASE}/usr/lib/libXm.so.4.0.2
>  openmotif_f10_FILE=	${LINUXBASE}/usr/X11R6/lib/libXm.so.3.0.3
> Index: ftp/linux-f10-curl/Makefile

Seems like PORTREVISION should be bumped.

[...]
> _at__at_ -24,6 +24,7 _at__at_
>  CONFLICTS=	linux-curl-[0-9]* linux-f8-curl-[0-9]*
>  
>  USE_LINUX_RPM=	yes
> +USE_LINUX_APPS=	cyrus-sasl2 openldap
>  LINUX_DIST_VER=	10
>  RPMVERSION=	5.fc10
>  USE_LDCONFIG=	yes
>
> # This is a shell archive.  Save it in a file, remove anything before
> # this line, and then unpack it by entering "sh file".  Note, it may
> # create directories; files and directories will be owned by you and
> # have default permissions.
> #
> # This archive contains:
> #
> #	net/linux-f10-openldap/
> #	net/linux-f10-openldap/Makefile
> #	net/linux-f10-openldap/distinfo.i386
> #	security/linux-f10-cyrus-sasl2/
> #	security/linux-f10-cyrus-sasl2/Makefile
> #	security/linux-f10-cyrus-sasl2/distinfo.i386
> #	www/linux-f10-flashplugin10/
> #	www/linux-f10-flashplugin10/Makefile
> #	www/linux-f10-flashplugin10/distinfo
> #	www/linux-f10-flashplugin10/pkg-descr
> #	www/linux-f10-flashplugin10/pkg-plist
> #
> echo c - net/linux-f10-openldap/
> mkdir -p net/linux-f10-openldap/ > /dev/null 2>&1
> echo x - net/linux-f10-openldap/Makefile
> sed 's/^X//' >net/linux-f10-openldap/Makefile << '17a12d65b66950d2cbc504ac86a37255'
> X# New ports collection makefile for:	net/linux-f10-openldap
> X# Date created:				2009-06-07
> X# Whom:					peter
> X#
> X# $FreeBSD$
> X#
> X
> XPORTNAME=	openldap
> XPORTVERSION=	2.4.12
> XCATEGORIES=	net linux
> XPKGNAMEPREFIX=	linux-f10-
> XDISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
> X
> XSRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}.src.rpm

Sorry that I wasn't verbose for the first time, this line is not needed
here.

No more comments from me. ;-)

Thanks!


WBR
-- 
bsam
Received on Sat Jun 27 2009 - 20:35:11 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:39:50 UTC