Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 8 Apr 2017 11:03:01 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r438029 - head/ftp/wzdftpd
Message-ID:  <201704081103.v38B31p4010683@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat Apr  8 11:03:01 2017
New Revision: 438029
URL: https://svnweb.freebsd.org/changeset/ports/438029

Log:
  - Add LICENSE_FILE
  - Switch to USES=localbase
  - Switch to options helpers

Modified:
  head/ftp/wzdftpd/Makefile

Modified: head/ftp/wzdftpd/Makefile
==============================================================================
--- head/ftp/wzdftpd/Makefile	Sat Apr  8 10:40:49 2017	(r438028)
+++ head/ftp/wzdftpd/Makefile	Sat Apr  8 11:03:01 2017	(r438029)
@@ -11,17 +11,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular FTP server configurable online using SITE commands
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	ICONV IPV6 MYSQL PERL PGSQL SQLITE TCL DOCS
-OPTIONS_RADIO=	TLS ZEROCONF
-OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
-OPTIONS_RADIO_ZEROCONF=	AVAHI HOWL
-OPTIONS_DEFAULT=	AVAHI GNUTLS
-HOWL_DESC=	Zeroconf support via Howl
-
-OPTIONS_SUB=	yes
-
-USES=		autoreconf gettext-tools libtool pkgconfig
+USES=		autoreconf gettext-tools libtool localbase pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${ETCDIR} --without-pam --disable-bonjour
 INSTALL_TARGET=	install-strip
@@ -29,8 +21,12 @@ USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	wzdftpd
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
+OPTIONS_DEFINE=	ICONV IPV6 MYSQL PERL PGSQL SQLITE TCL DOCS
+OPTIONS_RADIO=	TLS ZEROCONF
+OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
+OPTIONS_RADIO_ZEROCONF=	AVAHI HOWL
+OPTIONS_DEFAULT=	AVAHI GNUTLS
+OPTIONS_SUB=	yes
 
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 ICONV_CONFIGURE_OFF=	--disable-utf8
@@ -65,6 +61,7 @@ AVAHI_CONFIGURE_ON=	--with-zeroconf --en
 AVAHI_LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 			libavahi-core.so:net/avahi-app
 
+HOWL_DESC=		Zeroconf support via Howl
 HOWL_CONFIGURE_ON=	--with-zeroconf --enable-howl
 HOWL_CPPFLAGS=		-I${LOCALBASE}/include/howl
 HOWL_LIB_DEPENDS=	libhowl.so:net/howl
@@ -97,11 +94,13 @@ post-patch:
 		 /gcry_control/d' \
 
 post-install:
-	(cd ${WRKSRC} && ${INSTALL_DATA} *.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig )
+	${INSTALL_DATA} ${WRKSRC}/*.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in AUTHORS ChangeLog NEWS Permissions.ReadMeFirst README \
 	TLS.ReadMeFirst UPGRADING wzd_tls.cnf
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704081103.v38B31p4010683>