From owner-svn-ports-all@FreeBSD.ORG  Sun May 18 04:55:41 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C82A4936;
 Sun, 18 May 2014 04:55:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9ACFC28E3;
 Sun, 18 May 2014 04:55:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4I4tfUI086821;
 Sun, 18 May 2014 04:55:41 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4I4tfZq086820;
 Sun, 18 May 2014 04:55:41 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201405180455.s4I4tfZq086820@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sun, 18 May 2014 04:55:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r354390 - head/multimedia/kissdx
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 May 2014 04:55:41 -0000

Author: miwi
Date: Sun May 18 04:55:41 2014
New Revision: 354390
URL: http://svnweb.freebsd.org/changeset/ports/354390
QAT: https://qat.redports.org/buildarchive/r354390/

Log:
  - Fix build with clang
  - Stage support
  
  PR:		187756
  Submitted by:	ports fury

Modified:
  head/multimedia/kissdx/Makefile

Modified: head/multimedia/kissdx/Makefile
==============================================================================
--- head/multimedia/kissdx/Makefile	Sun May 18 04:23:39 2014	(r354389)
+++ head/multimedia/kissdx/Makefile	Sun May 18 04:55:41 2014	(r354390)
@@ -16,48 +16,44 @@ LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphi
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 
-USES=		iconv
-USE_DOS2UNIX=	yes
-USE_GCC=	any			# XXX: uses nested functions
+USES=		compiler:nestedfct dos2unix iconv
 MAKE_ENV=	FreeBSD=defined
 
-MAN1=		kissdx.1
 USE_RC_SUBR=	kissdx
 SUB_FILES=	pkg-message
 
-PLIST_FILES=	etc/kissdx.conf sbin/kissdx sbin/kissd-pretrigger \
-		sbin/kissd-posttrigger
 PORTDOCS=	README
-
-NO_STAGE=	yes
+PLIST_FILES=	etc/kissdx.conf man/man1/kissdx.1.gz  \
+		sbin/kissd-posttrigger sbin/kissd-pretrigger sbin/kissdx
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|Linux|Unix| ; s|/etc/|${PREFIX}&|' \
-		${WRKSRC}/kissdx.1
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}&|' ${WRKSRC}/config.c
-	@${RM} ${WRKSRC}/kissdx.o
+	@${REINPLACE_CMD} -e \
+		's|Linux|Unix| ; \
+		 s|/etc/|${PREFIX}&|' ${WRKSRC}/kissdx.1
+	@${REINPLACE_CMD} -e \
+		's|/etc/|${PREFIX}&|' ${WRKSRC}/config.c
 # Fix parallel (-jX) builds: sanitize dependencies
-	@${REINPLACE_CMD} -e 's|^\.o :|${PORTNAME}: $$(OBJS)| ; \
-		/^all:/s| $$(OBJS)||' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|-liconv|${ICONV_LIB}| ; \
+		 s|^\.o :|${PORTNAME}: $$(OBJS)| ; \
+		 /^all:/s| $$(OBJS)||' ${WRKSRC}/Makefile
+
+pre-build:
+	@${RM} -f ${WRKSRC}/kissdx.o
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kissdx ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/kissd-pretrigger ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/kissd-posttrigger ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/kissdx.conf ${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/kissdx.1 ${MANPREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} kissdx \
+		${STAGEDIR}${PREFIX}/sbin)
+	(cd ${WRKSRC} && ${INSTALL_SCRIPT} kissd-pretrigger kissd-posttrigger \
+		${STAGEDIR}${PREFIX}/sbin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} kissdx.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+	(cd ${WRKSRC} && ${INSTALL_DATA} kissdx.conf \
+		${STAGEDIR}${PREFIX}/etc)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} README \
+		${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>