diff options
author | gerald <gerald@FreeBSD.org> | 2004-01-06 06:39:43 +0800 |
---|---|---|
committer | gerald <gerald@FreeBSD.org> | 2004-01-06 06:39:43 +0800 |
commit | 66c8d6e4d683ef2bfc210116dbb690709e5c1383 (patch) | |
tree | 95d014be4f55bca4486c2df60b6903ae36833618 /lang/gcc33 | |
parent | 2da985ac6612477db11a208e71eeb3c606b3e76c (diff) | |
download | freebsd-ports-gnome-66c8d6e4d683ef2bfc210116dbb690709e5c1383.tar.gz freebsd-ports-gnome-66c8d6e4d683ef2bfc210116dbb690709e5c1383.tar.zst freebsd-ports-gnome-66c8d6e4d683ef2bfc210116dbb690709e5c1383.zip |
Update to the 2004-01-05 snapshot. On the way, combine and simplify the
post-install handling of target libraries and GCJ include files.
Diffstat (limited to 'lang/gcc33')
-rw-r--r-- | lang/gcc33/Makefile | 23 | ||||
-rw-r--r-- | lang/gcc33/distinfo | 12 | ||||
-rw-r--r-- | lang/gcc33/pkg-plist | 3 |
3 files changed, 13 insertions, 25 deletions
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile index bbc635daedb3..0337178e74c9 100644 --- a/lang/gcc33/Makefile +++ b/lang/gcc33/Makefile @@ -6,7 +6,7 @@ # $FreeBSD$ # -SNAPDATE=2003-12-22 +SNAPDATE=2004-01-05 PORTNAME= gcc PORTVERSION= 3.3.3 @@ -164,29 +164,20 @@ post-install: for mp in ${_MANPAGES} ; do \ ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp} ;\ done - cd ${PREFIX} ;\ - ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l \ - >${WRKDIR}/PLIST.lib - cd ${PREFIX} ;\ - ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib - (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.lib - # Handle GCJ include files. - ${RM} -f ${WRKDIR}/PLIST.gcj-inc -.for inc in ${PREFIX}/include/gcj ${PREFIX}/include/gnu ${PREFIX}/include/java ${PREFIX}/include/javax + # Handle target libraries and GCJ include files. + ${RM} -f ${WRKDIR}/PLIST.lib +.for inc in ${TARGLIB} include/gcj include/gnu include/java include/javax cd ${PREFIX} ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l \ - >>${WRKDIR}/PLIST.gcj-inc ;\ + >>${WRKDIR}/PLIST.lib ;\ ${FIND} ${inc:S/^${PREFIX}\///} -type d \ - | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc + | sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib .endfor + (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-lib 2>&1 || true") >> ${WRKDIR}/PLIST.lib ${ECHO_CMD} "r ${TMPPLIST}" > ${WRKDIR}/ex.script ${ECHO_CMD} "/Insert PLIST.lib" >> ${WRKDIR}/ex.script ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script ${ECHO_CMD} "r ${WRKDIR}/PLIST.lib" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "/Insert PLIST.gcj-inc" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "d" >> ${WRKDIR}/ex.script - ${ECHO_CMD} "r ${WRKDIR}/PLIST.gcj-inc" >> ${WRKDIR}/ex.script ${ECHO_CMD} "x!" >> ${WRKDIR}/ex.script ${CP} -p ${TMPPLIST} ${TMPPLIST}.pre cd ${WRKDIR} ; ex < ex.script diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo index 3f6fc24da4f8..9cd18740711f 100644 --- a/lang/gcc33/distinfo +++ b/lang/gcc33/distinfo @@ -1,6 +1,6 @@ -MD5 (gcc-core-3.3-20031222.tar.bz2) = 948761d3e6377eec5f591544a3b8b851 -MD5 (gcc-g++-3.3-20031222.tar.bz2) = c84bb41419822b9287e080fd005e98df -MD5 (gcc-g77-3.3-20031222.tar.bz2) = cfe541639f9a80a33938a193e5f8af49 -MD5 (gcc-java-3.3-20031222.tar.bz2) = a6c48a3316038a79101507135a1dcb6e -MD5 (gcc-objc-3.3-20031222.tar.bz2) = ed284ad5707039f8b3726967a519f660 -MD5 (gcc-testsuite-3.3-20031222.tar.bz2) = 08e949b3b22c864460fb792c733659b8 +MD5 (gcc-core-3.3-20040105.tar.bz2) = 972cb8b08fb2ab19694b06cebb526512 +MD5 (gcc-g++-3.3-20040105.tar.bz2) = 03d79136f451b964a1c7cf43dcf007d5 +MD5 (gcc-g77-3.3-20040105.tar.bz2) = abfcb1dc1f3fafdeaf1db979dcaccb69 +MD5 (gcc-java-3.3-20040105.tar.bz2) = 994e6dca70783e62c21d52298160ab53 +MD5 (gcc-objc-3.3-20040105.tar.bz2) = d771becee06c742b2c2ae23e5435d617 +MD5 (gcc-testsuite-3.3-20040105.tar.bz2) = 458c4e122467e0357726025ab1dae798 diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist index 8fa16e6be73d..80ca7aa2307f 100644 --- a/lang/gcc33/pkg-plist +++ b/lang/gcc33/pkg-plist @@ -38,6 +38,3 @@ share/java/libgcj-%%GCC_VER%%.jar @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- -@comment Insert PLIST.gcj-inc here -@comment -=[ begin PLIST.gcj-inc ]=- -@comment -=[ end PLIST.gcj-inc ]=- |