mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00
Code Issues Releases Activity

- Fix a breakage when at compile time there is a BSD iconv package installed;

Browse Source 
- respect CFLAGS.

Reported by:	*many*
This commit is contained in:
Maxim Sobolev 2001-08-13 12:33:47 +00:00
parent a75ddf1b33
commit 7c11e3f182
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=46180
8 changed files with 80 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/AbiWord/Makefile
View File

@ -37,7 +37,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAKEFILE= GNUmakefile
FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g'
's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \
s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g'
pre-configure:
@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog

18
editors/AbiWord/files/patch-configure.in-v2.13 Normal file
View File

@ -0,0 +1,18 @@
$FreeBSD$
--- configure.in-v2.13.orig Wed Jul 18 01:38:22 2001
+++ configure.in-v2.13 Mon Aug 13 14:47:43 2001
@@ -252,10 +252,10 @@
if test "$PLATFORM" = "unix"; then
if test "$gnome" = "true"; then
- PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
+ PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
PLATFORM_LIBS=
else
- PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS"
+ PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
PLATFORM_LIBS=
fi
fi

3
editors/AbiWord2/Makefile
View File

@ -37,7 +37,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAKEFILE= GNUmakefile
FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g'
's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \
s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g'
pre-configure:
@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog

18
editors/AbiWord2/files/patch-configure.in-v2.13 Normal file
View File

@ -0,0 +1,18 @@
$FreeBSD$
--- configure.in-v2.13.orig Wed Jul 18 01:38:22 2001
+++ configure.in-v2.13 Mon Aug 13 14:47:43 2001
@@ -252,10 +252,10 @@
if test "$PLATFORM" = "unix"; then
if test "$gnome" = "true"; then
- PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
+ PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
PLATFORM_LIBS=
else
- PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS"
+ PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
PLATFORM_LIBS=
fi
fi

3
editors/abiword-devel/Makefile
View File

@ -37,7 +37,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAKEFILE= GNUmakefile
FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g'
's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \
s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g'
pre-configure:
@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog

18
editors/abiword-devel/files/patch-configure.in-v2.13 Normal file
View File

@ -0,0 +1,18 @@
$FreeBSD$
--- configure.in-v2.13.orig Wed Jul 18 01:38:22 2001
+++ configure.in-v2.13 Mon Aug 13 14:47:43 2001
@@ -252,10 +252,10 @@
if test "$PLATFORM" = "unix"; then
if test "$gnome" = "true"; then
- PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
+ PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
PLATFORM_LIBS=
else
- PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS"
+ PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
PLATFORM_LIBS=
fi
fi

3
editors/abiword/Makefile
View File

@ -37,7 +37,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MAKEFILE= GNUmakefile
FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \
's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g'
's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \
s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g'
pre-configure:
@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog

18
editors/abiword/files/patch-configure.in-v2.13 Normal file
View File

@ -0,0 +1,18 @@
$FreeBSD$
--- configure.in-v2.13.orig Wed Jul 18 01:38:22 2001
+++ configure.in-v2.13 Mon Aug 13 14:47:43 2001
@@ -252,10 +252,10 @@
if test "$PLATFORM" = "unix"; then
if test "$gnome" = "true"; then
- PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
+ PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
PLATFORM_LIBS=
else
- PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS"
+ PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS"
PLATFORM_LIBS=
fi
fi