diff options
author | minskim <minskim@pkgsrc.org> | 2004-12-11 08:25:48 +0000 |
---|---|---|
committer | minskim <minskim@pkgsrc.org> | 2004-12-11 08:25:48 +0000 |
commit | 7331bb17fe534eb361ef5e0bc2ee3e321f9edc5d (patch) | |
tree | b528b99e401e6a5bf1a198ad435885610e1ff880 /net | |
parent | 2754efb63d151414d72a87223c1d3adcfad70c5d (diff) | |
download | pkgsrc-7331bb17fe534eb361ef5e0bc2ee3e321f9edc5d.tar.gz |
- Use VARBASE instead of hardcoding /var.
- Do not override file ownership.
Diffstat (limited to 'net')
-rw-r--r-- | net/bftpd/Makefile | 3 | ||||
-rw-r--r-- | net/bftpd/distinfo | 4 | ||||
-rw-r--r-- | net/bftpd/patches/patch-aa | 31 |
3 files changed, 26 insertions, 12 deletions
diff --git a/net/bftpd/Makefile b/net/bftpd/Makefile index e33a56f809c..93fb236c00a 100644 --- a/net/bftpd/Makefile +++ b/net/bftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/04/25 07:45:37 snj Exp $ +# $NetBSD: Makefile,v 1.3 2004/12/11 08:25:48 minskim Exp $ # DISTNAME= bftpd-1.0.24 @@ -16,6 +16,7 @@ GNU_CONFIGURE= YES CFLAGS+= -DPATH_BFTPD_CONF=\"\\\"${PKG_SYSCONFDIR}/bftpd.conf\\\"\" CONF_FILES= ${PREFIX}/share/examples/bftpd/bftpd.conf \ ${PKG_SYSCONFDIR}/bftpd.conf +MAKE_ENV+= VARBASE=${VARBASE:Q} pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bftpd diff --git a/net/bftpd/distinfo b/net/bftpd/distinfo index 598436fcdc4..e0390455758 100644 --- a/net/bftpd/distinfo +++ b/net/bftpd/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/06/02 13:13:15 jmmv Exp $ +$NetBSD: distinfo,v 1.2 2004/12/11 08:25:48 minskim Exp $ SHA1 (bftpd-1.0.24.tar.gz) = 4a047778e9435fc9221d02c1093f040186bb88d7 Size (bftpd-1.0.24.tar.gz) = 75995 bytes -SHA1 (patch-aa) = 3f02301b2ca9290dd7188b39859877f11108b001 +SHA1 (patch-aa) = e8114ee69380fcf1d765abe8fadfba2b2d4ee248 SHA1 (patch-ab) = faef48266dd0fb7b095738207be2b26ee34e9359 diff --git a/net/bftpd/patches/patch-aa b/net/bftpd/patches/patch-aa index 20bda865809..553ba46f15c 100644 --- a/net/bftpd/patches/patch-aa +++ b/net/bftpd/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/06/02 13:13:15 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2004/12/11 08:25:48 minskim Exp $ ---- Makefile.in.orig 2003-06-02 14:23:34.000000000 +0200 +--- Makefile.in.orig 2003-05-09 16:47:48.000000000 -0500 +++ Makefile.in @@ -4,6 +4,7 @@ INSTALL=@INSTALL@ CFLAGS=@CFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" @DEBUG@ @@ -10,13 +10,26 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/06/02 13:13:15 jmmv Exp $ mandir=@mandir@ sbindir=@sbindir@ DESTDIR= -@@ -28,8 +29,7 @@ $(OBJS): $(HEADERS) Makefile +@@ -26,14 +27,14 @@ bftpd: $(OBJS) + $(OBJS): $(HEADERS) Makefile + install: all - $(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/sbin - $(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8 +- $(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/sbin +- $(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8 - [ -f $(DESTDIR)/etc/bftpd.conf ] || \ - $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc -+ $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/$(datadir)/examples/bftpd - touch /var/log/bftpd.log - chmod 644 /var/log/bftpd.log - mkdir -p /var/run/bftpd +- touch /var/log/bftpd.log +- chmod 644 /var/log/bftpd.log +- mkdir -p /var/run/bftpd +- chmod 755 /var/run/bftpd ++ $(INSTALL) -m 700 bftpd $(DESTDIR)/$(prefix)/sbin ++ $(INSTALL) -m 644 bftpd.8 $(DESTDIR)/$(mandir)/man8 ++ $(INSTALL) -m 600 bftpd.conf $(DESTDIR)/$(datadir)/examples/bftpd ++ mkdir -p ${VARBASE}/log ++ touch ${VARBASE}/log/bftpd.log ++ chmod 644 ${VARBASE}/log/bftpd.log ++ mkdir -p ${VARBASE}/run/bftpd ++ chmod 755 ${VARBASE}/run/bftpd + + clean distclean: + rm -f *~ $(OBJS) bftpd mksources.finished |