diff options
author | joerg <joerg> | 2006-07-10 14:47:06 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-07-10 14:47:06 +0000 |
commit | 3191d3feb34b8621d8d5a39770faee0cf26577bc (patch) | |
tree | 2dbcfd1d0f7a08303166fdf09f2ca8fb2060da13 /x11/wxGTK | |
parent | a061ea8cacf7e1f051cf65a6f1d653c228ff88ac (diff) | |
download | pkgsrc-3191d3feb34b8621d8d5a39770faee0cf26577bc.tar.gz |
Kill a OS X specific shared library rule, which is not necessary with
libtool. Add a few files specific to Darwin as found by tonio@.
No revision bump, since it didn't build before.
Diffstat (limited to 'x11/wxGTK')
-rw-r--r-- | x11/wxGTK/Makefile.common | 4 | ||||
-rw-r--r-- | x11/wxGTK/PLIST.Darwin | 4 | ||||
-rw-r--r-- | x11/wxGTK/distinfo | 8 | ||||
-rw-r--r-- | x11/wxGTK/patches/manual-bakefile.diff | 30 |
4 files changed, 31 insertions, 15 deletions
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common index 8f2529b0fc6..f2f44399028 100644 --- a/x11/wxGTK/Makefile.common +++ b/x11/wxGTK/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2006/03/30 15:28:12 joerg Exp $ +# $NetBSD: Makefile.common,v 1.9 2006/07/10 14:47:06 joerg Exp $ # DISTNAME= wxGTK-2.6.3 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.wxwidgets.org/ PATCHDIR= ${.CURDIR}/../../x11/wxGTK/patches DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK/distinfo -PATCHFILES= ${DISTNAME}-libtool.diff.bz2 +PATCHFILES= ${DISTNAME}-libtool.diff2.bz2 PATCH_SITES= ${MASTER_SITE_LOCAL} USE_TOOLS+= pkg-config msgfmt diff --git a/x11/wxGTK/PLIST.Darwin b/x11/wxGTK/PLIST.Darwin new file mode 100644 index 00000000000..b73067ffa83 --- /dev/null +++ b/x11/wxGTK/PLIST.Darwin @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST.Darwin,v 1.1 2006/07/10 14:47:06 joerg Exp $ +include/wx-2.6/wx/mac/corefoundation/cfstring.h +include/wx-2.6/wx/mac/corefoundation/hid.h +include/wx-2.6/wx/mac/corefoundation/stdpaths.h diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo index 988f17de3b9..571590a8b4c 100644 --- a/x11/wxGTK/distinfo +++ b/x11/wxGTK/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.25 2006/04/08 13:12:07 joerg Exp $ +$NetBSD: distinfo,v 1.26 2006/07/10 14:47:06 joerg Exp $ SHA1 (wxGTK-2.6.3.tar.bz2) = 7c2dfe27a56aa99b4ea557a436bf84a13a579a9d RMD160 (wxGTK-2.6.3.tar.bz2) = d7465860d7c07b42d299d4b4c5d015b25f96a9dd Size (wxGTK-2.6.3.tar.bz2) = 7213119 bytes -SHA1 (wxGTK-2.6.3-libtool.diff.bz2) = 5e1e93f34f031aeb970c5821a19cd57ed7b2013c -RMD160 (wxGTK-2.6.3-libtool.diff.bz2) = 9031bc030bb1c23b1c46bdc43e2282741fcd078a -Size (wxGTK-2.6.3-libtool.diff.bz2) = 136324 bytes +SHA1 (wxGTK-2.6.3-libtool.diff2.bz2) = e79d3efcf21859911d87ab9a7c8e3c90d7455d8c +RMD160 (wxGTK-2.6.3-libtool.diff2.bz2) = 3250c47641c023228e44e6477ecb7aaf68280422 +Size (wxGTK-2.6.3-libtool.diff2.bz2) = 136484 bytes SHA1 (patch-aa) = 159a42a05fe9287931e46bfdd1adfa7cfa9d36a3 SHA1 (patch-ab) = 3e9c6bc0df33e466390a4f6483b1c84e2eb9257b diff --git a/x11/wxGTK/patches/manual-bakefile.diff b/x11/wxGTK/patches/manual-bakefile.diff index acfd038517a..bc3d6cc1a8f 100644 --- a/x11/wxGTK/patches/manual-bakefile.diff +++ b/x11/wxGTK/patches/manual-bakefile.diff @@ -1,7 +1,6 @@ -Binary files ../bakefile-0.2.0.orig/output/msvc6prj.pyc and ./output/msvc6prj.pyc differ -diff -uNr ../bakefile-0.2.0.orig/rules/autoconf.bkl ./rules/autoconf.bkl +diff -uNr ../bakefile-0.2.0.orig/rules/autoconf.bkl rules/autoconf.bkl --- ../bakefile-0.2.0.orig/rules/autoconf.bkl 2006-01-22 23:31:00.000000000 +0000 -+++ ./rules/autoconf.bkl 2006-02-28 18:00:14.000000000 +0000 ++++ rules/autoconf.bkl 2006-07-03 20:34:27.000000000 +0000 @@ -160,61 +160,18 @@ <set var="__linkname1">$(__linkname)</set> @@ -67,9 +66,22 @@ diff -uNr ../bakefile-0.2.0.orig/rules/autoconf.bkl ./rules/autoconf.bkl <set var="__mac_instname">$(__linkname2)</set> -diff -uNr ../bakefile-0.2.0.orig/rules/makefile.bkl ./rules/makefile.bkl +@@ -238,12 +195,6 @@ + <set var="__macinstname" eval="0"> + $(ifthenelse(__mac_instname=='',ref('__targetname',id),ref('__mac_instname',id))) + </set> +- <set var="__macinstnamecmd"> +- <if cond="PLATFORM_MACOSX=='1'"> +- -install_name $(value)/$(__macinstname) +- </if> +- </set> +- <ldflags>$(__macinstnamecmd)</ldflags> + + <modify-target target="install_$(id)"> + <command>(cd $(DESTDIR)$(value) ; $(ref('__so_symlinks_inst_cmd',id)))</command> +diff -uNr ../bakefile-0.2.0.orig/rules/makefile.bkl rules/makefile.bkl --- ../bakefile-0.2.0.orig/rules/makefile.bkl 2005-12-08 10:19:46.000000000 +0000 -+++ ./rules/makefile.bkl 2006-03-20 22:04:43.000000000 +0000 ++++ rules/makefile.bkl 2006-03-20 22:04:43.000000000 +0000 @@ -604,7 +604,7 @@ <define-tag name="install-to" rules="exe"> <modify-target target="install_$(id)"> @@ -107,9 +119,9 @@ diff -uNr ../bakefile-0.2.0.orig/rules/makefile.bkl ./rules/makefile.bkl </command> </modify-target> </define-tag> -diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl ./rules/makefile_defs_gnu.bkl +diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl rules/makefile_defs_gnu.bkl --- ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl 2005-06-16 17:48:03.000000000 +0000 -+++ ./rules/makefile_defs_gnu.bkl 2006-02-28 22:43:14.000000000 +0000 ++++ rules/makefile_defs_gnu.bkl 2006-02-28 22:43:14.000000000 +0000 @@ -37,12 +37,12 @@ <template id="__commands_templ_C"> @@ -125,9 +137,9 @@ diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_gnu.bkl ./rules/makefile_de </set> </template> -diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl ./rules/makefile_defs_unix.bkl +diff -uNr ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl rules/makefile_defs_unix.bkl --- ../bakefile-0.2.0.orig/rules/makefile_defs_unix.bkl 2005-03-13 22:50:03.000000000 +0000 -+++ ./rules/makefile_defs_unix.bkl 2006-03-20 21:30:47.000000000 +0000 ++++ rules/makefile_defs_unix.bkl 2006-03-20 21:30:47.000000000 +0000 @@ -15,20 +15,21 @@ <set var="DIRSEP">/</set> |