From 5d14122cb20d6d0910d2222402ff7f5fc8a50e0d Mon Sep 17 00:00:00 2001 From: Sam Lawrance Date: Sun, 19 Mar 2006 10:45:10 +0000 Subject: [PATCH] Rename the installed binary 'exiftool' to 'py-exiftool', thus avoiding the need for CONFLICTS with p5-Image-ExifTool. Bump PORTREVISION. PR: ports/92257 Submitted by: Andrew Pantyukhin --- graphics/py-exif/Makefile | 5 ++--- graphics/py-exif/pkg-plist | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/graphics/py-exif/Makefile b/graphics/py-exif/Makefile index 55a3a5b71966..e15e35272ffc 100644 --- a/graphics/py-exif/Makefile +++ b/graphics/py-exif/Makefile @@ -7,6 +7,7 @@ PORTNAME= exif PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= pyexif @@ -16,8 +17,6 @@ DISTNAME= pyexif-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Python library to extract EXIF metadata from JPEG and TIFF image files -CONFLICTS= p5-Image-ExifTool-[0-9]* - USE_PYTHON= yes WRKSRC= ${WRKDIR}/pyexif DATADIR= ${PREFIX}/share/py-exif @@ -39,7 +38,7 @@ do-install: @ ${MKDIR} ${PREFIX}/bin @ cd ${WRKSRC}/lib && ${INSTALL_DATA} *.py *.pyc *.pyo \ ${INSTALL_SITELIBDIR} - @ ${INSTALL_SCRIPT} ${WRKSRC}/bin/exiftool ${PREFIX}/bin + @ ${INSTALL_SCRIPT} ${WRKSRC}/bin/exiftool ${PREFIX}/bin/py-exiftool @ ${MKDIR} ${DATADIR} @ cd ${WRKSRC}/share/exiftool && ${INSTALL_DATA} *.html *.txt \ ${DATADIR} diff --git a/graphics/py-exif/pkg-plist b/graphics/py-exif/pkg-plist index 98b7c530cea5..5380f00277de 100644 --- a/graphics/py-exif/pkg-plist +++ b/graphics/py-exif/pkg-plist @@ -1,6 +1,6 @@ -%%PORTDOCS%%share/doc/py-exif/README -%%PORTDOCS%%share/doc/py-exif/README.exiftool -bin/exiftool +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.exiftool +bin/py-exiftool lib/%%PYTHON_VERSION%%/site-packages/__init__.py lib/%%PYTHON_VERSION%%/site-packages/__init__.pyc lib/%%PYTHON_VERSION%%/site-packages/__init__.pyo @@ -10,4 +10,4 @@ lib/%%PYTHON_VERSION%%/site-packages/exif.pyo share/py-exif/template.html share/py-exif/template.txt @dirrm share/py-exif -%%PORTDOCS%%@dirrm share/doc/py-exif +%%PORTDOCS%%@dirrm %%DOCSDIR%%