Date: Sun, 21 Jul 2002 21:07:49 +0400 (MSD) From: Dmitry Morozovsky <marck@rinet.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kaz@kobe1995.net Subject: ports/40848: reflect WITHOUT-X11 in package name for xmbmon Message-ID: <200207211707.g6LH7nh32465@woozle.rinet.ru>
next in thread | raw e-mail | index | archive | help
>Number: 40848
>Category: ports
>Synopsis: reflect WITHOUT-X11 in package name for xmbmon
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 21 10:10:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Morozovsky
>Release: FreeBSD 4-STABLE i386
>Organization:
Cronyx Plus LLC (RiNet ISP)
>Environment:
System: FreeBSD 4-STABLE
>Description:
It is useful for me to change package name when building xmbmon
without X.
Or maybe, dependent port would be useful.
I, resonally, prefer the second approach (both included
in "fix" section).
>How-To-Repeat:
cd /usr/ports/sysutils/xmbmon
make install WITHOUT_X11=yes
see /var/db/pkg/xmbmon*
>Fix:
1 approach: change package name
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/xmbmon/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 12 Mar 2002 02:51:41 -0000 1.4
+++ Makefile 21 Jul 2002 16:53:42 -0000
@@ -22,6 +22,7 @@
MAKE_ARGS+= WITHOUT_X11=yes DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
DOCS= 00README.txt 00READMEj.txt DEBUG_Info
PLIST_SUB= X11_ONLY="@comment "
+PKGNAMESUFFIX= -nox11
.else
USE_XLIB= yes
MAKE_ARGS+= DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
2 approach: dependant port (2 patches and shar)
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/Makefile,v
retrieving revision 1.277
diff -u -r1.277 Makefile
--- Makefile 17 Jul 2002 06:34:40 -0000 1.277
+++ Makefile 21 Jul 2002 17:05:37 -0000
@@ -111,6 +111,7 @@
SUBDIR += ltrace
SUBDIR += maint
SUBDIR += manck
+ SUBDIR += mbmon
SUBDIR += medusa
SUBDIR += memtest
SUBDIR += mgeupsd
Index: xmbmon/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/xmbmon/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- xmbmon/Makefile 12 Mar 2002 02:51:41 -0000 1.4
+++ xmbmon/Makefile 21 Jul 2002 17:05:37 -0000
@@ -5,11 +5,12 @@
# $FreeBSD: ports/sysutils/xmbmon/Makefile,v 1.4 2002/03/12 02:51:41 pat Exp $
#
-PORTNAME= xmbmon
+BASEPORTNAME= xmbmon
+PORTNAME?= ${BASEPORTNAME}
PORTVERSION= 107p1
CATEGORIES= sysutils
MASTER_SITES= http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
-DISTNAME= ${PORTNAME}${PORTVERSION:S/p/pl/}
+DISTNAME= ${BASEPORTNAME}${PORTVERSION:S/p/pl/}
MAINTAINER= kaz@kobe1995.net
@@ -22,6 +23,7 @@
MAKE_ARGS+= WITHOUT_X11=yes DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
DOCS= 00README.txt 00READMEj.txt DEBUG_Info
PLIST_SUB= X11_ONLY="@comment "
+PKGNAMESUFFIX= -nox11
.else
USE_XLIB= yes
MAKE_ARGS+= DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
@@ -30,10 +32,12 @@
.include <bsd.port.pre.mk>
+.if (${WITHOUT_X11} != yes)
pre-extract:
@${ECHO}
@${ECHO} "set WITHOUT_X11 variable to 'yes' if you want to build without X11"
@${ECHO}
+.endif
post-patch:
@${MV} -f ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.X
# 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:
#
# mbmon/
# mbmon/Makefile
#
echo c - mbmon/
mkdir -p mbmon/ > /dev/null 2>&1
echo x - mbmon/Makefile
sed 's/^X//' >mbmon/Makefile << 'END-of-mbmon/Makefile'
X# ports collection makefile for: mbmon
X# Date created: 2002/07/21
X# Whom: marck@rinet.ru
X#
X# $FreeBSD$
X#
X
XPORTNAME= mbmon
XWITHOUT_X11= yes
X
XMASTERDIR= ${.CURDIR}/../xmbmon
X
X.include "${MASTERDIR}/Makefile"
END-of-mbmon/Makefile
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207211707.g6LH7nh32465>