svn commit: r429386 - head/x11/xcalib

[Boris Samorodov]

Author: bsam
Date: Sat Dec 24 23:37:10 2016
New Revision: 429386
URL: https://svnweb.freebsd.org/changeset/ports/429386

Log:
  x11/xcalib: Update to version 0.9.0:
  . take maintainership;
  . simplfy MASTER_SITES;
  . use system make;
  . remove unused flags and defines;
  . ensure non-standard PREFIX may be used;
  . use system flags for building;
  . remove do-make target (bundled Makefile DTRT);
  . install an *.icm file as an example as well.

Modified:
  head/x11/xcalib/Makefile
  head/x11/xcalib/distinfo

Modified: head/x11/xcalib/Makefile
==============================================================================
--- head/x11/xcalib/Makefile	Sat Dec 24 23:27:18 2016	(r429385)
+++ head/x11/xcalib/Makefile	Sat Dec 24 23:37:10 2016	(r429386)
@@ -2,42 +2,35 @@
 # $FreeBSD$
 
 PORTNAME=	xcalib
-PORTVERSION=	0.8
-PORTREVISION=	1
+PORTVERSION=	0.9.0
 CATEGORIES=	x11 graphics
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-source-${PORTVERSION}
+MASTER_SITES=	SF/openicc/xcalib/xcalib%200.9/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	bsam at FreeBSD.org
 COMMENT=	Program for X11 display calibration with ICC profiles
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake
-USE_XORG=	x11 xext sm xxf86vm
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USES=		tar:bz2
+USE_XORG=	sm x11 xext xrandr xxf86vm
 
 PORTDOCS=	README README.profilers
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/${PORTNAME}
 
-DEFINES=	-DXCALIB_VERSION=\"${PORTVERSION}\" -DUNIX
-LDFLAGS+=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib -lm -lX11 -lXxf86vm -lXext
-CFLAGS+=	-I./icclib -I${LOCALBASE}/include -I${LOCALBASE}/include
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
+	    -e 's|CFLAGS =|CFLAFS ?=|g' -e 's|/usr/X11R6|${LOCALBASE}|g' \
 	    ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	@${REINPLACE_CMD} -e 's|if(i=0)|else|g' ${WRKSRC}/xcalib.c
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.icc ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.icc ${WRKSRC}/*.icm \
+	    ${STAGEDIR}${EXAMPLESDIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/x11/xcalib/distinfo
==============================================================================
--- head/x11/xcalib/distinfo	Sat Dec 24 23:27:18 2016	(r429385)
+++ head/x11/xcalib/distinfo	Sat Dec 24 23:37:10 2016	(r429386)
@@ -1,2 +1,3 @@
-SHA256 (xcalib-source-0.8.tar.gz) = 8a112ee710e5446f6c36e62345b2066f10639d500259db8c48bf1716caea06e6
-SIZE (xcalib-source-0.8.tar.gz) = 32782
+TIMESTAMP = 1482621088
+SHA256 (xcalib-0.9.0.tar.bz2) = 05c330c56ca8b4aa3b20720225ae264676d79264f2a0017d0c857380ecda1128
+SIZE (xcalib-0.9.0.tar.bz2) = 35520