svn commit: r395775 - in head/devel/ding-libs: . files

Dmitry Marakasov amdmi3 at FreeBSD.org
Tue Sep 1 16:11:35 UTC 2015


Author: amdmi3
Date: Tue Sep  1 16:11:34 2015
New Revision: 395775
URL: https://svnweb.freebsd.org/changeset/ports/395775

Log:
  - Fix build without DOCS by not trying to install files into /dev/null (both enabled and disabled DOCS are handled properly when docs are installed into usual location)
  - Drop 8.x support (and get rid of bunch of patches)
  
  Approved by:	portmgr blanket

Deleted:
  head/devel/ding-libs/files/extra-patch-Makefile.am
  head/devel/ding-libs/files/extra-patch-ini__ini_fileobj.c
  head/devel/ding-libs/files/extra-patch-ini__libini_config.sym
  head/devel/ding-libs/files/flags.c
  head/devel/ding-libs/files/fmemopen.c
Modified:
  head/devel/ding-libs/Makefile

Modified: head/devel/ding-libs/Makefile
==============================================================================
--- head/devel/ding-libs/Makefile	Tue Sep  1 16:10:30 2015	(r395774)
+++ head/devel/ding-libs/Makefile	Tue Sep  1 16:11:34 2015	(r395775)
@@ -25,30 +25,11 @@ CONFIGURE_ENV+=	DOXYGEN=""
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS=	--docdir=${DOCSDIR}
-.else
-CONFIGURE_ARGS=	--docdir=/dev/null
-.endif
-
-#fmemopen was commit r246120
-.if ${OSVERSION} < 901502
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-Makefile.am \
-		${FILESDIR}/extra-patch-ini__libini_config.sym \
-		${FILESDIR}/extra-patch-ini__ini_fileobj.c
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' ${WRKSRC}/collection/collection_tools.c \
 		${WRKSRC}/refarray/ref_array.c
 	@${REINPLACE_CMD} -e 's|git log -1 &>/dev/null|true|g' \
 		${WRKSRC}/configure.ac
-.if ${OSVERSION} < 901502
-	@${CP} ${FILESDIR}/fmemopen.c ${WRKSRC}/ini/fmemopen.c
-	@${CP} ${FILESDIR}/flags.c ${WRKSRC}/ini/flags.c
-.endif
 
 .include <bsd.port.mk>


More information about the svn-ports-head mailing list