LICENSE_FILE=${WRKSRC}/LICENSE
Anonymous
swell.k at gmail.com
Tue Sep 28 08:20:10 UTC 2010
ashish at FreeBSD.org (Ashish SHUKLA) writes:
> Anonymous writes:
>> ashish at FreeBSD.org (Ashish SHUKLA) writes:
>
>>> Anonymous writes:
>>>> ashish at FreeBSD.org (Ashish SHUKLA) writes:
>>>
>>>>>>> [1] http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/146513
>>>>>
>>>>>> 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.
>>>
>>>> Ah, so you're referring to _LICENSE_REPORT that's created in_LICENSE_DIR.
>>>> It's not just the case of a single license file named `LICENSE' but multiple
>>>> licenses with same filename but in different directories are affected as well.
>>>> Does the following diff fixes it for you?
>>>
>>> Yes, the following diff works fine and I don't have to rename LICENSE file
>>> anymore.
>> [...]
>
>> I've filed ports/148808 for the sweeping change so it's not forgotten
>> after 8.1-RELEASE is out.
>
> Great :)
Since that PR is committed can you remove workarounds then?
%%
diff --git a/cad/qelectrotech/Makefile b/cad/qelectrotech/Makefile
index 33f3d26..8a69682 100644
--- a/cad/qelectrotech/Makefile
+++ b/cad/qelectrotech/Makefile
@@ -20,15 +20,12 @@ QT_COMPONENTS= gui network svg xml \
INSTALLS_ICONS= yes
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_FILE= ${WRKSRC}/LICENSE
MAN1= qelectrotech.1
MANLANG= "" es fr.ISO8859-1 fr.UTF-8 fr pt_PT
MANCOMPRESSED= yes
-post-extract:
- @${CP} ${WRKSRC}/LICENSE ${WRKSRC}/COPYING
-
do-configure:
${MV} ${WRKSRC}/man/files/pt ${WRKSRC}/man/files/pt_PT
${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,g' \
diff --git a/irc/irssi-otr/Makefile b/irc/irssi-otr/Makefile
index 8f013e1..5f675a0 100644
--- a/irc/irssi-otr/Makefile
+++ b/irc/irssi-otr/Makefile
@@ -21,6 +21,9 @@ LIB_DEPENDS= otr.4:${PORTSDIR}/security/libotr \
gcrypt.17:${PORTSDIR}/security/libgcrypt
RUN_DEPENDS= irssi:${PORTSDIR}/irc/irssi
+LICENSE= GPLv2
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
USE_CMAKE= yes
USE_LDCONFIG= yes
USE_GNOME= glib20
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 74cebf0..c68090a 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -25,7 +25,7 @@ USE_LDCONFIG= yes
MAKE_JOBS_SAFE=yes
LICENSE= BSD
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_FILE= ${WRKSRC}/LICENSE
OPTIONS= DEBUG "Enable debugging" OFF \
POSTPROC "Enable postprocessing" ON \
@@ -74,9 +74,6 @@ CONFIGURE_ARGS+= --target=ia64-linux-gcc
IGNORE= no support for ${ARCH} the moment. testing/patches are welcome
.endif
-post-extract:
- @${MV} ${WRKSRC}/LICENSE ${WRKSRC}/COPYING
-
post-patch:
@${GREP} -Rl '^#!/bin/bash' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
-e 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,g'
diff --git a/www/xpi-foxyproxy/Makefile b/www/xpi-foxyproxy/Makefile
index 8d4abaa..34d9c38 100644
--- a/www/xpi-foxyproxy/Makefile
+++ b/www/xpi-foxyproxy/Makefile
@@ -18,12 +18,10 @@ XPI_NUM= 2464
XPI_ID= foxyproxy at eric.h.jung
LICENSE= GPLv2
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE_FILE= ${WRKSRC}/LICENSE
xpi-post-extract:
@${FIND} ${WRKSRC} -type f -name '*.js' |${XARGS} ${SED} -i '' -e 's/[[:space:]]*$$//g'
- @${MV} ${WRKSRC}/LICENSE ${WRKSRC}/COPYING
- @${GREP} -Rl LICENSE ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e s/LICENSE/COPYING/g
pre-install:
@${FIND} ${WRKSRC} -type f -name '*.orig' |${XARGS} ${RM} -f
diff --git a/www/xpi-foxyproxy/pkg-plist b/www/xpi-foxyproxy/pkg-plist
index 43e5867..6c7b668 100644
--- a/www/xpi-foxyproxy/pkg-plist
+++ b/www/xpi-foxyproxy/pkg-plist
@@ -1,4 +1,4 @@
-%%XPI_XPIDIR%%/COPYING
+%%XPI_XPIDIR%%/LICENSE
%%XPI_XPIDIR%%/chrome.manifest
%%XPI_XPIDIR%%/chrome/content/about.js
%%XPI_XPIDIR%%/chrome/content/about.xul
%%
More information about the freebsd-ports
mailing list