svn commit: r325288 - head/multimedia/kissdx

[Alexey Dokuchaev]

Author: danfe
Date: Sat Aug 24 09:07:34 2013
New Revision: 325288
URL: http://svnweb.freebsd.org/changeset/ports/325288

Log:
  - Unbreak parallel (-jX) builds: fix targets dependencies
  - Tighten Makefile header and COMMENT (drop an article)
  - Define LICENSE (GPLv2), install README file, modernize LIB_DEPENDS
  - Generally cleanup Makefile: trim redundant and obvious comments,
    superfluous global modifiers from regex', shorten overly long lines
  - Terminate WWW line in pkg-descr with a slash (per PH, sect. 3.2.1)
  
  Reported by:	marino
  Approved by:	miwi, bapt (portmgr, implicit)

Modified:
  head/multimedia/kissdx/Makefile
  head/multimedia/kissdx/pkg-descr

Modified: head/multimedia/kissdx/Makefile
==============================================================================
--- head/multimedia/kissdx/Makefile	Sat Aug 24 08:53:25 2013	(r325287)
+++ head/multimedia/kissdx/Makefile	Sat Aug 24 09:07:34 2013	(r325288)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	kissdx
-# Date created:				20. November 2007
-# Whom:					Simon I. Rigét
-#
+# Created by: Simon Riget <freebsd at paragi.dk>
 # $FreeBSD$
-#
 
 PORTNAME=	kissdx
 PORTVERSION=	0.13.10a
@@ -12,45 +8,51 @@ CATEGORIES=	multimedia net
 MASTER_SITES=	http://paragi.dk/kiss/
 
 MAINTAINER=	freebsd at paragi.dk
-COMMENT=	A multimedia streaming server for KiSS/Linksys player
+COMMENT=	Multimedia streaming server for KiSS/Linksys player
 
-# Dependencies of other packeges
-LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		dvdread:${PORTSDIR}/multimedia/libdvdread
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 
 USES=		iconv
+USE_DOS2UNIX=	yes
+MAKE_ENV=	FreeBSD=defined
 
-# Man pages
 MAN1=		kissdx.1
-
-# RC start and stop service
 USE_RC_SUBR=	kissdx
-
-# set enviroment variables for port makefile
-MAKE_ENV=	FreeBSD=defined
-
-# Convert CR/LF to LF in source files
-USE_DOS2UNIX=	yes
-
 SUB_FILES=	pkg-message
 
-# Remove files at uninstall (like pkg-plist)
-PLIST_FILES=	etc/kissdx.conf sbin/kissdx sbin/kissd-pretrigger sbin/kissd-posttrigger
+PLIST_FILES=	etc/kissdx.conf sbin/kissdx sbin/kissd-pretrigger \
+		sbin/kissd-posttrigger
+PORTDOCS=	README
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|Linux|Unix|g ; s|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/kissdx.1
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/config.c
+	@${REINPLACE_CMD} -e 's|Linux|Unix| ; s|/etc/|${PREFIX}&|' \
+		${WRKSRC}/kissdx.1
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|' ${WRKSRC}/config.c
 	@${RM} ${WRKSRC}/kissdx.o
+# Fix parallel (-jX) builds: sanitize dependencies
+	@${REINPLACE_CMD} -e 's|^\.o :|kissdx: $$(OBJS)| ; \
+		/^all:/s| $$(OBJS)||' ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/kissdx ${PREFIX}/sbin/kissdx
-	${INSTALL_SCRIPT} ${WRKSRC}/kissd-pretrigger ${PREFIX}/sbin/kissd-pretrigger
-	${INSTALL_SCRIPT} ${WRKSRC}/kissd-posttrigger ${PREFIX}/sbin/kissd-posttrigger
-	${INSTALL_DATA} ${WRKSRC}/kissdx.conf ${PREFIX}/etc/kissdx.conf
-	${INSTALL_MAN} ${WRKSRC}/kissdx.1 ${MANPREFIX}/man/man1/kissdx.1
+	${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}
 
 .include <bsd.port.mk>

Modified: head/multimedia/kissdx/pkg-descr
==============================================================================
--- head/multimedia/kissdx/pkg-descr	Sat Aug 24 08:53:25 2013	(r325287)
+++ head/multimedia/kissdx/pkg-descr	Sat Aug 24 09:07:34 2013	(r325288)
@@ -6,4 +6,4 @@ kissdx is a PC-Link clone based for the 
 replaces), with added features for media playback, management, flexibility and
 more.
 
-WWW: http://kissdx.vidartysse.net
+WWW: http://kissdx.vidartysse.net/