svn commit: r344408 - head/devel/libcidr

[Pawel Pekala]

Author: pawel
Date: Sat Feb 15 15:40:57 2014
New Revision: 344408
URL: http://svnweb.freebsd.org/changeset/ports/344408
QAT: https://qat.redports.org/buildarchive/r344408/

Log:
  - Update to version 1.2.3, more precise LICENSE [1]
  - Remove leading article from COMMENT
  - Convert to new options framework, use helpers
  - Respect CFLAGS
  
  PR:		ports/186340 [1]
  Submitted by:	maintainer

Modified:
  head/devel/libcidr/Makefile
  head/devel/libcidr/distinfo
  head/devel/libcidr/pkg-plist

Modified: head/devel/libcidr/Makefile
==============================================================================
--- head/devel/libcidr/Makefile	Sat Feb 15 15:39:42 2014	(r344407)
+++ head/devel/libcidr/Makefile	Sat Feb 15 15:40:57 2014	(r344408)
@@ -2,24 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	libcidr
-DISTVERSION=	1.2.2
+DISTVERSION=	1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.over-yonder.net/~fullermd/projects/${PORTNAME}/ \
-		http://distfiles.over-yonder.net/${PORTNAME}/ \
-		http://mirrors.rit.edu/zi/
+		http://distfiles.over-yonder.net/${PORTNAME}/
 
 MAINTAINER=	fullermd at over-yonder.net
-COMMENT=	A library to handle manipulating CIDR netblocks
+COMMENT=	Library to handle manipulating CIDR netblocks
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_XZ=		yes
 USE_LDCONFIG=	yes
-MAKE_ENV+=	CIDR_DOCDIR=${DOCSDIR} CIDR_EXDIR=${EXAMPLESDIR} NO_DOCS=yes
+MAKE_ENV+=	CIDR_DOCDIR=${DOCSDIR} CIDR_EXDIR=${EXAMPLESDIR}
 
-.if defined(NOPORTEXAMPLES)
-MAKE_ENV+=	NO_EXAMPLES=yes
-.endif
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+DOCS_MAKE_ENV_OFF=	NO_DOCS=yes
+EXAMPLES_MAKE_ENV_OFF=	NO_EXAMPLES=yes
+
+post-patch:
+	@${REINPLACE_CMD} 's|-g -O2 -pipe||' ${WRKSRC}/src/Makefile.inc
 
 .include <bsd.port.mk>

Modified: head/devel/libcidr/distinfo
==============================================================================
--- head/devel/libcidr/distinfo	Sat Feb 15 15:39:42 2014	(r344407)
+++ head/devel/libcidr/distinfo	Sat Feb 15 15:40:57 2014	(r344408)
@@ -1,2 +1,2 @@
-SHA256 (libcidr-1.2.2.tar.xz) = 918b76f80ed1a3a2f44adc5956b3a56417175c2856f380980049becba52e5d24
-SIZE (libcidr-1.2.2.tar.xz) = 151800
+SHA256 (libcidr-1.2.3.tar.xz) = afbe266a9839775a21091b0e44daaf890a46ea4c2d3f5126b3048d82b9bfbbc4
+SIZE (libcidr-1.2.3.tar.xz) = 155144

Modified: head/devel/libcidr/pkg-plist
==============================================================================
--- head/devel/libcidr/pkg-plist	Sat Feb 15 15:39:42 2014	(r344407)
+++ head/devel/libcidr/pkg-plist	Sat Feb 15 15:40:57 2014	(r344408)
@@ -1,15 +1,22 @@
-lib/libcidr.so
-lib/libcidr.so.0
 bin/cidrcalc
 include/libcidr.h
+lib/libcidr.so
+lib/libcidr.so.0
 man/man3/libcidr.3.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.inc
+%%PORTDOCS%%%%DOCSDIR%%/codelibrary-html.css
+%%PORTDOCS%%%%DOCSDIR%%/libcidr-big.html
+%%PORTDOCS%%%%DOCSDIR%%/libcidr.dvi
+%%PORTDOCS%%%%DOCSDIR%%/libcidr.pdf
+%%PORTDOCS%%%%DOCSDIR%%/libcidr.ps
+%%PORTDOCS%%%%DOCSDIR%%/libcidr.rtf
+%%PORTDOCS%%%%DOCSDIR%%/libcidr.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cidrcalc/cidrcalc.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cidrcalc/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl/acl.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl/acl.example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl/Makefile
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cidrcalc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/acl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cidrcalc/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cidrcalc/cidrcalc.c
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/cidrcalc
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/acl
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%