diff options
| author | joerg <joerg@pkgsrc.org> | 2014-08-13 22:37:37 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-08-13 22:37:37 +0000 |
| commit | 784805ab67e73eee717112fd47ff16d75f2b0fe9 (patch) | |
| tree | 644e6f7f55b6dec50629359197e6ae0b79f9ea8e /filesystems | |
| parent | 8178ff4e5e3b214cfa448e8bc6db8c00d271bb7f (diff) | |
| download | pkgsrc-784805ab67e73eee717112fd47ff16d75f2b0fe9.tar.gz | |
Use external argp. No longer installs glusterd rc script. Bump revision.
Diffstat (limited to 'filesystems')
| -rw-r--r-- | filesystems/glusterfs/Makefile | 7 | ||||
| -rw-r--r-- | filesystems/glusterfs/PLIST | 3 | ||||
| -rw-r--r-- | filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in | 13 |
3 files changed, 18 insertions, 5 deletions
diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile index e273f44d3f4..8e26bbaffed 100644 --- a/filesystems/glusterfs/Makefile +++ b/filesystems/glusterfs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.42 2014/05/18 21:21:32 joerg Exp $ +# $NetBSD: Makefile,v 1.43 2014/08/13 22:37:37 joerg Exp $ DISTNAME= glusterfs-3.5.0 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= filesystems MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/ @@ -54,7 +54,7 @@ CONF_FILES+= ${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol OWN_DIRS+= ${VARBASE}/log/glusterfs BUILD_DEFS+= VARBASE -RCD_SCRIPTS= glusterfsd glusterd +RCD_SCRIPTS= glusterfsd PLIST_SRC= ${PLIST_SRC_DFLT} PLIST_SUBST+= VARBASE=${VARBASE} @@ -84,6 +84,7 @@ LIBS+=-lgc .include "options.mk" .include "../../mk/bsd.prefs.mk" +.include "../../devel/argp/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST index 280e0efbbe8..6492432cf30 100644 --- a/filesystems/glusterfs/PLIST +++ b/filesystems/glusterfs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2014/04/18 08:31:20 manu Exp $ +@comment $NetBSD: PLIST,v 1.19 2014/08/13 22:37:37 joerg Exp $ etc/glusterfs/gluster-rsyslog-5.8.conf etc/glusterfs/gluster-rsyslog-7.2.conf etc/glusterfs/glusterd.vol.sample @@ -105,7 +105,6 @@ share/doc/glusterfs/benchmarking/local-script.sh share/doc/glusterfs/benchmarking/rdd.c share/doc/glusterfs/glusterfs-mode.el share/doc/glusterfs/glusterfs.vim -share/examples/rc.d/glusterd share/examples/rc.d/glusterfsd share/glusterfs/scripts/generate-gfid-file.sh share/glusterfs/scripts/get-gfid.sh diff --git a/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in b/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in new file mode 100644 index 00000000000..45a90db0b6f --- /dev/null +++ b/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-glusterfsd_src_Makefile.in,v 1.1 2014/08/13 22:37:37 joerg Exp $ + +--- glusterfsd/src/Makefile.in.orig 2014-08-13 13:08:12.000000000 +0000 ++++ glusterfsd/src/Makefile.in +@@ -281,7 +281,7 @@ glusterfsd_SOURCES = glusterfsd.c gluste + glusterfsd_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ + $(top_builddir)/rpc/xdr/src/libgfxdr.la \ +- $(GF_LDADD) $(GF_GLUSTERFS_LIBS) ++ $(GF_LDADD) $(GF_GLUSTERFS_LIBS) -largp + + glusterfsd_LDFLAGS = $(GF_LDFLAGS) + noinst_HEADERS = glusterfsd.h glusterfsd-mem-types.h |