Anonymous <swel...@gmail.com> writes:
>> ash...@freebsd.org (Ashish SHUKLA) writes:
>>> Anonymous <swel...@gmail.com> writes:
>>>> Why do you need to copy license file in post-extract?
>>> I added because specifying '${WRKSRC}/LICENSE' as 'LICENSE_FILE' results in
>>> a conflict because License infrastructure in ports system also creates a
>>> file
>>> named LICENSE. So, I'm just copying it to some name other than LICENSE, and
>>> than mentioning that in the LICENSE_FILE.
>
>> I've filed ports/148808 for the sweeping change so it's not forgotten
>> after 8.1-RELEASE is out.
>
> Since that PR is committed can you remove workarounds then?
A few more obvious workarounds this time by other committers (CC'd).
Renaming license files no longer has an effect, bsd.licenses.mk will
always install them under their respective names in _LICENSE_DIR to
avoid confusion/collision.
%%
diff --git a/devel/buildapp/Makefile b/devel/buildapp/Makefile
index fcb24e4..31e3dc5 100644
--- a/devel/buildapp/Makefile
+++ b/devel/buildapp/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= sbcl:${PORTSDIR}/lang/sbcl
RUN_DEPENDS= ${BUILD_DEPENDS}
LICENSE= BSD
-LICENSE_FILE= ${WRKSRC}/doc/LICENSE-buildapp
+LICENSE_FILE= ${WRKSRC}/doc/LICENSE
PLIST_FILES= bin/buildapp
PORTDOCS= *
@@ -27,9 +27,6 @@ PORTDOCS= *
WRKSRC= ${WRKDIR}/${DISTNAME}-${PORTVERSION}
ALL_TARGET=
-post-extract:
- @${MV} ${WRKSRC}/doc/LICENSE ${WRKSRC}/doc/LICENSE-buildapp
-
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 18f1495..7b96c20 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -21,7 +21,7 @@ COMMENT= An open-source JPEG 2000 codec
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
LICENSE= BSD
-LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+LICENSE_FILE= ${WRKSRC}/jp3d/LICENSE.txt
MAKE_JOBS_UNSAFE= yes
USE_GMAKE= yes
@@ -39,9 +39,6 @@ PLIST_FILES= include/openjpeg.h \
SHLIB_VER= 2
-post-extract:
- ${LN} ${WRKSRC}/jp3d/LICENSE.txt ${WRKSRC}/COPYRIGHT
-
post-patch: .SILENT
${FIND} ${WRKSRC} -type f -name Makefile -exec ${REINPLACE_CMD}
's|gcc|$$(CC)|g' {} +
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 2ad28d2..a2aef9d 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= din...@freebsd.org
COMMENT= A Sendmail LibMilter filter to block spam
LICENSE= BSD
-LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+LICENSE_FILE= ${WRKSRC}/LICENSE
HAS_CONFIGURE= yes
USE_RC_SUBR= spamilter.sh
@@ -67,9 +67,6 @@ PLIST_FILES+= bin/dnsblchk bin/dnsblupd bin/ipfwmtad
bin/mxlookup \
PORTDOCS= Changelog INSTALL LICENSE docs.html docs.txt db.rcpt \
db.rdnsbl db.sndr policy.html spamilter.rc
-post-extract:
- ${LN} ${WRKSRC}/LICENSE ${WRKSRC}/COPYRIGHT
-
pre-configure:
${REINPLACE_CMD} \
-e "s=/etc/spamilter.rc=${PREFIX}/etc/spamilter.rc=" \
diff --git a/math/stepulator/Makefile b/math/stepulator/Makefile
index a443e0c..6d505aa 100644
--- a/math/stepulator/Makefile
+++ b/math/stepulator/Makefile
@@ -18,7 +18,7 @@ MAINTAINER= din...@freebsd.org
COMMENT= Scientific calculator implementing RPN notation for GNUstep
LICENSE= BSD
-LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GNUSTEP= yes
USE_GNUSTEP_BACK= yes
@@ -27,9 +27,6 @@ USE_GNUSTEP_INSTALL= yes
WRKSRC= ${WRKDIR}/Stepulator-gs
-post-extract:
- ${LN} ${WRKSRC}/LICENSE ${WRKSRC}/COPYRIGHT
-
post-install:
${INSTALL_DATA} ${WRKSRC}/LICENSE \
${GNUSTEP_LOCAL_APPS}/Stepulator.app/Resources/
diff --git a/net/sixxs-aiccu/Makefile b/net/sixxs-aiccu/Makefile
index 8480a29..7662f7a 100644
--- a/net/sixxs-aiccu/Makefile
+++ b/net/sixxs-aiccu/Makefile
@@ -20,7 +20,7 @@ COMMENT= SixXS IPv6 TIC+ tunnel broker heartbeat client
LIB_DEPENDS= gnutls-openssl.40:${PORTSDIR}/security/gnutls
LICENSE= BSD
-LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+LICENSE_FILE= ${WRKSRC}/doc/LICENSE
USE_RC_SUBR= sixxs-aiccu
USE_GMAKE= yes
@@ -32,9 +32,6 @@ WRKSRC= ${WRKDIR}/aiccu
BUILD_WRKSRC= ${WRKDIR}/aiccu/unix-console
PORTDOCS= README
-post-extract:
- ${CP} ${WRKSRC}/doc/LICENSE ${WRKSRC}/COPYRIGHT
-
post-patch:
@${REINPLACE_CMD} \
-e 's:verbose true:verbose false:' \
diff --git a/security/xyssl/Makefile b/security/xyssl/Makefile
index 3039459..f482ad3 100644
--- a/security/xyssl/Makefile
+++ b/security/xyssl/Makefile
@@ -16,16 +16,13 @@ MAINTAINER= po...@freebsd.org
COMMENT= A liteweight SSL and TLS toolkit for C developers
LICENSE= BSD
-LICENSE_FILE= ${WRKSRC}/COPYRIGHT
+LICENSE_FILE= ${WRKSRC}/BSD.txt
# HAS_CONFIGURE= no
# GNU_CONFIGURE= no
PORTDOCS= BSD.txt ChangeLog
-post-extract:
- ${LN} ${WRKSRC}/BSD.txt ${WRKSRC}/COPYRIGHT
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
%%
_______________________________________________
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
