30.07.2012 17:42, Tijl Coosemans пишет:
On 30-07-2012 14:18, Boris Samorodov wrote:
30.07.2012 16:00, Tijl Coosemans пишет:
On 30-07-2012 13:39, Boris Samorodov wrote:
> While agree with DESCR part, I'm not sure about PLIST one
> since I can't reproduce it. Can you provide some more
> details?
I'll take a closer look later, but maybe it's because I have
"WRKDIRPREFIX=/usr/obj" in /etc/make.conf.
That imho should not be the case.
It's because of WRKDIRPREFIX in combination with portmaster.
Also, in bsd.port.mk
the default value of PLIST is ${PKGDIR}/pkg-plist.
This is really more accurate. Seems that this should be
done for all ports using a non-standard PLIST.
Yes, here are some others:
# grep -R '^PLIST=' * | grep -v -E
'(WRKDIR|CURDIR|PKGDIR|MASTERDIR|FILESDIR|WRKSRC|NONEXISTENT)'
audio/linux-esound/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
audio/linux-f10-libaudiofile/Makefile:PLIST=
pkg-plist.${LINUX_RPM_ARCH}
audio/linux-libaudiofile/Makefile:PLIST=
pkg-plist.${LINUX_RPM_ARCH}
cad/salome/Makefile.ext:PLIST= ../salome${PKGNAMESUFFIX}/pkg-plist
devel/linux-libglade/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
devel/linux-libglade2/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
games/qix/Makefile:PLIST= pkg-plist.x11
graphics/linux-f10-imlib/Makefile:PLIST=
pkg-plist.${LINUX_RPM_ARCH}
graphics/linux-f10-tiff/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
graphics/linux-imlib/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
graphics/linux-tiff/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
graphics/linux-ungif/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
japanese/namazu2/Makefile:PLIST= "@comment this plist is
intentionally left empty"
security/ossec-hids-client/Makefile:PLIST= pkg-plist.client
security/sinfp/Makefile:PLIST= ""
textproc/linux-libxml/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
textproc/linux-libxml2/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
x11-toolkits/linux-f10-gtk/Makefile:PLIST=
pkg-plist.${LINUX_RPM_ARCH}
x11-toolkits/linux-f10-qt33/Makefile:PLIST=
pkg-plist.${LINUX_RPM_ARCH}
x11-toolkits/linux-gtk/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
x11-toolkits/linux-qt33/Makefile:PLIST= pkg-plist.${LINUX_RPM_ARCH}
OK, as of linux ports. Here is a patch. Any objections?
--
WBR, Boris Samorodov (bsam)
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve
Index: /home/bsam/tmp/ports-svn/devel/linux-libglade2/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/devel/linux-libglade2/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/devel/linux-libglade2/Makefile (working copy)
@@ -21,7 +21,7 @@
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= LIBVERSION="0.0.7" PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/devel/linux-libglade/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/devel/linux-libglade/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/devel/linux-libglade/Makefile (working copy)
@@ -22,7 +22,7 @@
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/textproc/linux-libxml/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/textproc/linux-libxml/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/textproc/linux-libxml/Makefile (working copy)
@@ -22,7 +22,7 @@
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/textproc/linux-libxml2/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/textproc/linux-libxml2/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/textproc/linux-libxml2/Makefile (working copy)
@@ -22,7 +22,7 @@
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/graphics/linux-imlib/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/graphics/linux-imlib/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/graphics/linux-imlib/Makefile (working copy)
@@ -23,7 +23,7 @@
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/graphics/linux-tiff/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/graphics/linux-tiff/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/graphics/linux-tiff/Makefile (working copy)
@@ -27,7 +27,7 @@
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/graphics/linux-f10-imlib/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/graphics/linux-f10-imlib/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/graphics/linux-f10-imlib/Makefile (working copy)
@@ -22,6 +22,6 @@
RPMVERSION= 9.fc10
BRANDELF_FILES= usr/bin/imlib_config
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/graphics/linux-f10-tiff/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/graphics/linux-f10-tiff/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/graphics/linux-f10-tiff/Makefile (working copy)
@@ -24,7 +24,7 @@
LINUX_DIST_VER= 10
RPMVERSION= 11.fc10
BRANDELF_DIRS= usr/bin
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
USE_LDCONFIG= yes
PLIST_SUB+= PORTVERSION="${PORTVERSION}"
Index: /home/bsam/tmp/ports-svn/graphics/linux-ungif/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/graphics/linux-ungif/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/graphics/linux-ungif/Makefile (working copy)
@@ -22,7 +22,7 @@
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB= PORTVERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/audio/linux-f10-libaudiofile/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/audio/linux-f10-libaudiofile/Makefile
(revision 301718)
+++ /home/bsam/tmp/ports-svn/audio/linux-f10-libaudiofile/Makefile
(working copy)
@@ -23,7 +23,7 @@
RPMVERSION= 9.fc10
BRANDELF_DIRS= usr/bin
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
Index: /home/bsam/tmp/ports-svn/audio/linux-esound/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/audio/linux-esound/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/audio/linux-esound/Makefile (working copy)
@@ -24,7 +24,7 @@
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= ESOUND_VERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/audio/linux-libaudiofile/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/audio/linux-libaudiofile/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/audio/linux-libaudiofile/Makefile (working copy)
@@ -23,7 +23,7 @@
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
BRANDELF_DIRS= usr/bin
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
PLIST_SUB+= LIBAUDIOFILE_VERSION="${PORTVERSION}"
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/x11-toolkits/linux-gtk/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/x11-toolkits/linux-gtk/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/x11-toolkits/linux-gtk/Makefile (working copy)
@@ -27,6 +27,6 @@
USE_LINUX_APPS= xorglibs
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/x11-toolkits/linux-qt33/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/x11-toolkits/linux-qt33/Makefile (revision
301718)
+++ /home/bsam/tmp/ports-svn/x11-toolkits/linux-qt33/Makefile (working copy)
@@ -23,6 +23,6 @@
RPMVERSION= 15.5
LINUX_DIST_VER= 4
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
.include <bsd.port.mk>
Index: /home/bsam/tmp/ports-svn/x11-toolkits/linux-f10-qt33/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/x11-toolkits/linux-f10-qt33/Makefile
(revision 301718)
+++ /home/bsam/tmp/ports-svn/x11-toolkits/linux-f10-qt33/Makefile
(working copy)
@@ -24,7 +24,7 @@
LINUX_DIST_VER= 10
RPMVERSION= 17.fc10
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
Index: /home/bsam/tmp/ports-svn/x11-toolkits/linux-f10-gtk/Makefile
===================================================================
--- /home/bsam/tmp/ports-svn/x11-toolkits/linux-f10-gtk/Makefile
(revision 301718)
+++ /home/bsam/tmp/ports-svn/x11-toolkits/linux-f10-gtk/Makefile
(working copy)
@@ -24,6 +24,6 @@
LINUX_DIST_VER= 10
RPMVERSION= 66.fc10
USE_LDCONFIG= yes
-PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST= ${PKGDIR}/pkg-plist.${LINUX_RPM_ARCH}
.include <bsd.port.mk>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-emulation
To unsubscribe, send any mail to "[email protected]"
