Date: Thu, 20 Mar 2014 03:26:13 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/187756: multimedia/kissdx: Fix build on -current Message-ID: <20140320032613.13f44f881cbe74ac7755aec7@yahoo.com> Resent-Message-ID: <201403191840.s2JIe6RN002575@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187756
>Category: ports
>Synopsis: multimedia/kissdx: Fix build on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 19 18:40:06 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/multimedia/kissdx/Makefile multimedia/kissdx/Makefile
--- /usr/ports/multimedia/kissdx/Makefile 2014-02-22 05:44:30.000000000 +0900
+++ multimedia/kissdx/Makefile 2014-03-20 00:00:00.000000000 +0900
@@ -16,48 +16,44 @@
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>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140320032613.13f44f881cbe74ac7755aec7>