* Eric Faurot wrote:
> Hi,
>
> I think I sent it a long time ago, but here it is again.
>
> - update to 1.1.6
> - fix WANTLIB in subpackages
> - -bin subpackage depends on -main
> - install public headers
> - remove maintainer per his request
>
> ok?
that looks correct. ok mbalmer. And I will check if this is needed
somewehere in Zope-Land, if so, we can add flavors later.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/py-Imaging/Makefile,v
> retrieving revision 1.34
> diff -u -r1.34 Makefile
> --- Makefile 14 Feb 2008 08:52:51 -0000 1.34
> +++ Makefile 27 May 2008 06:32:01 -0000
> @@ -6,9 +6,9 @@
> COMMENT-examples= example programs for the Python Imaging Library
> COMMENT-bin= binaries for the Python Imaging Library
>
> -VERSION= 1.1.5
> +VERSION= 1.1.6
> DISTNAME= Imaging-${VERSION}
> -PKGNAME-main= py-${DISTNAME}p2
> +PKGNAME-main= py-${DISTNAME}
> FULLPKGNAME-examples= py-Imaging-examples-${VERSION}
> FULLPKGNAME-bin= py-Imaging-bin-${VERSION}
>
> @@ -16,23 +16,23 @@
>
> HOMEPAGE= http://www.pythonware.com/products/pil/
>
> -MAINTAINER= Aleksander Piotrowski <[EMAIL PROTECTED]>
> -
> # PIL Software License
> # Permission to use, copy, modify and distribute freely.
> PERMIT_PACKAGE_CDROM= Yes
> PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> -WANTLIB= freetype tcl84 z
> +WANTLIB-main= freetype tcl84 z
>
> MASTER_SITES= http://effbot.org/media/downloads/
>
> MODULES= lang/python
>
> RUN_DEPENDS= ${MODPY_TKINTER_DEPENDS}
> +RUN_DEPENDS-bin= ${RUN_DEPENDS} \
> + :py-Imaging:graphics/py-Imaging
> BUILD_DEPENDS= ${RUN_DEPENDS}
> -LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
> +LIB_DEPENDS-main= jpeg.>=62::graphics/jpeg \
> tk84:tk-8.4.*:x11/tk/8.4
>
> FLAVORS= python2.4 python2.5
> @@ -54,6 +54,7 @@
> @perl -pi -e "s|!LOCALBASE!|${LOCALBASE}|g; s|!X11BASE!|${X11BASE}|g;
> s|!MODPY_VERSION!|${MODPY_VERSION}|g" \
> ${WRKSRC}/setup.py ${WRKSRC}/Scripts/pil*.py
>
> +INCDIR=${PREFIX}/include/python${MODPY_VERSION}
> post-install:
> ${INSTALL_SCRIPT_DIR} ${PREFIX}/share/examples/py-Imaging
> ${INSTALL_SCRIPT} ${WRKSRC}/Scripts/*.py \
> @@ -64,6 +65,9 @@
> ${INSTALL_SCRIPT} $$file ${PREFIX}/bin/`basename $$file .py`; \
> done
> find ${WRKINST} -name \*.egg-info -exec rm {} \;
> + ${INSTALL_DATA_DIR} ${INCDIR}
> + ${INSTALL_DATA} ${WRKSRC}/libImaging/ImPlatform.h ${INCDIR}
> + ${INSTALL_DATA} ${WRKSRC}/libImaging/Imaging.h ${INCDIR}
>
> do-regress: fake
> @cd ${WRKSRC} && \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/graphics/py-Imaging/distinfo,v
> retrieving revision 1.6
> diff -u -r1.6 distinfo
> --- distinfo 5 Apr 2007 16:19:58 -0000 1.6
> +++ distinfo 27 May 2008 06:32:01 -0000
> @@ -1,5 +1,5 @@
> -MD5 (Imaging-1.1.5.tar.gz) = pkUS45RpITztDQkbnrp2wA==
> -RMD160 (Imaging-1.1.5.tar.gz) = mcpYHy+W0REvbDbszfltoawBSgQ=
> -SHA1 (Imaging-1.1.5.tar.gz) = BnBbMbU0oVrvgnvMyH3OuevFG58=
> -SHA256 (Imaging-1.1.5.tar.gz) = FP1wC2TTBg41b8IX2FOdH7Ro2GiKRR+dbi+q7xE5pYw=
> -SIZE (Imaging-1.1.5.tar.gz) = 429570
> +MD5 (Imaging-1.1.6.tar.gz) = OptcIMpS8KmQBRLSxzR2Ig==
> +RMD160 (Imaging-1.1.6.tar.gz) = M2u5JILrgz5bscnoweWFyb3DONE=
> +SHA1 (Imaging-1.1.6.tar.gz) = lS0kHkr4ugn3TmkmEIt8DHSND4k=
> +SHA256 (Imaging-1.1.6.tar.gz) = fdc1irUZFhlnyDjfJ0ZSgtGAoyBvaTui22QnPWiLP5A=
> +SIZE (Imaging-1.1.6.tar.gz) = 435854
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/graphics/py-Imaging/pkg/PLIST-main,v
> retrieving revision 1.1
> diff -u -r1.1 PLIST-main
> --- pkg/PLIST-main 14 Feb 2008 08:52:51 -0000 1.1
> +++ pkg/PLIST-main 27 May 2008 06:32:01 -0000
> @@ -2,6 +2,8 @@
> @option no-default-conflict
> @conflict py-Imaging-*-python${MODPY_VERSION}
> @pkgpath graphics/py-Imaging
> +include/python${MODPY_VERSION}/ImPlatform.h
> +include/python${MODPY_VERSION}/Imaging.h
> lib/python${MODPY_VERSION}/site-packages/PIL/
> lib/python${MODPY_VERSION}/site-packages/PIL.pth
> lib/python${MODPY_VERSION}/site-packages/PIL/ArgImagePlugin.py
> @@ -58,6 +60,8 @@
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageColor.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageDraw.py
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageDraw.pyc
> +lib/python${MODPY_VERSION}/site-packages/PIL/ImageDraw2.py
> +lib/python${MODPY_VERSION}/site-packages/PIL/ImageDraw2.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageEnhance.py
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageEnhance.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageFile.py
> @@ -72,12 +76,18 @@
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageGL.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageGrab.py
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageGrab.pyc
> +lib/python${MODPY_VERSION}/site-packages/PIL/ImageMath.py
> +lib/python${MODPY_VERSION}/site-packages/PIL/ImageMath.pyc
> +lib/python${MODPY_VERSION}/site-packages/PIL/ImageMode.py
> +lib/python${MODPY_VERSION}/site-packages/PIL/ImageMode.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageOps.py
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageOps.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImagePalette.py
> lib/python${MODPY_VERSION}/site-packages/PIL/ImagePalette.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImagePath.py
> lib/python${MODPY_VERSION}/site-packages/PIL/ImagePath.pyc
> +lib/python${MODPY_VERSION}/site-packages/PIL/ImageQt.py
> +lib/python${MODPY_VERSION}/site-packages/PIL/ImageQt.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageSequence.py
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageSequence.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/ImageStat.py
> @@ -154,4 +164,5 @@
> lib/python${MODPY_VERSION}/site-packages/PIL/__init__.pyc
> lib/python${MODPY_VERSION}/site-packages/PIL/_imaging.so
> lib/python${MODPY_VERSION}/site-packages/PIL/_imagingft.so
> +lib/python${MODPY_VERSION}/site-packages/PIL/_imagingmath.so
> lib/python${MODPY_VERSION}/site-packages/PIL/_imagingtk.so
>