From df1dfa0cd2288bfb83e5ada456ffdeff38bc8659 Mon Sep 17 00:00:00 2001 From: Bruce M Simpson Date: Mon, 12 Dec 2005 21:47:07 +0000 Subject: [PATCH] Update to r05.1. Submitted by: Henrik Andersen --- devel/p4v/Makefile | 82 ++++++++++++++++++++++++++-------------- devel/p4v/distinfo.i386 | 4 +- devel/p4v/pkg-message | 2 +- devel/p4v/pkg-plist.i386 | 28 ++++++++++---- 4 files changed, 77 insertions(+), 39 deletions(-) diff --git a/devel/p4v/Makefile b/devel/p4v/Makefile index e44f4e4b6498..8e42b388764e 100644 --- a/devel/p4v/Makefile +++ b/devel/p4v/Makefile @@ -6,19 +6,19 @@ # PORTNAME= p4v -PORTVERSION= 2004.1.65538 +PORTVERSION= 2005.1.85663 CATEGORIES= devel MASTER_SITES= \ - http://www.perforce.com/downloads/perforce/r04.1/bin.freebsd4/ \ - ftp://ftp.perforce.com/pub/perforce/r04.1/bin.freebsd4/ + http://www.perforce.com/downloads/perforce/r05.1/bin.freebsd4/ \ + ftp://ftp.perforce.com/pub/perforce/r05.1/bin.freebsd4/ DISTNAME= ${PORTNAME} EXTRACT_SUFX= .tgz MAINTAINER= bms@FreeBSD.org COMMENT= Visual client for Perforce SCM -NO_CDROM= yes -RESTRICTED= "Binary redistribution restrictions in effect" +NO_CDROM= "Binary redistribution restrictions in effect" +RESTRICTED= "${NO_CDROM}" ONLY_FOR_ARCHS= i386 NO_BUILD= yes @@ -27,42 +27,62 @@ NO_WRKSUBDIR= yes PLIST= ${MASTERDIR}/pkg-plist.${MACHINE_ARCH} MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +P4V_ICONS_DIR= P4VResources/icons +P4V_ICONS= p4v_16_low.png p4v_32_high.png p4v_32_low.png p4v_48_high.png + P4V_DOCS_DIR= P4VResources/p4vhelp -P4V_DOCS= About_Perforce_products.html About_file_icons.html \ +P4V_DOCS= About_Perforce_products.html \ + About_file_icons.html \ Adding_files_to_the_depot.html \ Changing_a_file_s_type.html \ Configuring_display_preferences.html \ Connecting_to_the_Perforce_server.html \ - Defining_a_client_view.html Deleting_files.html \ + Defining_a_client_view.html \ + Deleting_files.html \ Displaying_a_file_s_revision_history.html \ Displaying_client_specifications.html \ - Editing_files.html Getting_more_information.html \ + Editing_files.html \ + Getting_more_information.html \ Getting_started_with_Perforce.html \ Integrating_files_into_codelines.html \ Managing_branch_specifications.html \ - Managing_jobs.html Managing_labels.html Managing_users.html \ - P4V_shortcuts.html Renaming_files.html Resolving_files.html \ - Retrieving_files_from_the_depot.html The_P4V_windows.html \ - Working_with_changelists.html ancillary_p4v_files.html \ - diffing_files.html merging_files.html p4vindex.html + Managing_jobs.html \ + Managing_labels.html \ + Managing_users.html \ + P4V_shortcuts.html \ + Renaming_files.html \ + Resolving_files.html \ + Retrieving_files_from_the_depot.html \ + The_P4V_windows.html \ + Working_with_changelists.html \ + ancillary_p4v_files.html \ + custom_tools.html \ + diffing_folders.html \ + p4v-gs.pdf \ + p4vindex.html \ + revision_graph.html \ + time_lapse.html P4V_IMGS_DIR= P4VResources/p4vhelp/p4images -P4V_IMGS= p4v_file_add.png p4v_file_add_other.png p4v_file_delete.png \ - p4v_file_delete_notsync.png p4v_file_delete_other.png \ - p4v_file_delete_resolve.png p4v_file_deleted.png \ - p4v_file_edit_head.png p4v_file_edit_notsync.png \ - p4v_file_edit_other.png p4v_file_edit_other_notsyn.png \ - p4v_file_edit_other_notsync.png p4v_file_edit_resolve.png \ - p4v_file_edit_resolve_other_delete.png p4v_file_lock.png \ - p4v_file_lock_other.png p4v_file_needs_resolve.png \ - p4v_file_notmapped.png p4v_file_notsync.png \ - p4v_file_rev_add.png p4v_file_rev_branch.png \ - p4v_file_rev_delete.png p4v_file_rev_edit.png \ - p4v_file_rev_have_add.png p4v_file_rev_have_branch.png \ - p4v_file_rev_have_edit.png p4v_file_revision_integrated.png \ - p4v_pin.png p4v_file_revsynced.png p4v_file_sync.png \ - p4v_file_txt.png p4v_file_ws.png p4v_filter.png \ - p4v_merge_screenshot.png p4v_diff_screenshot.png +P4V_IMGS= p4v_bookmark.png p4v_file_add.png p4v_file_add_other.png \ + p4v_file_delete.png p4v_file_delete_notsync.png \ + p4v_file_delete_other.png p4v_file_delete_resolve.png \ + p4v_file_deleted.png p4v_file_edit_head.png \ + p4v_file_edit_notsync.png p4v_file_edit_other.png \ + p4v_file_edit_other_notsyn.png p4v_file_edit_other_notsync.png \ + p4v_file_edit_resolve.png \ + p4v_file_edit_resolve_other_delete.png \ + p4v_file_lock.png p4v_file_lock_other.png \ + p4v_file_needs_resolve.png p4v_file_notmapped.png \ + p4v_file_notsync.png p4v_file_rev_add.png \ + p4v_file_rev_branch.png p4v_file_rev_delete.png \ + p4v_file_rev_edit.png p4v_file_rev_have_add.png \ + p4v_file_rev_have_branch.png p4v_file_rev_have_edit.png \ + p4v_file_revision_integrated.png p4v_file_revsynced.png \ + p4v_file_sync.png p4v_file_txt.png p4v_file_ws.png \ + p4v_filter.png p4v_filters.png p4v_folder_diff_screenshot.png \ + p4v_pin.png p4v_revision_graph_screenshot.png p4v_sort.png \ + p4v_tearoff.png p4v_time_lapse_screenshot.png p4v_views.png .include @@ -72,6 +92,10 @@ LIB_DEPENDS+= c_r.4:${PORTSDIR}/misc/compat4x do-install: ${INSTALL_PROGRAM} ${WRKSRC}/p4v ${PREFIX}/bin + ${MKDIR} ${PREFIX}/share/${P4V_ICONS_DIR} +.for _ICONFILE in ${P4V_ICONS} + ${INSTALL_DATA} ${WRKSRC}/${P4V_ICONS_DIR}/${_ICONFILE} ${PREFIX}/share/${P4V_ICONS_DIR} +.endfor .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/${P4V_DOCS_DIR} ${PREFIX}/share/${P4V_IMGS_DIR} .for _DOCFILE in ${P4V_DOCS} diff --git a/devel/p4v/distinfo.i386 b/devel/p4v/distinfo.i386 index a75dafb77c6b..9c3db901b578 100644 --- a/devel/p4v/distinfo.i386 +++ b/devel/p4v/distinfo.i386 @@ -1,2 +1,2 @@ -MD5 (p4v.tgz) = 450c2ffc700cfae401b899b581327f87 -SIZE (p4v.tgz) = 5217615 +MD5 (p4v.tgz) = 795cf9b7d34d73e64121777689857c24 +SIZE (p4v.tgz) = 6475917 diff --git a/devel/p4v/pkg-message b/devel/p4v/pkg-message index 860d7a28512f..23148db78746 100644 --- a/devel/p4v/pkg-message +++ b/devel/p4v/pkg-message @@ -4,6 +4,6 @@ location of the p4v resources directory. For example: % setenv P4VRES %%PREFIX%%/share/P4VResources -The application is compiled for FreeBSD 4.4, so be sure to have appropriate +The application is compiled for FreeBSD 4.10, so be sure to have appropriate compatibility libraries (and kernel support, if applicable) installed on your system. diff --git a/devel/p4v/pkg-plist.i386 b/devel/p4v/pkg-plist.i386 index 2267fe6fdc28..0be05d0935d4 100644 --- a/devel/p4v/pkg-plist.i386 +++ b/devel/p4v/pkg-plist.i386 @@ -1,4 +1,8 @@ bin/p4v +share/P4VResources/icons/p4v_16_low.png +share/P4VResources/icons/p4v_32_high.png +share/P4VResources/icons/p4v_32_low.png +share/P4VResources/icons/p4v_48_high.png %%PORTDOCS%%share/P4VResources/p4vhelp/About_Perforce_products.html %%PORTDOCS%%share/P4VResources/p4vhelp/About_file_icons.html %%PORTDOCS%%share/P4VResources/p4vhelp/Adding_files_to_the_depot.html @@ -24,8 +28,13 @@ bin/p4v %%PORTDOCS%%share/P4VResources/p4vhelp/The_P4V_windows.html %%PORTDOCS%%share/P4VResources/p4vhelp/Working_with_changelists.html %%PORTDOCS%%share/P4VResources/p4vhelp/ancillary_p4v_files.html -%%PORTDOCS%%share/P4VResources/p4vhelp/diffing_files.html -%%PORTDOCS%%share/P4VResources/p4vhelp/merging_files.html +%%PORTDOCS%%share/P4VResources/p4vhelp/custom_tools.html +%%PORTDOCS%%share/P4VResources/p4vhelp/diffing_folders.html +%%PORTDOCS%%share/P4VResources/p4vhelp/p4v-gs.pdf +%%PORTDOCS%%share/P4VResources/p4vhelp/p4vindex.html +%%PORTDOCS%%share/P4VResources/p4vhelp/revision_graph.html +%%PORTDOCS%%share/P4VResources/p4vhelp/time_lapse.html +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_bookmark.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_add.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_add_other.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_delete.png @@ -53,15 +62,20 @@ bin/p4v %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_rev_have_branch.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_rev_have_edit.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_revision_integrated.png -%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_pin.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_revsynced.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_sync.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_txt.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_file_ws.png %%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_filter.png -%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_merge_screenshot.png -%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_diff_screenshot.png +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_filters.png +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_folder_diff_screenshot.png +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_pin.png +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_revision_graph_screenshot.png +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_sort.png +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_tearoff.png +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_time_lapse_screenshot.png +%%PORTDOCS%%share/P4VResources/p4vhelp/p4images/p4v_views.png %%PORTDOCS%%@dirrm share/P4VResources/p4vhelp/p4images -%%PORTDOCS%%share/P4VResources/p4vhelp/p4vindex.html %%PORTDOCS%%@dirrm share/P4VResources/p4vhelp -%%PORTDOCS%%@dirrm share/P4VResources +@dirrm share/P4VResources/icons +@dirrm share/P4VResources