nix LICENSE_TYPE. This is much prettier now.

This commit is contained in:
turan 2000-03-03 14:23:10 +00:00
parent 7456cd85ad
commit 8eaddcf1e3
3 changed files with 14 additions and 68 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.19 2000/02/22 09:27:51 turan Exp $
# $OpenBSD: Makefile,v 1.20 2000/03/03 14:23:10 turan Exp $
# $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
#
@ -54,8 +54,8 @@ print-index: ${.CURDIR}/INDEX
@awk -F\| '{ printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\n\n", $$1, $$2, $$4, $$6, $$7, $$8, $$9); }' < ${.CURDIR}/INDEX
print-licenses: ${.CURDIR}/INDEX
@printf "Port PC PF DC DF L-Type Maint\n"
@awk -F\| '{printf("%-35.34s%-3.2s%-3.2s%-3.2s%-3.2s%-10.9s%-20.20s\n",$$2,$$11,$$12,$$13,$$14,$$15,$$6);}' < ${.CURDIR}/INDEX
@printf "Port PC PF DC DF Maint\n"
@awk -F\| '{printf("%-40.39s%-3.2s%-3.2s%-3.2s%-3.2s%-25.25s\n",$$2,$$11,$$12,$$13,$$14,$$6);}' < ${.CURDIR}/INDEX
search: ${.CURDIR}/INDEX
.if !defined(key)

View File

@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.211 2000/02/28 18:13:18 espie Exp $$
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.212 2000/03/03 14:23:10 turan Exp $$
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -1207,9 +1207,8 @@ ${_EXTRACT_COOKIE}:
# You need to define LICENCE_TYPE and PERMIT_* to make the warning go away.
# See ports/infrastructure/templates/Makefile.template
.if !defined(LICENSE_TYPE) || !defined(PERMIT_PACKAGE_CDROM) || \
!defined(PERMIT_PACKAGE_FTP) || !defined(PERMIT_DISTFILES_CDROM) || \
!defined(PERMIT_DISTFILES_FTP)
.if !defined(PERMIT_PACKAGE_CDROM) || !defined(PERMIT_PACKAGE_FTP) || \
!defined(PERMIT_DISTFILES_CDROM) || !defined(PERMIT_DISTFILES_FTP)
@echo >&2 "*** The licensing info for this port is incomplete."
@echo >&2 "*** Please notify the OpenBSD port maintainer <${MAINTAINER}>"
.endif
@ -2020,12 +2019,6 @@ describe:
@echo -n "?|"
. endif
. if defined(LICENSE_TYPE)
@echo "${LICENSE_TYPE}"
. else
@echo "?"
. endif
.endif
README.html:

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.template,v 1.18 2000/02/23 06:38:01 turan Exp $
# $OpenBSD: Makefile.template,v 1.19 2000/03/03 14:23:11 turan Exp $
# $FreeBSD/NetBSD: credit FreeBSD/NetBSD if thats where the port came from $
# Original from: credit the original author here
#
@ -28,64 +28,17 @@ CATEGORIES= ???
#
MAINTAINER= ports@openbsd.org
# Licensing for this port. License types:
# ARTISTIC: PERL Artistic license, or similar.
# BSD: BSD (or a BSD like) license.
# Can be distributed. Documentation that mentions package may
# need to include owners copyright.
# COMM: Commercial software.
# For fee software.
# COPY: Copyright that allows or denys distribution
# Read copyright before use, there may be usage restrictions
# even if distribution is allowed.
# CRYPTO: Third party crypto not allowed.
# DISTONLY: May distribute the distfile only.
# GPL: Licensed under the GNU GPL license.
# INCLUDED: Package is included in OpenBSD, distribution not needed.
# LGPL: Licensed under the GNU LGPL license.
# LICENSE: Requires license for redistribution.
# Note: a license may only be required for a `commercial'
# distribution which is how I'm treating the OpenBSD CD-ROMs.
# NOEXTRAFEE: Can not charge _extra_ for distribution
# May distribute when the price of the distribution does would
# not change if the port were removed from the distribution.
# NOFEE: Can not charge for distribution
# The software may be `free', but the copyright states
# `may not charge for distribution' or words to that effect.
# NOMODIFY: May not distribute ports that are modified in any way,
# i.e, the package may not have any patches applied to it.
# Precompiled packages are fine as long as they do not
# change the original port.
# NONE: No license/copyright found in source code or related
# documentation. Assume no rights in these cases except for
# cases that are obviously meant to be distributed e.g.
# patch files, some documentation, etc.
# PAT: Patent or Patent Pending
# PD: Explicitly stated to be in the Public Domain.
# RESTRICT: Restrictive license
# SHARE: Shareware.
# X: X Consortium (or X consortium like, e.g. XFree86) license.
# a full and unrestricted irrevocable, world-wide, paid up,
# royalty-free, nonexclusive right and license to deal in this
# software...
# TOG: The Open Group license. Not to be confused with X or XFree86.
# Software distributed under the TOG license is NOT free.
#
# NOTE: A LICENSE THAT ALLOWS COPYING/REDISTRIBUTION MAY STILL
# BE RESTRICTIVE WITH RESPECT TO USE OF THE BINARY AND/OR
# SOURCE CODE. PLEASE READ ALL LICENSES/COPYRIGHTS CAREFULLY.
#
# Licensing: This determines what we can distribute.
# When you determine the license type, make sure to look at ALL distfiles.
# Every distfile can have a different license. The PERMIT_* values are
# determined by the most restrictive license. If you have two licenses
# that are in conflict, set LICENSE_TYPE="lic1 lic2" and set the appropriate
# PERMIT_* values to No. Make SURE you get these values right.
# that are in conflict, set PERMIT_* based on the most restrictive one.
# Make SURE you get these values right.
LICENSE_TYPE= "License type"
PERMIT_PACKAGE_CDROM= "Yes|'Reason if No'"
PERMIT_PACKAGE_FTP= "Yes|'Reason if No'"
PERMIT_DISTFILES_CDROM= "Yes|'Reason if No'"
PERMIT_DISTFILES_FTP= "Yes|'Reason if No'"
PERMIT_PACKAGE_CDROM= Yes | "Reason if No"
PERMIT_PACKAGE_FTP= Yes | "Reason if No"
PERMIT_DISTFILES_CDROM= Yes | "Reason if No"
PERMIT_DISTFILES_FTP= Yes | "Reason if No"
# where the source files and patches can be fetched
#