Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 16 Mar 2006 03:47:25 -0000
From:      Shaun Amott <shaun@inerd.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        vsevolod@highsecure.ru
Subject:   ports/94530: lang/fpc2 - Create slave port; modify master to facilitate
Message-ID:  <1142480845.9965@charon.picobyte.net>
Resent-Message-ID: <200603161509.k2GF9Kas082040@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         94530
>Category:       ports
>Synopsis:       lang/fpc2 - Create slave port; modify master to facilitate
>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:   Thu Mar 16 15:09:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Shaun Amott
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
>Environment:

>Description:

I'm working on a port which requires lang/fpc2 to be installed (at build-time
and run-time). It also requires that all the additional "units" be installed.

The current fpc2 port installs units via OPTIONS, but I need to be able to
guarantee all of them are installed.

Below is a new slave port which does this, along with a master port patch to
facilitate the change.

(fpc2 maintainer CD'ed)

>How-To-Repeat:

>Fix:

--- fpc2.diff begins here ---
diff -urN fpc2.orig/Makefile fpc2/Makefile
--- fpc2.orig/Makefile	Wed Dec 28 22:06:36 2005
+++ fpc2/Makefile	Thu Mar 16 03:15:30 2006
@@ -19,13 +19,13 @@
 DISTNAME=	${PORTNAME}-${PORTVERSION}.i386-freebsd
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	vsevolod@highsecure.ru
+MAINTAINER?=	vsevolod@highsecure.ru
 COMMENT=	Free Pascal compiler with Turbo, Delphi and other extensions
 
 BUILDNAME=	i386-freebsd
 
 # Define some libraries for fpc using OPTIONS
-OPTIONS=	BFD "Install bfd support" off \
+OPTIONS?=	BFD "Install bfd support" off \
 		FCL "Install fcl support" off \
 		FORMS "Install forms support" off \
 		FPGTK "Install fpgtk support" off \
@@ -66,7 +66,6 @@
 
 .include <bsd.port.pre.mk>
 
-USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
 PKGDEINSTALL=	${PKGINSTALL}
@@ -106,6 +105,8 @@
 LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
 .endif
 
+.if !defined(UNITS)
+
 # Build units list
 .if defined(WITH_BFD)
 UNITS+=	bfd
@@ -226,6 +227,8 @@
 .endif
 .if defined(WITH_ZVT)
 UNITS+=	zvt
+.endif
+
 .endif
 
 do-extract:
--- fpc2.diff ends here ---



--- fpc2-allunits.shar begins here ---
# 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:
#
#	fpc2-allunits/
#	fpc2-allunits/Makefile
#
echo c - fpc2-allunits/
mkdir -p fpc2-allunits/ > /dev/null 2>&1
echo x - fpc2-allunits/Makefile
sed 's/^X//' >fpc2-allunits/Makefile << 'END-of-fpc2-allunits/Makefile'
X# New ports collection makefile for:	fpc2-allunits
X# Date Created:				2006-02-09
X# Whom:					Shaun Amott <shaun@inerd.com>
X#
X# $FreeBSD$
X#
X
XPKGNAMESUFFIX=	-allunits
X
XMAINTAINER=	shaun@inerd.com
X
XMASTERDIR=	${.CURDIR}/../fpc2
X
XCONFLICTS=	fpc-2*
X
X# Override master port
X# Ignore OPTIONS, and install all the modules
X
XOPTIONS=
XUNITS=WITH_MD5
XUNITS+=WITH_MYSQL
XUNITS+=WITH_NCURSES
XUNITS+=WITH_NETDB
XUNITS+=WITH_ODBC
XUNITS+=WITH_OPENGL
XUNITS+=WITH_ORACLE
XUNITS+=WITH_PASJPEG
XUNITS+=WITH_PASZLIB
XUNITS+=WITH_POSTGRES
XUNITS+=WITH_PTHREADS
XUNITS+=WITH_REGEXP
XUNITS+=WITH_SQLITE
XUNITS+=WITH_SVGALIB
XUNITS+=WITH_SYSLOG
XUNITS+=WITH_TCL
XUNITS+=WITH_UNZIP
XUNITS+=WITH_UTMP
XUNITS+=WITH_X11
XUNITS+=WITH_ZLIB
XUNITS+=WITH_ZVT
X
X.include "${MASTERDIR}/Makefile"
END-of-fpc2-allunits/Makefile
exit
--- fpc2-allunits.shar ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1142480845.9965>