Date: Wed, 11 Sep 2013 19:54:55 +0100 (BST) From: Chris Rees <crees@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/182021: Modify port: ports-mgmt/dialog4ports to allow slave ports Message-ID: <20130911185455.83FA03B533@pegasus.bayofrum.net> Resent-Message-ID: <201309111900.r8BJ00gn035190@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182021
>Category: ports
>Synopsis: Modify port: ports-mgmt/dialog4ports to allow slave ports
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 11 19:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Chris Rees
>Release: FreeBSD 9.1-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD pegasus.bayofrum.net 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #1 r252227M: Sat Jun 29 13:55:30 BST 2013 root@pegasus.bayofrum.net:/usr/obj/usr/src/sys/PEGASUS amd64
>Description:
Joe Marcus Clarke and I would like to add a slave port to ports-mgmt/dialog4ports to compile a static binary, so that it can be copied to chroots and used inside them without shlib complaints.
Please confirm that you approve of the minor modifications to ports-mgmt/dialog4ports, and I'll add the new port.
>How-To-Repeat:
>Fix:
--- patch.txt begins here ---
Index: ports-mgmt/Makefile
===================================================================
--- ports-mgmt/Makefile (revision 326922)
+++ ports-mgmt/Makefile (working copy)
@@ -8,6 +8,7 @@
SUBDIR += bxpkg
SUBDIR += chucky
SUBDIR += dialog4ports
+ SUBDIR += dialog4ports-static
SUBDIR += distilator
SUBDIR += fastest_sites
SUBDIR += fbsdmon
Index: ports-mgmt/dialog4ports/Makefile
===================================================================
--- ports-mgmt/dialog4ports/Makefile (revision 326922)
+++ ports-mgmt/dialog4ports/Makefile (working copy)
@@ -3,7 +3,7 @@
PORTNAME= dialog4ports
PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTREVISION?= 1
CATEGORIES= ports-mgmt
MASTER_SITES= http://m1cro.tk/dialog4ports/ \
http://files.etoilebsd.net/dialog4ports/ \
@@ -13,17 +13,19 @@
ftp://invisible-island.net/dialog/:dialog \
http://mirror.shatow.net/freebsd/${PORTNAME}/:dialog
-MAINTAINER= rum1cro@yandex.ru
-COMMENT= Console Interface to configure ports
+MAINTAINER?= rum1cro@yandex.ru
+COMMENT?= Console Interface to configure ports
# CCACHE has options, so may need d4p, make d4p not ccache friendly
# to avoid circular dependency
NO_CCACHE= yes
MANCOMPRESSED= yes
-MAN1= ${PORTNAME}.1
MAKE_ENV+= __MAKE_CONF=/dev/null SRCCONF=/dev/null
+.if !defined(D4P_SLAVE)
+MAN1= ${PORTNAME}.1
PLIST_FILES= bin/dialog4ports
+.endif
.include <bsd.port.pre.mk>
@@ -36,7 +38,7 @@
DIALOG4PORTS= ${WRKSRC}/dialog4ports
.endif
-.if ${OSVERSION} < 900030
+.if ${OSVERSION} < 900030 || defined(D4P_SLAVE)
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${DIALOGNAME}.tgz:dialog
DIALOGNAME= dialog-1.1-20120706
Index: ports-mgmt/dialog4ports-static/Makefile
===================================================================
--- ports-mgmt/dialog4ports-static/Makefile (revision 0)
+++ ports-mgmt/dialog4ports-static/Makefile (working copy)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX= -static
+
+MAINTAINER= marcus@marcuscom.com
+COMMENT= Console Interface to configure ports (static version for chroots)
+
+MASTERDIR= ${.CURDIR}/../dialog4ports
+DESCR= ${.CURDIR}/pkg-descr
+MAKE_ENV+= NO_SHARED=yes
+D4P_SLAVE= yes
+
+PLIST_FILES= bin/dialog4ports-static
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/dialog4ports \
+ ${PREFIX}/bin/dialog4ports-static
+
+.include "${MASTERDIR}/Makefile"
Property changes on: ports-mgmt/dialog4ports-static/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: ports-mgmt/dialog4ports-static/pkg-descr
===================================================================
--- ports-mgmt/dialog4ports-static/pkg-descr (revision 0)
+++ ports-mgmt/dialog4ports-static/pkg-descr (working copy)
@@ -0,0 +1,4 @@
+dialog4ports -- a dialog for FreeBSD ports. This is a static version that
+can be used in chroots, for example in Tinderbox.
+
+WWW: https://bitbucket.org/m1cro/d4p/
Property changes on: ports-mgmt/dialog4ports-static/pkg-descr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- patch.txt ends here ---
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130911185455.83FA03B533>