summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordmcmahill <dmcmahill>2004-04-27 21:58:15 +0000
committerdmcmahill <dmcmahill>2004-04-27 21:58:15 +0000
commit964ce70094b349056811636a4276280a32cd6a03 (patch)
tree6bed3a8f947ff6cc6743ed7327a1d3b31d5858bc
parent927d40476f8f76835b45aaa159cfa67754b21bfe (diff)
downloadpkgsrc-964ce70094b349056811636a4276280a32cd6a03.tar.gz
avoid tricking the configure script into thinking we're cross compiling
which breaks compilation if you do not have a cross tool chain installed. Not sure how this ever compiled before...
-rw-r--r--editors/poedit/distinfo4
-rw-r--r--editors/poedit/patches/patch-aa36
-rw-r--r--editors/poedit/patches/patch-ab36
3 files changed, 75 insertions, 1 deletions
diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo
index 23a8b534e87..b59a62bbf2a 100644
--- a/editors/poedit/distinfo
+++ b/editors/poedit/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/03/30 23:20:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/04/27 21:58:15 dmcmahill Exp $
SHA1 (poedit-1.2.5.tar.gz) = 3bcb1009c8687887ae5c53ebebe186bc6c98fb3a
Size (poedit-1.2.5.tar.gz) = 1313243 bytes
+SHA1 (patch-aa) = b581d7d9c0f8a7e9503da04a4574e9b04a235cb3
+SHA1 (patch-ab) = dade8088c126722a4f83bf92b8db96c6410ed690
diff --git a/editors/poedit/patches/patch-aa b/editors/poedit/patches/patch-aa
new file mode 100644
index 00000000000..4fd7d92f27e
--- /dev/null
+++ b/editors/poedit/patches/patch-aa
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.1 2004/04/27 21:58:15 dmcmahill Exp $
+
+--- configure.in.orig Sun Jan 25 22:16:53 2004
++++ configure.in
+@@ -12,19 +12,19 @@ AC_CANONICAL_TARGET
+
+ dnl cross-compiling support: we're cross compiling if the build system is
+ dnl different from the target one (assume host and target be always the same)
+-if test "$build" != "$host" ; then
+- CC=$host_alias-gcc
+- CXX=$host_alias-c++
+- AR=$host_alias-ar
+- RANLIB=$host_alias-ranlib
+- DLLTOOL=$host_alias-dlltool
+- RESCOMP=$host_alias-windres
+- LD=$host_alias-ld
+- NM=$host_alias-nm
+- STRIP=$host_alias-strip
+-else
++#if test "$build" != "$host" ; then
++# CC=$host_alias-gcc
++# CXX=$host_alias-c++
++# AR=$host_alias-ar
++# RANLIB=$host_alias-ranlib
++# DLLTOOL=$host_alias-dlltool
++# RESCOMP=$host_alias-windres
++# LD=$host_alias-ld
++# NM=$host_alias-nm
++# STRIP=$host_alias-strip
++#else
+ RESCOMP=windres
+-fi
++#fi
+
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
diff --git a/editors/poedit/patches/patch-ab b/editors/poedit/patches/patch-ab
new file mode 100644
index 00000000000..7a0eb6dc28c
--- /dev/null
+++ b/editors/poedit/patches/patch-ab
@@ -0,0 +1,36 @@
+$NetBSD: patch-ab,v 1.1 2004/04/27 21:58:15 dmcmahill Exp $
+
+--- configure.orig Sun Jan 25 22:17:58 2004
++++ configure
+@@ -1460,19 +1460,19 @@ test -n "$target_alias" &&
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
+-if test "$build" != "$host" ; then
+- CC=$host_alias-gcc
+- CXX=$host_alias-c++
+- AR=$host_alias-ar
+- RANLIB=$host_alias-ranlib
+- DLLTOOL=$host_alias-dlltool
+- RESCOMP=$host_alias-windres
+- LD=$host_alias-ld
+- NM=$host_alias-nm
+- STRIP=$host_alias-strip
+-else
++#if test "$build" != "$host" ; then
++# CC=$host_alias-gcc
++# CXX=$host_alias-c++
++# AR=$host_alias-ar
++# RANLIB=$host_alias-ranlib
++# DLLTOOL=$host_alias-dlltool
++# RESCOMP=$host_alias-windres
++# LD=$host_alias-ld
++# NM=$host_alias-nm
++# STRIP=$host_alias-strip
++#else
+ RESCOMP=windres
+-fi
++#fi
+
+ am__api_version="1.7"
+ # Find a good install program. We prefer a C program (faster),