mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-14 07:43:06 +00:00
Code Issues Releases Activity

Move the REINPLACE bits to Makefile.in so that all the XFree86 ports can

Browse Source 
use them.  Without this, the patch was being applied to the other ports,
but the PTHREAD substitutions were not being done.

Reported by:	adamw
This commit is contained in:
Joe Marcus Clarke 2004-02-06 04:41:48 +00:00
parent 6b0329cd7e
commit cedbe303a3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=100110
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,6 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
USE_X_PREFIX= no
USE_REINPLACE= yes
PREFIX?= ${X11BASE}
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
INSTALLS_SHLIB= yes
@ -82,9 +81,6 @@ post-extract:
post-patch:
${CP} ${MASTERDIR}/files/nls::Compose::microsoft-cp1251 ${WRKSRC}/nls/Compose/microsoft-cp1251
@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
${WRKSRC}/config/cf/FreeBSD.cf
post-install:
${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PM.h \

8
x11/XFree86-4-libraries/Makefile.inc
View File

@ -15,6 +15,7 @@
DIST_SUBDIR= xc
WRKSRC?= ${WRKDIR}/xc
USE_IMAKE= YES
USE_REINPLACE= yes
XFREE86_HTML_MAN= yes
PATCHDIR?= ${.CURDIR}/../../x11/XFree86-4-libraries/files
SCRIPTS_ENV+= CC="${CC}" \
@ -32,6 +33,13 @@ pre-everything::
${FALSE}; \
fi;
.if !target(pre-configure)
pre-configure:
@${REINPLACE_CMD} -e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|g ; \
s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g' \
${WRKSRC}/config/cf/FreeBSD.cf
.endif
.if !target(do-configure)
do-configure:
@cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf