PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-13 19:29:04 +00:00
Code Issues Projects Releases Wiki Activity
Files
54e73d555a03388a99aad1557d4e79c06b51ad6b
nmap/zenmap/install_scripts/macosx/MacPorts-ports.diff
david a1bae1bb5f Update build instructions for MacPorts 2.1.1. 
An important side effect of this change is the move the
--with-included-loaders flag from gtk2 to gdk-pixbuf2. This upstream
change:
http://git.gnome.org/browse/gtk+/commit/configure.in?h=gtk-2-24&id=cb29d2770714943af7b488a6a94f1f37b7466c8f
means that --with-included-loaders no longer has an effect when given to
gtk2's configure. This caused dynamic loaders to be searched for under
my /Users/david/macports-10.5 installation directory, which isn't
present after installing from the .dmg package.

Here's an report of a hang caused by the missing loaders:
http://seclists.org/nmap-dev/2012/q2/370
2012-05-31 07:04:39 +00:00

263 lines
11 KiB
Diff
Raw Blame History

diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/archivers/xz/Portfile ports/archivers/xz/Portfile
--- ports.orig/archivers/xz/Portfile 2011-07-14 03:00:23.000000000 -0700
+++ ports/archivers/xz/Portfile 2012-05-30 19:41:29.000000000 -0700
@@ -23,9 +23,9 @@
checksums sha1 79661fd1c24603437e325d76732046b1da683b32 \
rmd160 10127da6e2e35e5e92b3125f6088c756b80931e5
-depends_lib port:libiconv port:gettext
+depends_lib port:gettext
-configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix}
+configure.args --with-libintl-prefix=${prefix}
# previous version defaulted to static liblzma (through --enable-dynamic=mixed)
configure.args-append --disable-shared
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/apr-util/Portfile ports/devel/apr-util/Portfile
--- ports.orig/devel/apr-util/Portfile 2012-01-31 15:30:28.000000000 -0800
+++ ports/devel/apr-util/Portfile 2012-05-30 16:53:56.000000000 -0700
@@ -21,13 +21,13 @@
rmd160 a16ca2c192e82ff811570e84b88f9b6b60141ca6
depends_lib port:apr port:expat \
- port:libiconv port:db46 \
+ port:db46 \
port:sqlite3
use_parallel_build yes
configure.ccache no
configure.args --with-apr=${prefix}/bin/apr-1-config --with-expat=${prefix} \
- --with-iconv=${prefix} --with-berkeley-db=${prefix}/include:${prefix}/lib/db46 \
+ --with-berkeley-db=${prefix}/include:${prefix}/lib/db46 \
--without-mysql --without-pgsql --with-sqlite3=${prefix}
test.run yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/atk/Portfile ports/devel/atk/Portfile
--- ports.orig/devel/atk/Portfile 2012-05-28 17:30:31.000000000 -0700
+++ ports/devel/atk/Portfile 2012-05-30 00:10:54.000000000 -0700
@@ -27,8 +27,7 @@
depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
- port:gettext \
- port:libiconv
+ port:gettext
configure.args --enable-static \
--disable-introspection
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/gettext/Portfile ports/devel/gettext/Portfile
--- ports.orig/devel/gettext/Portfile 2011-07-25 23:30:20.000000000 -0700
+++ ports/devel/gettext/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -46,12 +46,10 @@
configure.args-append --without-git \
--without-cvs
-depends_lib port:libiconv \
- port:ncurses \
+depends_lib port:ncurses \
port:expat
-archcheck.files lib/libiconv.dylib \
- lib/libncurses.dylib \
+archcheck.files lib/libncurses.dylib \
lib/libexpat.dylib
test.run yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/devel/glib2/Portfile ports/devel/glib2/Portfile
--- ports.orig/devel/glib2/Portfile 2012-05-17 21:00:38.000000000 -0700
+++ ports/devel/glib2/Portfile 2012-05-30 00:11:31.000000000 -0700
@@ -41,13 +41,11 @@
patch-gio_gdbusprivate.c.diff
depends_lib port:gettext \
- port:libiconv \
port:zlib \
port:libffi \
path:bin/perl:perl5
archcheck.files lib/libintl.dylib \
- lib/libiconv.dylib \
lib/libz.dylib \
lib/libffi.dylib
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/gnome/gtk2/Portfile ports/gnome/gtk2/Portfile
--- ports.orig/gnome/gtk2/Portfile 2012-05-02 11:01:07.000000000 -0700
+++ ports/gnome/gtk2/Portfile 2012-05-30 09:46:48.000000000 -0700
@@ -47,10 +47,20 @@
# port:librsvg
-depends_run port:shared-mime-info \
- port:hicolor-icon-theme
-
+# If shared-mime-info is installed it causes GTK+ to use Glib's GIO to
+# do automatic file type guessing and to disable its own internal
+# guessing. The guessing then fails at runtime if the MIME database
+# (/usr/share/mime) isn't present. Avoid using GIO and always use GTK+'s
+# internal guesser.
+# depends_run port:shared-mime-info
+depends_run port:hicolor-icon-theme
+
+# Don't have the immodules as loadable modules. This would require
+# running install_name_tool on the .so files to make the libraries they
+# depend on relative to @executable_path, not the MacPorts installation
+# directory.
configure.args --enable-static \
+ --with-included-immodules \
--disable-glibtest \
--disable-introspection \
gio_can_sniff=yes
@@ -92,19 +102,6 @@
xinstall -d ${destroot}${docdir}
xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING HACKING NEWS README \
${destroot}${docdir}
-
- ui_debug "Creating gtk.immodules..."
- system "DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
- ${destroot}${prefix}/bin/gtk-query-immodules-2.0 \
- ${destroot}${prefix}/lib/gtk-2.0/2.10.0/immodules/*.so \
- >${destroot}${prefix}/etc/gtk-2.0/gtk.immodules"
- reinplace "s|${destroot}||" ${destroot}${prefix}/etc/gtk-2.0/gtk.immodules
-}
-
-post-activate {
- ui_debug "Updating gdk-pixbuf.loaders..."
- system "${prefix}/bin/gdk-pixbuf-query-loaders \
- >${prefix}/etc/gtk-2.0/gdk-pixbuf.loaders"
}
platform darwin 8 {
@@ -123,7 +120,7 @@
}
if {[variant_isset universal]} {
- set cups /usr/bin/cups-config
+ set cups /Developer/SDKs/MacOSX10.5.sdk/usr/bin/cups-config
if {[info exists universal_sysroot]} {
set cups ${universal_sysroot}${cups}
}
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/graphics/fontconfig/Portfile ports/graphics/fontconfig/Portfile
--- ports.orig/graphics/fontconfig/Portfile 2012-05-10 09:00:32.000000000 -0700
+++ ports/graphics/fontconfig/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -27,12 +27,10 @@
depends_build port:pkgconfig
-depends_lib port:libiconv \
- port:expat \
+depends_lib port:expat \
port:freetype
-archcheck.files lib/libiconv.dylib \
- lib/libexpat.dylib \
+archcheck.files lib/libexpat.dylib \
lib/libfreetype.dylib
if {${os.platform} == "darwin" && ${os.major} < 9} {
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/graphics/gdk-pixbuf2/Portfile ports/graphics/gdk-pixbuf2/Portfile
--- ports.orig/graphics/gdk-pixbuf2/Portfile 2012-05-15 04:30:33.000000000 -0700
+++ ports/graphics/gdk-pixbuf2/Portfile 2012-05-30 09:47:13.000000000 -0700
@@ -47,7 +47,12 @@
}
}
+# Don't have the GDK image loaders as loadable modules. This would
+# require running install_name_tool on the .so files to make the
+# libraries they depend on relative to @executable_path, not the
+# MacPorts installation directory.
configure.args --with-libjasper \
+ --with-included-loaders \
--enable-introspection=no
test.run yes
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/perl/p5-locale-gettext/Portfile ports/perl/p5-locale-gettext/Portfile
--- ports.orig/perl/p5-locale-gettext/Portfile 2011-08-15 10:00:54.000000000 -0700
+++ ports/perl/p5-locale-gettext/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -22,7 +22,7 @@
rmd160 767adfce05b8fe77ddd7d3814951822746cf6e4b
if {${perl5.major} != ""} {
-depends_lib-append port:gettext port:libiconv
+depends_lib-append port:gettext
if {[variant_isset universal]} {
set archflags ${configure.universal_cflags}
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py26-gobject/Portfile ports/python/py26-gobject/Portfile
--- ports.orig/python/py26-gobject/Portfile 2012-04-14 04:30:34.000000000 -0700
+++ ports/python/py26-gobject/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -35,7 +35,6 @@
depends_lib path:${prefix}/lib/pkgconfig/glib-2.0.pc:glib2 \
port:libxslt \
port:gettext \
- port:libiconv \
port:libffi \
port:python26
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/python/py27-libxml2/files/patch-setup.py.diff ports/python/py27-libxml2/files/patch-setup.py.diff
--- ports.orig/python/py27-libxml2/files/patch-setup.py.diff 2010-11-29 21:30:48.000000000 -0800
+++ ports/python/py27-libxml2/files/patch-setup.py.diff 2012-05-30 00:08:06.000000000 -0700
@@ -1,6 +1,6 @@
--- setup.py.orig 2007-10-11 15:24:20.000000000 +0200
+++ setup.py 2007-10-11 15:24:54.000000000 +0200
-@@ -56,11 +56,7 @@
+@@ -56,11 +56,8 @@
# - iconv.h
# - libxslt/xsltconfig.h
includes_dir = [
@@ -10,6 +10,7 @@
-os.path.join(ROOT,'include'),
-HOME
+"@PREFIX@/include",
++"/Developer/SDKs/MacOSX10.5.sdk/usr/include",
];
xml_includes=""
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/help2man/Portfile ports/textproc/help2man/Portfile
--- ports.orig/textproc/help2man/Portfile 2012-04-05 23:30:23.000000000 -0700
+++ ports/textproc/help2man/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -22,7 +22,7 @@
sha256 13599a89080628617f31ca1e7eee38d0b11b2c088708c14eba35b99d67b23cb4
depends_lib port:perl5.12 port:p5.12-locale-gettext \
- port:gettext port:libiconv
+ port:gettext
configure.perl ${prefix}/bin/perl5.12
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/libxml2/Portfile ports/textproc/libxml2/Portfile
--- ports.orig/textproc/libxml2/Portfile 2012-03-22 15:30:30.000000000 -0700
+++ ports/textproc/libxml2/Portfile 2012-05-30 00:13:53.000000000 -0700
@@ -22,7 +22,7 @@
sha1 859dd535edbb851cc15b64740ee06551a7a17d40 \
rmd160 30709622cfe3e2175e73d6701b7e19a25ab5ac47
-depends_lib port:libiconv port:zlib
+depends_lib port:zlib
post-extract {
reinplace -locale C "s|/etc|${prefix}/etc|g" \
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/textproc/libxslt/Portfile ports/textproc/libxslt/Portfile
--- ports.orig/textproc/libxslt/Portfile 2011-07-07 08:30:19.000000000 -0700
+++ ports/textproc/libxslt/Portfile 2012-05-30 00:08:06.000000000 -0700
@@ -30,8 +30,7 @@
sha1 69f74df8228b504a87e2b257c2d5238281c65154 \
rmd160 fc7630352ae5772d25fc8132a373d477fb8d8d5f
-depends_lib port:libiconv \
- port:libxml2 \
+depends_lib port:libxml2 \
port:zlib
configure.args --mandir=${prefix}/share/man \
diff --unidirectional-new-file -ru -x 'PortIndex*' ports.orig/x11/pango/Portfile ports/x11/pango/Portfile
--- ports.orig/x11/pango/Portfile 2012-05-30 00:08:06.000000000 -0700
+++ ports/x11/pango/Portfile 2012-05-30 00:16:09.000000000 -0700
@@ -95,6 +95,7 @@
}
configure.args --enable-static \
+ --with-included-modules \
--disable-introspection \
--disable-silent-rules \
--without-x
Reference in New Issue View Git Blame Copy Permalink