From be54d47d8c928327b44dcb81a563ac61bbda13ad Mon Sep 17 00:00:00 2001 From: pvalchev Date: Fri, 28 Sep 2001 06:02:12 +0000 Subject: [PATCH] CONFIGURE_STYLE=gnu w/ proper MODGNU_CONFIG_GUESS_DIRS needed for the powerpc -> macppc name change --- archivers/lzop/Makefile | 4 +++- astro/kstars/Makefile | 4 +++- audio/knapster/Makefile | 4 +++- converters/libiconv/Makefile | 3 ++- databases/mysql/Makefile | 4 +++- databases/sqsh/Makefile | 3 ++- devel/ddd/Makefile | 3 ++- devel/lam/Makefile | 3 ++- devel/libsigc++/Makefile | 3 ++- devel/libslang/Makefile | 3 ++- devel/mico/Makefile | 4 +++- devel/sdl/Makefile | 3 ++- devel/swig/Makefile | 3 ++- devel/t1lib/Makefile | 3 ++- editors/kxmleditor/Makefile | 3 ++- editors/nvi-m17n/Makefile | 3 ++- emulators/frodo/Makefile | 3 ++- games/heroes/Makefile | 3 ++- graphics/kuickshow/Makefile | 3 ++- lang/egcs/dejagnu/Makefile | 3 ++- lang/egcs/stable/Makefile | 3 ++- lang/erlang/Makefile | 6 ++++-- mail/hypermail/Makefile | 3 ++- mail/kbiff/Makefile | 3 ++- math/grace/Makefile | 3 ++- math/octave/Makefile | 3 ++- misc/amanda/Makefile | 3 ++- misc/cdrdao/Makefile | 3 ++- misc/ktail/Makefile | 3 ++- misc/rpm/Makefile | 3 ++- net/irc/Makefile | 3 ++- net/kmago/Makefile | 3 ++- net/kxicq2/Makefile | 3 ++- net/nmap/Makefile | 3 ++- net/rrdtool/Makefile | 3 ++- net/yafc/Makefile | 3 ++- print/a2ps/Makefile | 3 ++- print/lyx/Makefile | 3 ++- print/pdflib/Makefile | 3 ++- print/teTeX/base/Makefile | 3 ++- security/cyrus-sasl/Makefile | 3 ++- security/fragrouter/Makefile | 3 ++- security/gnupg/Makefile | 3 ++- security/nessus/Makefile | 3 ++- security/pgp5/Makefile | 3 ++- shells/bash2/Makefile | 3 ++- sysutils/xosview/Makefile | 3 ++- textproc/expat/Makefile | 3 ++- textproc/sablotron/Makefile | 3 ++- www/amaya/browser/Makefile | 3 ++- www/cgicc/Makefile | 3 ++- www/squid/Makefile | 3 ++- x11/gtkmm/Makefile | 3 ++- x11/kde/artwork2/Makefile | 3 ++- x11/kde/base2/Makefile | 3 ++- x11/kde/games2/Makefile | 3 ++- x11/kde/graphics2/Makefile | 3 ++- x11/kde/kdoc2/Makefile | 3 ++- x11/kde/libs2/Makefile | 4 +++- x11/kde/mosfet-liquid/Makefile | 3 ++- x11/kde/office2/Makefile | 3 ++- x11/kde/toys2/Makefile | 3 ++- x11/lesstif/Makefile | 3 ++- x11/paragui/Makefile | 3 ++- x11/rclock/Makefile | 3 ++- x11/rxvt/Makefile | 3 ++- x11/sawfish/Makefile | 3 ++- x11/xdaliclock/Makefile | 3 ++- 68 files changed, 144 insertions(+), 69 deletions(-) diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile index 80491a7a727..4042b68837e 100644 --- a/archivers/lzop/Makefile +++ b/archivers/lzop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2001/04/20 17:35:34 brad Exp $ +# $OpenBSD: Makefile,v 1.9 2001/09/28 06:02:12 pvalchev Exp $ # $FreeBSD: ports/archivers/lzop/Makefile,v 1.3 2000/06/22 05:51:49 will Exp $ COMMENT= "fast file compressor similar to gzip" @@ -24,4 +24,6 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/acconfig + .include diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index 3a932938f3f..8cb4271802e 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2001/09/12 11:43:28 kevlo Exp $ +# $OpenBSD: Makefile,v 1.2 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "desktop planetarium" @@ -35,4 +35,6 @@ CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${LOCALBASE} +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin + .include diff --git a/audio/knapster/Makefile b/audio/knapster/Makefile index 53dedebfb64..cdebf3d7812 100644 --- a/audio/knapster/Makefile +++ b/audio/knapster/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2001/06/14 11:41:12 lebel Exp $ +# $OpenBSD: Makefile,v 1.10 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "Napster client for KDE 2" VERSION= 0.3 @@ -31,6 +31,8 @@ CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include CONFIGURE_ENV= MOC=${LOCALBASE}/bin/moc2 +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin + pre-build: @echo "" @echo "*** WARNING: you may see an error such as" diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index a52dfacdba4..ea1def801fb 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/09/23 03:08:50 brad Exp $ +# $OpenBSD: Makefile,v 1.7 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "character set conversion library" @@ -19,6 +19,7 @@ PERMIT_DISTFILES_FTP= Yes SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf ${WRKSRC}/libcharset/autoconf CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --enable-static diff --git a/databases/mysql/Makefile b/databases/mysql/Makefile index 2b81d7cf808..d833e46400a 100644 --- a/databases/mysql/Makefile +++ b/databases/mysql/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2001/09/10 02:59:35 brad Exp $ +# $OpenBSD: Makefile,v 1.56 2001/09/28 06:02:13 pvalchev Exp $ # $FreeBSD: Makefile,v 1.44 1999/03/04 21:27:58 dirk Exp $ # Uses pthreads @@ -49,6 +49,8 @@ CONFIGURE_ARGS+= --enable-static \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/pth" \ LDFLAGS="-L${LOCALBASE}/lib/pth" +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/mit-pthreads/config + FLAVORS= max FLAVOR?= diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 1501468e033..6bffd89e422 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/09/15 23:26:38 jcs Exp $ +# $OpenBSD: Makefile,v 1.3 2001/09/28 06:02:13 pvalchev Exp $ DISTNAME= sqsh-1.7 CATEGORIES= databases shells @@ -20,6 +20,7 @@ LIB_DEPENDS= intl.1::devel/gettext \ tds.0::databases/freetds CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ SYBASE="${LOCALBASE}" diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index 104794bbe96..45b4e946812 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2001/05/06 00:12:57 lebel Exp $ +# $OpenBSD: Makefile,v 1.27 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "Data Display Debugger, graphical front-end for GDB, etc" @@ -20,6 +20,7 @@ PERMIT_DISTFILES_FTP= Yes USE_MOTIF= any USE_GMAKE= Yes CONFIGURE_STYLE=gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/libiberty ${WRKSRC}/readline/support CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ INSTALL_DATA="${INSTALL_DATA}" diff --git a/devel/lam/Makefile b/devel/lam/Makefile index 8e79b66199d..96c748ea86c 100644 --- a/devel/lam/Makefile +++ b/devel/lam/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/04/13 20:29:14 todd Exp $ +# $OpenBSD: Makefile,v 1.7 2001/09/28 06:02:13 pvalchev Exp $ # Original from: Yannick Cote DISTNAME= lam-6.5.1 @@ -23,6 +23,7 @@ MASTER_SITE_SUBDIR= files HOMEPAGE= http://www.lam-mpi.org/ CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config ${WRKSRC}/mpi2c++ CONFIGURE_ARGS+= --with-rsh="ssh -x" .include diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index 80f0fdc6d6d..41d6a425422 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/06/20 11:12:34 shell Exp $ +# $OpenBSD: Makefile,v 1.5 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "callback framework for C++" @@ -17,6 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/scripts DOCFILE= API FAQ UML conventions diagrams marshal \ powerusers requirements riscos signals diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 51d6e866650..5f750ff355c 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2001/05/11 23:19:53 drahn Exp $ +# $OpenBSD: Makefile,v 1.30 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "stack-based interpreter for terminal applications" @@ -19,6 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf test: build @cd ${WRKSRC} && ${MAKE} runtests diff --git a/devel/mico/Makefile b/devel/mico/Makefile index 3a72fb4eed6..e516b268a42 100644 --- a/devel/mico/Makefile +++ b/devel/mico/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2001/06/28 19:59:03 shell Exp $ +# $OpenBSD: Makefile,v 1.2 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "free and complete CORBA-compliant implementation" @@ -19,6 +19,8 @@ PERMIT_DISTFILES_FTP= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin + FAKE_FLAGS= prefix="${WRKINST}${PREFIX}" WRKDIST= ${WRKDIR}/mico diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile index ae70df93dec..f4b1985b8b7 100644 --- a/devel/sdl/Makefile +++ b/devel/sdl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2001/08/30 02:24:52 brad Exp $ +# $OpenBSD: Makefile,v 1.18 2001/09/28 06:02:13 pvalchev Exp $ # Uses pthreads COMMENT= "cross-platform multimedia library" @@ -28,6 +28,7 @@ USE_GMAKE= Yes SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/test CONFIGURE_ENV+= X11BASE="${X11BASE}" CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --disable-pthread-sem \ diff --git a/devel/swig/Makefile b/devel/swig/Makefile index 6169d892a1f..6501865e21c 100644 --- a/devel/swig/Makefile +++ b/devel/swig/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2001/09/02 13:53:34 kevlo Exp $ +# $OpenBSD: Makefile,v 1.20 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "simplified wrapper and interface generator" COMMENT-examples= "examples for swig" @@ -34,6 +34,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-tclincl=${LOCALBASE}/include/tcl8.3 \ --with-tcllib==${LOCALBASE}/lib/tcl8.3 \ --with-guilelib=${LOCALBASE}/lib +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/Tools ALL_TARGET= swig runtime diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile index cc523bce89a..5254a56fd71 100644 --- a/devel/t1lib/Makefile +++ b/devel/t1lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/08/28 01:03:00 brad Exp $ +# $OpenBSD: Makefile,v 1.7 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "Type 1 rasterizer library for UNIX/X11" @@ -23,6 +23,7 @@ USE_GMAKE= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --enable-static +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/ac-tools ALL_TARGET= without_doc diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile index c5f9628dec2..31e30d53bd6 100644 --- a/editors/kxmleditor/Makefile +++ b/editors/kxmleditor/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/09/12 07:08:22 kevlo Exp $ +# $OpenBSD: Makefile,v 1.5 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "xml editor for KDE" @@ -34,5 +34,6 @@ CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${LOCALBASE} +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin .include diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile index 26796cf239f..e6b7e5cf02f 100644 --- a/editors/nvi-m17n/Makefile +++ b/editors/nvi-m17n/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2001/09/11 22:36:34 heko Exp $ +# $OpenBSD: Makefile,v 1.15 2001/09/28 06:02:13 pvalchev Exp $ # NetBSD: Makefile,v 1.6 2000/01/19 12:28:44 hubertf Exp # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp @@ -28,6 +28,7 @@ FLAVOR?= PATCH_DIST_STRIP=-p1 WRKSRC= ${WRKDIR}/${DISTNAME}/build CONFIGURE_STYLE=gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build CONFIGURE_ENV= OPTFLAG='-D_PATH_SYSEXRC=\"/etc/vi.exrc\"' CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n --host=${ARCH}-unknown-netbsd diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile index 9e9d9f6c384..083831837ee 100644 --- a/emulators/frodo/Makefile +++ b/emulators/frodo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/07/25 11:50:14 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "Commodore 64 emulator" @@ -21,6 +21,7 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_CDROM= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/Frodo/Src USE_X11= Yes RUN_DEPENDS= ${WISH}::x11/tk/8.3 diff --git a/games/heroes/Makefile b/games/heroes/Makefile index 9ece319b67d..dca5172df53 100644 --- a/games/heroes/Makefile +++ b/games/heroes/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/09/23 06:57:14 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.5 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "graphically improved game of yore" @@ -65,6 +65,7 @@ CONFIGURE_ARGS+= --without-ggi SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/tools CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS+= --disable-optimizations \ diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile index a614ba881b1..bfa94952074 100644 --- a/graphics/kuickshow/Makefile +++ b/graphics/kuickshow/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/08/02 13:54:52 kevlo Exp $ +# $OpenBSD: Makefile,v 1.3 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "image viewer similar to ACDSee for Windows" @@ -29,6 +29,7 @@ MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2' USE_GMAKE= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2 CONFIGURE_ARGS+= --with-qt-libraries=${LOCALBASE}/lib/qt2 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib diff --git a/lang/egcs/dejagnu/Makefile b/lang/egcs/dejagnu/Makefile index 3a0cc1eea6d..d04ae0e67bb 100644 --- a/lang/egcs/dejagnu/Makefile +++ b/lang/egcs/dejagnu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/05/06 01:27:54 lebel Exp $ +# $OpenBSD: Makefile,v 1.7 2001/09/28 06:02:13 pvalchev Exp $ COMMENT= "dejagnu snapshot, needed for gcc" @@ -20,6 +20,7 @@ WRKSRC=${WRKDIST}/dejagnu CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --with-tclinclude=${PREFIX}/include/tcl8.3/generic \ --with-tkinclude=${PREFIX}/include/tk8.3/generic +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/dejagnu post-extract: @rm -rf ${WRKSRC}/{expect,tcl} diff --git a/lang/egcs/stable/Makefile b/lang/egcs/stable/Makefile index 233d44b4289..6985dd35f56 100644 --- a/lang/egcs/stable/Makefile +++ b/lang/egcs/stable/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.48 2001/09/15 11:51:35 espie Exp $ +# $OpenBSD: Makefile,v 1.49 2001/09/28 06:02:13 pvalchev Exp $ # This is a configuration file for egcs @@ -178,6 +178,7 @@ post-patch: # snapshot, you know what you're doing, don't you ? CONFIGURE_STYLE= gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/gcc #CONFIGURE_SCRIPT=../source/configure diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index 6db21e14bda..7ceabd82535 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2001/05/06 01:27:55 lebel Exp $ +# $OpenBSD: Makefile,v 1.10 2001/09/28 06:02:14 pvalchev Exp $ # COMMENT= "Ericsson's high-level functional programming language" -DISTNAME= erlang-47.4.0 +VERSION= 47.4.0 +DISTNAME= erlang-${VERSION} CATEGORIES= lang NEED_VERSION= 1.402 FAKE=No @@ -21,6 +22,7 @@ EXTRACT_SUFX= .base.tar.gz USE_GMAKE= Yes CONFIGURE_STYLE= autoconf +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/erts-${VERSION}/autoconf ALL_TARGET= emulator new_libraries diff --git a/mail/hypermail/Makefile b/mail/hypermail/Makefile index 19619e9d019..90feec417dc 100644 --- a/mail/hypermail/Makefile +++ b/mail/hypermail/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.3 2000/01/10 14:35:22 hubertf Exp $ # $FreeBSD: ports/www/hypermail/Makefile,v 1.4 1999/08/31 02:42:53 peter Exp $ -# $OpenBSD: Makefile,v 1.9 2001/07/30 13:04:26 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "generate a cross-referenced HTML mail archive" @@ -21,6 +21,7 @@ PERMIT_DISTFILES_FTP= Yes MAINTAINER= Oleg Safiullin CONFIGURE_STYLE=gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/src/pcre CONFIGURE_ARGS= --with-htmldir=${PREFIX}/share/doc/hypermail COPTS= -DWITHOUT_TRIO -Dtrio_snprintf=snprintf \ diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile index 672f5096647..852650b450e 100644 --- a/mail/kbiff/Makefile +++ b/mail/kbiff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/08/06 03:24:45 lebel Exp $ +# $OpenBSD: Makefile,v 1.6 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "new mail notification utility" @@ -26,6 +26,7 @@ MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2' USE_X11= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2 CONFIGURE_ARGS+= --with-qt-libraries=${LOCALBASE}/lib/qt2 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib diff --git a/math/grace/Makefile b/math/grace/Makefile index 745b1c70cb1..a1ecbc6b559 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2001/07/13 18:53:55 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.2 2001/09/28 06:02:14 pvalchev Exp $ # $FreeBSD: ports/math/grace/Makefile,v 1.18 2001/04/25 05:59:19 lkoeller Exp $ # Original from: Lars Koeller @@ -25,6 +25,7 @@ MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/grace/src/ \ FAKE_FLAGS= GRACE_HOME=${WRKINST}${PREFIX}/grace CONFIGURE_STYLE= gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/ac-tools CONFIGURE_ARGS+= --with-bundled-xbae \ --with-extra-incpath=${LOCALBASE}/include \ --with-extra-ldpath=${LOCALBASE}/lib \ diff --git a/math/octave/Makefile b/math/octave/Makefile index c0f5ea0b0d2..a2de7ca2e95 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/09/12 23:59:20 naddy Exp $ +# $OpenBSD: Makefile,v 1.3 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "High-level language for numerical computations" VERSION= 2.0.16 @@ -25,6 +25,7 @@ RUN_DEPENDS= gnuplot:gnuplot-*:math/gnuplot USE_GMAKE= Yes CONFIGURE_STYLE= gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/kpathsea ${WRKSRC}/readline ${WRKSRC}/readline/support CONFIGURE_ARGS= ${CONFIGURE_SHARED} ${GCCARCH} CONFIGURE_ENV= FFLAGS="${FFLAGS}" SOREV="${SHLIB_VER}" diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile index 9a68b062a71..8a693da41ca 100644 --- a/misc/amanda/Makefile +++ b/misc/amanda/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2001/05/12 16:41:08 naddy Exp $ +# $OpenBSD: Makefile,v 1.18 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "network-capable tape backup (client and tape server)" COMMENT-client= "network-capable tape backup (client only)" @@ -55,6 +55,7 @@ MULTI_PACKAGES= -client USE_GMAKE= Yes CONFIGURE_STYLE=gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config # Because Amanda does not conform to shared library naming standards, # and knowing that no software outside of Amanda attempts to use the diff --git a/misc/cdrdao/Makefile b/misc/cdrdao/Makefile index cace39a1e50..af961392457 100644 --- a/misc/cdrdao/Makefile +++ b/misc/cdrdao/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2001/05/10 03:21:59 fgsch Exp $ +# $OpenBSD: Makefile,v 1.12 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "write audio/data CD-Rs in disk-at-once mode" @@ -22,6 +22,7 @@ BUILD_DEPENDS= ${PREFIX}/bin/antlr::devel/pccts USE_GMAKE= Yes CONFIGURE_STYLE= autoconf dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/paranoia ${WRKSRC}/scsilib CONFIGURE_ARGS+= --with-posix-threads=no post-install: diff --git a/misc/ktail/Makefile b/misc/ktail/Makefile index 7ae3ff49293..a33a9855b42 100644 --- a/misc/ktail/Makefile +++ b/misc/ktail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/08/02 13:54:57 kevlo Exp $ +# $OpenBSD: Makefile,v 1.3 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "file monitor" @@ -24,6 +24,7 @@ MAKE_ENV= ${CONFIGURE_ENV} MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2' CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2 CONFIGURE_ARGS+= --with-qt-libraries=${LOCALBASE}/lib/qt2 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 62a3e4e5a49..52cadf56a38 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2001/09/23 19:27:15 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "redhat package manager" @@ -22,6 +22,7 @@ LIB_DEPENDS+= intl.::devel/gettext LIB_DEPENDS+= popt.0.::devel/popt CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/popt # Enforce check for pgp, so no build-time depend is needed CONFIGURE_ENV= PGPBIN=$(LOCALBASE)/bin/pgp diff --git a/net/irc/Makefile b/net/irc/Makefile index 3b03db03586..7e6ff5741cc 100644 --- a/net/irc/Makefile +++ b/net/irc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2001/04/20 07:31:35 bmc Exp $ +# $OpenBSD: Makefile,v 1.20 2001/09/28 06:02:14 pvalchev Exp $ # $FreeBSD: Makefile,v 1.19 1998/12/09 20:15:29 billf Exp $ COMMENT= "internet relay chat (irc) server" @@ -20,6 +20,7 @@ PERMIT_DISTFILES_FTP= Yes SYSCONFDIR= /etc/ircd CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/support CONFIGURE_ARGS= --logdir="/var/log/ircd" \ --localstatedir="/var/run" \ diff --git a/net/kmago/Makefile b/net/kmago/Makefile index 2d87ea51dc4..3a3d72facdc 100644 --- a/net/kmago/Makefile +++ b/net/kmago/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/08/02 13:54:54 kevlo Exp $ +# $OpenBSD: Makefile,v 1.6 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "download manager for KDE" @@ -27,6 +27,7 @@ MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2' USE_GMAKE= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2 CONFIGURE_ARGS+= --with-qt-libraries=${LOCALBASE}/lib/qt2 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib diff --git a/net/kxicq2/Makefile b/net/kxicq2/Makefile index e585efab9e0..3d7a40523a5 100644 --- a/net/kxicq2/Makefile +++ b/net/kxicq2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2001/07/15 09:28:29 kevlo Exp $ +# $OpenBSD: Makefile,v 1.2 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "ICQ client for KDE" @@ -26,6 +26,7 @@ MAKE_ENV= ${CONFIGURE_ENV} MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2' CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2 CONFIGURE_ARGS+= --with-qt-libraries=${LOCALBASE}/lib/qt2 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib diff --git a/net/nmap/Makefile b/net/nmap/Makefile index a2fcc40a5ed..e92b9089a90 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.37 2001/06/05 11:27:56 bmc Exp $ +# $OpenBSD: Makefile,v 1.38 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "port scanning large networks" @@ -19,6 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/nbase ${WRKSRC}/libpcap-possiblymodified FLAVORS= no_x11 FLAVOR?= diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile index cac0ee3413e..1191adef4de 100644 --- a/net/rrdtool/Makefile +++ b/net/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2001/04/06 15:04:13 danh Exp $ +# $OpenBSD: Makefile,v 1.15 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "system to store and display time-series data" @@ -25,6 +25,7 @@ FLAVORS= tcl FLAVOR?= CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config ${WRKSRC}/contrib/php4 CONFIGURE_ARGS+= ${CONFIGURE_SHARED} --enable-static .if ${FLAVOR:L:Mtcl} diff --git a/net/yafc/Makefile b/net/yafc/Makefile index 933074c29ac..975a46ac962 100644 --- a/net/yafc/Makefile +++ b/net/yafc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2001/08/11 00:53:58 avsm Exp $ +# $OpenBSD: Makefile,v 1.10 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "powerful console ftp client with many features" @@ -18,6 +18,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/support CONFIGURE_ARGS= --with-readline --with-catgets DOCS= NEWS README TODO diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index 8eec8795cb7..dc8770f8cd6 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2001/05/06 03:19:44 lebel Exp $ +# $OpenBSD: Makefile,v 1.27 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "format ascii files for printing on PostScript printers" @@ -20,6 +20,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ftp://ftp.enst.fr/pub/unix/a2ps/ CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/auxdir FLAVORS= a4 letter letterdj FLAVOR?= letter diff --git a/print/lyx/Makefile b/print/lyx/Makefile index f20195b85ee..5eb86e8d6ba 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2001/08/10 04:49:22 obecian Exp $ +# $OpenBSD: Makefile,v 1.20 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "graphical frontend for LaTeX (nearly WYSIWYG)" @@ -27,6 +27,7 @@ RUN_DEPENDS= latex::print/teTeX/base \ LIB_DEPENDS= xforms::x11/xforms CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config STRIP= CONFIGURE_ARGS+=--with-extra-lib=${LOCALBASE}/lib \ --with-extra-inc="${LOCALBASE}/include \ diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile index 7fc3c89aaf4..4b0ec3186f0 100644 --- a/print/pdflib/Makefile +++ b/print/pdflib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/09/11 13:54:35 jakob Exp $ +# $OpenBSD: Makefile,v 1.6 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "C library to produce PDF files" @@ -22,6 +22,7 @@ LIB_DEPENDS= jpeg.62::graphics/jpeg \ tiff.35::graphics/tiff CONFIGURE_STYLE= gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --with-tifflib \ --with-pnglib \ diff --git a/print/teTeX/base/Makefile b/print/teTeX/base/Makefile index e46df7439b7..7f3a11920cd 100644 --- a/print/teTeX/base/Makefile +++ b/print/teTeX/base/Makefile @@ -1,6 +1,6 @@ # Whom: Angelos D. Keromytis # -# $OpenBSD: Makefile,v 1.13 2001/05/24 02:28:23 kevlo Exp $ +# $OpenBSD: Makefile,v 1.14 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "TeX distribution, executables" @@ -33,6 +33,7 @@ LIB_DEPENDS= png.2::graphics/png PNGDIR=${PREFIX} CONFIGURE_STYLE=gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/texk ${WRKSRC}/config ${WRKSRC}/libs/ncurses ${WRKSRC}/texinfo ${WRKSRC} CONFIGURE_ARGS= --disable-multiplatform --without-texinfo \ --with-system-ncurses --with-system-zlib --with-system-pnglib \ --with-pnglib-libdir=${PNGDIR}/lib --with-pnglib-include=${PNGDIR}/include diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index b575e9a1277..65cefafb74d 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2001/03/25 18:17:19 jakob Exp $ +# $OpenBSD: Makefile,v 1.11 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "RFC 2222 SASL (Simple Authentication and Security Layer)" @@ -20,6 +20,7 @@ PERMIT_DISTFILES_FTP= yes SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --enable-static \ --enable-login \ diff --git a/security/fragrouter/Makefile b/security/fragrouter/Makefile index 3c55691a316..2b56f49743c 100644 --- a/security/fragrouter/Makefile +++ b/security/fragrouter/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2001/08/07 22:07:38 dugsong Exp $ +# $OpenBSD: Makefile,v 1.16 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "tool for testing network IDS implementations" @@ -18,6 +18,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/libpcap-0.4 ${WRKSRC}/Libnet-0.99b do-install: ${INSTALL_PROGRAM} ${WRKSRC}/fragrouter ${PREFIX}/sbin diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 4c757f7cc3a..d243e316c78 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2001/07/12 16:07:17 reinhard Exp $ +# $OpenBSD: Makefile,v 1.32 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= 'GNU privacy guard - a free PGP replacement' @@ -40,6 +40,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/scripts CONFIGURE_ARGS= --with-included-gettext FLAVORS= idea diff --git a/security/nessus/Makefile b/security/nessus/Makefile index 01ebc43afb4..be653060dee 100644 --- a/security/nessus/Makefile +++ b/security/nessus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2001/07/03 07:57:46 reinhard Exp $ +# $OpenBSD: Makefile,v 1.25 2001/09/28 06:02:14 pvalchev Exp $ COMMENT= "network security scanner" @@ -47,6 +47,7 @@ FLAVOR?= # Can't do CONFIGURE_STYLE=autoconf because of configure wrapper # that builds each tarball in succession. CONFIGURE_STYLE=gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/nessus-core ${WRKSRC}/nessus-plugins ${WRKSRC}/libnasl ${WRKSRC}/nessus-libraries/libpcap-nessus ${WRKSRC}/nessus-libraries/libpeks/gmp3 ${WRKSRC}/nessus-libraries/libpeks ${WRKSRC}/nessus-libraries CONFIGURE_ARGS+=--localstatedir=/var --enable-gmp=${LOCALBASE} \ --disable-nessuspcap diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile index 22ef83d6ab4..7a5905462cd 100644 --- a/security/pgp5/Makefile +++ b/security/pgp5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2001/05/08 06:20:49 marc Exp $ +# $OpenBSD: Makefile,v 1.27 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "Pretty Good Privacy 5.0i (world wide use)" @@ -31,6 +31,7 @@ PERMIT_DISTFILES_CDROM= "no commercial use" PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config WRKDIST= ${WRKDIR}/pgp50i/src diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index b6448a748b7..2c8265a9c04 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2001/04/10 15:32:55 naddy Exp $ +# $OpenBSD: Makefile,v 1.21 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "GNU Bourne Again Shell" @@ -21,6 +21,7 @@ FLAVORS= static FLAVOR?= CONFIGURE_STYLE= gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/support .if ${FLAVOR:L} == "static" CONFIGURE_ARGS= --enable-static-link diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 1cda13b662d..bd48babb745 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2001/08/17 12:28:37 form Exp $ +# $OpenBSD: Makefile,v 1.24 2001/09/28 06:02:15 pvalchev Exp $ # $NetBSD: Makefile,v 1.9 1998/04/15 10:38:50 agc Exp $ COMMENT= "graphical performance meter" @@ -19,6 +19,7 @@ PERMIT_DISTFILES_FTP= Yes USE_X11= Yes CONFIGURE_STYLE=gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/config CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib" \ UVM=Yes diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile index 4a3f2cd1795..699b0724ee5 100644 --- a/textproc/expat/Makefile +++ b/textproc/expat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2001/05/06 04:11:41 lebel Exp $ +# $OpenBSD: Makefile,v 1.14 2001/09/28 06:02:15 pvalchev Exp $ # $FreeBSD: Makefile,v 1.2 1999/08/31 02:09:14 peter Exp $ COMMENT= "XML 1.0 parser written in C" @@ -19,6 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/conftools CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --enable-static diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index de877cb0635..86cfe699c2f 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2001/09/24 18:16:28 brad Exp $ +# $OpenBSD: Makefile,v 1.11 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "fast, compact and portable XSL/XSLT processor" @@ -24,6 +24,7 @@ LIB_DEPENDS= expat.2::textproc/expat USE_GMAKE= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/tools CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/amaya/browser/Makefile b/www/amaya/browser/Makefile index aefecbd2b99..8a77c605872 100644 --- a/www/amaya/browser/Makefile +++ b/www/amaya/browser/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/05/06 04:22:45 lebel Exp $ +# $OpenBSD: Makefile,v 1.7 2001/09/28 06:02:15 pvalchev Exp $ # Original from: Bruno Rohee # # Many variables moved to ../Makefile.inc @@ -19,6 +19,7 @@ WRKBUILD= ${WRKSRC}/obj USE_GMAKE= Yes CONFIGURE_STYLE= gnu dest +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/../libwww/config CONFIGURE_SCRIPT= ../configure pre-install: diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile index 1e42e05592a..c198a318008 100644 --- a/www/cgicc/Makefile +++ b/www/cgicc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2001/07/25 03:03:31 shell Exp $ +# $OpenBSD: Makefile,v 1.2 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "c++ compliant CGI applications libraries" @@ -20,5 +20,6 @@ PERMIT_DISTFILES_FTP= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-static +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/example ${WRKSRC}/support .include diff --git a/www/squid/Makefile b/www/squid/Makefile index 594ec02e193..24a6b7e0ab5 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2001/08/30 02:24:52 brad Exp $ +# $OpenBSD: Makefile,v 1.36 2001/09/28 06:02:15 pvalchev Exp $ # Uses pthreads (can but does not at the moment) COMMENT= "WWW and FTP proxy cache and accelerator" @@ -26,6 +26,7 @@ STATEDIR?= /var/squid SUBST_VARS= STATEDIR CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/cfgaux CONFIGURE_ARGS= --localstatedir="${STATEDIR}" \ --enable-heap-replacement diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile index 64b8d3d428a..f29da4790f9 100644 --- a/x11/gtkmm/Makefile +++ b/x11/gtkmm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/07/09 17:11:08 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.6 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "C++ interface for gtk+" @@ -23,5 +23,6 @@ USE_X11= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/scripts .include diff --git a/x11/kde/artwork2/Makefile b/x11/kde/artwork2/Makefile index 8151ff363a4..ef69eaff0d3 100644 --- a/x11/kde/artwork2/Makefile +++ b/x11/kde/artwork2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2001/09/27 10:54:59 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "X11 toolkit, additional artwork" CATEGORIES= x11 x11/kde @@ -23,6 +23,7 @@ LIB_DEPENDS= kdecore.3::x11/kde/libs2 BUILD_DEPENDS+= :zsh-*:shells/zsh/stable CONFIGURE_STYLE= autoconf +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include diff --git a/x11/kde/base2/Makefile b/x11/kde/base2/Makefile index 433de539166..98befc2e28d 100644 --- a/x11/kde/base2/Makefile +++ b/x11/kde/base2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2001/09/27 10:54:59 espie Exp $ +# $OpenBSD: Makefile,v 1.28 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "X11 toolkit, basic applications" COMMENT-plugins= "X11 toolkit, netscape plugins" @@ -34,6 +34,7 @@ LIB_DEPENDS= kdecore.3,kdeui::x11/kde/libs2 \ BUILD_DEPENDS= ::x11/qt2-designer :zsh-*:shells/zsh/stable ::audio/lame CONFIGURE_STYLE= autoconf +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include diff --git a/x11/kde/games2/Makefile b/x11/kde/games2/Makefile index 1f0595dab91..3e0b03a1017 100644 --- a/x11/kde/games2/Makefile +++ b/x11/kde/games2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2001/09/27 10:54:59 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= games for KDE COMMENT-cards= faces for kde card games @@ -46,6 +46,7 @@ LIB_DEPENDS= kdecore.3::x11/kde/libs2 BUILD_DEPENDS= ::x11/qt2-designer :zsh-*:shells/zsh/stable CONFIGURE_STYLE= autoconf +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2 CONFIGURE_ARGS+= --with-qt-libraries=${LOCALBASE}/lib/qt2 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib diff --git a/x11/kde/graphics2/Makefile b/x11/kde/graphics2/Makefile index 46c760a237f..d11dfea2b0b 100644 --- a/x11/kde/graphics2/Makefile +++ b/x11/kde/graphics2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2001/09/27 10:54:59 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "X11 toolkit, graphics applications" CATEGORIES= x11 x11/kde @@ -18,6 +18,7 @@ LIB_DEPENDS= kdecore.3::x11/kde/libs2 BUILD_DEPENDS= ::x11/qt2-designer :zsh-*:shells/zsh/stable CONFIGURE_STYLE= autoconf +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include diff --git a/x11/kde/kdoc2/Makefile b/x11/kde/kdoc2/Makefile index 1ddf5bdc258..2b900e356cf 100644 --- a/x11/kde/kdoc2/Makefile +++ b/x11/kde/kdoc2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2001/09/19 15:20:12 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "embedded documentation in C++" CATEGORIES= x11 x11/kde devel @@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${VERSION}/src/ EXTRACT_SUFX= .tar.bz2 CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin # GPL PERMIT_DISTFILES_CDROM= Yes diff --git a/x11/kde/libs2/Makefile b/x11/kde/libs2/Makefile index 6350422e3ac..0648a5d7662 100644 --- a/x11/kde/libs2/Makefile +++ b/x11/kde/libs2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2001/09/27 10:52:15 espie Exp $ +# $OpenBSD: Makefile,v 1.27 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "X11 toolkit, libraries" CATEGORIES= x11 x11/kde @@ -31,6 +31,8 @@ BUILD_DEPENDS= :zsh-*:shells/zsh/stable ::x11/qt2,-html # qt docs # CUPS +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin + CONFIGURE_STYLE= autoconf CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib diff --git a/x11/kde/mosfet-liquid/Makefile b/x11/kde/mosfet-liquid/Makefile index 486a09ff164..c4d6e9b795b 100644 --- a/x11/kde/mosfet-liquid/Makefile +++ b/x11/kde/mosfet-liquid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2001/09/27 10:55:00 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2001/09/28 06:02:15 pvalchev Exp $ V=0.5.1 CATEGORIES= x11 x11/kde NEED_VERSION= 1.461 @@ -28,6 +28,7 @@ PERMIT_PACKAGE_CDROM= "Not without the source" CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include diff --git a/x11/kde/office2/Makefile b/x11/kde/office2/Makefile index de4ed997395..c324be61fea 100644 --- a/x11/kde/office2/Makefile +++ b/x11/kde/office2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2001/09/19 15:20:12 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "office applications for kde" CATEGORIES= x11 x11/kde productivity @@ -18,6 +18,7 @@ LIB_DEPENDS= kdecore.3::x11/kde/libs2 MODULES= qt2 CONFIGURE_STYLE= autoconf +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include diff --git a/x11/kde/toys2/Makefile b/x11/kde/toys2/Makefile index d5e7d4b8114..51ab2afff97 100644 --- a/x11/kde/toys2/Makefile +++ b/x11/kde/toys2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2001/09/27 10:55:00 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "some useless kde applications" @@ -16,6 +16,7 @@ MODULES= qt2 LIB_DEPENDS= kdecore.3::x11/kde/libs2 CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 9d84d62ad9c..99cb23b0c45 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2001/05/06 04:41:18 lebel Exp $ +# $OpenBSD: Makefile,v 1.47 2001/09/28 06:02:15 pvalchev Exp $ # $FreeBSD: Makefile,v 1.17 1998/03/28 14:12:55 steve Exp $ COMMENT= "API compatible clone of the Motif toolkit" @@ -23,6 +23,7 @@ USE_X11= Yes USE_GMAKE= Yes SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/lib/Xlt ${WRKSRC}/lib/Xbae CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+=--enable-static --enable-production --enable-build-12 \ --disable-build-20 --disable-build-21 --enable-default-12 \ diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile index b2f7c12776a..95b60fd6cc2 100644 --- a/x11/paragui/Makefile +++ b/x11/paragui/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2001/08/11 17:25:30 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.3 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "cross-platform high-level application framework" @@ -28,6 +28,7 @@ USE_X11= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/test CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ LIBS=-pthread diff --git a/x11/rclock/Makefile b/x11/rclock/Makefile index 7d523db0f54..5e25cf9846f 100644 --- a/x11/rclock/Makefile +++ b/x11/rclock/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2001/06/22 20:53:19 jasoni Exp $ +# $OpenBSD: Makefile,v 1.11 2001/09/28 06:02:15 pvalchev Exp $ COMMENT= "analog clock for X11 w/appoint. reminder and mail notif" @@ -20,6 +20,7 @@ PERMIT_DISTFILES_FTP= Yes USE_X11= Yes CONFIGURE_STYLE=gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/autoconf ALL_TARGET= clock diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index f9d3aaaefc9..d26a6a3ea76 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2001/08/29 17:12:09 jasoni Exp $ +# $OpenBSD: Makefile,v 1.21 2001/09/28 06:02:16 pvalchev Exp $ COMMENT= "color, low memory usage, xterm replacement" @@ -21,6 +21,7 @@ PERMIT_DISTFILES_FTP= Yes USE_X11= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/autoconf CONFIGURE_ARGS= --enable-utmp \ --enable-wtmp \ --with-xpm \ diff --git a/x11/sawfish/Makefile b/x11/sawfish/Makefile index d0355338b23..bb3194e5327 100644 --- a/x11/sawfish/Makefile +++ b/x11/sawfish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2001/07/09 17:11:18 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.6 2001/09/28 06:02:16 pvalchev Exp $ COMMENT= "extensible window manager for the X Window System." @@ -30,6 +30,7 @@ SUBST_VARS= OPSYS_VER VERSION USE_X11= Yes USE_GMAKE= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/etc CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ARGS+= --disable-capplet --disable-themer \ --disable-gnome-widgets --disable-linguas diff --git a/x11/xdaliclock/Makefile b/x11/xdaliclock/Makefile index 60c2ac8beb5..513af88e4cc 100644 --- a/x11/xdaliclock/Makefile +++ b/x11/xdaliclock/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2001/07/10 21:38:46 lebel Exp $ +# $OpenBSD: Makefile,v 1.13 2001/09/28 06:02:16 pvalchev Exp $ COMMENT= "rather neat animated clock" @@ -19,6 +19,7 @@ PERMIT_DISTFILES_FTP= Yes USE_X11= Yes CONFIGURE_STYLE= gnu +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/X11 WRKSRC= ${WRKDIST}/X11 .include