Re-work paths, using INSTALLATION_DIRS

[Hauke Fath <hauke%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Tue Jun 26 15:42:58 2018 +0200
Changeset:	9c1659fc4053420cb91cf1fc10fa450955f5c5ff

Modified Files:
	tsm62/Makefile

Log Message:
Re-work paths, using INSTALLATION_DIRS

(Attempt to) Force ldconfig run for both linux and linux32 by setting
RUN_LDCONFIG

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9c1659fc4053420cb91cf1fc10fa450955f5c5ff

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tsm62/Makefile | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diffs:
diff --git a/tsm62/Makefile b/tsm62/Makefile
index cd6c165ce0..4ab735eebd 100644
--- a/tsm62/Makefile
+++ b/tsm62/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2014/01/09 13:42:06 hfath Exp $
+# $NetBSD$
 
 DISTNAME=	tsm-6.2.4.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.software.ibm.com/storage/tivoli-storage-management/maintenance/client/v6r2/Linux/LinuxX86/v624/
 DISTFILES=	6.2.4.0-TIV-TSMBAC-LinuxX86.tar
 
 MAINTAINER=	hauke%NetBSD.org@localhost
-HOMEPAGE=	http://www-306.ibm.com/software/tivoli/products/storage-mgr/
+HOMEPAGE=	https://www.ibm.com/us-en/marketplace/data-protection-and-recovery
 COMMENT=	IBM Tivoli Storage Manager Client
 
 PKG_SYSCONFSUBDIR=	tsm
-DOC_DIR=		${DESTDIR}${PREFIX}/share/doc/tsm
-EG_DIR=			${DESTDIR}${PREFIX}/share/examples/tsm
-CONF_FILES=		${EG_DIR}/dsm.sys.smp ${PKG_SYSCONFDIR}/dsm.sys
-CONF_FILES+=		${EG_DIR}/dsm.opt.smp ${PKG_SYSCONFDIR}/dsm.opt
+DOC_DIR=		share/doc/tsm
+EG_DIR=			share/examples/tsm
+CONF_FILES=		${PREFIX}/${EG_DIR}/dsm.sys.smp ${PKG_SYSCONFDIR}/dsm.sys
+CONF_FILES+=		${PREFIX}/${EG_DIR}/dsm.opt.smp ${PKG_SYSCONFDIR}/dsm.opt
 
 PUBLIC_BINS=		dsmc
 
@@ -22,6 +22,7 @@ NOT_FOR_PLATFORM=	Linux-*-* NetBSD-[0-1]*-*
 
 EMUL_PLATFORMS=		linux-i386 linux-x86_64
 EMUL_MODULES.linux=	base
+RUN_LDCONFIG=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -62,15 +63,22 @@ RPMFILES+=		${WRKDIR}/TIVsm-API64.i386.rpm \
 # Make sure suse pkg version equals the above
 DEPENDS+=		suse32_base-[0-9]*:../../emulators/suse121_32_base
 
-EMUL32DIR=		${PREFIX}${_OPSYS_EMULDIR.linux32}
+EMUL32DIR=		${_OPSYS_EMULDIR.linux32}
+EMUL32SUBDIR=		${_OPSYS_EMULDIR.linux32:S/^\///1}
+
 PLIST_SUBST+=		EMUL32DIR=${EMUL32DIR:Q}
 MESSAGE_SUBST+=		EMUL32DIR=${EMUL32DIR:Q}
-MAKE_DIRS+=		${EMUL32DIR}/etc/ld.so.conf.d
+
+INSTALLATION_DIRS+=	${EMUL32SUBDIR}/opt
+INSTALLATION_DIRS+=	${EMUL32SUBDIR}/etc/ld.so.conf.d
+INSTALLATION_DIRS+=	${EMUL32SUBDIR}/usr/local/ibm
 
 LDCONFIG_ADD_CMD=	${EMULDIR}/sbin/ldconfig ; ${EMUL32DIR}/sbin/ldconfig
 LDCONFIG_REMOVE_CMD=	${LDCONFIG_ADD_CMD}
 .endif
 
+INSTALLATION_DIRS+=	bin ${EMULSUBDIR}/etc/ld.so.conf.d ${DOC_DIR} ${EG_DIR}
+
 .include "options.mk"
 
 do-extract:
@@ -78,29 +86,23 @@ do-extract:
 
 post-install:
 .if empty(PKG_OPTIONS:Mjava)
-	for bb in `${SED} -e '/^[$$]{PLIST\.java}/!d' -e 's/^[$$]{PLIST\.java}//g' ${PLIST_SRC}`; do \
+	for bb in `${SED} -e '/^[$$]{PLIST\\.java}/!d' -e 's/^[$$]{PLIST\\.java}//g' ${PLIST_SRC}`; do \
 	    ${RM} -f ${DESTDIR}${PREFIX}/$${bb}; \
 	done
 .endif
-	${INSTALL_DATA_DIR} ${DOC_DIR}
-	${INSTALL_DATA} ${WRKSRC}/NOTICES.TXT ${DOC_DIR}
-	${INSTALL_DATA_DIR} ${EG_DIR}
+	${INSTALL_DATA} ${WRKSRC}/NOTICES.TXT ${DESTDIR}${PREFIX}/${DOC_DIR}
 	${INSTALL_DATA} ${DESTDIR}${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/dsm.*.smp \
-		${EG_DIR}
-	${INSTALL_DATA} ${FILESDIR}/tsm_daily.sh ${EG_DIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMULDIR}/etc/ld.so.conf.d
+		${DESTDIR}${PREFIX}/${EG_DIR}
+	${INSTALL_DATA} ${FILESDIR}/tsm_daily.sh ${DESTDIR}${PREFIX}/${EG_DIR}
 	${INSTALL_DATA} ${FILESDIR}/tsm_ld.so.conf.${MACHINE_ARCH} \
 		${DESTDIR}${EMULDIR}/etc/ld.so.conf.d/tsm_ld.so.conf
 .if ${EMUL_PLATFORM} == "linux-x86_64"
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMUL32DIR}/opt
 	${LN} -s /..${EMULDIR}/opt/tivoli/ \
-		${DESTDIR}${EMUL32DIR}/opt/tivoli
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMUL32DIR}/usr/local/ibm
+		${DESTDIR}${PREFIX}${EMUL32DIR}/opt/tivoli
 	${LN} -s /..${EMULDIR}/usr/local/ibm/gsk8/ \
-		${DESTDIR}${EMUL32DIR}/usr/local/ibm/gsk8
-	${INSTALL_DATA_DIR} ${DESTDIR}${EMUL32DIR}/etc/ld.so.conf.d
+		${DESTDIR}${PREFIX}${EMUL32DIR}/usr/local/ibm/gsk8
 	${INSTALL_DATA} ${FILESDIR}/tsm_ld.so.conf.i386 \
-		${DESTDIR}${EMUL32DIR}/etc/ld.so.conf.d/tsm_ld.so.conf
+		${DESTDIR}${PREFIX}${EMUL32DIR}/etc/ld.so.conf.d/tsm_ld.so.conf
 .endif
 	${LN} -s /..${PKG_SYSCONFDIR}/dsm.sys \
 		${DESTDIR}${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/
@@ -108,9 +110,8 @@ post-install:
 		${DESTDIR}${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/
 	${LN} -s ../../lang/EN_US \
 		${DESTDIR}${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/
-	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
 .for bb in ${PUBLIC_BINS}
-	${LN} -s ${EMULDIR}/${TSMCLIENTSUBDIR}/ba/bin/${bb} \
+	${LN} -s ../${EMULSUBDIR}/${TSMCLIENTSUBDIR}/ba/bin/${bb} \
 		${DESTDIR}${PREFIX}/bin/${bb}
 .endfor