[24347] trunk/dports/archivers/p7zip

source_changes at macosforge.org source_changes at macosforge.org
Sun Apr 22 13:20:05 PDT 2007


Revision: 24347
          http://trac.macosforge.org/projects/macports/changeset/24347
Author:   pipping at macports.org
Date:     2007-04-22 13:20:04 -0700 (Sun, 22 Apr 2007)

Log Message:
-----------
 * remove manual installation of doc files, add patch to fix automated installation

previously, doc files were installed to /usr/local/share/doc. they no longer are.

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

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

Modified: trunk/dports/archivers/p7zip/Portfile
===================================================================
--- trunk/dports/archivers/p7zip/Portfile	2007-04-22 19:33:42 UTC (rev 24346)
+++ trunk/dports/archivers/p7zip/Portfile	2007-04-22 20:20:04 UTC (rev 24347)
@@ -21,7 +21,9 @@
 
 worksrcdir       ${name}_${version}
 
-patch {
+patchfiles       patch-makefile
+
+post-patch {
 	reinplace "s|/usr|${prefix}|" \
 		${worksrcpath}/man1/7z.1 \
 		${worksrcpath}/man1/7za.1
@@ -33,15 +35,4 @@
 	}
 }
 
-destroot.destdir DEST_BIN=${destroot}${prefix}/bin \
-                 DEST_SHARE=${destroot}${prefix}/lib/${name} \
-                 DEST_MAN=${destroot}${prefix}/share/man
-
-post-destroot {
-	set docDir ${destroot}${prefix}/share/doc/${name}
-	file mkdir ${docDir}
-	file copy ${worksrcpath}/DOCS ${docDir}
-	file attributes ${docDir}/DOCS -permissions 0755
-	file attributes ${docDir}/DOCS/7zC.txt -permissions 0644
-	file attributes ${docDir}/DOCS/copying.txt -permissions 0644
-}
+destroot.destdir DEST_HOME=${destroot}${prefix}

Added: trunk/dports/archivers/p7zip/files/patch-makefile
===================================================================
--- trunk/dports/archivers/p7zip/files/patch-makefile	                        (rev 0)
+++ trunk/dports/archivers/p7zip/files/patch-makefile	2007-04-22 20:20:04 UTC (rev 24347)
@@ -0,0 +1,26 @@
+--- 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/20070422/f3ab8927/attachment.html


More information about the macports-changes mailing list