summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/realplayer7/Makefile3
-rw-r--r--editors/framemaker/Makefile5
-rw-r--r--emulators/linux-locale/Makefile3
-rw-r--r--emulators/suse_base/Makefile13
-rw-r--r--emulators/suse_linux/suse.mk5
-rw-r--r--games/rollemup/Makefile3
-rw-r--r--graphics/mtv/Makefile3
-rw-r--r--graphics/ns-flash/Makefile4
-rw-r--r--japanese/king/Makefile3
-rw-r--r--misc/staroffice/Makefile3
-rw-r--r--print/acroread/Makefile6
-rw-r--r--print/acroread3/Makefile8
-rw-r--r--security/uvscan/Makefile4
-rw-r--r--www/asWedit/Makefile4
-rw-r--r--www/ns-plugger-common/Makefile4
15 files changed, 50 insertions, 21 deletions
diff --git a/audio/realplayer7/Makefile b/audio/realplayer7/Makefile
index c73be6149ed..c3df9c2c673 100644
--- a/audio/realplayer7/Makefile
+++ b/audio/realplayer7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/25 00:20:21 jlam Exp $
#
DISTNAME= rp7_linux20_libc6_i386_cs1
@@ -31,6 +31,7 @@ EXTRACT_CMD= HOME=${WRKDIR} XAUTHORITY=${XAUTHORITY} ${RP_INSTALLER}
.else
EXTRACT_CMD= HOME=${WRKDIR} ${RP_INSTALLER}
.endif
+LDD?= /emul/linux/usr/bin/ldd
DOWNLOAD= http://proforma.real.com/real/player/unix/unix.html
REALPLAYER_HOME= ${PREFIX}/lib/RealPlayer7
diff --git a/editors/framemaker/Makefile b/editors/framemaker/Makefile
index 5be5351f44b..4c0f59607cf 100644
--- a/editors/framemaker/Makefile
+++ b/editors/framemaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/18 22:46:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/25 00:20:21 jlam Exp $
#
DISTNAME= fmlinux
@@ -16,7 +16,8 @@ HOMEPAGE= http://www.adobe.com/products/framemaker/fmlinux.html
.include "../../mk/bsd.prefs.mk"
.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386")
# At least on 1.4.2, suse-6.3 is NOT ok, you need 6.1!
-DEPENDS+= suse_linux>=6.1:../../emulators/suse_linux
+DEPENDS+= suse_linux>=6.1:../../emulators/suse_linux
+LDD?= /emul/linux/usr/bin/ldd
.endif
RESTRICTED= "Distributed only by Adobe Inc."
diff --git a/emulators/linux-locale/Makefile b/emulators/linux-locale/Makefile
index f181d08c2a1..e25b27938ba 100644
--- a/emulators/linux-locale/Makefile
+++ b/emulators/linux-locale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/05/12 05:19:09 sakamoto Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/25 00:20:22 jlam Exp $
#
DISTNAME= locales-2.1-1mdk
@@ -41,6 +41,7 @@ EMULDIR= ${PREFIX}/${EMULSUBDIR}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
EXCLUDELIST= ${WRKDIR}/EXCLUDE
CPIOLIST= ${WRKDIR}/CPIOLIST
+LDD?= ${EMULDIR}/usr/bin/ldd
do-install:
@${RM} -f ${CPIOLIST}
diff --git a/emulators/suse_base/Makefile b/emulators/suse_base/Makefile
index 9faeee4d2ae..07b8e30b33d 100644
--- a/emulators/suse_base/Makefile
+++ b/emulators/suse_base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/01/09 07:10:37 tls Exp $
+# $NetBSD: Makefile,v 1.12 2000/08/25 00:20:22 jlam Exp $
DISTNAME= suse_base-6.3
CATEGORIES= emulators
@@ -27,7 +27,7 @@ RPMFILES= aaa_dir.rpm shlibs.rpm ldso.rpm libz.rpm \
bash.rpm gppshare.rpm ncurses-p1.rpm
RPMIGNOREPATH= tmp usr/tmp var
-LDD= ${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
+LINUX_LDD= ${PREFIX}/${EMULSUBDIR}/usr/bin/ldd
RPMLIB= ${LOCALBASE}/lib/librpm.a
do-build:
@@ -54,10 +54,11 @@ do-install:
${EMULDIR}/sbin/ldconfig -r ${EMULDIR}
${ECHO} "@exec %D/${EMULSUBDIR}/sbin/ldconfig -r %D/${EMULSUBDIR}" \
>>${PLIST_SRC}
- ${SED} -e 's:#! :#! /${EMULSUBDIR}:' \
- -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' <${LDD} >${LDD}.new
- ${MV} ${LDD}.new ${LDD}
- ${CHMOD} +x ${LDD}
+ ${SED} -e 's:#! :#! /${EMULSUBDIR}:' \
+ -e 's:^RTLD=:RTLD=/${EMULSUBDIR}:' \
+ < ${LINUX_LDD} > ${LINUX_LDD}.new
+ ${MV} ${LINUX_LDD}.new ${LINUX_LDD}
+ ${CHMOD} +x ${LINUX_LDD}
@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${INSTALL_FILE} - POST-INSTALL
.include "../suse_linux/suse.mk"
diff --git a/emulators/suse_linux/suse.mk b/emulators/suse_linux/suse.mk
index 5d11d7ddd7e..2da7da203a2 100644
--- a/emulators/suse_linux/suse.mk
+++ b/emulators/suse_linux/suse.mk
@@ -1,4 +1,4 @@
-# $NetBSD: suse.mk,v 1.5 2000/08/10 08:33:00 tron Exp $
+# $NetBSD: suse.mk,v 1.6 2000/08/25 00:20:22 jlam Exp $
MASTER_SITE_SUSE= ftp://ftp.suse.com/pub/suse/i386/6.3/suse/
@@ -12,6 +12,9 @@ EMULDIR= ${PREFIX}/${EMULSUBDIR}
RPM2PKG= ${PREFIX}/sbin/rpm2pkg
+# The SuSE Linux packages have circular dependencies.
+LDD?= ${TRUE}
+
RPM2PKGARGS= -d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
.for TEMP in ${RPMIGNOREPATH}
RPM2PKGARGS+= -i ${TEMP}
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index 7c5333d1b14..71582039f33 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/08/18 22:46:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.13 2000/08/25 00:20:22 jlam Exp $
#
DISTNAME= Rollemup
@@ -37,6 +37,7 @@ ONLY_FOR_PLATFORM= *-*-i386
.if ${OPSYS} == "NetBSD"
DEPENDS= suse_linux>=6.1:../../emulators/suse_linux
+LDD?= /emul/linux/usr/bin/ldd
.endif
do-build:
diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile
index 642f5022897..dda010e0c55 100644
--- a/graphics/mtv/Makefile
+++ b/graphics/mtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2000/08/18 22:46:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2000/08/25 00:20:23 jlam Exp $
DISTNAME= mtv-1.1.4
CATEGORIES= graphics
@@ -16,6 +16,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-i386 NetBSD-1.4Z[A-Z]-i386 \
DIST_SUBDIR= mtv
LICENSE= fee-based-commercial-use
MANCOMPRESSED=
+LDD= /emul/linux/usr/bin/ldd
RESTRICTED= "Commercial software."
NO_SRC_ON_FTP= ${RESTRICTED}
diff --git a/graphics/ns-flash/Makefile b/graphics/ns-flash/Makefile
index b1faf19812e..503805f5e8b 100644
--- a/graphics/ns-flash/Makefile
+++ b/graphics/ns-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/18 22:46:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/25 00:20:23 jlam Exp $
#
PKGNAME= ns-flash-4.0r12
@@ -12,9 +12,11 @@ ONLY_FOR_PLATFORM= *-*-i386 SunOS-*-sparc
DEPENDS+= suse_linux>=6.1:../../emulators/suse_linux
DISTUNAME= linux
WRKNAME= Linux
+LDD?= /emul/linux/usr/bin/ldd
.elif ${MACHINE_ARCH} == "sparc" && ${OPSYS} == "SunOS"
DISTUNAME= solaris
WRKNAME= Solaris
+LDD?= ${TRUE}
.endif
DISTNAME= flash_${DISTUNAME}
diff --git a/japanese/king/Makefile b/japanese/king/Makefile
index 1651fbc654c..61e0fa859e1 100644
--- a/japanese/king/Makefile
+++ b/japanese/king/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/08/18 22:46:36 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/25 00:20:23 jlam Exp $
#
DISTNAME= king-1.00-tb40-1
@@ -28,6 +28,7 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
EMULSUBDIR= emul/linux
EMULDIR= ${PREFIX}/${EMULSUBDIR}
SBINDIR= ${PREFIX}/sbin
+LDD?= ${EMULDIR}/usr/bin/ldd
RPM2PKG= ${PREFIX}/sbin/rpm2pkg
RPM2PKGARGS= -d ${PREFIX} -f ${PLIST_SRC} -p ${EMULSUBDIR}
diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile
index 26424dfc557..fd5e03c0e9f 100644
--- a/misc/staroffice/Makefile
+++ b/misc/staroffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/08/18 22:46:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/25 00:20:23 jlam Exp $
#
DISTNAME= so51a_lnx_${LANGNO}
@@ -27,6 +27,7 @@ PATCH_FUZZ_FACTOR= -F1
IS_INTERACTIVE= YES
NO_BUILD= YES
+LDD?= /emul/linux/usr/bin/ldd
DECOMPRESS_CMD= ${CAT}
.include "../../mk/bsd.prefs.mk"
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 8ca1f37697f..b34b614ece0 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/08/21 21:01:32 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2000/08/25 00:20:24 jlam Exp $
# FreeBSD Id: Makefile,v 1.13 1999/04/08 07:49:18 dima Exp $
PKGNAME= acroread-4.05
@@ -25,6 +25,7 @@ DEPENDS= suse_linux>=6.1:../../emulators/suse_linux
DISTNAME= linux-ar-405
PLATFORM= intellinux
WRKSRC= ${WRKDIR}/ILINXR.install
+LDD?= /emul/linux/usr/bin/ldd
.elif (${MACHINE_ARCH} == "alpha")
.if !exists(/emul/osf1/sbin/loader)
IGNORE= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
@@ -32,6 +33,7 @@ IGNORE= '${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)'
DISTNAME= fdec-rs-405
PLATFORM= alphaosf
WRKSRC= ${WRKDIR}/AOSFRS.install
+LDD?= ${TRUE}
.elif (${MACHINE_ARCH} == "sparc")
.if !exists(/emul/svr4/usr/lib/ld.so)
IGNORE= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
@@ -39,8 +41,10 @@ IGNORE= '${PKGNAME} requires Solaris libraries - see compat_svr4(8)'
DISTNAME= sunsparc-rs-405
WRKSRC= ${WRKDIR}/SSOLRS.install
PLATFORM= sparcsolaris
+LDD?= ${TRUE}
.else
DISTNAME= ${PKGNAME}
+LDD?= ${TRUE}
.endif
ONLY_FOR_PLATFORM= *-*-i386 *-1.4[L-Z]-sparc *-1.[5-9]*-sparc *-[2-9]*-sparc
# *-*-alpha
diff --git a/print/acroread3/Makefile b/print/acroread3/Makefile
index 70e0468c62b..9a9a9541cb9 100644
--- a/print/acroread3/Makefile
+++ b/print/acroread3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/08/22 10:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/25 00:20:24 jlam Exp $
PKGNAME= acroread3-3.01
CATEGORIES= print
@@ -23,29 +23,35 @@ NO_BUILD= YES
DEPENDS= suse_linux>=6.3:../../emulators/suse_linux
DISTNAME= acroread_linux_301
PLATFORM= intellinux
+LDD?= /emul/linux/usr/bin/ldd
.elif (${MACHINE_ARCH} == "alpha")
.if !exists(/emul/osf1/sbin/loader)
IGNORE= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)"
.endif
DISTNAME= acroread_osf_301
PLATFORM= alphaosf
+LDD?= ${TRUE}
.elif (${MACHINE_ARCH} == "sparc")
.if !exists(/emul/sunos/usr/lib/ld.so)
IGNORE= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)"
.endif
DISTNAME= acroread_sunos_301
PLATFORM= sparcsun
+LDD?= ${TRUE}
.else
DISTNAME= ${PKGNAME}
+LDD?= ${TRUE}
.endif
ONLY_FOR_PLATFORM= *-*-i386 *-*-sparc # *-*-alpha
.elif ${OPSYS} == "SunOS"
DISTNAME= acroread_solaris_301
PLATFORM= sparcsolaris
+LDD?= ${TRUE}
post-patch:
${CHMOD} -R o+rwx ${WRKSRC}
.else
DISTNAME= ${PKGNAME}
+LDD?= ${TRUE}
.endif
WRKSRC= ${WRKDIR}
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 4b9f86d9bef..8c2dba25fe8 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/08/18 22:46:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/08/25 00:20:24 jlam Exp $
#
DISTNAME= vlnx407e
@@ -24,6 +24,8 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
+LDD?= /emul/linux/usr/bin/ldd
+
do-configure:
${SED} <${FILESDIR}/uvscan.sh >${WRKSRC}/uvscan.sh \
-e 's:@@PREFIX@@:${PREFIX}:g'
diff --git a/www/asWedit/Makefile b/www/asWedit/Makefile
index cb8f1c621f1..5c20a8d3633 100644
--- a/www/asWedit/Makefile
+++ b/www/asWedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/08/18 22:46:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/25 00:20:24 jlam Exp $
#
DISTNAME= ${PKGNAME}-i386.linux
@@ -27,6 +27,8 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BUILD= yes
MESSAGE_FILE= ${WRKDIR}/MESSAGE
+LDD?= /emul/linux/usr/bin/ldd
+
do-configure:
cd ${WRKSRC} && ${CP} AsWedit AsWedit.bak && \
${SED} -e 's:/usr/local/lib:${PREFIX}/libdata:g' \
diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile
index 329693a4756..183978a1989 100644
--- a/www/ns-plugger-common/Makefile
+++ b/www/ns-plugger-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/08/22 11:02:12 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/08/25 00:20:25 jlam Exp $
#
DISTNAME= plugger-3.2-linux-x86-glibc
@@ -33,6 +33,8 @@ PLUGGERVERS= ${PLUGGERFULL:C/.*-//}
PLUGGERNAME= ${PLUGGERFULL:C/-.*//}
NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins
+LDD?= ${TRUE}
+
do-install:
.if ${BINNAME} != common
cd ${WRKSRC} && \
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 15:23:25 +0000