Date: Thu, 7 Nov 1996 19:13:17 -0800 (PST) From: asami@freebsd.org (Satoshi Asami) To: jmz@cabri.obs-besancon.fr Cc: CVS-committers@freefall.freebsd.org, cvs-all@freefall.freebsd.org, cvs-ports@freefall.freebsd.org Subject: Re: cvs commit: ports/x11/XFree86 Makefile ports/x11/XFree86/files md5 ports/x11/XFree86/pkg COMMENT DESCR PLIST ports/x11/XFree86/scripts configure Message-ID: <199611080313.TAA01349@silvia.HIP.Berkeley.EDU> In-Reply-To: <9611071529.AA28601@cabri.obs-besancon.fr> (message from Jean-Marc Zucconi on Thu, 7 Nov 96 16:29:48 %2B0100)
next in thread | previous in thread | raw e-mail | index | archive | help
* > Thanks, but I think you forgot to cvs add Makefile.ftp.
*
* Done.
Thanks...but is this file really necessary? There is nothing in there
that can't be in the regular Makefile.
Actually, looking at the Makefile, I get the impression that it is
unnecessarily complex and non-standard, probably because of the
history from back when you had support for FTP and two different
CDROMs.
I made it much simpler, it seems to work fine.
===
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/x11/XFree86/Makefile,v
retrieving revision 1.20
diff -c -r1.20 Makefile
*** Makefile 1996/11/06 13:37:54 1.20
--- Makefile 1996/11/08 02:58:17
***************
*** 6,40 ****
# $Id: Makefile,v 1.20 1996/11/06 13:37:54 jmz Exp $
#
! #######################################################################
! # #
! # Configurable Section #
! # #
! #######################################################################
! #
! # Define FORCE_PACKAGE from the command line if you want to override
! # this and build a package
! NO_PACKAGE = yes
! #######################################################################
! DISTNAME = xc
! PKGNAME = XFree86-3.2
! CATEGORIES = x11
! IS_INTERACTIVE = yes
! PREFIX = /usr/X11R6
! MAINTAINER= jmz@FreeBSD.ORG
!
! do-build:
! @(cd ${WRKSRC}; echo Good night...; make World 2>&1 | tee world.log)
! @touch ${WRKDIR}/.build_done
! do-install:
! @(cd ${WRKSRC}; make install; make install.man)
! @touch ${WRKDIR}/.install_done
! .include "Makefile.ftp"
post-install:
! ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>
-
--- 6,32 ----
# $Id: Makefile,v 1.20 1996/11/06 13:37:54 jmz Exp $
#
! DISTNAME= xc
! PKGNAME= XFree86-3.2
! CATEGORIES= x11
! MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.2/source/ \
! ftp://xfree86.cdrom.com/pub/XFree86/source/ \
! ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.2/source/ \
! ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.2/source/
! DISTFILES= X32src-1.tgz X32src-2.tgz X32contrib.tgz
! MAINTAINER= jmz@FreeBSD.ORG
! # Define FORCE_PACKAGE from the command line if you want to override
! # this and build a package
! NO_PACKAGE= yes
! IS_INTERACTIVE= yes # configure script asks questions
! USE_X11= yes
! ALL_TARGET= World
! INSTALL_TARGET= install install.man
! DIST_SUBDIR= xc
post-install:
! /sbin/ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>
===
(This is the case where a diff is longer than the original file, but
it's still good for comparison. ;)
There is no configurable variables left. The log part is not
necessary, it's the user's job to redirect the output if he's too
stupid to remember all that's scrolling by. There is no need to touch
the cookies from inside the do-* targets. The two-phase install can
be done by specifying INSTALL_TARGET.
Please take a look at it. It looks just like any other port (other
than that it has a very nice configure script, thanks). :)
* What is the problem with "./" ? With such a PLIST you are sure to
* never forgot a file. The restriction is that you are forced to make an
* install in an empty /usr/X11R6 directory if you want to make a
* package, but this is not a problem.
I'm not worried about the package itself, it's pkg_delete. The user
should be able to "pkg_delete XFree86-3.1.2" and then install the new
version to safely upgrade the system. Also we will lose the ability
to grep the PLIST or +CONTENTS to see where the file came from.
* Of course, removing the package
* implies that everything under X11R6 will be removed, but this is
* logical since all other ports depend on X11 :-)
I'm assuming this is a joke, right? (Yes, I see the smiley, sorry to
be so dense but someone might believe it. ;)
* On the other hand the PLIST depends on the options you choose at
* configure time.
Just list everything, I assume it's mostly the X servers, right? The
only problem is a warning at pkg_delete.
If it's too much trouble for you, I can make the PLIST (I just did a
full build myself and still have the tree around, I only need to do a
find to make the list and add the servers I didn't build).
Satoshi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199611080313.TAA01349>