[pkgsrc/trunk]: pkgsrc/devel/libtool-base Revert:

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a274b3b2fbcd
branches:  trunk
changeset: 469802:a274b3b2fbcd
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Feb 29 10:28:24 2004 +0000

description:
Revert:
revision 1.29
date: 2004/02/18 19:13:30;  author: jlam;  state: Exp;  lines: +23 -23
Configure and build shlibtool after configuring and building libtool,
resepectively.  This makes the build output look more logically grouped
into phases.
to make this build again on 1.5.x systems.
Addresses PR 24588.

diffstat:

 devel/libtool-base/Makefile |  50 ++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 25 deletions(-)

diffs (69 lines):

diff -r 1365ceff2312 -r a274b3b2fbcd devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Sun Feb 29 08:54:41 2004 +0000
+++ b/devel/libtool-base/Makefile       Sun Feb 29 10:28:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/02/22 12:22:47 grant Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/29 10:28:24 wiz Exp $
 #
 
 PKGNAME=       ${DISTNAME:C/-/-base-/}
@@ -55,30 +55,8 @@
 .  include "../../devel/dlcompat/buildlink3.mk"
 .endif
 
-BUILD_SHLIBTOOL?=      yes
-BUILDING_SHLIBTOOL=    no
-
-.if !empty(BUILD_SHLIBTOOL:M[nN][oO])
-PLIST_SUBST+=          SHLIBTOOL="@comment"
-.else
-SHLIBTOOL_WRKDIR=      ${WRKDIR}/shlibtool
-SHLIBTOOL_WRKSRC=      ${WRKSRC:S/${WRKDIR}/${SHLIBTOOL_WRKDIR}/}
-SHLIBTOOL_MAKEFLAGS=   BUILDING_SHLIBTOOL=yes
-SHLIBTOOL_MAKEFLAGS+=  WRKDIR=${SHLIBTOOL_WRKDIR}
-PLIST_SUBST+=          SHLIBTOOL=
-.  if !empty(BUILDING_SHLIBTOOL:M[yY][eE][sS])
-CONFIGURE_ARGS+=       --disable-static
-.  else
-post-configure:
-       cd ${.CURDIR} && ${MAKE} configure ${SHLIBTOOL_MAKEFLAGS}
-
-post-build:
-       cd ${.CURDIR} && ${MAKE} build ${SHLIBTOOL_MAKEFLAGS}
-.  endif
-
-post-install:
-       ${INSTALL_SCRIPT} ${SHLIBTOOL_WRKSRC}/libtool ${PREFIX}/bin/shlibtool
-.endif
+BUILD_SHLIBTOOL?=      YES
+BUILDING_SHLIBTOOL?=   NO
 
 .PHONY: fix-libtool
 fix-libtool:
@@ -90,4 +68,26 @@
 
 post-build: fix-libtool
 
+.if ${BUILDING_SHLIBTOOL} == "YES"
+CONFIGURE_ARGS+=       --disable-static
+.else
+SHLIBTOOL_WRKDIR=      ${WRKDIR}/shlibtool
+SHLIBTOOL_WRKSRC=      ${WRKSRC:S/${WRKDIR}/${SHLIBTOOL_WRKDIR}/}
+SHLIBTOOL_MAKEFLAGS=   BUILDING_SHLIBTOOL=YES
+SHLIBTOOL_MAKEFLAGS+=  WRKDIR=${SHLIBTOOL_WRKDIR}
+
+.  if ${BUILD_SHLIBTOOL} == "NO"
+PLIST_SUBST+=          SHLIBTOOL="@comment "
+.  else
+PLIST_SUBST+=          SHLIBTOOL=
+
+post-build:
+       cd ${.CURDIR} && ${MAKE} build ${SHLIBTOOL_MAKEFLAGS}
+
+post-install:
+       ${INSTALL_SCRIPT} ${SHLIBTOOL_WRKSRC}/libtool                   \
+               ${PREFIX}/bin/shlibtool
+.  endif
+.endif
+
 .include "../../mk/bsd.pkg.mk"