Date: Tue, 21 Mar 2006 16:25:52 +0300 From: Boris Samorodov <bsam@ipt.ru> To: Alexander Leidinger <Alexander@Leidinger.net> Cc: freebsd-emulation@freebsd.org Subject: Re: [patch] for bsd.linux-rpm.mk (generating auto-plist) Message-ID: <61288143@serv3.int.kfs.ru> In-Reply-To: <20060321095421.ud04qz5xrwgswwcw@netchild.homeip.net> (Alexander Leidinger's message of "Tue, 21 Mar 2006 09:54:21 %2B0100") References: <48803978@ho.ipt.ru> <20060321002210.2a721250.jylefort@FreeBSD.org> <20060321095421.ud04qz5xrwgswwcw@netchild.homeip.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
On Tue, 21 Mar 2006 09:54:21 +0100 Alexander Leidinger wrote:
> Jean-Yves Lefort <jylefort@freebsd.org> wrote:
> > On Tue, 21 Mar 2006 01:13:09 +0300
> > Boris Samorodov <bsam@ipt.ru> wrote:
> >
> >> Both linux_base-8 port and linux_base-fc3 have not only @dirrm but
> >> also @dirrmtry commands at their pkg-plist files. Current version of
> >> bsd.linux-rpm.mk deals only with the first ones. The proposed uses
> >> both and hence generate a more accurate auto-plist file.
> >>
> >> CC: to jylefort@ as it was his original code to generate automatic
> >> plist files.
> >>
> >> Comments are welcome.
> >
> > Looks good. I'll probably commit it when the freeze ends.
> I want to ask portmgr (I intend to CC you) for approval to commit the current
> patchset for linux-rpm (you've seen it already) together with fixes for your
> ports (because of the "new world order" after patching linux-rpm). Boris is
And the patch at subject also should be added as it helps to generate
a more accurate plist file.
> preparing patches for your ports and will present them to you for review. I
> can include this patch into the patchset too. Actually this patch may fix
> something in your ports, so it's not a sweeping change but a potential fix
> for several ports.
Actually, I had to change the version of one port (audio/linux-openal)
to a newer one as I can't fetch those from the current port.
Other changes are plain (5 ports involved):
o edit WRKSRC (add rpm/i386/${LINUX_DIST}/${LINUX_DIST_VER};
o add source distfiles to distinfo to allow auto fetching sources
with defined PACKAGE_BUILDING;
o remove some variables already defined at linux-rpm
(i.e. MASTRE_SITE_SUBDIR);
o add LINUX_DIST_VER to every port (in case default linux_base
changes);
o bump PORTREVISION.
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=audio.patch
Content-Description: audio patch
diff -ruN linux-alsa-lib.orig/Makefile linux-alsa-lib/Makefile
--- linux-alsa-lib.orig/Makefile Mon Mar 20 22:33:48 2006
+++ linux-alsa-lib/Makefile Mon Mar 20 23:43:16 2006
@@ -7,9 +7,8 @@
PORTNAME= alsa-lib
DISTVERSION= 1.0.6-8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio linux
-MASTER_SITE_SUBDIR= updates/3/${LINUX_RPM_ARCH}/
DISTNAME= ${PORTNAME}-${DISTVERSION}.FC3
MAINTAINER= jylefort@FreeBSD.org
@@ -17,6 +16,7 @@
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
INSTALLS_SHLIB= yes
AUTOMATIC_PLIST=yes
diff -ruN linux-alsa-lib.orig/distinfo.i386 linux-alsa-lib/distinfo.i386
--- linux-alsa-lib.orig/distinfo.i386 Mon Mar 20 22:33:48 2006
+++ linux-alsa-lib/distinfo.i386 Mon Mar 20 22:43:06 2006
@@ -1,3 +1,6 @@
-MD5 (alsa-lib-1.0.6-8.FC3.i386.rpm) = 35377c586c8021e86117fad58f19c1a4
-SHA256 (alsa-lib-1.0.6-8.FC3.i386.rpm) = 5bcfe63440fe4a40a744caa351fd69dd7ecb994a0ce3b17511e75d1e6ac95d81
-SIZE (alsa-lib-1.0.6-8.FC3.i386.rpm) = 309665
+MD5 (rpm/i386/fedora/3/alsa-lib-1.0.6-8.FC3.i386.rpm) = 35377c586c8021e86117fad58f19c1a4
+SHA256 (rpm/i386/fedora/3/alsa-lib-1.0.6-8.FC3.i386.rpm) = 5bcfe63440fe4a40a744caa351fd69dd7ecb994a0ce3b17511e75d1e6ac95d81
+SIZE (rpm/i386/fedora/3/alsa-lib-1.0.6-8.FC3.i386.rpm) = 309665
+MD5 (rpm/i386/fedora/3/alsa-lib-1.0.6-8.FC3.src.rpm) = f13f1e1e8dd76d97a32a9414122fc9f9
+SHA256 (rpm/i386/fedora/3/alsa-lib-1.0.6-8.FC3.src.rpm) = bd93dbcb2d2b02e95109003f7f0a51ae207389aad3a6503e17c45d2747cf25da
+SIZE (rpm/i386/fedora/3/alsa-lib-1.0.6-8.FC3.src.rpm) = 681514
------------------------------------------------------------------------
diff -ruN linux-arts.orig/Makefile linux-arts/Makefile
--- linux-arts.orig/Makefile Tue Mar 21 01:48:09 2006
+++ linux-arts/Makefile Tue Mar 21 01:56:44 2006
@@ -7,16 +7,19 @@
PORTNAME= arts
DISTVERSION= 1.3.0-4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio kde linux
MAINTAINER= jylefort@FreeBSD.org
COMMENT= Audio system for the KDE integrated X11 desktop (Linux version)
ONLY_FOR_ARCHS= i386 amd64
+LINUX_DIST_VER= 3
USE_LINUX_RPM= yes
INSTALLS_SHLIB= yes
AUTOMATIC_PLIST= yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
+BRANDELF_DIRS= usr
.include <bsd.port.mk>
diff -ruN linux-arts.orig/distinfo.i386 linux-arts/distinfo.i386
--- linux-arts.orig/distinfo.i386 Tue Mar 21 01:48:10 2006
+++ linux-arts/distinfo.i386 Tue Mar 21 01:51:17 2006
@@ -1,3 +1,6 @@
-MD5 (arts-1.3.0-4.i386.rpm) = d758fd89abb6bb80dfc944557b546b40
-SHA256 (arts-1.3.0-4.i386.rpm) = 06a6ef2683d5d957d35a8584304b1db93c7d4568434595c4111dcc7f9d6a9ef2
-SIZE (arts-1.3.0-4.i386.rpm) = 1136312
+MD5 (rpm/i386/fedora/3/arts-1.3.0-4.i386.rpm) = d758fd89abb6bb80dfc944557b546b40
+SHA256 (rpm/i386/fedora/3/arts-1.3.0-4.i386.rpm) = 06a6ef2683d5d957d35a8584304b1db93c7d4568434595c4111dcc7f9d6a9ef2
+SIZE (rpm/i386/fedora/3/arts-1.3.0-4.i386.rpm) = 1136312
+MD5 (rpm/i386/fedora/3/arts-1.3.0-4.src.rpm) = d80aff550109ae4dd8ec00bd3fb50350
+SHA256 (rpm/i386/fedora/3/arts-1.3.0-4.src.rpm) = 044711b4873ae9b71308cdf0dc297543a3c89373657132ede633fa6d6fa3ecff
+SIZE (rpm/i386/fedora/3/arts-1.3.0-4.src.rpm) = 977930
------------------------------------------------------------------------
diff -ruN linux-libogg.orig/Makefile linux-libogg/Makefile
--- linux-libogg.orig/Makefile Tue Mar 21 02:24:05 2006
+++ linux-libogg/Makefile Tue Mar 21 02:29:35 2006
@@ -7,15 +7,15 @@
PORTNAME= libogg
DISTVERSION= 1.1.2-2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio linux
-MASTER_SITE_SUBDIR= 4/${LINUX_RPM_ARCH}/os/Fedora/RPMS/
MAINTAINER= jylefort@FreeBSD.org
COMMENT= Ogg bitstream library (Linux version)
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+LINUX_DIST_VER= 4
INSTALLS_SHLIB= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff -ruN linux-libogg.orig/distinfo.i386 linux-libogg/distinfo.i386
--- linux-libogg.orig/distinfo.i386 Tue Mar 21 02:24:05 2006
+++ linux-libogg/distinfo.i386 Tue Mar 21 02:27:54 2006
@@ -1,3 +1,6 @@
-MD5 (libogg-1.1.2-2.i386.rpm) = d919dbbf758b1a1bd0ef8265e9b824ea
-SHA256 (libogg-1.1.2-2.i386.rpm) = 66cf5abe033d80fad01755e7be5f21aadefd80125c9f51938677fe1c95bdbc61
-SIZE (libogg-1.1.2-2.i386.rpm) = 16555
+MD5 (rpm/i386/fedora/4/libogg-1.1.2-2.i386.rpm) = d919dbbf758b1a1bd0ef8265e9b824ea
+SHA256 (rpm/i386/fedora/4/libogg-1.1.2-2.i386.rpm) = 66cf5abe033d80fad01755e7be5f21aadefd80125c9f51938677fe1c95bdbc61
+SIZE (rpm/i386/fedora/4/libogg-1.1.2-2.i386.rpm) = 16555
+MD5 (rpm/i386/fedora/4/libogg-1.1.2-2.src.rpm) = 6efdbff9dbd34b17c87556af4be0b9ff
+SHA256 (rpm/i386/fedora/4/libogg-1.1.2-2.src.rpm) = cb698b8f539874633cba98da5c9498cd081e30f3ba4ec6a149b63491756d5c4a
+SIZE (rpm/i386/fedora/4/libogg-1.1.2-2.src.rpm) = 424192
------------------------------------------------------------------------
diff -ruN linux-libvorbis.orig/Makefile linux-libvorbis/Makefile
--- linux-libvorbis.orig/Makefile Tue Mar 21 02:30:20 2006
+++ linux-libvorbis/Makefile Tue Mar 21 02:35:58 2006
@@ -7,7 +7,7 @@
PORTNAME= libvorbis
DISTVERSION= 1.1.0-1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio linux
MAINTAINER= jylefort@FreeBSD.org
@@ -17,6 +17,7 @@
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
INSTALLS_SHLIB= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
diff -ruN linux-libvorbis.orig/distinfo.i386 linux-libvorbis/distinfo.i386
--- linux-libvorbis.orig/distinfo.i386 Tue Mar 21 02:30:20 2006
+++ linux-libvorbis/distinfo.i386 Tue Mar 21 02:33:56 2006
@@ -1,3 +1,6 @@
-MD5 (libvorbis-1.1.0-1.i386.rpm) = 59f208bbf878f6d41e7687ea0716c86f
-SHA256 (libvorbis-1.1.0-1.i386.rpm) = a7253de71a2934d3e3e0a421aa7b798319921829558494fe9d1cb5526fdb0622
-SIZE (libvorbis-1.1.0-1.i386.rpm) = 189788
+MD5 (rpm/i386/fedora/3/libvorbis-1.1.0-1.i386.rpm) = 59f208bbf878f6d41e7687ea0716c86f
+SHA256 (rpm/i386/fedora/3/libvorbis-1.1.0-1.i386.rpm) = a7253de71a2934d3e3e0a421aa7b798319921829558494fe9d1cb5526fdb0622
+SIZE (rpm/i386/fedora/3/libvorbis-1.1.0-1.i386.rpm) = 189788
+MD5 (rpm/i386/fedora/3/libvorbis-1.1.0-1.src.rpm) = e91a42ddfc1f959b375f494e5c1997ad
+SHA256 (rpm/i386/fedora/3/libvorbis-1.1.0-1.src.rpm) = da4618c92bd07860421a823d515efbb90db7c20a529f7835e3fb374ac8b8beb3
+SIZE (rpm/i386/fedora/3/libvorbis-1.1.0-1.src.rpm) = 1314220
------------------------------------------------------------------------
diff -ruN linux-openal.orig/Makefile linux-openal/Makefile
--- linux-openal.orig/Makefile Tue Mar 21 03:19:16 2006
+++ linux-openal/Makefile Tue Mar 21 03:22:02 2006
@@ -6,8 +6,7 @@
#
PORTNAME= openal
-DISTVERSION= 0.0-0.2.20040726
-PORTREVISION= 1
+DISTVERSION= 0.0.9-0.3.20060226cvs.fc3
CATEGORIES= audio linux
MASTER_SITE_SUBDIR= ../extras/3/${LINUX_RPM_ARCH}/
@@ -24,8 +23,11 @@
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
INSTALLS_SHLIB= yes
AUTOMATIC_PLIST=yes
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
+
+MASTER_SITE_SRC_SUBDIR= ../extras/3/SRPMS
.include <bsd.port.mk>
diff -ruN linux-openal.orig/distinfo.i386 linux-openal/distinfo.i386
--- linux-openal.orig/distinfo.i386 Tue Mar 21 03:19:16 2006
+++ linux-openal/distinfo.i386 Tue Mar 21 03:16:49 2006
@@ -1,3 +1,6 @@
-MD5 (openal-0.0-0.2.20040726.i386.rpm) = 90eb77535e33d7c35b86d48b4dbfaa5a
-SHA256 (openal-0.0-0.2.20040726.i386.rpm) = fc1899bc52728ec12ae3d45e3d29ccb5de5fc97cc6581cb49fee431650d24f5c
-SIZE (openal-0.0-0.2.20040726.i386.rpm) = 121188
+MD5 (rpm/i386/fedora/3/openal-0.0.9-0.3.20060226cvs.fc3.i386.rpm) = 6842d2ac069f3aaec12e52d6cafd7c28
+SHA256 (rpm/i386/fedora/3/openal-0.0.9-0.3.20060226cvs.fc3.i386.rpm) = 2860b47d8391a3ff9a556f7ab36352c889b0065f5bbeadcf02649989cec95851
+SIZE (rpm/i386/fedora/3/openal-0.0.9-0.3.20060226cvs.fc3.i386.rpm) = 129732
+MD5 (rpm/i386/fedora/3/openal-0.0.9-0.3.20060226cvs.fc3.src.rpm) = d24c288da4ccde1c6ff2ce994bfa55c3
+SHA256 (rpm/i386/fedora/3/openal-0.0.9-0.3.20060226cvs.fc3.src.rpm) = b2da011fb31ed01da72f538d2ee2d5b59a142a5e2df3715fb8403f9dcf98d87e
+SIZE (rpm/i386/fedora/3/openal-0.0.9-0.3.20060226cvs.fc3.src.rpm) = 1368091
--=-=-=
The patch is relative to ports/audio path (cd ports/audio;
patch < _the_patch_).
WBR
--
Boris B. Samorodov, Research Engineer
InPharmTech Co, http://www.ipt.ru
Telephone & Internet Service Provider
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?61288143>