From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Feb 14 02:40:09 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECEB816A4CF for ; Sat, 14 Feb 2004 02:40:09 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E82E143D2D for ; Sat, 14 Feb 2004 02:40:09 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i1EAe9bv046885 for ; Sat, 14 Feb 2004 02:40:09 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i1EAe9Qa046884; Sat, 14 Feb 2004 02:40:09 -0800 (PST) (envelope-from gnats) Resent-Date: Sat, 14 Feb 2004 02:40:09 -0800 (PST) Resent-Message-Id: <200402141040.i1EAe9Qa046884@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Michael Ranner Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3866316A4CE for ; Sat, 14 Feb 2004 02:31:51 -0800 (PST) Received: from dwarf.jawa.at (81-223-113-157.dynamic.adsl-line.inode.at [81.223.113.157]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27E8A43D1F for ; Sat, 14 Feb 2004 02:31:50 -0800 (PST) (envelope-from mranner@dwarf.jawa.at) Received: from dwarf.jawa.at (localhost.jawa.at [127.0.0.1]) by dwarf.jawa.at (8.12.9p2/8.12.9) with ESMTP id i1EAUwqa031280 for ; Sat, 14 Feb 2004 11:30:59 +0100 (CET) (envelope-from mranner@dwarf.jawa.at) Received: (from root@localhost) by dwarf.jawa.at (8.12.9p2/8.12.9/Submit) id i1EAUwaE031279; Sat, 14 Feb 2004 11:30:58 +0100 (CET) (envelope-from mranner) Message-Id: <200402141030.i1EAUwaE031279@dwarf.jawa.at> Date: Sat, 14 Feb 2004 11:30:58 +0100 (CET) From: Michael Ranner To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/62829: Mk file bsd.linux.rpm.mk supporting Linux RPM based ports X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Michael Ranner List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Feb 2004 10:40:10 -0000 >Number: 62829 >Category: ports >Synopsis: Mk file bsd.linux.rpm.mk supporting Linux RPM based ports >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 14 02:40:09 PST 2004 >Closed-Date: >Last-Modified: >Originator: Michael Ranner >Release: FreeBSD 4.9-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD dwarf.jawa.at 4.9-RELEASE-p1 FreeBSD 4.9-RELEASE-p1 #4: Sat Nov 29 11:09:14 CET 2003 root@dwarf.jawa.at:/usr/src/sys/compile/DWARF i386 >Description: Mk file bsd.linux.rpm.mk supporting Linux RPM based ports There is some redundant code in some Linux RPM based ports, like linux-gtk This new makefile makes it easier to integrate new ports for Linux RPM's I like to bring in a port for DBDesigner4 which needs some new RPM's, and this patch should make life for RPM port maintainers easier. >How-To-Repeat: cd /usr/ports && patch Fix: --- patch-bsd-linux-rpm-mk begins here --- diff -crN Mk.orig/bsd.linux.rpm.mk Mk/bsd.linux.rpm.mk *** Mk.orig/bsd.linux.rpm.mk Thu Jan 1 01:00:00 1970 --- Mk/bsd.linux.rpm.mk Sat Feb 14 11:17:02 2004 *************** *** 0 **** --- 1,61 ---- + # + # bsd.linux.rpm.mk - Support for Linux-RPM-based ports. + # + # Created by: Michael Ranner + # Based on: emulators/linux_base by marcel@FreeBSD.org + # & multimedia/xmovie by sanpei@sanpei.org + # & x11-toolkits/linux-gtk + # + # For FreeBSD committers: + # Please send all suggested changes to the maintainer instead of committing + # them to CVS yourself. + # + # $FreeBSD$ + # + # Adding 'USE_LINUX_RPM=yes' to a port includes this Makefile after bsd.ports.pre.mk. + # + # The port can set these options in its Makefile before bsd.ports.pre.mk: + # + # RPM_SET= - Name of the Linux RPM + # BASEVERSION= - Version of the linux_base port + # + + Linux_RPM_Include_MAINTAINER= ports@FreeBSD.org + + MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g} + PKGNAMEPREFIX= linux- + DISTFILES= ${RPM_SET} + + BUILD_DEPENDS?= rpm:${PORTSDIR}/archivers/rpm + USE_LINUX_PREFIX= yes + + ONLY_FOR_ARCHS?= i386 alpha + DIST_SUBDIR= rpm + EXTRACT_ONLY= + NO_BUILD= yes + NO_FILTER_SHLIBS= yes + PLIST?= ${PKGDIR}/pkg-plist.${MACHINE_ARCH} + MD5_FILE?= ${MASTERDIR}/distinfo.${MACHINE_ARCH} + + # Let's avoid hardcoding 'en' as the language. + LANG?= en + # Set the version of linux_base + BASEVERSION?= 7.1 + RPM_MIRRORS= \ + ftp://ftp.redhat.com/pub/redhat/__DIR__/ \ + ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \ + ftp://ftp.mirror.ac.uk/sites/ftp.redhat.com/pub/redhat/__DIR__/ + STDDIR= linux/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS + UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH} + DBPATH= /var/lib/rpm + RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \ + --nodeps --replacepkgs + RPMDIR= ${DISTDIR}/${DIST_SUBDIR} + + .if !target(do-install) + do-install: + @for R in ${RPM_SET}; do \ + ${ECHO_MSG} $$R; \ + rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \ + done + .endif diff -crN Mk.orig/bsd.port.mk Mk/bsd.port.mk *** Mk.orig/bsd.port.mk Sat Feb 14 11:22:13 2004 --- Mk/bsd.port.mk Sat Feb 14 11:14:47 2004 *************** *** 1227,1232 **** --- 1227,1236 ---- .include "${PORTSDIR}/Mk/bsd.php.mk" .endif + .if defined(USE_LINUX_RPM) + .include "${PORTSDIR}/Mk/bsd.linux.rpm.mk" + .endif + .if defined(USE_PYTHON) .include "${PORTSDIR}/Mk/bsd.python.mk" .endif --- patch-bsd-linux-rpm-mk ends here --- >Release-Note: >Audit-Trail: >Unformatted: