diff options
| author | Alex Kozlov <ak@FreeBSD.org> | 2013-01-30 00:14:17 +0000 |
|---|---|---|
| committer | Alex Kozlov <ak@FreeBSD.org> | 2013-01-30 00:14:17 +0000 |
| commit | 517b338ea6ca50a8b538f7e494a64552aeb82a32 (patch) | |
| tree | 6d9a0635ef9d0e98840730663582df2785ea6098 /x11/xloadimage | |
| parent | 7f06449f4e86225427b5141ff5b5cb73ffe8b4c3 (diff) | |
| download | ports-517b338ea6ca50a8b538f7e494a64552aeb82a32.tar.gz ports-517b338ea6ca50a8b538f7e494a64552aeb82a32.zip | |
Notes
Diffstat (limited to 'x11/xloadimage')
| -rw-r--r-- | x11/xloadimage/Makefile | 35 | ||||
| -rw-r--r-- | x11/xloadimage/distinfo | 8 |
2 files changed, 19 insertions, 24 deletions
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile index ad0d38ae3198..ec5367c47e5e 100644 --- a/x11/xloadimage/Makefile +++ b/x11/xloadimage/Makefile @@ -2,30 +2,25 @@ # $FreeBSD$ PORTNAME= xloadimage -PORTVERSION= 4.1.17 -PORTREVISION= 1 +PORTVERSION= 4.1.21 CATEGORIES= x11 graphics -MASTER_SITES= ftp://ftp.x.org/R5contrib/:x11 \ - ${MASTER_SITE_DEBIAN_POOL} +MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}.${VERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:x11 \ - ${PORTNAME}_${VERSION}-${REVISION}.debian.tar.gz +DISTFILES= ${DISTNAME:S/./_/}.orig${EXTRACT_SUFX} \ + ${DISTNAME:S/./_/}-${REVISION}.debian.tar.gz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ak@FreeBSD.org COMMENT= X11 Image Loading Utility -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff - LICENSE= MIT -DEPRECATED= Debian patches no more availables -EXPIRATION_DATE= 2012-11-26 +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ + png15:${PORTSDIR}/graphics/png \ + tiff:${PORTSDIR}/graphics/tiff CONFLICTS_INSTALL= xli-* -EXTRA_PATCHES= ${WRKDIR}/debian/patches/*.dpatch +EXTRA_PATCHES= ${WRKDIR}/debian/patches/*.patch PATCH_STRIP= -p1 VERSION= ${PORTVERSION:R} @@ -48,7 +43,8 @@ post-patch: ${WRKSRC}/tiff.c @${REINPLACE_CMD} -e \ 's:/etc/X11/Xloadimage:${PREFIX}/etc/xloadimagerc: ; \ - s:/usr/lib/xloadimagerc:${PREFIX}/etc/xloadimagerc:' \ + s:/usr/lib/xloadimagerc:${PREFIX}/etc/xloadimagerc: ; \ + s:/usr/include/X11/bitmaps:${PREFIX}/include/X11/bitmaps:' \ ${WRKSRC}/xloadimage.man do-install: @@ -57,11 +53,10 @@ do-install: ${LN} -sf xloadimage xsetbg && \ ${LN} -sf xloadimage xview ${INSTALL_PROGRAM} ${WRKSRC}/uufilter ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${MANPREFIX}/man/man1/xloadimage.1 - ${INSTALL_MAN} ${WRKSRC}/uufilter.man ${MANPREFIX}/man/man1/uufilter.1 + ${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${MAN1PREFIX}/man/man1/xloadimage.1 + ${INSTALL_MAN} ${WRKSRC}/uufilter.man ${MAN1PREFIX}/man/man1/uufilter.1 ${INSTALL_DATA} ${WRKSRC}/xloadimagerc ${PREFIX}/etc/xloadimagerc.sample -.if !exists(${PREFIX}/etc/xloadimagerc) - @cd ${PREFIX}/etc && ${CP} -f xloadimagerc.sample xloadimagerc -.endif + @[ -f ${PREFIX}/etc/xloadimagerc ] || ${CP} -f ${PREFIX}/etc/xloadimagerc.sample \ + ${PREFIX}/etc/xloadimagerc .include <bsd.port.mk> diff --git a/x11/xloadimage/distinfo b/x11/xloadimage/distinfo index beadb31fec15..1ec2b416d749 100644 --- a/x11/xloadimage/distinfo +++ b/x11/xloadimage/distinfo @@ -1,4 +1,4 @@ -SHA256 (xloadimage.4.1.tar.gz) = 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4 -SIZE (xloadimage.4.1.tar.gz) = 596021 -SHA256 (xloadimage_4.1-17.debian.tar.gz) = ffdc6aca613511e03ceeb000db0b705254b955ed3a04c08fe3c51c8e44360e9e -SIZE (xloadimage_4.1-17.debian.tar.gz) = 73774 +SHA256 (xloadimage_4.1.orig.tar.gz) = 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4 +SIZE (xloadimage_4.1.orig.tar.gz) = 596021 +SHA256 (xloadimage_4.1-21.debian.tar.gz) = 4a15879f501462f1e45f3f8064a67b46362826c44bab5827e5dc051cd5c0a49f +SIZE (xloadimage_4.1-21.debian.tar.gz) = 76415 |