Date: Mon, 17 Mar 2014 00:00:41 +0100 From: Thierry Thomas <thierry@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/186702: Mk/bsd.linux-rpm.mk does not allow grouping rules (:something) Message-ID: <20140316230041.GO15009@graf.pompo.net> In-Reply-To: <201402122020.s1CKK1MV049065@freefall.freebsd.org> References: <20140212201524.8192371E4AF@graf.pompo.net> <201402122020.s1CKK1MV049065@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
As suggested by netchild@, I tested the proposed patch with some
important ports.
For emulators/linux_base-f10, x11-toolkits/linux-f10-gtk2,
x11-toolkits/linux-f10-tk85 and so on, it is non applicable, because
they have only one set of MASTER_SITES - but it does not hurt.
I retried the patch proposed for devel/linux-f10-devtools, and it still
works.
I also tried it on x11-toolkits/linux-f10-qt45, with the hereunder
patch, and it's OK:
--- linux-f10-qt45.diff begins here ---
diff -urN x11-toolkits/linux-f10-qt45.orig/Makefile x11-toolkits/linux-f10-qt45/Makefile
--- x11-toolkits/linux-f10-qt45.orig/Makefile 2013-10-07 15:36:45.000000000 +0200
+++ x11-toolkits/linux-f10-qt45/Makefile 2014-03-16 23:29:12.000000000 +0100
@@ -3,10 +3,10 @@
PORTNAME= ${LINUX_NAME}45
PORTVERSION= 4.5.3
CATEGORIES= x11-toolkits linux
-MASTER_SITES= http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/10/i386/ \
- http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/10/SRPMS/
+MASTER_SITES= http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/10/i386/:bin \
+ http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/10/SRPMS/:src
PKGNAMEPREFIX= linux-f10-
-DISTNAME= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}
+DISTFILES= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}:bin
MAINTAINER= emulation@FreeBSD.org
COMMENT= RPM of QT4 (Linux Fedora 10)
@@ -16,6 +16,7 @@
LINUX_NAME= qt
LINUX_DIST_VER= 10
RPMVERSION= 9.fc10
+SRC_DISTFILES= ${LINUX_NAME}-${PORTVERSION}-${RPMVERSION}${SRC_SUFX}:src
USE_LDCONFIG= yes
PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
--- linux-f10-qt45.diff ends here ---
If you think about other important ports with at least two sets of
MASTER_SITES (not the critical ones), let me know, and I'll try them.
Best regards,
--
Th. Thomas.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140316230041.GO15009>