Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Sep 2016 17:53:14 +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: r421572 - head/irc/bip
Message-ID:  <201609081753.u88HrEKS051852@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Sep  8 17:53:13 2016
New Revision: 421572
URL: https://svnweb.freebsd.org/changeset/ports/421572

Log:
  - Fix build WITHOUT=EXAMPLES
  - While here, fix LICENSE, add LICENSE_FILE, switch to USES=ssl, switch to options helpers, unsilence installation
  
  PR:		207283
  Submitted by:	samorders@gmail.com
  Approved by:	maintainer timeout (swills, 6 months)

Modified:
  head/irc/bip/Makefile
  head/irc/bip/pkg-plist

Modified: head/irc/bip/Makefile
==============================================================================
--- head/irc/bip/Makefile	Thu Sep  8 17:49:12 2016	(r421571)
+++ head/irc/bip/Makefile	Thu Sep  8 17:53:13 2016	(r421572)
@@ -9,17 +9,16 @@ MASTER_SITES=	https://projects.duckcorp.
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Simple IRC proxy with SSL support
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-Wno-sign-compare -Wno-error
-USES=	cpe gmake
+USES=		cpe gmake ssl
 CPE_VENDOR=	duckcorp
 INSTALL_TARGET=	SUBDIR=src install-exec
 
-USE_OPENSSL=	yes
-
 PATCH_STRIP=	-p1
 SUB_FILES=	pkg-message
 
@@ -28,25 +27,22 @@ EXAMPLEFILES=	bip.conf bip.vim
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
 post-install:
-	@cd ${WRKSRC} && ${INSTALL} bip.1 ${STAGEDIR}${PREFIX}/man/man1
-	@cd ${WRKSRC} && ${INSTALL} bipmkpw.1 ${STAGEDIR}${PREFIX}/man/man1
-	@cd ${WRKSRC} && ${INSTALL} bip.conf.5 ${STAGEDIR}${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/bip.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/bipmkpw.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/bip.conf.5 ${STAGEDIR}${PREFIX}/man/man5
 
-.if ${PORT_OPTIONS:MDOCS}
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR}  ${STAGEDIR}${EXAMPLESDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${EXAMPLEFILES}
 	${INSTALL_DATA} ${WRKSRC}/samples/${i} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/irc/bip/pkg-plist
==============================================================================
--- head/irc/bip/pkg-plist	Thu Sep  8 17:49:12 2016	(r421571)
+++ head/irc/bip/pkg-plist	Thu Sep  8 17:53:13 2016	(r421572)
@@ -3,5 +3,5 @@ bin/bipmkpw
 man/man1/bip.1.gz
 man/man1/bipmkpw.1.gz
 man/man5/bip.conf.5.gz
-%%EXAMPLESDIR%%/bip.conf
-%%EXAMPLESDIR%%/bip.vim
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bip.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bip.vim



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