From owner-freebsd-ports Tue Apr 27 8:40: 6 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 9D0681562B for ; Tue, 27 Apr 1999 08:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA15869; Tue, 27 Apr 1999 08:40:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from shale.csir.co.za (shale.csir.co.za [146.64.46.5]) by hub.freebsd.org (Postfix) with ESMTP id 6982E15622 for ; Tue, 27 Apr 1999 08:36:43 -0700 (PDT) (envelope-from reg@shale.csir.co.za) Received: (from reg@localhost) by shale.csir.co.za (8.9.3/8.9.3) id RAA01981; Tue, 27 Apr 1999 17:36:39 +0200 (SAT) (envelope-from reg) Message-Id: <199904271536.RAA01981@shale.csir.co.za> Date: Tue, 27 Apr 1999 17:36:39 +0200 (SAT) From: reg@shale.csir.co.za Reply-To: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/11354: Port fix: x11/XFree86 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 11354 >Category: ports >Synopsis: Port fix: x11/XFree86 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Apr 27 08:40:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Jeremy Lea >Release: FreeBSD 4.0-CURRENT i386 >Organization: Arb's Inc. >Environment: FreeBSD Ports collection. >Description: PLIST fixups. The moving of the two rstart files out of sort is deliberate, since they are symlinked directories, and are removed without complaint once the directory to which they point is removed. Otherwise they require crufty @exec and @unexec rules. The patch to the Makefile, along with the following, allows Imake programs to be complied with the system CFLAGS, dynamically. This may not be the best way to do this, so suggestions are welcome, particulary if they don't involve make.conf. --- /usr/src/etc/make.conf Mon Mar 15 10:14:43 1999 +++ /usr/src/etc/make.conf Thu Apr 8 14:11:34 1999 @@ -11,7 +11,8 @@ # # One, and probably the most common, use could be: # #CFLAGS= -O -pipe +X11_CFLAGS!= ${CFLAGS} # # # Avoid compiling profiled libraries >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /usr/home/ncvs/ports/x11/XFree86/Makefile,v retrieving revision 1.54 diff -u -r1.54 Makefile --- Makefile 1999/03/19 22:35:25 1.54 +++ Makefile 1999/04/07 15:29:46 @@ -61,6 +61,11 @@ .endif .endif +post-configure: +.if defined(X11_CFLAGS) + @${ECHO} '#define DefaultGcc2i386Opt $${X11_CFLAGS}' >> ${WRKSRC}/config/cf/xf86site.def +.endif + .include pre-install: Index: pkg/PLIST =================================================================== RCS file: /usr/home/ncvs/ports/x11/XFree86/pkg/PLIST,v retrieving revision 1.18 diff -u -r1.18 PLIST --- PLIST 1998/11/24 01:22:05 1.18 +++ PLIST 1999/04/06 11:52:37 @@ -524,6 +524,9 @@ lib/X11/config/cray.cf lib/X11/config/fujitsu.cf lib/X11/config/generic.cf +lib/X11/config/gnu.cf +lib/X11/config/gnuLib.rules +lib/X11/config/gnuLib.tmpl lib/X11/config/host.def lib/X11/config/hp.cf lib/X11/config/hpLib.rules @@ -594,6 +597,7 @@ lib/X11/doc/README.DECtga lib/X11/doc/README.DGA lib/X11/doc/README.FreeBSD +lib/X11/doc/README.I128 lib/X11/doc/README.LinkKit lib/X11/doc/README.MGA lib/X11/doc/README.Mach32 @@ -1262,8 +1266,6 @@ lib/X11/rstart/commands/@List lib/X11/rstart/commands/ListContexts lib/X11/rstart/commands/ListGenericCommands -lib/X11/rstart/commands/x -lib/X11/rstart/commands/x11 lib/X11/rstart/commands/x11r6/@List lib/X11/rstart/commands/x11r6/LoadMonitor lib/X11/rstart/commands/x11r6/Terminal @@ -1388,6 +1390,7 @@ lib/X11/xkb/symbols/be lib/X11/xkb/symbols/bg lib/X11/xkb/symbols/ca +lib/X11/xkb/symbols/ca_enhanced lib/X11/xkb/symbols/cs lib/X11/xkb/symbols/ctrl lib/X11/xkb/symbols/de @@ -1418,6 +1421,7 @@ lib/X11/xkb/symbols/pc104 lib/X11/xkb/symbols/pl lib/X11/xkb/symbols/pt +lib/X11/xkb/symbols/ralt lib/X11/xkb/symbols/ru lib/X11/xkb/symbols/se lib/X11/xkb/symbols/sgi/jp @@ -2603,6 +2607,8 @@ @dirrm lib/X11/twm @dirrm lib/X11/rstart/contexts @dirrm lib/X11/rstart/commands/x11r6 +lib/X11/rstart/commands/x +lib/X11/rstart/commands/x11 @dirrm lib/X11/rstart/commands @dirrm lib/X11/rstart @dirrm lib/X11/proxymngr >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message