diff options
| author | Will Andrews <will@FreeBSD.org> | 2001-03-05 12:17:08 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2001-03-05 12:17:08 +0000 |
| commit | 34849535bebfc5c5d005eca7cd0f98a370f72b8f (patch) | |
| tree | e128e75ec713570fee1d10d4741e8f3ee842bcd9 | |
| parent | 7f69652b20076b42f78d474a9b090aff3c2d59b2 (diff) | |
| download | ports-34849535bebfc5c5d005eca7cd0f98a370f72b8f.tar.gz ports-34849535bebfc5c5d005eca7cd0f98a370f72b8f.zip | |
Attempt to fix conflicts with a local getopt.h (specifically, the fix is
for libgnugetopt's getopt.h). Not tested, but should work.
Notes
Notes:
svn path=/head/; revision=39086
40 files changed, 40 insertions, 40 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/archivers/ark/Makefile +++ b/archivers/ark/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/audio/kdemultimedia2/Makefile b/audio/kdemultimedia2/Makefile index 50c3174949fc..ca5f0709a0b4 100644 --- a/audio/kdemultimedia2/Makefile +++ b/audio/kdemultimedia2/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index 50c3174949fc..ca5f0709a0b4 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/comms/kremotecontrol/Makefile +++ b/comms/kremotecontrol/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/converters/kdesupport2/Makefile b/converters/kdesupport2/Makefile index 628a05204520..78094ac43756 100644 --- a/converters/kdesupport2/Makefile +++ b/converters/kdesupport2/Makefile @@ -27,7 +27,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-extra-libs=${LOCALBASE}/lib \ --without-audiofile CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/deskutils/kcharselect/Makefile +++ b/deskutils/kcharselect/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/games/kdegames2/Makefile b/games/kdegames2/Makefile index 5060b46e15fd..8a6ecc508c1a 100644 --- a/games/kdegames2/Makefile +++ b/games/kdegames2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include" + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 5060b46e15fd..8a6ecc508c1a 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include" + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 5060b46e15fd..8a6ecc508c1a 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" \ - CPPFLAGS="-I${LOCALBASE}/include" + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" USE_GMAKE= yes .include <bsd.port.mk> diff --git a/graphics/kdegraphics2/Makefile b/graphics/kdegraphics2/Makefile index fc87f1816cb6..5cd06a85e3bc 100644 --- a/graphics/kdegraphics2/Makefile +++ b/graphics/kdegraphics2/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index fc87f1816cb6..5cd06a85e3bc 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index fc87f1816cb6..5cd06a85e3bc 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/math/kcalc/Makefile +++ b/math/kcalc/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/misc/kdeutils2/Makefile +++ b/misc/kdeutils2/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/misc/kdeutils4/Makefile +++ b/misc/kdeutils4/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 50c3174949fc..ca5f0709a0b4 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 50c3174949fc..ca5f0709a0b4 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/net/kdenetwork2/Makefile b/net/kdenetwork2/Makefile index c80ace0cbddb..1847c939eb92 100644 --- a/net/kdenetwork2/Makefile +++ b/net/kdenetwork2/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H -D_XOPEN_UNIX" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index c80ace0cbddb..1847c939eb92 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H -D_XOPEN_UNIX" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index c80ace0cbddb..1847c939eb92 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include -D_XOPEN_UNIX" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H -D_XOPEN_UNIX" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/security/kgpg-kde4/Makefile +++ b/security/kgpg-kde4/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/security/kwallet/Makefile +++ b/security/kwallet/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/sysutils/kfloppy/Makefile +++ b/sysutils/kfloppy/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile index 6387bd1efbd7..1833fce21603 100644 --- a/sysutils/sweeper/Makefile +++ b/sysutils/sweeper/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" \ USER_LDFLAGS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile index 4a5fca050001..ed7dfbd8a059 100644 --- a/x11-clocks/kdetoys2/Makefile +++ b/x11-clocks/kdetoys2/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index 4a5fca050001..ed7dfbd8a059 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile index 4a5fca050001..ed7dfbd8a059 100644 --- a/x11-clocks/kdetoys4/Makefile +++ b/x11-clocks/kdetoys4/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= LIBQT="-lqt2" MOC="${MOC}" DO_NOT_COMPILE=mouse LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index a346796a21ee..4beb1235bc5f 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index a346796a21ee..4beb1235bc5f 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index a346796a21ee..4beb1235bc5f 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index a346796a21ee..4beb1235bc5f 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index a346796a21ee..4beb1235bc5f 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index a346796a21ee..4beb1235bc5f 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index a346796a21ee..4beb1235bc5f 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index a346796a21ee..4beb1235bc5f 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-extra-libs=${LOCALBASE}/lib \ --disable-closure CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ - CPPFLAGS="-I${LOCALBASE}/include" \ + CPPFLAGS="-I${LOCALBASE}/include -D_GETOPT_H" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lstdc++ -lgcc" USE_GMAKE= yes diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile index 44b695d2e414..5ba118d06462 100644 --- a/x11/kdelibs2/Makefile +++ b/x11/kdelibs2/Makefile @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 44b695d2e414..5ba118d06462 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 44b695d2e414..5ba118d06462 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -29,7 +29,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include -D_GETOPT_H" \ MOC="${MOC}" LIBQT="-lqt2" LIBQTFILE="libqt2" \ LIBS="-Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg -lgcc -lstdc++" USE_GMAKE= yes |