[25665] trunk/dports/archivers/p7zip

[source_changes at macosforge.org]

Revision: 25665
          http://trac.macosforge.org/projects/macports/changeset/25665
Author:   pipping at macports.org
Date:     2007-05-27 14:48:23 -0700 (Sun, 27 May 2007)

Log Message:
-----------
 * bump to version 4.47
 * remove patch obsoleted upstream [ 1706002 ]
 * add new patch to fix path in manpages

Modified Paths:
--------------
    trunk/dports/archivers/p7zip/Portfile

Added Paths:
-----------
    trunk/dports/archivers/p7zip/files/patch-install.sh

Removed Paths:
-------------
    trunk/dports/archivers/p7zip/files/patch-makefile

Modified: trunk/dports/archivers/p7zip/Portfile
===================================================================
--- trunk/dports/archivers/p7zip/Portfile	2007-05-27 21:32:42 UTC (rev 25664)
+++ trunk/dports/archivers/p7zip/Portfile	2007-05-27 21:48:23 UTC (rev 25665)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name             p7zip
-version          4.45
+version          4.47
 categories       archivers
 maintainers      nomaintainer at macports.org
 description      7-Zip implementation
@@ -13,29 +13,21 @@
 platforms        darwin
 
 master_sites     sourceforge
-distname         ${name}_${version}_src_all
 use_bzip2        yes
-checksums        md5 b7eb7a92b1bf0e73a2feae95cd3184f7 \
-                 sha1 06bdaf755e288539da4efa399fc143648db57acd \
-                 rmd160 23677f41e1a2c1d8c254073bc17ea40ea90851f1
+distname         [strsed ${distname} {g/-/_/}]
+distfiles        ${distname}_src_all${extract.suffix}
+checksums        md5 76f486aa882638f1c259cd8d810adf6c \
+                 sha1 568abf5571fe92c18798feb582604c0f5563a6b0 \
+                 rmd160 7bb770ad4f721bdc024052e24d9c5fbb1bc3c04c
 
-worksrcdir       ${name}_${version}
+patchfiles       patch-install.sh
 
-# I've created a ticket at http://preview.tinyurl.com/2omofl regarding
-# the issue with DEST_(HOME|SHARE_DOC), addressed in the patch below
-# --pipping
-patchfiles       patch-makefile
-
-post-patch {
-	reinplace "s|/usr|${prefix}|" \
-		${worksrcpath}/man1/7z.1 \
-		${worksrcpath}/man1/7za.1
-}
-
 configure {
 	if {${os.platform} == "darwin"} {
 		file copy -force ${worksrcpath}/makefile.macosx ${worksrcpath}/makefile.machine
 	}
 }
 
-destroot.destdir DEST_HOME=${destroot}${prefix}
+destroot.destdir  DEST_HOME=${prefix} \
+                  DEST_MAN=${prefix}/share/man \
+                  DEST_DIR=${destroot}

Added: trunk/dports/archivers/p7zip/files/patch-install.sh
===================================================================
--- trunk/dports/archivers/p7zip/files/patch-install.sh	                        (rev 0)
+++ trunk/dports/archivers/p7zip/files/patch-install.sh	2007-05-27 21:48:23 UTC (rev 25665)
@@ -0,0 +1,21 @@
+--- install.sh.orig	2007-05-27 23:49:11 +0200
++++ install.sh	2007-05-27 23:50:56 +0200
+@@ -123,15 +123,15 @@
+ if [ -d DOCS ]
+ then
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
+-   sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > ${DEST_DIR}${DEST_MAN}/man1/7z.1
++   sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > ${DEST_DIR}${DEST_MAN}/man1/7z.1
+    chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7z.1
+ 
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
+-   sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > ${DEST_DIR}${DEST_MAN}/man1/7za.1
++   sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > ${DEST_DIR}${DEST_MAN}/man1/7za.1
+    chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7za.1
+ 
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+-   sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > ${DEST_DIR}${DEST_MAN}/man1/7zr.1
++   sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > ${DEST_DIR}${DEST_MAN}/man1/7zr.1
+    chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7zr.1
+ else
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"

Deleted: trunk/dports/archivers/p7zip/files/patch-makefile
===================================================================
--- trunk/dports/archivers/p7zip/files/patch-makefile	2007-05-27 21:32:42 UTC (rev 25664)
+++ trunk/dports/archivers/p7zip/files/patch-makefile	2007-05-27 21:48:23 UTC (rev 25665)
@@ -1,26 +0,0 @@
---- makefile.orig	2007-04-22 21:42:20.000000000 +0200
-+++ makefile	2007-04-22 21:46:35.000000000 +0200
-@@ -1,7 +1,9 @@
--
--DEST_BIN=/usr/local/bin
--DEST_SHARE=/usr/local/lib/p7zip
--DEST_MAN=/usr/local/man
-+DEST_HOME=/usr/local/
-+DEST_BIN=$(DEST_HOME)/bin
-+DEST_SHARE=$(DEST_HOME)/lib/p7zip
-+DEST_SHARE_DOC=$(DEST_HOME)/share/doc/p7zip
-+DEST_MAN=$(DEST_HOME)/share/man
-+DEST_DIR=""
- 
- .PHONY: default all all2 7za sfx 7z 7zr Client7z common clean tar_bin depend test test_7z test_7zr test_Client7z all_test
- 
-@@ -92,7 +94,8 @@
- 	cd check ; ./check_Client7z.sh ../bin/Client7z
- 
- install:
--	./install.sh $(DEST_BIN) $(DEST_SHARE) $(DEST_MAN)
-+	./install.sh $(DEST_BIN) $(DEST_SHARE) $(DEST_MAN) \
-+	$(DEST_DIR) $(DEST_SHARE_DOC)
- 
- REP=$(shell pwd)
- ARCHIVE=$(shell basename $(REP))

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070527/4d33e2c0/attachment.html