cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The __WORD_BIT constant in GCC's stl_bvector.h caused a namespace

Browse Source 
conflict which kept the mailsync port from compiling.  Resolve it.
This commit is contained in:
Trevor Johnson 2003-12-04 06:38:33 +00:00
parent 6adf02f268
commit 9d50625beb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=94877
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/gcc295/Makefile
View File

@ -8,6 +8,7 @@
PORTNAME= gcc
PORTVERSION= 2.95.3
PORTREVISION= 1
CATEGORIES= lang java
MASTER_SITES= ${MASTER_SITE_GCC}
MASTER_SITE_SUBDIR= releases/${PKGNAME}
@ -58,6 +59,11 @@ MAN1= cccp.1 g++295.1 gcc295.1
pre-patch:
@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
@${MV} ${WRKSRC}/libstdc++/stl/stl_bvector.h \
${WRKSRC}/libstdc++/stl/stl_bvector.h.orig
@${SED} -e "s,_WORD_BIT,_WORD_BIT_GCC295,g" \
< ${WRKSRC}/libstdc++/stl/stl_bvector.h.orig \
> ${WRKSRC}/libstdc++/stl/stl_bvector.h
pre-configure:
@(MAJ=`/sbin/sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \

8
mail/mailsync/Makefile
View File

@ -27,12 +27,6 @@ ALL_TARGET= default
MAN1= mailsync.1
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500113
BROKEN= "Does not compile (bad C++ code)"
.endif
post-patch:
@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
${WRKSRC}/examples/mailsync \
@ -48,4 +42,4 @@ do-install:
${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/mailsync ${EXAMPLESDIR}
.include <bsd.port.post.mk>
.include <bsd.port.mk>