Date: Wed, 25 Sep 2013 19:25:12 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328308 - head/x11/xloadimage Message-ID: <201309251925.r8PJPC0L080043@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Wed Sep 25 19:25:12 2013 New Revision: 328308 URL: http://svnweb.freebsd.org/changeset/ports/328308 Log: - Support STAGEDIR - Convert to new LIB_DEPENDS syntax Reviewed by: eadler Modified: head/x11/xloadimage/Makefile head/x11/xloadimage/pkg-plist (contents, props changed) Modified: head/x11/xloadimage/Makefile ============================================================================== --- head/x11/xloadimage/Makefile Wed Sep 25 19:17:26 2013 (r328307) +++ head/x11/xloadimage/Makefile Wed Sep 25 19:25:12 2013 (r328308) @@ -14,9 +14,9 @@ COMMENT= X11 Image Loading Utility LICENSE= MIT -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - tiff:${PORTSDIR}/graphics/tiff +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png \ + libtiff.so:${PORTSDIR}/graphics/tiff CONFLICTS_INSTALL= xli-* @@ -32,11 +32,6 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= xloadimage.1 uufilter.1 -MLINKS= xloadimage.1 xsetbg.1 \ - xloadimage.1 xview.1 - -NO_STAGE= yes post-patch: @${CHMOD} a+rx ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|TIFFHeader|TIFFHeaderClassic|g' \ @@ -48,15 +43,16 @@ post-patch: ${WRKSRC}/xloadimage.man do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xloadimage ${PREFIX}/bin - @cd ${PREFIX}/bin && \ + ${INSTALL_PROGRAM} ${WRKSRC}/xloadimage ${STAGEDIR}${PREFIX}/bin + @(cd ${STAGEDIR}${PREFIX}/bin && \ ${LN} -sf xloadimage xsetbg && \ - ${LN} -sf xloadimage xview - ${INSTALL_PROGRAM} ${WRKSRC}/uufilter ${PREFIX}/bin - ${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 - @[ -f ${PREFIX}/etc/xloadimagerc ] || ${CP} -f ${PREFIX}/etc/xloadimagerc.sample \ - ${PREFIX}/etc/xloadimagerc + ${LN} -sf xloadimage xview ) + ${INSTALL_PROGRAM} ${WRKSRC}/uufilter ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/uufilter.man ${STAGEDIR}${MAN1PREFIX}/man/man1/uufilter.1 + ${INSTALL_MAN} ${WRKSRC}/xloadimage.man ${STAGEDIR}${MAN1PREFIX}/man/man1/xloadimage.1 + @(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && \ + ${LN} -sf xloadimage.1 xsetbg.1 && \ + ${LN} -sf xloadimage.1 xview.1 ) + ${INSTALL_DATA} ${WRKSRC}/xloadimagerc ${STAGEDIR}${PREFIX}/etc/xloadimagerc.sample .include <bsd.port.mk> Modified: head/x11/xloadimage/pkg-plist ============================================================================== --- head/x11/xloadimage/pkg-plist Wed Sep 25 19:17:26 2013 (r328307) +++ head/x11/xloadimage/pkg-plist Wed Sep 25 19:25:12 2013 (r328308) @@ -2,6 +2,10 @@ bin/uufilter bin/xloadimage bin/xsetbg bin/xview +man/man1/uufilter.1.gz +man/man1/xloadimage.1.gz +man/man1/xsetbg.1.gz +man/man1/xview.1.gz @unexec if cmp -s %D/etc/xloadimagerc.sample %D/etc/xloadimagerc; then rm -f %D/etc/xloadimagerc; fi etc/xloadimagerc.sample @exec if [ ! -f %D/etc/xloadimagerc ] ; then cp -p %D/%F %B/xloadimagerc; fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309251925.r8PJPC0L080043>