xpm: Version bump and build universal

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@43029 d073be05-634f-4543-b044-5fe20cf6d1d6

x11/xpm/Portfile

@@ -3,23 +3,42 @@
 PortSystem 1.0
 
 name		xpm
-version		3.4k
+version		3.5.7
+categories	x11 devel graphics
+maintainers	jeremyhu
 description	The X Pixmap Library
-
+homepage	http://www.x.org
+platforms	darwin macosx
 long_description XPM (X PixMap) is a format for storing/retrieving X pixmaps to/from files.  It is used by a large number of common X applications and has become something of a de-facto standard.
+master_sites	 ${homepage}/pub/individual/lib/
+
+distname	libXpm-${version}
+checksums           md5     cd15ee542d9f515538b4462a6f79d977 \
+                    sha1    215208091051530867efae0a4c1cedb7385d5f0e \
+                    rmd160  6bd355cb5f011b271b177d86db7f9a4e9d885ed3
+use_bzip2	yes
+use_parallel_build      yes
+
+depends_build	port:pkgconfig \
+                port:xorg-xproto
+
+depends_lib	lib:libX11:xorg-libX11
 
-maintainers	nomaintainer
-categories	x11 graphics
-platforms	darwin
-master_sites	freebsd \
-		xcontrib:libraries
-checksums	md5 dd7c6df259912646671ab8cbd3fcafd7
-depends_build	bin:xmkmf:imake
-use_xmkmf	yes
+# Panther and Tiger actually require the newer libX11 to build, so
+# force them to pull it in.  We should revert this to ALWAYS force
+# this to pull in port:xorg-libX11 once we convert other ports to use
+# lib:libXrender:xrender instead of port:xrender
 
-destroot.target-append install.man
+platform darwin 7 {
+    depends_lib-delete		lib:libX11:xorg-libX11
+    depends_lib-append		port:xorg-libX11
+}
 
-destroot.destdir-append \
-        BINDIR=${prefix}/bin \
-        MANDIR=${prefix}/share/man
+platform darwin 8 {
+    depends_lib-delete		lib:libX11:xorg-libX11
+    depends_lib-append		port:xorg-libX11
+}
 
+livecheck.check regex
+livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
+livecheck.regex libXpm-(\\d+(?:\\.\\d+)*)