fix irregular PERMIT_*

This commit is contained in:
sthen 2019-07-12 21:25:58 +00:00
parent 1098d5ad4b
commit 98e1710fa2
3 changed files with 4 additions and 9 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2019/07/12 21:15:33 sthen Exp $ # $OpenBSD: Makefile,v 1.29 2019/07/12 21:25:58 sthen Exp $
COMMENT-main= display the phase of the Sun on a map of the Earth COMMENT-main= display the phase of the Sun on a map of the Earth
COMMENT-maps= additional maps of the Earth for sunclock COMMENT-maps= additional maps of the Earth for sunclock
@ -30,13 +30,12 @@ MULTI_PACKAGES= -main -maps
.include <bsd.port.arch.mk> .include <bsd.port.arch.mk>
PERMIT_PACKAGE_CDROM-maps= no license for additional maps
PERMIT_PACKAGE_FTP-maps= no license for additional maps
RUN_DEPENDS-maps= astro/sunclock RUN_DEPENDS-maps= astro/sunclock
PKG_ARCH-maps= * PKG_ARCH-maps= *
# GPL # GPL
PERMIT_PACKAGE= Yes PERMIT_PACKAGE= Yes
PERMIT_PACKAGE-maps= no license for additional maps
WANTLIB-main= X11 Xext Xpm Xau Xdmcp c m z jpeg png WANTLIB-main= X11 Xext Xpm Xau Xdmcp c m z jpeg png
DIST_SUBDIR= sunclock DIST_SUBDIR= sunclock

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2019/07/12 21:15:35 sthen Exp $ # $OpenBSD: Makefile,v 1.35 2019/07/12 21:25:58 sthen Exp $
COMMENT-canna= X input method for Japanese, canna support COMMENT-canna= X input method for Japanese, canna support
COMMENT-canna-wnn= X input method for Japanese, canna and wnn support COMMENT-canna-wnn= X input method for Japanese, canna and wnn support
@ -26,8 +26,6 @@ FLAVOR?= wnn
BUILD_DEPENDS+= japanese/Wnn BUILD_DEPENDS+= japanese/Wnn
.endif .endif
.if ${FLAVOR:Mcanna} .if ${FLAVOR:Mcanna}
PERMIT_PACKAGE_CDROM= Canna prevents it
PERMIT_PACKAGE_FTP = Yes
WANTLIB += canna16 WANTLIB += canna16
LIB_DEPENDS= japanese/canna LIB_DEPENDS= japanese/canna
.endif .endif

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2019/07/12 21:15:35 sthen Exp $ # $OpenBSD: Makefile,v 1.20 2019/07/12 21:25:58 sthen Exp $
COMMENT= library for Japanese Input Method Wnn4 COMMENT= library for Japanese Input Method Wnn4
@ -29,8 +29,6 @@ BUILD_DEPENDS= japanese/Wnn
.endif .endif
.if ${FLAVOR:Mcanna} .if ${FLAVOR:Mcanna}
PERMIT_PACKAGE_CDROM= Canna prevents it
PERMIT_PACKAGE_FTP = Yes
LIB_DEPENDS+= japanese/canna LIB_DEPENDS+= japanese/canna
WANTLIB += canna WANTLIB += canna
.endif .endif