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-FontServer | |
| 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-FontServer')
| -rw-r--r-- | x11-servers/XFree86-4-FontServer/Makefile | 4 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-FontServer/scripts/configure | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile index 48ac7d6f356f..73d0b8862e7f 100644 --- a/x11-servers/XFree86-4-FontServer/Makefile +++ b/x11-servers/XFree86-4-FontServer/Makefile @@ -7,6 +7,7 @@ PORTNAME= FontServer PORTVERSION= 4.2.0 +PORTREVISION= 1 CATEGORIES= x11-servers x11-fonts MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} @@ -20,6 +21,9 @@ XFREE86_VERSION= 4 USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc +SCRIPTS_ENV= CC="${CC}" \ + CXX="${CXX}" \ + CFLAGS="${CFLAGS}" PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files MAN1= Xserver.1 xfs.1 XBUILD_DIRS= programs/xfs diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure index 38581aaadf57..70303f06cf69 100644 --- a/x11-servers/XFree86-4-FontServer/scripts/configure +++ b/x11-servers/XFree86-4-FontServer/scripts/configure @@ -58,6 +58,9 @@ configure () { echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF + echo "#define FreeBSDCC ${CC}" >> $LOCALDEF + echo "#define FreeBSDCXX ${CXX}" >> $LOCALDEF + echo "#define FreeBSDCFLAGS ${CFLAGS}" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF |