CVS commit: pkgsrc/filesystems/fuse-djmount

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jun  4 19:04:11 UTC 2021

Modified Files:
        pkgsrc/filesystems/fuse-djmount: Makefile distinfo
Added Files:
        pkgsrc/filesystems/fuse-djmount/patches: patch-configure

Log Message:
fuse-djmount: mark as broken


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/filesystems/fuse-djmount/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/filesystems/fuse-djmount/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/filesystems/fuse-djmount/patches/patch-configure

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

Modified files:

Index: pkgsrc/filesystems/fuse-djmount/Makefile
diff -u pkgsrc/filesystems/fuse-djmount/Makefile:1.10 pkgsrc/filesystems/fuse-djmount/Makefile:1.11
--- pkgsrc/filesystems/fuse-djmount/Makefile:1.10       Fri Mar 20 11:57:37 2020
+++ pkgsrc/filesystems/fuse-djmount/Makefile    Fri Jun  4 19:04:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/03/20 11:57:37 nia Exp $
+# $NetBSD: Makefile,v 1.11 2021/06/04 19:04:10 adam Exp $
 
 DISTNAME=      djmount-0.71
 PKGNAME=       fuse-${DISTNAME}
@@ -9,14 +9,19 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
 MAINTAINER=    agc%NetBSD.org@localhost
 HOMEPAGE=      http://djmount.sourceforge.net/
 COMMENT=       FUSE filesystem for accessing Media Server content via UPnP
+LICENSE=       gnu-gpl-v2
 
-GNU_CONFIGURE= yes
-USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake
+BROKEN=                "Does not build with neither external or internal libupnp"
 
+USE_LIBTOOL=           yes
+USE_TOOLS+=            gmake
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-external-libupnp
 CONFIGURE_ARGS+=       --with-libupnp-prefix=${BUILDLINK_PREFIX.libupnp}
 
+# compatibility with ancient libixml (part of libupnp)
+CPPFLAGS+=     -DIN="" -DOUT="" -DINOUT=""
+
 INSTALLATION_DIRS=     share/doc/djmount
 
 post-install:
@@ -24,7 +29,6 @@ post-install:
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../net/libupnp/buildlink3.mk"
-
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/filesystems/fuse-djmount/distinfo
diff -u pkgsrc/filesystems/fuse-djmount/distinfo:1.4 pkgsrc/filesystems/fuse-djmount/distinfo:1.5
--- pkgsrc/filesystems/fuse-djmount/distinfo:1.4        Tue Nov  3 00:15:00 2015
+++ pkgsrc/filesystems/fuse-djmount/distinfo    Fri Jun  4 19:04:10 2021
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 00:15:00 agc Exp $
+$NetBSD: distinfo,v 1.5 2021/06/04 19:04:10 adam Exp $
 
 SHA1 (djmount-0.71.tar.gz) = 527d4603d85b7fb86dc97d326b78c97bdcc4d687
 RMD160 (djmount-0.71.tar.gz) = 695e2ea0cd3fe654339f82c5101eb74da739d3f7
 SHA512 (djmount-0.71.tar.gz) = 6735c1dc346470d72d3ab2434be5e634d7b6b2863a182fa15b4f24e5bda7e0338d90d3efe58e5c161bd5f5cf0f4e8209c988492b1c1fa12bd625eb0c97ad57bd
 Size (djmount-0.71.tar.gz) = 1159653 bytes
 SHA1 (patch-aa) = e6135ae8c014cf57acc6397dc74bedbaf86f80e4
+SHA1 (patch-configure) = 62c06c5fc52e8e5e627f8965a4ccfa8f383406af
 SHA1 (patch-djmount_upnp__util.c) = 56247528bb7fbe2964e39893c014c2b4602285b6
 SHA1 (patch-djmount_upnp__util.h) = 72d1b7dbd1544fa4702cf149ded983f625d936e7

Added files:

Index: pkgsrc/filesystems/fuse-djmount/patches/patch-configure
diff -u /dev/null pkgsrc/filesystems/fuse-djmount/patches/patch-configure:1.1
--- /dev/null   Fri Jun  4 19:04:11 2021
+++ pkgsrc/filesystems/fuse-djmount/patches/patch-configure     Fri Jun  4 19:04:11 2021
@@ -0,0 +1,33 @@
+$NetBSD: patch-configure,v 1.1 2021/06/04 19:04:11 adam Exp $
+
+Fix for newer libupnp.
+
+--- configure.orig     2006-08-27 20:13:13.000000000 +0000
++++ configure
+@@ -26527,7 +26527,7 @@ fi;
+ 
+ if test x"$with_libupnp_prefix" != x ; then
+       LIBUPNP_CFLAGS="$LIBUPNP_CFLAGS -I$with_libupnp_prefix/include "
+-      LIBUPNP_LIBS="$LIBUPNP_LIBS -L$with_libupnp_prefix/lib -lupnp -lthreadutil -lixml"
++      LIBUPNP_LIBS="$LIBUPNP_LIBS -L$with_libupnp_prefix/lib -lupnp -lixml"
+ fi
+ 
+ #
+@@ -26597,7 +26597,7 @@ fi
+ 
+       if test x"$rt_package_find_libupnp_pkg_config_ok" != xyes; then
+                 LIBUPNP_CFLAGS=""
+-                LIBUPNP_LIBS="-lupnp -lthreadutil -lixml"
++                LIBUPNP_LIBS="-lupnp -lixml"
+       fi
+ fi
+ 
+@@ -26761,7 +26761,7 @@ subdirs="$subdirs libupnp"
+       # this is handled in djmount/Makefile.am
+ 
+       bd='$(top_builddir)/libupnp' # ! shall not expand $top_builddir !
+-      LIBUPNP_LIBS="-L$bd/upnp -lupnp -L$bd/threadutil -lthreadutil -L$bd/ixml -lixml"
++      LIBUPNP_LIBS="-L$bd/upnp -lupnp -L$bd/ixml -lixml"
+ 
+       # Set specific libupnp debug flag (not provided by bundled library,
+       # but provided by external libupnp version >= 1.3)