flash10 vs f10
Juergen Lock
nox at jelal.kn-bremen.de
Sun Jun 28 08:29:05 UTC 2009
On Sun, Jun 28, 2009 at 02:36:02AM +0400, Boris Samorodov wrote:
> 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.
>
Aah, okay. :)
> >> > 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.
>
Ooops, indeed, I should have read your patch more closely...
> 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.
>
Anyway, fixed now.
> [...]
> > Index: ftp/linux-f10-curl/Makefile
>
> Seems like PORTREVISION should be bumped.
>
> [...]
I guess you are right.
New patch and shar:
Index: Mk/bsd.linux-apps.mk
@@ -70,7 +70,8 @@
_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}
@@ -136,6 +137,14 @@
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
@@ -307,6 +316,11 @@
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
--- ftp/linux-f10-curl/Makefile.1 2009-06-27 22:55:17.000000000 +0200
+++ ftp/linux-f10-curl/Makefile 2009-06-28 10:14:22.000000000 +0200
@@ -7,7 +7,7 @@
PORTNAME= curl
PORTVERSION= 7.19.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp linux
PKGNAMEPREFIX= linux-f10-
DISTFILES= curl-${PORTVERSION}-${RPMVERSION}.i386.rpm \
@@ -24,6 +24,7 @@
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
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_FILES= 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
X
X# do not install any openldap configuration directories/files
Xpost-extract:
X ${RM} -rf ${WRKSRC}/etc
X
X# use a native openldap configuration directories/files
Xpost-install:
X ${LN} -sf ${LOCALBASE}/etc/openldap ${PREFIX}/etc
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
XMD5 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.src.rpm) = f28ec039fad4f81abc6df09c5542bdaa
XSHA256 (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.src.rpm) = 84bff280805bf046849d96ba80bd6b0d0da895da07f0e6d6efde2667b4ff1e1c
XSIZE (rpm/i386/fedora/10/openldap-2.4.12-1.fc10.src.rpm) = 16905121
f422178bbd4668750265f4e584e91c0e
echo c - security/linux-f10-cyrus-sasl2/
mkdir -p security/linux-f10-cyrus-sasl2/ > /dev/null 2>&1
echo x - security/linux-f10-cyrus-sasl2/Makefile
sed 's/^X//' >security/linux-f10-cyrus-sasl2/Makefile << '4fc58bcf97a8889077c61da23cb55faa'
X# New ports collection makefile for: security/linux-f10-cyrus-sasl2
X# Date created: 2009-06-07
X# Whom: peter
X#
X# $FreeBSD$
X#
X
XPORTNAME= cyrus-sasl2
XPORTVERSION= 2.1.22
XCATEGORIES= security linux
XPKGNAMEPREFIX= linux-f10-
XDISTNAME= cyrus-sasl-lib-${PORTVERSION}-${RPMVERSION}
X
XSRC_DISTFILES= cyrus-sasl-${PORTVERSION}-${RPMVERSION}.src.rpm
X
XMAINTAINER= emulation at FreeBSD.org
XCOMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) (Linux Fedora 10)
X
X#CONFLICTS=
X
XUSE_LINUX_RPM= yes
XLINUX_DIST_VER= 10
XRPMVERSION= 19.fc10
XUSE_LDCONFIG= yes
XBRANDELF_FILES= usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
XDESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
X
XPLIST_DIRS= etc/sasl2 usr/lib/sasl2
XPLIST_FILES= usr/lib/libsasl2.so.2 usr/lib/libsasl2.so.2.0.22 usr/lib/sasl2/libanonymous.so usr/lib/sasl2/libanonymous.so.2 usr/lib/sasl2/libanonymous.so.2.0.22 usr/lib/sasl2/libsasldb.so usr/lib/sasl2/libsasldb.so.2 usr/lib/sasl2/libsasldb.so.2.0.22 usr/sbin/sasldblistusers2 usr/sbin/saslpasswd2
XDOCSDIR= usr/share/doc/cyrus-sasl-lib-${PORTVERSION}
XPORTDOCS= AUTHORS COPYING NEWS README advanced.html appconvert.html components.html gssapi.html index.html install.html macosx.html mechanisms.html options.html plugprog.html programming.html readme.html sysadmin.html upgrading.html windows.html
X
X.include <bsd.port.mk>
4fc58bcf97a8889077c61da23cb55faa
echo x - security/linux-f10-cyrus-sasl2/distinfo.i386
sed 's/^X//' >security/linux-f10-cyrus-sasl2/distinfo.i386 << '9c7e54bf867023e1f8fcaa16319c72f4'
XMD5 (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = 5a4ee3c84ec9581723fd56b658eec994
XSHA256 (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = ae8da4ee07615519c657ddbe3b8c128a2e81f00a4db0da17b7369dabe03ed6d2
XSIZE (rpm/i386/fedora/10/cyrus-sasl-lib-2.1.22-19.fc10.i386.rpm) = 145305
XMD5 (rpm/i386/fedora/10/cyrus-sasl-2.1.22-19.fc10.src.rpm) = f66997139328e0446b1635b4c59c5cd4
XSHA256 (rpm/i386/fedora/10/cyrus-sasl-2.1.22-19.fc10.src.rpm) = 70f087f10f7a6c62a30befadef9904c03543aa20ae890889b2a08a04382e6963
XSIZE (rpm/i386/fedora/10/cyrus-sasl-2.1.22-19.fc10.src.rpm) = 1661687
9c7e54bf867023e1f8fcaa16319c72f4
echo c - www/linux-f10-flashplugin10/
mkdir -p www/linux-f10-flashplugin10/ > /dev/null 2>&1
echo x - www/linux-f10-flashplugin10/Makefile
sed 's/^X//' >www/linux-f10-flashplugin10/Makefile << '5455d901d257b50d731e64397ea6df2f'
X# New ports collection makefile for: www/linux-f10-flashplugin10
X# Date created: 2009-06-26
X# Whom: bsam
X# Based on: www/linux-f8-flashplugin10 by nox@
X#
X# $FreeBSD$
X#
X
XPORTNAME= flashplugin
XPORTVERSION= 10.0r22
XCATEGORIES= www multimedia linux
XMASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/current/:plugin \
X ftp://ftp.ipt.ru/pub/download/:suplib
XPKGNAMEPREFIX= linux-f10-
XDISTFILES= install_flash_player_10_linux.tar.gz:plugin \
X linux-f10-flashsupport-9.0.1.i386.tar.gz:suplib
XDIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
X
XMAINTAINER= emulation at FreeBSD.org
XCOMMENT= Adobe Flash Player NPAPI Plugin
X
XONLY_FOR_ARCHS= amd64 i386
XUSE_LINUX= yes
XUSE_LINUX_APPS= openssl curl cyrus-sasl2 libssh2 nspr nss openldap
X
XRESTRICTED= Redistribution not allowed
XRESTRICTED_FILES= ${DISTFILES:Nlinux-f10-flashsupport*:C/:[^:]+$//}
X
XNO_BUILD= yes
XWRKSRC= ${WRKDIR}/install_flash_player_10_linux
X
XUSE_NPAPI= linux-*
XNPAPI_FILES= libflashplayer.so
X
XCONFLICTS= linux-flashplugin-7* linux-flashplugin-9* linux-f8-flashplugin10-*
X
Xpost-install:
X @${INSTALL_PROGRAM} ${WRKDIR}/libflashsupport.so ${LINUXBASE}/usr/lib
X
X.include <bsd.port.pre.mk>
X.include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
X.include <bsd.port.post.mk>
5455d901d257b50d731e64397ea6df2f
echo x - www/linux-f10-flashplugin10/distinfo
sed 's/^X//' >www/linux-f10-flashplugin10/distinfo << '1f552e2e0c05a396106217e48ff92103'
XMD5 (flashplugin/10.0r22/install_flash_player_10_linux.tar.gz) = 23e4c2b844db0f87ff62084178aa2b1f
XSHA256 (flashplugin/10.0r22/install_flash_player_10_linux.tar.gz) = cd29f166c87fecc943e88fe951bb61c56728fab12b4bf343badafa73ea95394e
XSIZE (flashplugin/10.0r22/install_flash_player_10_linux.tar.gz) = 3994294
XMD5 (flashplugin/10.0r22/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 6e416c81497f65065d78dae1e0acad0d
XSHA256 (flashplugin/10.0r22/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf
XSIZE (flashplugin/10.0r22/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455
1f552e2e0c05a396106217e48ff92103
echo x - www/linux-f10-flashplugin10/pkg-descr
sed 's/^X//' >www/linux-f10-flashplugin10/pkg-descr << '57a1420ff5e8cb1b77c71ecb3a15c599'
XThis is the official Flash Player from Adobe. This plugin enables
Xyou to see .swf and .spl files on the 'net from your Opera, Mozilla or
XFirefox sessions.
X
XPlease see the Adobe home page for more information.
X
XFreeBSD Flash License Agreement:
X http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/96374
X
XWWW: http://www.adobe.com/
57a1420ff5e8cb1b77c71ecb3a15c599
echo x - www/linux-f10-flashplugin10/pkg-plist
sed 's/^X//' >www/linux-f10-flashplugin10/pkg-plist << '9254ee58cdc375ce93f8fc3b1afc9e77'
X at cwd /compat/linux
Xusr/lib/libflashsupport.so
X at cwd
9254ee58cdc375ce93f8fc3b1afc9e77
exit
More information about the freebsd-current
mailing list