[Midnightbsd-cvs] mports [24194] trunk/lang/gcc48: fix build

[laffer1 at midnightbsd.org]

Revision: 24194
          http://svnweb.midnightbsd.org/mports/?rev=24194
Author:   laffer1
Date:     2018-09-04 20:43:37 -0400 (Tue, 04 Sep 2018)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/lang/gcc48/Makefile
    trunk/lang/gcc48/pkg-descr

Modified: trunk/lang/gcc48/Makefile
===================================================================
--- trunk/lang/gcc48/Makefile	2018-09-04 13:58:33 UTC (rev 24193)
+++ trunk/lang/gcc48/Makefile	2018-09-05 00:43:37 UTC (rev 24194)
@@ -86,8 +86,8 @@
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
-		gcc${SUFFIX}/libgomp
-INFO+=		gcc${SUFFIX}/libquadmath \
+		gcc${SUFFIX}/libgomp \
+		gcc${SUFFIX}/libquadmath \
 		gcc${SUFFIX}/libitm
 SUB_FILES=	pkg-message
 SUB_LIST+=	TARGLIB=${TARGLIB}
@@ -97,6 +97,11 @@
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
+post-patch:
+	@${FIND} ${WRKSRC} -type f -name '*.[ch]' | \
+	    ${XARGS} ${EGREP} -l '"(HOST_WIDE|PLUGIN_COND)' | \
+	    ${XARGS} ${REINPLACE_CMD} -E -e 's/"(HOST_WIDE|PLUGIN_COND)/" \1/g'
+
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
@@ -110,18 +115,15 @@
 
 post-install:
 	${RM} -f ${PREFIX}/man/man7/*
-	${RM} -f ${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
-	         ${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
+	-${RM} -r ${FAKE_DESTDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
-	    ${FIND} $d -type d | ${SORT} -r \
-	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
-	cd ${WRKDIR} ; ${SED} -i.bak -e 's|.la$$|d|' ${WRKDIR}/PLIST.lib
+	cd ${WRKDIR} ; grep -v '.la$$' ${WRKDIR}/PLIST.lib > ${WRKDIR}/PLIST.lib2; ${MV} ${WRKDIR}/PLIST.lib2 ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>

Modified: trunk/lang/gcc48/pkg-descr
===================================================================
--- trunk/lang/gcc48/pkg-descr	2018-09-04 13:58:33 UTC (rev 24193)
+++ trunk/lang/gcc48/pkg-descr	2018-09-05 00:43:37 UTC (rev 24194)
@@ -1,5 +1,5 @@
 GCC, the GNU Compiler Collection, supports a number of languages.  This
-port installs the C, C++, Fortran and Java front ends as gcc48, g++48,
-gfortran48, and gcj48, respectively.
+port installs the C, C++, Fortran front ends as gcc48, g++48, and
+gfortran48.
 
 WWW: http://gcc.gnu.org/