Fri Jul 5 14:47:41 2013 UTC ()
Build fix for SunOS >= 5.11.


(jperkin)
diff -r1.37 -r1.38 pkgsrc/net/vsftpd/Makefile
cvs diff -r1.37 -r1.38 pkgsrc/net/vsftpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/vsftpd/Makefile 2013/02/06 23:23:27 1.37
+++ pkgsrc/net/vsftpd/Makefile 2013/07/05 14:47:41 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.37 2013/02/06 23:23:27 jperkin Exp $ 1# $NetBSD: Makefile,v 1.38 2013/07/05 14:47:41 jperkin Exp $
2# 2#
3 3
4DISTNAME= vsftpd-2.3.4 4DISTNAME= vsftpd-2.3.4
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://security.appspot.com/downloads/ \ 7MASTER_SITES= http://security.appspot.com/downloads/ \
8 ${MASTER_SITE_LOCAL} 8 ${MASTER_SITE_LOCAL}
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://vsftpd.beasts.org/ 11HOMEPAGE= http://vsftpd.beasts.org/
12COMMENT= FTP server that aims to be very secure 12COMMENT= FTP server that aims to be very secure
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
@@ -30,26 +30,33 @@ OWN_DIRS= ${VARBASE}/chroot/vsftpd @@ -30,26 +30,33 @@ OWN_DIRS= ${VARBASE}/chroot/vsftpd
30 30
31INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \ 31INSTALLATION_DIRS= libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
32 ${EGDIR} ${DOCDIR}/SECURITY 32 ${EGDIR} ${DOCDIR}/SECURITY
33 33
34SUBST_CLASSES+= paths 34SUBST_CLASSES+= paths
35SUBST_FILES.paths= vsftpd.8 vsftpd.conf.5 vsftpd.conf 35SUBST_FILES.paths= vsftpd.8 vsftpd.conf.5 vsftpd.conf
36SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' 36SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
37SUBST_STAGE.paths= post-patch 37SUBST_STAGE.paths= post-patch
38 38
39MAKE_ENV+= LIBS=${LIBS:Q} 39MAKE_ENV+= LIBS=${LIBS:Q}
40 40
41.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
42 42
 43.if ${OPSYS} == "SunOS" && ${OS_VERSION} == "5.11"
 44SUBST_CLASSES+= dirfd
 45SUBST_STAGE.dirfd= pre-build
 46SUBST_FILES.dirfd= port/solaris_bogons.h
 47SUBST_SED.dirfd= -e '/dirfd_extras/d'
 48.endif
 49
43VSFTPD_USER?= vsftpd 50VSFTPD_USER?= vsftpd
44VSFTPD_GROUP?= vsftpd 51VSFTPD_GROUP?= vsftpd
45PKG_GROUPS= ${VSFTPD_GROUP} 52PKG_GROUPS= ${VSFTPD_GROUP}
46PKG_USERS= ${VSFTPD_USER}:${VSFTPD_GROUP} 53PKG_USERS= ${VSFTPD_USER}:${VSFTPD_GROUP}
47 54
48PKG_GROUPS_VARS+= VSFTPD_GROUP 55PKG_GROUPS_VARS+= VSFTPD_GROUP
49PKG_USERS_VARS+= VSFTPD_USER 56PKG_USERS_VARS+= VSFTPD_USER
50 57
51CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" 58CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
52LIBS.SunOS= -lsocket -lnsl -lrt -lsendfile -lresolv 59LIBS.SunOS= -lsocket -lnsl -lrt -lsendfile -lresolv
53 60
54.include "options.mk" 61.include "options.mk"
55 62