- Remove always false OSVERSION conditions

- Fix whitespace
- Don't cat pkgmessage from Makefile
This commit is contained in:
Dmitry Marakasov 2015-02-03 14:51:03 +00:00
parent b55097447b
commit 6f901b1ba8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=378354
2 changed files with 1 additions and 45 deletions

View file

@ -24,7 +24,7 @@ CONFLICTS= skype-1* skype-2.0* skype-2.1*
NO_BUILD= yes
USES= tar:bzip2
USES= tar:bzip2
USE_LINUX= yes
USE_LINUX_APPS+=alsalib alsa-plugins-oss expat fontconfig libasyncns \
libsigcpp20
@ -54,27 +54,6 @@ SUB_LIST+= VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so "
SUB_LIST+= VIDEO=""
.endif
### FIX ME, once they get bumped:
# for 7: 704102
# for 8: 802504
# for HEAD: 900037
# we need src/sys/dev/sound/pcm/dsp.c r221388
IGNORE_MSG= needs sys/dev/sound/pcm/dsp.c r221388 (and other changes).\
Please update your system post
.if ${OSVERSION} < 704102
OUTDATED= true
IGNORE_MSG+= r221584 / Sat May 7 09:33:37 2011 UTC
.elif (${OSVERSION} > 800000 && ${OSVERSION} < 802503)
OUTDATED= true
IGNORE_MSG+= r221583 / Sat May 7 09:26:11 2011 UTC
.elif (${OSVERSION} > 900000 && ${OSVERSION} < 900036)
OUTDATED= true
IGNORE_MSG+= r221388 / Tue May 3 15:50:22 2011 UTC
.endif
.ifdef OUTDATED
IGNORE= ${IGNORE_MSG}
.endif
do-install:
@${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications
@${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/
@ -92,6 +71,5 @@ do-install:
@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>

View file

@ -34,7 +34,6 @@ PLIST_SUB+= SKYPEDIR=${SKYPEDIR}
SUB_FILES= skype.sh
SUB_LIST+= SKYPEDIR=${SKYPEDIR}
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MNVIDIA_GL}
@ -52,27 +51,6 @@ SUB_LIST+= VIDEO="LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so "
SUB_LIST+= VIDEO=""
.endif
### FIX ME, once they get bumped:
# for 7: 704102
# for 8: 802504
# for HEAD: 900037
# we need src/sys/dev/sound/pcm/dsp.c r221388
IGNORE_MSG= needs sys/dev/sound/pcm/dsp.c r221388 (and other changes).\
Please update your system post
.if ${OSVERSION} < 704102
OUTDATED= true
IGNORE_MSG+= r221584 / Sat May 7 09:33:37 2011 UTC
.elif (${OSVERSION} > 800000 && ${OSVERSION} < 802503)
OUTDATED= true
IGNORE_MSG+= r221583 / Sat May 7 09:26:11 2011 UTC
.elif (${OSVERSION} > 900000 && ${OSVERSION} < 900036)
OUTDATED= true
IGNORE_MSG+= r221388 / Tue May 3 15:50:22 2011 UTC
.endif
.ifdef OUTDATED
IGNORE= ${IGNORE_MSG}
.endif
do-install:
@${INSTALL} -d ${STAGEDIR}${PREFIX}/share/applications
@${INSTALL_DATA} ${WRKSRC}/skype.desktop ${STAGEDIR}${PREFIX}/share/applications/