diff options
| author | anholt <anholt@FreeBSD.org> | 2002-10-17 15:20:03 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2002-10-17 15:20:03 +0800 |
| commit | 3dae6bbb516fec9bfcdf48ddf7751b4bc567c22a (patch) | |
| tree | 0acfbf3a6277cbde9ebd74ce059793b8b936e7b8 /x11-servers/XFree86-4-Server | |
| parent | 3f799016a652135e258dffb274eb127ea19e6b9c (diff) | |
| download | freebsd-ports-gnome-3dae6bbb516fec9bfcdf48ddf7751b4bc567c22a.tar.gz freebsd-ports-gnome-3dae6bbb516fec9bfcdf48ddf7751b4bc567c22a.tar.zst freebsd-ports-gnome-3dae6bbb516fec9bfcdf48ddf7751b4bc567c22a.zip | |
[1] Make the 4.2.1 ports all use the merged 4.2.1+mitshm patch.
[2] Make the ports respect CFLAGS better. Now CFLAGS (and CC/CXX) are set for
the build during the configure stage.
PR: [2] 40271, 43369
Diffstat (limited to 'x11-servers/XFree86-4-Server')
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 7 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 2b6ea4554a28..f1a26e3fe5f7 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -7,7 +7,7 @@ PORTNAME= Server PORTVERSION= 4.2.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -39,7 +39,10 @@ SCRIPTS_ENV= OSVERSION=${OSVERSION} \ ExtendedInputDevices=${ExtendedInputDevices} \ BuildXF86DRI=${BuildXF86DRI} \ HasGlide3=${HasGlide3} \ - HaveMatroxHal=${HaveMatroxHal} + HaveMatroxHal=${HaveMatroxHal} \ + CC="${CC}" \ + CXX="${CXX}" \ + CFLAGS="${CFLAGS}" MAN1= XFree86.1 \ Xserver.1 \ kbd_mode.1 \ diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index 19fdf2092e4d..7cd0e774b0d5 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -81,7 +81,10 @@ configure () { echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF - + echo "#define FreeBSDCC ${CC}" >> $LOCALDEF + echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF + echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF + # More of the i386 drivers could probably move to XF86CardDrivers. # Is fbdev driver useful to us? # GlideDriver was left out because we have no Glide2 package. |