diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-12 05:52:38 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-12 05:52:38 +0800 |
| commit | b719a85d32877e3cee85a420d89ad70a8070a9f0 (patch) | |
| tree | c20a3c48288a26931d3e5b66258839be9005e480 | |
| parent | 5a58b4213274969e69bcec518ee766fffe709881 (diff) | |
| download | marcuscom-ports-b719a85d32877e3cee85a420d89ad70a8070a9f0.tar marcuscom-ports-b719a85d32877e3cee85a420d89ad70a8070a9f0.tar.gz marcuscom-ports-b719a85d32877e3cee85a420d89ad70a8070a9f0.tar.bz2 marcuscom-ports-b719a85d32877e3cee85a420d89ad70a8070a9f0.tar.lz marcuscom-ports-b719a85d32877e3cee85a420d89ad70a8070a9f0.tar.xz marcuscom-ports-b719a85d32877e3cee85a420d89ad70a8070a9f0.tar.zst marcuscom-ports-b719a85d32877e3cee85a420d89ad70a8070a9f0.zip | |
Shorten indent, this will make a ltverhack patch I'm working much more
readable.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18880 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.gnome.mk | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 3459f94fb..72e9e0b76 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -728,14 +728,15 @@ PLIST_SUB+= GTK2_VERSION="${GTK2_VERSION}" \ # included in the post-makefile section). .if defined(_AUTOTOOL_libtool) lthacks_CONFIGURE_ENV= ac_cv_path_DOLT_BASH= -lthacks_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ - ${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \ - for file in ${LIBTOOLFILES}; do \ - ${REINPLACE_CMD} -e \ - '/^ltmain=/!s|$$ac_aux_dir/ltmain\.sh|${LIBTOOLFLAGS} ${WRKDIR}/gnome-ltmain.sh|g; \ - /^LIBTOOL=/s|$$(top_builddir)/libtool|${WRKDIR}/gnome-libtool|g' \ - ${PATCH_WRKSRC}/$$file; \ - done; +lthacks_PRE_PATCH= \ + ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ + ${CP} -pf ${LIBTOOL} ${WRKDIR}/gnome-libtool && \ + for file in ${LIBTOOLFILES}; do \ + ${REINPLACE_CMD} -e \ + '/^ltmain=/!s|$$ac_aux_dir/ltmain\.sh|${LIBTOOLFLAGS} ${WRKDIR}/gnome-ltmain.sh|g; \ + '/^LIBTOOL=/s|$$(top_builddir)/libtool|${WRKDIR}/gnome-libtool|g' \ + ${PATCH_WRKSRC}/$$file; \ + done; .else . if ${USE_GNOME:Mltverhack*}!="" || ${USE_GNOME:Mltasneededhack}!="" IGNORE= cannot install: ${PORTNAME} uses the ltverhack and/or ltasneededhack GNOME components but does not use libtool @@ -748,22 +749,24 @@ ltverhack_LIB_VERSION= major=.`expr $$current - $$age` ltverhack_LIB_VERSION= major=".${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}" .endif ltverhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS} -ltverhack_PRE_PATCH= for file in gnome-ltmain.sh gnome-libtool; do \ - if [ -f ${WRKDIR}/$$file ]; then \ - ${REINPLACE_CMD} -e \ - '/freebsd-elf)/,/;;/ s|major="\.$$current"|${ltverhack_LIB_VERSION}|; \ - /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \ - ${WRKDIR}/$$file; \ - fi; \ - done +ltverhack_PRE_PATCH= \ + for file in gnome-ltmain.sh gnome-libtool; do \ + if [ -f ${WRKDIR}/$$file ]; then \ + ${REINPLACE_CMD} -e \ + '/freebsd-elf)/,/;;/ s|major="\.$$current"|${ltverhack_LIB_VERSION}|; \ + /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \ + ${WRKDIR}/$$file; \ + fi; \ + done ltasneededhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS} -ltasneededhack_PRE_PATCH= if [ -f ${WRKDIR}/gnome-libtool ]; then \ - ${REINPLACE_CMD} -e \ - '/^archive_cmds=/s/-shared/-shared -Wl,--as-needed/ ; \ - /^archive_expsym_cmds=/s/-shared/-shared -Wl,--as-needed/' \ - ${WRKDIR}/gnome-libtool; \ - fi +ltasneededhack_PRE_PATCH= \ + if [ -f ${WRKDIR}/gnome-libtool ]; then \ + ${REINPLACE_CMD} -e \ + '/^archive_cmds=/s/-shared/-shared -Wl,--as-needed/ ; \ + /^archive_expsym_cmds=/s/-shared/-shared -Wl,--as-needed/' \ + ${WRKDIR}/gnome-libtool; \ + fi # Set USE_CSTD for all ports that depend on glib12 .if defined(_USE_GNOME) && !empty(_USE_GNOME:Mglib12) |