Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Mar 2014 16:37:04 +0000 (UTC)
From:      Rusmir Dusko <nemysis@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346929 - head/graphics/imageindex
Message-ID:  <201403031637.s23Gb4Fw004616@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: nemysis
Date: Mon Mar  3 16:37:04 2014
New Revision: 346929
URL: http://svnweb.freebsd.org/changeset/ports/346929
QAT: https://qat.redports.org/buildarchive/r346929/

Log:
  - Remove leading article from COMMENT
  - Use LIB_DEPENDS for graphics/jpeg
  - Change RUN_DEPENDS for graphics/ImageMagick and multimedia/mplayer
  - Support STAGEDIR
  - Add DOCS Option
  - Change typo | ;' to |'
  
  PR:		ports/177322
  Submitted by:	nemysis (self)
  Approved by:	maintainer timeout (11 months)

Modified:
  head/graphics/imageindex/Makefile

Modified: head/graphics/imageindex/Makefile
==============================================================================
--- head/graphics/imageindex/Makefile	Mon Mar  3 16:36:37 2014	(r346928)
+++ head/graphics/imageindex/Makefile	Mon Mar  3 16:37:04 2014	(r346929)
@@ -9,31 +9,27 @@ MASTER_SITES=	http://www.edwinh.org/imag
 		http://www.reynoldsnet.org/imageindex/release/
 
 MAINTAINER=	johnjen@reynoldsnet.org
-COMMENT=	A digital photo gallery tool
+COMMENT=	Digital photo gallery tool
 
-RUN_DEPENDS=	\
-	${LOCALBASE}/bin/Magick-config:${PORTSDIR}/graphics/ImageMagick \
-	${LOCALBASE}/bin/wrjpgcom:${PORTSDIR}/graphics/jpeg \
-	${LOCALBASE}/bin/mplayer:${PORTSDIR}/multimedia/mplayer \
-	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick \
+		mplayer:${PORTSDIR}/multimedia/mplayer \
+		p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
 
 USES=		perl5
 USE_PERL5=	run
-MAKE_ARGS+=	PERLPATH=${PERL}
+MAKE_ARGS+=	PERLPATH=${PERL} PREFIX=${STAGEDIR}${PREFIX}
 
-PLIST_FILES=	bin/imageindex bin/autocaption
+PLIST_FILES=	bin/imageindex bin/autocaption \
+		man/man1/imageindex.1.gz
 PORTDOCS=	README
+OPTIONS_DEFINE=	DOCS
 
-MAN1=	imageindex.1
-
-NO_STAGE=	yes
 post-patch:
-	${REINPLACE_CMD} -e 's|share/man|man| ;' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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