Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Aug 2015 16:49:36 +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: r395378 - head/graphics/jpeg
Message-ID:  <201508261649.t7QGnaSs046058@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Wed Aug 26 16:49:35 2015
New Revision: 395378
URL: https://svnweb.freebsd.org/changeset/ports/395378

Log:
  - Unsilence install commands
  - Switch to options helpers
  
  Approved by:	portmgr (bapt)

Modified:
  head/graphics/jpeg/Makefile

Modified: head/graphics/jpeg/Makefile
==============================================================================
--- head/graphics/jpeg/Makefile	Wed Aug 26 16:34:41 2015	(r395377)
+++ head/graphics/jpeg/Makefile	Wed Aug 26 16:49:35 2015	(r395378)
@@ -33,8 +33,6 @@ CONFIGURE_ARGS+=	--enable-maxmem=${J_MAX
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/jpegexiforient.c ${WRKSRC}/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/exifautotran.txt ${WRKSRC}/exifautotran
@@ -49,15 +47,15 @@ regression-test:	test
 
 post-install:
 	${LN} -s libjpeg.so.8 ${STAGEDIR}${PREFIX}/lib/libjpeg.so.11
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/jpeg
-	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/jpeg/
-	@${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${PREFIX}/share/doc/jpeg/
-.endif
 .for header in ${ADDITIONAL_HEADER}
-	@${INSTALL_DATA} ${WRKSRC}/${header} ${STAGEDIR}${PREFIX}/include/
+	${INSTALL_DATA} ${WRKSRC}/${header} ${STAGEDIR}${PREFIX}/include/
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/jpegexiforient ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/exifautotran ${STAGEDIR}${PREFIX}/bin/
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/jpeg
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/jpeg/
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${PREFIX}/share/doc/jpeg/
+
 .include <bsd.port.mk>



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