ports/130034: [PATCH] devel/p4v: update to 2008.2.179173
Sean C. Farley
scf at FreeBSD.org
Mon Dec 29 19:50:01 UTC 2008
>Number: 130034
>Category: ports
>Synopsis: [PATCH] devel/p4v: update to 2008.2.179173
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 29 19:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Sean C. Farley
>Release: FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD thor.farley.org 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0 r186423M: Tue Dec 23 00:34:23 CST
>Description:
- Update to 2008.2.179173
- Appease portlint.
Please note that this update (and not the port) renames bin/assistant to
bin/assistant_adp fixing a conflict with the x11-toolkits/qt33 port.
Port maintainer (bms at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- p4v-2008.2.179173.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/p4v.orig/Makefile /usr/ports/devel/p4v/Makefile
--- /usr/ports/devel/p4v.orig/Makefile 2008-08-28 10:28:15.000000000 -0500
+++ /usr/ports/devel/p4v/Makefile 2008-12-29 09:03:17.000000000 -0600
@@ -6,10 +6,10 @@
#
PORTNAME= p4v
-PORTVERSION= 2007.3.155579
+PORTVERSION= 2008.2.179173
CATEGORIES= devel
MASTER_SITES= \
- http://filehost.perforce.com/perforce/r07.3/bin.freebsd60x86${MACHINE_ARCH:Mamd64:S/^amd/_/}/
+ http://filehost.perforce.com/perforce/r08.2/bin.freebsd60x86${MACHINE_ARCH:Mamd64:S/^amd/_/}/
DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
@@ -34,10 +34,10 @@
IGNORE= please upgrade to FreeBSD 6.x or newer
.endif
-P4V_BIN= \
- bin/assistant bin/p4v bin/p4v.bin
+P4V_BIN= \
+ bin/assistant_adp bin/p4merge bin/p4merge.bin bin/p4v bin/p4v.bin
-P4V_LIBS= \
+P4V_LIBS= \
lib/p4v/qt4/lib/libQtAssistantClient.so.4 \
lib/p4v/qt4/lib/libQtCore.so.4 \
lib/p4v/qt4/lib/libQtGui.so.4 \
@@ -48,20 +48,21 @@
lib/p4v/qt4/plugins/codecs/libqjpcodecs.so \
lib/p4v/qt4/plugins/codecs/libqkrcodecs.so \
lib/p4v/qt4/plugins/codecs/libqtwcodecs.so \
- lib/p4v/qt4/plugins/imageformats/libqtiff.so \
- lib/p4v/qt4/plugins/imageformats/libqsvg.so \
- lib/p4v/qt4/plugins/imageformats/libqmng.so \
- lib/p4v/qt4/plugins/imageformats/libqjpeg.so \
lib/p4v/qt4/plugins/imageformats/libqgif.so \
+ lib/p4v/qt4/plugins/imageformats/libqico.so \
+ lib/p4v/qt4/plugins/imageformats/libqjpeg.so \
+ lib/p4v/qt4/plugins/imageformats/libqmng.so \
+ lib/p4v/qt4/plugins/imageformats/libqsvg.so \
+ lib/p4v/qt4/plugins/imageformats/libqtiff.so \
lib/p4v/qt4/plugins/inputmethods/libqimsw-multi.so
-P4V_ICONS= \
+P4V_ICONS= \
lib/p4v/P4VResources/icons/p4v_16_low.png \
lib/p4v/P4VResources/icons/p4v_32_high.png \
lib/p4v/P4VResources/icons/p4v_32_low.png \
lib/p4v/P4VResources/icons/p4v_48_high.png
-P4V_DIRS= \
+P4V_DIRS= \
lib/p4v/qt4/plugins/inputmethods \
lib/p4v/qt4/plugins/imageformats \
lib/p4v/qt4/plugins/codecs \
@@ -71,20 +72,21 @@
lib/p4v/qt4 \
lib/p4v/P4VResources/p4vhelp/p4images \
lib/p4v/P4VResources/p4vhelp \
+ lib/p4v/P4VResources/p4mergehelp/p4images \
+ lib/p4v/P4VResources/p4mergehelp \
lib/p4v/P4VResources/icons \
lib/p4v/P4VResources \
lib/p4v
-P4V_DOCS= \
- lib/p4v/P4VResources/p4vhelp/p4v-gs.pdf \
- lib/p4v/P4VResources/p4vhelp/p4vhelp.adp \
- lib/p4v/P4VResources/p4vhelp/revision_graph.html \
- lib/p4v/P4VResources/p4vhelp/time_lapse.html \
+P4V_DOCS= \
+ lib/p4v/P4VResources/p4mergehelp/assistant-manual.html \
+ lib/p4v/P4VResources/p4mergehelp/diffing_files.html \
+ lib/p4v/P4VResources/p4mergehelp/diffing_images.html \
+ lib/p4v/P4VResources/p4mergehelp/merging_files.html \
+ lib/p4v/P4VResources/p4mergehelp/p4mergehelp.adp \
lib/p4v/P4VResources/p4vhelp/About_Perforce_products.html \
lib/p4v/P4VResources/p4vhelp/About_file_icons.html \
lib/p4v/P4VResources/p4vhelp/Adding_files_to_the_depot.html \
- lib/p4v/P4VResources/p4vhelp/Admin_creating_groups.html \
- lib/p4v/P4VResources/p4vhelp/Admin_creating_users.html \
lib/p4v/P4VResources/p4vhelp/Admin_homepage.html \
lib/p4v/P4VResources/p4vhelp/Admin_managing_permissions.html \
lib/p4v/P4VResources/p4vhelp/Admin_managing_users_and_groups.html \
@@ -104,7 +106,6 @@
lib/p4v/P4VResources/p4vhelp/Managing_branch_specifications.html \
lib/p4v/P4VResources/p4vhelp/Managing_jobs.html \
lib/p4v/P4VResources/p4vhelp/Managing_labels.html \
- lib/p4v/P4VResources/p4vhelp/Managing_users.html \
lib/p4v/P4VResources/p4vhelp/Offline.html \
lib/p4v/P4VResources/p4vhelp/P4V_shortcuts.html \
lib/p4v/P4VResources/p4vhelp/Renaming_files.html \
@@ -118,12 +119,41 @@
lib/p4v/P4VResources/p4vhelp/custom_tools.html \
lib/p4v/P4VResources/p4vhelp/diffing_files.html \
lib/p4v/P4VResources/p4vhelp/diffing_folders.html \
+ lib/p4v/P4VResources/p4vhelp/diffing_images.html \
lib/p4v/P4VResources/p4vhelp/folder_diff_cheatsheet.html \
- lib/p4v/P4VResources/p4vhelp/merging_files.html
+ lib/p4v/P4VResources/p4vhelp/merging_files.html \
+ lib/p4v/P4VResources/p4vhelp/p4v-gs.pdf \
+ lib/p4v/P4VResources/p4vhelp/p4vhelp.adp \
+ lib/p4v/P4VResources/p4vhelp/revision_graph.html \
+ lib/p4v/P4VResources/p4vhelp/time_lapse.html
-P4V_IMGS= \
+P4V_IMGS= \
+ lib/p4v/P4VResources/p4mergehelp/p4diff_help.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/addyourstheirs.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/basefile.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/choosechunk.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/deletedyourstheirs.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/editedtext.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/expandme.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/file1.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/file2.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/filediagram.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/find.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/gotoline.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/inline-button.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/inline-off.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/inline-on.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/lineend.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/linenumbers.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/nextdiff.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/p4_merge_help.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/sameyourstheirs.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/theiradd.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/theirdelete.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/youradd.png \
+ lib/p4v/P4VResources/p4mergehelp/p4images/yourdelete.png \
+ lib/p4v/P4VResources/p4mergehelp/p4merge_help.png \
lib/p4v/P4VResources/p4vhelp/p4images/P4V_help_128x128.png \
- lib/p4v/P4VResources/p4vhelp/p4images/P4V_help_16x16.png \
lib/p4v/P4VResources/p4vhelp/p4images/addyourstheirs.png \
lib/p4v/P4VResources/p4vhelp/p4images/basefile.png \
lib/p4v/P4VResources/p4vhelp/p4images/choosechunk.png \
@@ -135,8 +165,13 @@
lib/p4v/P4VResources/p4vhelp/p4images/filediagram.png \
lib/p4v/P4VResources/p4vhelp/p4images/find.png \
lib/p4v/P4VResources/p4vhelp/p4images/gotoline.png \
+ lib/p4v/P4VResources/p4vhelp/p4images/inline-button.png \
+ lib/p4v/P4VResources/p4vhelp/p4images/inline-off.png \
+ lib/p4v/P4VResources/p4vhelp/p4images/inline-on.png \
lib/p4v/P4VResources/p4vhelp/p4images/lineend.png \
lib/p4v/P4VResources/p4vhelp/p4images/linenumbers.png \
+ lib/p4v/P4VResources/p4vhelp/p4images/new_user.png \
+ lib/p4v/P4VResources/p4vhelp/p4images/new_workspace.png \
lib/p4v/P4VResources/p4vhelp/p4images/nextdiff.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4_merge_help.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4diff_help.png \
@@ -153,6 +188,7 @@
lib/p4v/P4VResources/p4vhelp/p4images/p4v_file_add.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_file_add_other.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_file_add_other_ws.png \
+ lib/p4v/P4VResources/p4vhelp/p4images/p4v_file_branch.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_file_delete.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_file_delete_notsync.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_file_delete_other.png \
@@ -193,6 +229,8 @@
lib/p4v/P4VResources/p4vhelp/p4images/p4v_folder_black_triangle.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_folder_diff_screenshot.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_folderdiff.png \
+ lib/p4v/P4VResources/p4vhelp/p4images/p4v_help_16x16.png \
+ lib/p4v/P4VResources/p4vhelp/p4images/p4v_integrate.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_integration_dialog.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_main_window.png \
lib/p4v/P4VResources/p4vhelp/p4images/p4v_nextdiff.png \
@@ -227,15 +265,17 @@
lib/p4v/P4VResources/p4vhelp/p4images/youradd.png \
lib/p4v/P4VResources/p4vhelp/p4images/yourdelete.png
-PLIST_DIRS+= ${P4V_DIRS}
-PLIST_FILES+= ${P4V_BIN} ${P4V_ICONS} ${P4V_LIBS}
+PLIST_DIRS+= ${P4V_DIRS}
+PLIST_FILES+= ${P4V_BIN} ${P4V_ICONS} ${P4V_LIBS}
.if !defined(NOPORTDOCS)
-PLIST_FILES+= ${P4V_DOCS} ${P4V_IMGS}
+PLIST_FILES+= ${P4V_DOCS} ${P4V_IMGS}
.endif
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/assistant ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/assistant_adp ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/p4merge.bin ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/p4v.bin ${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/p4merge ${PREFIX}/bin
${INSTALL_SCRIPT} ${WRKSRC}/bin/p4v ${PREFIX}/bin
.for _DIR in ${P4V_DIRS}
${MKDIR} ${PREFIX}/${_DIR}
diff -ruN --exclude=CVS /usr/ports/devel/p4v.orig/distinfo.amd64 /usr/ports/devel/p4v/distinfo.amd64
--- /usr/ports/devel/p4v.orig/distinfo.amd64 2008-06-09 03:04:29.000000000 -0500
+++ /usr/ports/devel/p4v/distinfo.amd64 2008-12-29 09:03:17.000000000 -0600
@@ -1,3 +1,3 @@
-MD5 (p4v-2007.3.155579/p4v.tgz) = d74af254109873764ecf4da736f63d4a
-SHA256 (p4v-2007.3.155579/p4v.tgz) = 4d3a038a570149dac5f534adab1d3d4d66923e460d294be973d9f158e7cf0cc8
-SIZE (p4v-2007.3.155579/p4v.tgz) = 12942279
+MD5 (p4v-2008.2.179173/p4v.tgz) = a8e3060120848b5e21e199e3b5edb9c8
+SHA256 (p4v-2008.2.179173/p4v.tgz) = a1e9f07fac738c129cce72e39094c0f905015400f16e85f0cb8e448cb62c803e
+SIZE (p4v-2008.2.179173/p4v.tgz) = 16711446
diff -ruN --exclude=CVS /usr/ports/devel/p4v.orig/distinfo.i386 /usr/ports/devel/p4v/distinfo.i386
--- /usr/ports/devel/p4v.orig/distinfo.i386 2008-08-28 10:28:15.000000000 -0500
+++ /usr/ports/devel/p4v/distinfo.i386 2008-12-29 09:03:17.000000000 -0600
@@ -1,3 +1,3 @@
-MD5 (p4v-2007.3.155579/p4v.tgz) = 7cd7a463f00bf606a94494ea131ab488
-SHA256 (p4v-2007.3.155579/p4v.tgz) = d4426b7a61aad3743345a1bf86a836879a70c8681bd4c7175b50a9062f7912bd
-SIZE (p4v-2007.3.155579/p4v.tgz) = 12647927
+MD5 (p4v-2008.2.179173/p4v.tgz) = 9536ae0952a17743504af3bbf17255a4
+SHA256 (p4v-2008.2.179173/p4v.tgz) = abc8590a4e27ec4ccfc7e397e60a60fe03e768fb030a2dd0d4466aabad0c203f
+SIZE (p4v-2008.2.179173/p4v.tgz) = 16459981
--- p4v-2008.2.179173.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list