cvs commit: ports/devel/ppl Makefile distinfo pkg-plist
ports/devel/ppl/files patch-configure
Daniel Eischen
deischen at freebsd.org
Wed Oct 19 21:02:34 UTC 2011
On Wed, 19 Oct 2011, Chris Rees wrote:
> On 19 Oct 2011 02:00, "Daniel Eischen" <deischen at freebsd.org> wrote:
>>
>> On Wed, 19 Oct 2011, Daniel Eischen wrote:
>>
>>> deischen 2011-10-19 00:20:16 UTC
>>>
>>> FreeBSD ports repository
>>>
>>> Modified files:
>>> devel/ppl Makefile distinfo pkg-plist
>>> Removed files:
>>> devel/ppl/files patch-configure
>>> Log:
>>> Upgrade to 0.11.2.
>>>
>>> Submitted by: Mark Murray <markm_at_fbsd_dot_org
>>>
>>> Revision Changes Path
>>> 1.27 +5 -6 ports/devel/ppl/Makefile
>>> 1.11 +2 -2 ports/devel/ppl/distinfo
>>> 1.2 +0 -21 ports/devel/ppl/files/patch-configure (dead)
>>> 1.11 +1141 -1036 ports/devel/ppl/pkg-plist
>>
>>
>> I just updated the above port and I noticed that the
>> pkg-plist (both before and after the update) had some
>> files of the form:
>>
>> %%PORTDOCS%%%%DOCSDIR%%/../pwl
>> %%PORTDOCS%%%%DOCSDIR%%/../pwl/bar/
>> %%PORTDOCS%%%%DOCSDIR%%/../pwl/bar/a
>> %%PORTDOCS%%%%DOCSDIR%%/../pwl/bar/b
>>
>> When I tried 'make package; make deinstall; pkg_add ...'
>> I got errors:
>>
>> share/doc/ppl/../pwl/BUGS: Path contains '..'
>> share/doc/ppl/../pwl/COPYING: Path contains '..'
>> share/doc/ppl/../pwl/CREDITS: Path contains '..'
>> share/doc/ppl/../pwl/ChangeLog: Path contains '..'
>> ...
>> tar: Error exit delayed from previous errors.
>> pkg_add: tar extract of /usr/ports/packages/All/ppl-0.10.2_1.tbz failed!
>> pkg_add: unable to extract '/usr/ports/packages/All/ppl-0.10.2_1.tbz'!
>>
>> Is there anything wrong with having '..' in the pathname
>> of files in pkg-plist? Since %%DOCSDIR%% is 'ppl' for this
>> port, should files installed under pwl just be specified as
>> this:
>>
>> %%PORTDOCS%%/pwl/bar
>> %%PORTDOCS%%/pwl/bar/a
>> %%PORTDOCS%%/pwl/bar/b
>> ...
>>
>> and omit %%DOCSDIR%% from their path?
>>
>> Thanks for any insights.
>>
>
> Depends if there are (or could be) symlinks involved....
Thanks for responding! No, there are no symlinks. I
think I have solved it, but not sure that this is the
acceptable way. Please see attached diffs. If they
get removed by the mailer, it is basically just using
PWL_DOC_PREFIX= share/doc/pwl
PLIST_SUB+= PWL_DOC_PREFIX=${PWL_DOC_PREFIX}
in the Makefile and using %%PORTDOCS%%%%PWL_DOC_PREFIX%%
in the pkg-plist.
--
DE
-------------- next part --------------
? work
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/ppl/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile 19 Oct 2011 00:20:16 -0000 1.27
+++ Makefile 19 Oct 2011 03:41:34 -0000
@@ -19,6 +19,8 @@
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp
+PWL_DOC_PREFIX= share/doc/pwl
+
USE_GMAKE= yes
USE_PERL5_BUILD=yes
USE_AUTOTOOLS= libtool
@@ -48,4 +50,6 @@
${WRKSRC}/doc/Makefile.in ${WRKSRC}/Watchdog/doc/Makefile.in
.endif
+PLIST_SUB+= PWL_DOC_PREFIX=${PWL_DOC_PREFIX}
+
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/ppl/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- pkg-plist 19 Oct 2011 00:20:16 -0000 1.11
+++ pkg-plist 19 Oct 2011 03:41:36 -0000
@@ -1109,79 +1109,79 @@
%%PORTDOCS%%%%DOCSDIR%%/ppl-user-c-interface-0.11.2-html/tree.html
%%PORTDOCS%%%%DOCSDIR%%/ppl-user-c-interface-0.11.2.pdf
%%PORTDOCS%%%%DOCSDIR%%/ppl-user-c-interface-0.11.2.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/README
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/README.doc
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/fdl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/fdl.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/fdl.txt
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/gpl.pdf
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/gpl.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/gpl.txt
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/GFDL.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/GPL.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Doubly__Linked__Object-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Doubly__Linked__Object.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1EList-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1EList.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1EList__Iterator-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1EList__Iterator.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler__Flag-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler__Flag.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler__Function-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler__Function.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Pending__Element-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Pending__Element.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Pending__List-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Pending__List.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Threshold__Watcher-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Threshold__Watcher.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Time-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Time.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Watchdog-members.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Watchdog.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2blank.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2doc.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2folderclosed.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2folderopen.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2lastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2link.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2mlastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2mnode.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2node.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2plastnode.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2pnode.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/ftv2vertline.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/functions_rela.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/functions_type.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/graph_legend.dot
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/graph_legend.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/graph_legend.png
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/hierarchy.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/main.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/pages.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/tab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/tab_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8-html/tree.html
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8.pdf
-%%PORTDOCS%%%%DOCSDIR%%/../pwl/pwl-user-0.8.ps.gz
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/../pwl/pwl-user-0.8-html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/../pwl
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/BUGS
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/COPYING
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/CREDITS
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/ChangeLog
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/NEWS
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/README
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/README.doc
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/fdl.pdf
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/fdl.ps.gz
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/fdl.txt
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/gpl.pdf
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/gpl.ps.gz
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/gpl.txt
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/GFDL.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/GPL.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/annotated.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Doubly__Linked__Object-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Doubly__Linked__Object.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1EList-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1EList.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1EList__Iterator-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1EList__Iterator.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler__Flag-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler__Flag.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler__Function-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Handler__Function.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Pending__Element-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Pending__Element.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Pending__List-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Pending__List.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Threshold__Watcher-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Threshold__Watcher.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Time-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Time.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Watchdog-members.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classParma__Watchdog__Library_1_1Watchdog.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/classes.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/doxygen.css
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/doxygen.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2blank.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2doc.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2folderclosed.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2folderopen.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2lastnode.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2link.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2mlastnode.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2mnode.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2node.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2plastnode.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2pnode.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/ftv2vertline.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/functions.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/functions_func.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/functions_rela.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/functions_type.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/graph_legend.dot
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/graph_legend.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/graph_legend.png
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/hierarchy.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/index.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/main.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/pages.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/tab_b.gif
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/tab_l.gif
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/tab_r.gif
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/tabs.css
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8-html/tree.html
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8.pdf
+%%PORTDOCS%%%%PWL_DOC_PREFIX%%/pwl-user-0.8.ps.gz
+%%PORTDOCS%%@dirrm %%PWL_DOC_PREFIX%%/pwl-user-0.8-html
+%%PORTDOCS%%@dirrm %%PWL_DOC_PREFIX%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ppl-user-c-interface-0.11.2-html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ppl-user-0.11.2-html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
More information about the freebsd-ports
mailing list