mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

[1] Make the 4.2.1 ports all use the merged 4.2.1+mitshm patch.

Browse Source 
[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
This commit is contained in:
Eric Anholt 2002-10-17 07:20:03 +00:00
parent bd9d86d032
commit d0cc39f7c8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=68192
24 changed files with 117 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11-servers/XFree86-4-FontServer/Makefile
View File

@ -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

3
x11-servers/XFree86-4-FontServer/scripts/configure vendored
View File

@ -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

20
x11-servers/XFree86-4-NestServer/Makefile
View File

@ -7,28 +7,30 @@
PORTNAME= NestServer
PORTVERSION= 4.2.1
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421fixes/} \
${MASTER_SITE_LOCAL:S/$/:local/}
MASTER_SITE_SUBDIR= 4.2.0/:x \
${PORTVERSION}/patches/:x421patch \
${PORTVERSION}/fixes/:x421fixes \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
4.2.0-4.2.1.diff.gz:x421patch \
4.2.1-mit-shm-security.patch:x421fixes \
Wraphelp.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
MAINTAINER= anholt@freebsd.org
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
MANCOMPRESSED= yes
MAN1= Xnest.1 Xserver.1
@ -41,11 +43,5 @@ post-extract:
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
pre-patch::
-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
-@${CAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.1-mit-shm-security.patch \
| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
.include <bsd.port.mk>

3
x11-servers/XFree86-4-NestServer/distinfo
View File

@ -1,4 +1,3 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e
MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274

3
x11-servers/XFree86-4-NestServer/scripts/configure vendored
View File

@ -49,6 +49,9 @@ configure () {
echo "#define XnestServer YES" >> $LOCALDEF
echo "#define BuildServersOnly 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

20
x11-servers/XFree86-4-PrintServer/Makefile
View File

@ -7,28 +7,30 @@
PORTNAME= PrintServer
PORTVERSION= 4.2.1
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421fixes/} \
${MASTER_SITE_LOCAL:S/$/:local/}
MASTER_SITE_SUBDIR= 4.2.0/:x \
${PORTVERSION}/patches/:x421patch \
${PORTVERSION}/fixes/:x421fixes \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
4.2.0-4.2.1.diff.gz:x421patch \
4.2.1-mit-shm-security.patch:x421fixes \
Wraphelp.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
MAINTAINER= anholt@freebsd.org
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
XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
XINCLUDE_DIRS= lib/xkbfile lib/xtrans
@ -38,12 +40,6 @@ post-extract:
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
pre-patch::
-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
-@${CAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.1-mit-shm-security.patch \
| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
do-install:
$(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt

3
x11-servers/XFree86-4-PrintServer/distinfo
View File

@ -1,4 +1,3 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e
MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274

3
x11-servers/XFree86-4-PrintServer/scripts/configure vendored
View File

@ -49,6 +49,9 @@ configure () {
echo "#define XprtServer YES" >> $LOCALDEF
echo "#define BuildServersOnly 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

7
x11-servers/XFree86-4-Server-snap/Makefile
View File

@ -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 \

3
x11-servers/XFree86-4-Server-snap/scripts/configure vendored
View File

@ -81,6 +81,9 @@ 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?

7
x11-servers/XFree86-4-Server/Makefile
View File

@ -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 \

3
x11-servers/XFree86-4-Server/scripts/configure vendored
View File

@ -81,6 +81,9 @@ 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?

20
x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
View File

@ -7,22 +7,21 @@
PORTNAME= VirtualFramebufferServer
PORTVERSION= 4.2.1
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421fixes/} \
${MASTER_SITE_LOCAL:S/$/:local/}
MASTER_SITE_SUBDIR= 4.2.0/:x \
${PORTVERSION}/patches/:x421patch \
${PORTVERSION}/fixes/:x421fixes \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
4.2.0-4.2.1.diff.gz:x421patch \
4.2.1-mit-shm-security.patch:x421fixes \
Wraphelp.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
MAINTAINER= anholt@freebsd.org
RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
@ -33,6 +32,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 Xvfb.1
XBUILD_DIRS= lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver
@ -44,11 +46,5 @@ post-extract:
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
pre-patch::
-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
-@${CAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.1-mit-shm-security.patch \
| ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 --batch
.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
.include <bsd.port.mk>

3
x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
View File

@ -1,4 +1,3 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
MD5 (xc/4.2.1-mit-shm-security.patch) = 18eb56110c7f66895111bd9f3513b54e
MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274

3
x11-servers/XFree86-4-VirtualFramebufferServer/scripts/configure vendored
View File

@ -50,6 +50,9 @@ configure () {
echo "#define BuildServersOnly 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
# Copy ORIGDEF to DESTDEF
rm -f $DESTDEF

25
x11/XFree86-4-clients/Makefile
View File

@ -7,20 +7,17 @@
PORTNAME= clients
PORTVERSION= 4.2.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/}
MASTER_SITE_SUBDIR= 4.2.0/:x \
${PORTVERSION}/patches/:x421patch \
anholt/:local
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/}
MASTER_SITE_SUBDIR= 4.2.0/:x
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
X420src-2.tgz:x \
4.2.0-4.2.1.diff.gz:x421patch
DISTFILES= X420src-1.tgz:x
EXTRACT_ONLY= X420src-1.tgz
PATCH_DIST_STRIP= -p1
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
MAINTAINER= anholt@freebsd.org
@ -36,7 +33,10 @@ SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \
InstallXinitConfig=${InstallXinitConfig} \
InstallAppDefFiles=${InstallAppDefFiles} \
HasSecureRPC=${HasSecureRPC} \
HasPam=${HasPam}
HasPam=${HasPam} \
CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \
PORTNAME=${PORTNAME} \
PORTVERSION=${PORTVERSION}
@ -67,9 +67,6 @@ post-extract:
${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \
| ${TAR} -xf - xc/fonts/util )
pre-patch:
-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
| ${PATCH} ${PATCH_DIST_ARGS} --batch
post-patch:
cd ${WRKSRC}/nls; \

3
x11/XFree86-4-clients/distinfo
View File

@ -1,4 +1,3 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274

3
x11/XFree86-4-clients/scripts/configure vendored
View File

@ -75,6 +75,9 @@ configure () {
echo "#define PreloadSetup" >> $LOCALDEF
echo "#define BuildPlugin NO" >> $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

18
x11/XFree86-4-libraries/Makefile
View File

@ -7,21 +7,20 @@
PORTNAME= libraries
PORTVERSION= 4.2.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \
${MASTER_SITE_LOCAL:S/$/:local/}
MASTER_SITE_SUBDIR= 4.2.0/:x \
${PORTVERSION}/patches/:x421patch \
anholt/:local
PKGNAMEPREFIX= XFree86-
DISTFILES= X420src-1.tgz:x \
4.2.0-4.2.1.diff.gz:x421patch \
Wraphelp.gz:local
EXTRACT_ONLY= X420src-1.tgz
PATCH_DIST_STRIP= -p1
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
MAINTAINER= anholt@freebsd.org
@ -43,7 +42,10 @@ SCRIPTS_ENV= HasSecureRPC=${HasSecureRPC} \
BuildXIE=${BuildXIE} \
BuildAoutLibraries=${BuildAoutLibraries} \
ForceNormalLib=${ForceNormalLib} \
DebuggableLibraries=${DebuggableLibraries}
DebuggableLibraries=${DebuggableLibraries} \
CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \
PORTNAME=${PORTNAME} \
PORTVERSION=${PORTVERSION}
@ -105,10 +107,6 @@ post-extract:
${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \
${WRKSRC}/lib/Xdmcp/Wraphelp.c
pre-patch:
-@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \
| ${PATCH} ${PATCH_DIST_ARGS} --batch
post-patch:
cd ${WRKSRC}/nls; \
for i in Compose XI18N_OBJS XLC_LOCALE; do \

2
x11/XFree86-4-libraries/distinfo
View File

@ -1,3 +1,3 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659
MD5 (xc/4.2.0-4.2.1.diff.gz) = 38adc94a4953a6b29e8619c25dda4887
MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274

28
x11/XFree86-4-libraries/files/patch-c
View File

@ -1,5 +1,5 @@
--- config/cf/Imake.tmpl.orig Tue Jan 15 13:22:33 2002
+++ config/cf/Imake.tmpl Tue Sep 3 23:37:40 2002
--- config/cf/Imake.tmpl.orig Wed Oct 16 20:56:39 2002
+++ config/cf/Imake.tmpl Wed Oct 16 21:52:31 2002
@@ -220,7 +220,7 @@
#ifndef RmanCmd
@ -9,7 +9,7 @@
#define RmanCmd rman
#else
#define RmanCmd $(TOP)/config/util/rman
@@ -1273,7 +1273,7 @@
@@ -1282,7 +1282,7 @@
#define LoaderLibPrefix /**/
#endif
#ifndef ImakeCmd
@ -18,7 +18,7 @@
#define ImakeCmd imake
#else
#define ImakeCmd $(IMAKESRC)/imake
@@ -1281,19 +1281,19 @@
@@ -1290,19 +1290,19 @@
#endif
#ifndef DependCmd
#if UseGccMakeDepend
@ -41,7 +41,7 @@
#define DependCmd makedepend
#else
#define DependCmd $(DEPENDSRC)/makedepend
@@ -1320,21 +1320,21 @@
@@ -1329,21 +1329,21 @@
#ifndef ExportListCmd
# ifndef ExportListGenSource
# define ExportListCmd /**/
@ -66,21 +66,3 @@
#define RevPathCmd revpath
#else
#define RevPathCmd $(CONFIGSRC)/util/revpath
@@ -1536,7 +1536,7 @@
CXXOPTIONS = CplusplusOptions
CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
#endif
#if !BuildLibraries && AlternateIncRoot
@@ -1736,7 +1736,7 @@
*/
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
LDPRELIB = LdPreLib
LDPOSTLIB = LdPostLib

20
x11/XFree86-4-libraries/files/patch-c2
View File

@ -1,23 +1,5 @@
--- config/cf/Library.tmpl.orig Mon Aug 27 10:40:55 2001
+++ config/cf/Library.tmpl Mon Sep 2 12:06:46 2002
@@ -67,7 +67,7 @@
STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
CDEBUGFLAGS = LibraryCDebugFlags
CLIBDEBUGFLAGS = LibraryDebugOpt
- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ CFLAGS += $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
# if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
PICFLAGS = LargePositionIndependentCFlags
# endif
@@ -92,7 +92,7 @@
STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
CXXDEBUGFLAGS = LibraryCplusplusDebugFlags
CXXLIBDEBUGFLAGS = LibraryDebugOpt
- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
+ CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXLIBDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
# if defined(LargePICTable) && LargePICTable
# ifdef LargePositionIndependentCplusplusFlags
CXXPICFLAGS = LargePositionIndependentCplusplusFlags
+++ config/cf/Library.tmpl Wed Oct 16 21:53:13 2002
@@ -300,6 +300,10 @@
*/

42
x11/XFree86-4-libraries/files/patch-d
View File

@ -1,5 +1,5 @@
--- config/cf/FreeBSD.cf.orig Sun Oct 6 18:14:59 2002
+++ config/cf/FreeBSD.cf Sun Oct 6 18:28:12 2002
--- config/cf/FreeBSD.cf.orig Wed Oct 16 20:31:40 2002
+++ config/cf/FreeBSD.cf Wed Oct 16 20:32:04 2002
@@ -43,11 +43,15 @@
#define GccUsesGas YES
#define UseGas YES
@ -58,13 +58,13 @@
#if BuildThreadStubLibrary && !UseInstalled
-# define CcCmd $(CLIENTENVSETUP) cc
-# define CplusplusCmd $(CLIENTENVSETUP) c++
+# define CcCmd $(CLIENTENVSETUP) ${FBSDCC}
+# define CplusplusCmd $(CLIENTENVSETUP) ${FBSDCXX}
+# define CcCmd $(CLIENTENVSETUP) FreeBSDCC
+# define CplusplusCmd $(CLIENTENVSETUP) FreeBSDCXX
#else
-# define CcCmd cc
-# define CplusplusCmd c++
+# define CcCmd ${FBSDCC}
+# define CplusplusCmd ${FBSDCXX}
+# define CcCmd FreeBSDCC
+# define CplusplusCmd FreeBSDCXX
#endif
#define CppCmd /usr/bin/cpp
@ -99,24 +99,28 @@
#define StandardDefines -DCSRG_BASED
@@ -448,14 +469,14 @@
/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
#ifndef DefaultGcc2i386Opt
#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O2
+#define DefaultGcc2i386Opt
#endif
@@ -445,18 +466,8 @@
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
#endif
#ifdef i386Architecture
# define OptimizedCDebugFlags DefaultGcc2i386Opt
#else
-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
-#ifndef DefaultGcc2i386Opt
-#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
-#define DefaultGcc2i386Opt -O2
-#endif
-#endif
-
-#ifdef i386Architecture
-# define OptimizedCDebugFlags DefaultGcc2i386Opt
-#else
-# define OptimizedCDebugFlags -O
+# define OptimizedCDebugFlags
#endif
-#endif
+#define DefaultGcc2i386Opt
+#define OptimizedCDebugFlags FreeBSDCFLAGS
#ifndef PreIncDir
@@ -509,6 +530,10 @@
# define PreIncDir /usr/include
@@ -509,6 +520,10 @@
#ifndef PamLibraries
#define PamLibraries -lpam DlLibrary

3
x11/XFree86-4-libraries/scripts/configure vendored
View File

@ -73,6 +73,9 @@ configure () {
echo "#define FreeBSDBuildXlib YES" >> $LOCALDEF
echo "#define FreeBSDBuildXbin NO" >> $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