diff options
| author | maho <maho@FreeBSD.org> | 2005-03-19 17:41:52 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2005-03-19 17:41:52 +0800 |
| commit | b2e65a66ff84f96eb16403329bf371fc74456e6d (patch) | |
| tree | 3c6292eae828c69d8d180cdb24cdce3b0016fba9 /lang | |
| parent | a63bff3101f7d1c6c223052abc7f36f487157ca0 (diff) | |
| download | freebsd-ports-gnome-b2e65a66ff84f96eb16403329bf371fc74456e6d.tar.gz freebsd-ports-gnome-b2e65a66ff84f96eb16403329bf371fc74456e6d.tar.zst freebsd-ports-gnome-b2e65a66ff84f96eb16403329bf371fc74456e6d.zip | |
Fix pkg-plist
Submitted by: kris
Encouraged by: kris
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc-ooo/Makefile | 19 | ||||
| -rw-r--r-- | lang/gcc-ooo/pkg-plist | 10 |
2 files changed, 4 insertions, 25 deletions
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index dac4344e9595..825e8aefe746 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -24,8 +24,6 @@ PATCH_DIST_STRIP= -p1 MAINTAINER?= openoffice@FreeBSD.org COMMENT?= GNU Compiler Collection for OpenOffice.org -BROKEN= Incomplete pkg-plist - NO_LATEST_LINK= yes USE_BISON= yes @@ -49,12 +47,14 @@ SRCDIR= ${WRKDIR}/gcc-${PORTVERSION} PATCH_WRKSRC= ${SRCDIR} WRKSRC= ${WRKDIR}/build SUFFIX= -ooo -TARGLIB= ${PREFIX}/lib/gcc-ooo/${CONFIGURE_TARGET}/${PORTVERSION} +TARGLIB= ${PREFIX}/gcc-ooo/${CONFIGURE_TARGET}/${PORTVERSION} GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls \ --with-system-zlib \ --with-libiconv-prefix=${LOCALBASE} \ --program-suffix=${SUFFIX} \ + --libdir=${TARGLIB}/lib \ + --libexecdir=${TARGLIB}/libexec \ --with-gxx-include-dir=${TARGLIB}/include/c++/ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) @@ -104,24 +104,13 @@ post-install: fake-manpages ${PREFIX}/man/man1/${f}${SUFFIX}.1; \ fi .endfor - # These libraries are moved from PREFIX/lib to avoid conflicts with - # the stock compiler. -.for f in libstdc++ libsupc++ ${EXTRA_SHLIB} - ${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB} -.endfor -# -${MV} -f ${PREFIX}/lib/ieee ${TARGLIB} - ${RM} -f ${PREFIX}/lib/libiberty.a - ${RM} -f ${TARGLIB}/*.la - # Handle target libraries. - ${RM} -f ${WRKDIR}/PLIST.lib -.for d in ${TARGLIB:S/^${PREFIX}\///} include/gnu +.for d in gcc-ooo 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 - (${ECHO_CMD} "@unexec rmdir %D/lib/gcc-ooo/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec rmdir %D/lib/gcc-ooo 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 diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist index 87ee6a88f42f..1ca6edff43c6 100644 --- a/lang/gcc-ooo/pkg-plist +++ b/lang/gcc-ooo/pkg-plist @@ -9,16 +9,6 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%% bin/%%GNU_HOST%%-gcc-ooo bin/%%GNU_HOST%%-g++-ooo bin/gccbug-ooo -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1 -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/collect2 -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixinc.sh -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/fixincl -libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders -@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools -@dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% -@unexec rmdir %D/libexec/gcc/%%GNU_HOST%% 2>/dev/null || true -@unexec rmdir %D/libexec/gcc 2>/dev/null || true @comment Insert PLIST.lib here @comment -=[ begin PLIST.lib ]=- @comment -=[ end PLIST.lib ]=- |