diff options
| author | joerg <joerg@pkgsrc.org> | 2009-02-09 23:05:02 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-02-09 23:05:02 +0000 |
| commit | 6c4db3a7acb739675c82bf1e1fb9ee62c95a61dd (patch) | |
| tree | 2ef1263ce744bbaae2f0f769aad4b3ab098ce115 | |
| parent | 3c645bb7fc37b7d01fc429cb6ae2e339153385de (diff) | |
| download | pkgsrc-6c4db3a7acb739675c82bf1e1fb9ee62c95a61dd.tar.gz | |
Don't create /var/spool/... at install time, the scripts will take care
of it. Mark as user-destdir after that.
| -rw-r--r-- | chat/ejabberd/Makefile | 15 | ||||
| -rw-r--r-- | chat/ejabberd/distinfo | 4 | ||||
| -rw-r--r-- | chat/ejabberd/patches/patch-aa | 10 |
3 files changed, 18 insertions, 11 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile index df9d574f51a..4422e5b871d 100644 --- a/chat/ejabberd/Makefile +++ b/chat/ejabberd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2009/02/03 12:07:26 martti Exp $ +# $NetBSD: Makefile,v 1.8 2009/02/09 23:05:02 joerg Exp $ DISTNAME= ejabberd-2.0.3 #PKGREVISION= 1 @@ -9,6 +9,8 @@ MAINTAINER= martti@NetBSD.org HOMEPAGE= http://www.ejabberd.im/ COMMENT= Free and Open Source distributed fault-tolerant Jabber server +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS+= jabberd-[0-9]* GNU_CONFIGURE= yes @@ -49,8 +51,6 @@ BUILD_DEFS+= EJABBERD_EXDIR BUILD_DEFS+= VARBASE PKG_SYSCONFSUBDIR= ejabberd -PKG_DESTDIR_SUPPORT= destdir - .include "../../mk/bsd.prefs.mk" EJABBERD_USER= ejabberd @@ -63,7 +63,6 @@ EJABBERD_EXDIR= share/examples/ejabberd OWN_DIRS+= ${EJABBERD_PIDDIR} OWN_DIRS+= ${EJABBERD_LOGDIR} OWN_DIRS+= ${EJABBERD_DB} - OWN_DIRS_PERMS+= ${EJABBERD_PIDDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 OWN_DIRS_PERMS+= ${EJABBERD_LOGDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 OWN_DIRS_PERMS+= ${EJABBERD_DB} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 @@ -90,10 +89,10 @@ post-patch: ${RM} -f ${WRKSRC}/doc/guide.tex.orig post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/${PKGNAME_NOREV} - ${INSTALL_DATA} ${WRKSRC}/doc/Makefile ${PREFIX}/share/doc/${PKGNAME_NOREV} - ${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${PREFIX}/share/doc/${PKGNAME_NOREV} - ${INSTALL_DATA} ${WRKSRC}/doc/api/* ${PREFIX}/share/doc/${PKGNAME_NOREV}/api + ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV} + ${INSTALL_DATA} ${WRKSRC}/doc/Makefile ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV} + ${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV} + ${INSTALL_DATA} ${WRKSRC}/doc/api/* ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}/api SUBST_CLASSES+= paths SUBST_MESSAGE.paths= Localizing paths diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo index 58576494491..c675163df30 100644 --- a/chat/ejabberd/distinfo +++ b/chat/ejabberd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2009/02/03 12:07:26 martti Exp $ +$NetBSD: distinfo,v 1.6 2009/02/09 23:05:02 joerg Exp $ SHA1 (ejabberd-2.0.3.tar.gz) = ee3a503befea79378c4c8f7ce5be6151209bf474 RMD160 (ejabberd-2.0.3.tar.gz) = e5f77715a9e74dfed5b9dbdd17ad2255d40f3d13 Size (ejabberd-2.0.3.tar.gz) = 1089870 bytes -SHA1 (patch-aa) = 5b0c2994aad402cf13cc9531465513aad69de1e0 +SHA1 (patch-aa) = b3cc3c7eaffeada40f322303f6b8d7ee4624f205 SHA1 (patch-ac) = 271640b343bdc24f6609fe9c95250a91d514bc28 SHA1 (patch-ad) = a6504e8454878c97e434040a2f9136174b994c0d SHA1 (patch-ae) = c1c615a1d2e28d05d069f2bafa30179437922536 diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa index 1684638f08e..709c9038b30 100644 --- a/chat/ejabberd/patches/patch-aa +++ b/chat/ejabberd/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2008/11/12 13:13:59 martti Exp $ +$NetBSD: patch-aa,v 1.4 2009/02/09 23:05:02 joerg Exp $ Modified for pkgsrc @@ -24,3 +24,11 @@ Modified for pkgsrc SBINDIR = $(DESTDIR)@sbindir@ ifeq ($(shell uname),Darwin) +@@ -114,7 +114,6 @@ install: all + install -m 644 *.beam $(BEAMDIR) + rm -f $(BEAMDIR)/configure.beam + install -m 644 *.app $(BEAMDIR) +- install -d -m 750 $(SPOOLDIR) + install -d $(SODIR) + install -d $(PBINDIR) + install -m 644 *.so $(SODIR) |