diff options
| -rw-r--r-- | sysutils/xfm/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/xfm/patches/patch-af | 4 | ||||
| -rw-r--r-- | sysutils/xosview/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xosview/patches/patch-configure | 24 |
4 files changed, 30 insertions, 5 deletions
diff --git a/sysutils/xfm/distinfo b/sysutils/xfm/distinfo index 3f7902ed2da..0933b716390 100644 --- a/sysutils/xfm/distinfo +++ b/sysutils/xfm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2010/03/07 09:03:14 obache Exp $ +$NetBSD: distinfo,v 1.6 2013/10/20 17:52:57 joerg Exp $ SHA1 (xfm-1.4.3.tar.gz) = 8d6235bb63e04491cc99603144b52884866b39e2 RMD160 (xfm-1.4.3.tar.gz) = b06c562b467e5085e5ecdd4273b64d554415ce69 @@ -8,5 +8,5 @@ SHA1 (patch-ab) = cd16fe1b8f0d2fb0c4c7846c81b0f5e0bfc4137c SHA1 (patch-ac) = 40a32177cc5b64a49a51ea9c77062bfdc77da75d SHA1 (patch-ad) = 64709ecb67e91d8677545a7af54fa205079a77fd SHA1 (patch-ae) = 9e2a79a0a7becdca8bcdb30da457ef7b25ccd22d -SHA1 (patch-af) = 575a1a38b9a99d387779254a9dd7bb7c037c50dc +SHA1 (patch-af) = 075d38b00064ef6a853e62268e07a0432b1a7710 SHA1 (patch-ag) = 5c825371254e0056c5b932901bacc5599dd514d2 diff --git a/sysutils/xfm/patches/patch-af b/sysutils/xfm/patches/patch-af index f1f632de5b7..1f2c64e1a68 100644 --- a/sysutils/xfm/patches/patch-af +++ b/sysutils/xfm/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1 2006/03/29 22:39:49 joerg Exp $ +$NetBSD: patch-af,v 1.2 2013/10/20 17:52:57 joerg Exp $ --- src/Imakefile.orig 2006-03-29 20:52:53.000000000 +0000 +++ src/Imakefile @@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.1 2006/03/29 22:39:49 joerg Exp $ #ifdef XAW3D XAWDEFINES = -DXAW3D -XAWLIB = $(XAWLIBDIR) -lXaw3d -+XAWLIB = $(XAWLIBDIR) -R${PREFIX}/lib -lXaw3d ++XAWLIB = $(XAWLIBDIR) ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lXaw3d #endif #ifdef USE_HISTORY diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo index 1a4382b5bec..ccfd77ffe4a 100644 --- a/sysutils/xosview/distinfo +++ b/sysutils/xosview/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2013/01/11 23:33:35 joerg Exp $ +$NetBSD: distinfo,v 1.27 2013/10/20 17:52:58 joerg Exp $ SHA1 (xosview-1.8.3.tar.gz) = 420fd0620ff9fb9ba83fc833eeb8b872414e377e RMD160 (xosview-1.8.3.tar.gz) = 595e812dee686ccaa5d95eb537782679d752271b @@ -9,5 +9,6 @@ SHA1 (patch-ac) = 3e9073c4ccd7e08d29a76b08f2ed0c7f9f9d9ede SHA1 (patch-ad) = 02ae8395e200e5cbf8d6339eced33fe5aa421d38 SHA1 (patch-ae) = 6ff69eeffd40ec4ee3686f2069fd46853f346fff SHA1 (patch-af) = c556f02c7d8297968a78eb087f413f9472371c54 +SHA1 (patch-configure) = 903afa94aeee2d687f0341c08bca7b163849249d SHA1 (patch-linux_lmstemp.cc) = d46c27884963901d0e5f5bed7cc880dc7fddc01c SHA1 (patch-sunos5_diskmeter.cc) = 99e119cb645c9982f2a116950ac2ffe84eeff1d4 diff --git a/sysutils/xosview/patches/patch-configure b/sysutils/xosview/patches/patch-configure new file mode 100644 index 00000000000..f169d657da7 --- /dev/null +++ b/sysutils/xosview/patches/patch-configure @@ -0,0 +1,24 @@ +$NetBSD: patch-configure,v 1.1 2013/10/20 17:52:58 joerg Exp $ + +--- configure.orig 2013-10-18 22:56:10.000000000 +0000 ++++ configure +@@ -3327,8 +3327,8 @@ linux*) + LIBS="-L$x_libraries $LIBS" + ELF_LINK_FLAGS="" ;; + *) +- LIBS="-L$x_libraries -R$x_libraries $LIBS" +- ELF_LINK_FLAGS="-Wl,-R$x_libraries" ;; ++ LIBS="-L$x_libraries ${COMPILER_RPATH_FLAG}$x_libraries $LIBS" ++ ELF_LINK_FLAGS="${COMPILER_RPATH_FLAG}$x_libraries" ;; + esac + + +@@ -5254,7 +5254,7 @@ solaris2*) + + EXTRA_CXXFLAGS="-Wall -O4" + +- EXTRALIBS="-R$x_libraries -lsocket -lnsl -lkstat $XPMLIB" ++ EXTRALIBS="${COMPILER_RPATH_FLAG}$x_libraries -lsocket -lnsl -lkstat $XPMLIB" + host_dir=sunos5 + host_os=sunos5 ;; + *) { { echo "$as_me:$LINENO: error: xosview has not been ported to $host_os :(. Sorry." >&5 |