diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2006-07-18 11:29:23 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2006-07-18 11:29:23 +0000 |
| commit | e99c5fc107c25c2749108979fc6a880e9504e0e8 (patch) | |
| tree | 47e5376d305d321e3eccc88c2acc237a40e89ed9 /graphics/xaralx/files | |
| parent | 5271cfccd2b6c42b2c7b7d46dfdd55a5e935655e (diff) | |
| download | ports-e99c5fc107c25c2749108979fc6a880e9504e0e8.tar.gz ports-e99c5fc107c25c2749108979fc6a880e9504e0e8.zip | |
Notes
Diffstat (limited to 'graphics/xaralx/files')
| -rw-r--r-- | graphics/xaralx/files/patch-PreComp_Makefile.am | 17 | ||||
| -rw-r--r-- | graphics/xaralx/files/patch-configure.in | 31 |
2 files changed, 10 insertions, 38 deletions
diff --git a/graphics/xaralx/files/patch-PreComp_Makefile.am b/graphics/xaralx/files/patch-PreComp_Makefile.am deleted file mode 100644 index 9b4c5e1810ec..000000000000 --- a/graphics/xaralx/files/patch-PreComp_Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ ---- PreComp/Makefile.am.orig Mon Mar 27 09:58:41 2006 -+++ PreComp/Makefile.am Mon Mar 27 09:58:52 2006 -@@ -13,10 +13,10 @@ - camtypes.h.gch: camtypes.h
- if $(CXXCOMPILE) -x c++-header -MT $@ -MD -MP -MF "$(DEPDIR)/camtypes.h.Tpo" -c -o $@ $<; \
- then mv -f "$(DEPDIR)/camtypes.h.Tpo" "$(DEPDIR)/camtypes.h.Po"; else rm -f "$(DEPDIR)/camtypes.h.Tpo"; exit 1; fi
-- make -C ../Kernel clean
-- make -C ../wxXtra clean
-- make -C ../tools clean
-- make -C ../wxOil clean
-+ $(MAKE) -C ../Kernel clean
-+ $(MAKE) -C ../wxXtra clean
-+ $(MAKE) -C ../tools clean
-+ $(MAKE) -C ../wxOil clean
-
-
-
diff --git a/graphics/xaralx/files/patch-configure.in b/graphics/xaralx/files/patch-configure.in index 932bd36803e7..f8934484b3e1 100644 --- a/graphics/xaralx/files/patch-configure.in +++ b/graphics/xaralx/files/patch-configure.in @@ -1,22 +1,11 @@ ---- configure.in.orig Mon Jun 5 15:06:26 2006 -+++ configure.in Mon Jun 5 15:07:19 2006 -@@ -139,7 +139,7 @@ - WX_CPPFLAGS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --cppflags`" - WX_CXXFLAGS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --cxxflags | sed -e 's/-fno-exceptions//'`" - WX_LIBS="`$WXCONFIG --static=$StaticEnable --debug=$DebugEnable --unicode=yes --libs`" -- WXRC="`$WXCONFIG --utility=wxrc`" -+ WXRC="`$WXCONFIG --utility=wxrc-gtk2u`" - - # See if we are running on GTK - WX_GTK="no" -@@ -252,8 +252,8 @@ - fi - - # pass the Pango, FreeType and GTK flags (required for wxGTK font rendering) --CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS" --CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS" -+CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS $CPPFLAGS_APPEND" -+CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS $CPPFLAGS_APPEND" +--- configure.in.orig Tue Jun 6 15:00:31 2006 ++++ configure.in Tue Jun 6 16:43:23 2006 +@@ -173,7 +173,7 @@ - AC_MSG_CHECKING([Linker]) - case $host in + if test "$InternationalEnable" = "yes"; then + AC_MSG_CHECKING([wxWidgets wxrc utility]) +- WXRC="`$WXCONFIG --utility=wxrc`" ++ WXRC="`$WXCONFIG --utility=wxrc-gtk2u`" + + if test "$WXRC" = "" ; then + AC_MSG_RESULT([not found, disabling international build]) |