From owner-freebsd-ports Fri Mar 15 20:32:27 2002 Delivered-To: freebsd-ports@freebsd.org Received: from sahiro.homeip.net (p14-dna05sawada.niigata.ocn.ne.jp [211.122.195.142]) by hub.freebsd.org (Postfix) with ESMTP id 8E96F37B416; Fri, 15 Mar 2002 20:31:13 -0800 (PST) Date: Sat, 16 Mar 2002 13:31:20 +0900 From: SASAKI Katuhiro Subject: Re: 5.x packages and request for help. To: Will Andrews Cc: Alex Zepeda , Kris Kennaway , current@FreeBSD.ORG, ports@FreeBSD.ORG Message-ID: <3c92ca4e.6675%sahiro@crest.ocn.ne.jp> In-Reply-To: <20020315174117.GY53073@squall.waterspout.com> References: <20020314163143.A47940@xor.obsecurity.org> <20020314175440.B64023@zippy.mybox.zip> <20020315174117.GY53073@squall.waterspout.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org Hi. In <20020315174117.GY53073@squall.waterspout.com>, Will Andrews wrote: >Um.. objprelink is disabled if OSVERSION >= 500029. So it is >already "ripped out" for -current. > I think it better to rip objprelink out of kde port on -CURRENT, too. On my -CURRENT (updated in Mar 11), many kde binaries build with using objprelink dump cores (I confirmed kde-config, artsd and so on.). And they seems to work fine when I set NO_KDE_OBJPRELINK at build time. I show a patch to disable objprelink on -CURRENT below. How about this, Will? diff -urN /usr/ports/audio/kdemultimedia2/Makefile audio/kdemultimedia2/Makefile --- /usr/ports/audio/kdemultimedia2/Makefile Fri Jan 18 00:00:19 2002 +++ audio/kdemultimedia2/Makefile Sat Mar 16 04:40:50 2002 @@ -28,13 +28,13 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib -_NO_KDE_FINAL= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} .include + +_NO_KDE_FINAL= yes +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" \ diff -urN /usr/ports/deskutils/kdepim/Makefile deskutils/kdepim/Makefile --- /usr/ports/deskutils/kdepim/Makefile Wed Mar 6 00:01:08 2002 +++ deskutils/kdepim/Makefile Sat Mar 16 04:40:50 2002 @@ -24,6 +24,8 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib @@ -55,4 +57,4 @@ find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \ "s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g" -.include +.include diff -urN /usr/ports/devel/kdesdk/Makefile devel/kdesdk/Makefile --- /usr/ports/devel/kdesdk/Makefile Sat Jan 12 00:01:13 2002 +++ devel/kdesdk/Makefile Sat Mar 16 04:40:50 2002 @@ -22,6 +22,8 @@ USE_BZIP2= yes GNU_CONFIGURE= yes +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" USE_GMAKE= yes @@ -41,4 +43,4 @@ cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include +.include diff -urN /usr/ports/devel/kdevelop/Makefile devel/kdevelop/Makefile --- /usr/ports/devel/kdevelop/Makefile Sat Jan 12 00:01:13 2002 +++ devel/kdevelop/Makefile Sat Mar 16 04:40:50 2002 @@ -38,6 +38,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-qtdoc-dir=${X11BASE}/share/doc/qt2/html +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-everything:: @@ -62,4 +64,4 @@ pre-build: ${PERL} -pi -e "s@libkdeui.so.3@libkdeui.so@g" ${WRKSRC}/kdevelop/main.cpp -.include +.include diff -urN /usr/ports/editors/koffice/Makefile editors/koffice/Makefile --- /usr/ports/editors/koffice/Makefile Sat Jan 12 00:01:47 2002 +++ editors/koffice/Makefile Sat Mar 16 04:40:50 2002 @@ -26,6 +26,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes +.include + _NO_KDE_OBJPRELINK= yes .include "${.CURDIR}/../../x11/kde2/Makefile.kde" @@ -56,4 +58,4 @@ ${MV} ${PREFIX}/bin/kivio ${PREFIX}/bin/kivio.real ${INSTALL_SCRIPT} ${FILESDIR}/kivio.sh ${PREFIX}/bin/kivio -.include +.include diff -urN /usr/ports/games/kdegames2/Makefile games/kdegames2/Makefile --- /usr/ports/games/kdegames2/Makefile Sat Jan 12 00:02:15 2002 +++ games/kdegames2/Makefile Sat Mar 16 04:40:50 2002 @@ -22,6 +22,8 @@ GNU_CONFIGURE= yes USE_GMAKE= yes +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -35,4 +37,4 @@ cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include +.include diff -urN /usr/ports/graphics/kdegraphics2/Makefile graphics/kdegraphics2/Makefile --- /usr/ports/graphics/kdegraphics2/Makefile Sat Jan 12 00:02:37 2002 +++ graphics/kdegraphics2/Makefile Sat Mar 16 04:40:50 2002 @@ -26,9 +26,9 @@ USE_GMAKE= yes CONFIGURE_ARGS+=--without-kamera -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" # temporarily disable kamera, it requires gphoto2 PLIST_SUB+= KAMERA="@comment " diff -urN /usr/ports/misc/kdeaddons/Makefile misc/kdeaddons/Makefile --- /usr/ports/misc/kdeaddons/Makefile Sat Jan 12 00:04:12 2002 +++ misc/kdeaddons/Makefile Sat Mar 16 04:40:50 2002 @@ -27,9 +27,9 @@ PLIST_SUB+= RM=${RM} CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: ${MKDIR} ${WRKSRC}/auto-bin diff -urN /usr/ports/misc/kdeutils2/Makefile misc/kdeutils2/Makefile --- /usr/ports/misc/kdeutils2/Makefile Sat Jan 12 00:04:14 2002 +++ misc/kdeutils2/Makefile Sat Mar 16 04:40:50 2002 @@ -24,6 +24,8 @@ USE_GMAKE= yes MAN1= efax.1 efix.1 fax.1 +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +39,4 @@ cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include +.include diff -urN /usr/ports/net/kdenetwork2/Makefile net/kdenetwork2/Makefile --- /usr/ports/net/kdenetwork2/Makefile Sat Jan 12 00:04:35 2002 +++ net/kdenetwork2/Makefile Sat Mar 16 04:40:50 2002 @@ -27,6 +27,8 @@ CONFIGURE_ENV+= PATH=${WRKSRC}/auto-bin:$$PATH MAKE_ENV= ${CONFIGURE_ENV} +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -43,4 +45,4 @@ ${PERL} -pi -e "s@all_includes=\"@all_includes=\"-I/usr/include @g" ${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4 ${PERL} -pi -e "s@^AC_CHECK_UTMP_FILE@# AC_CHECK_UTMP_FILE@g" ${WRKSRC}/configure.in -.include +.include diff -urN /usr/ports/sysutils/kdeadmin/Makefile sysutils/kdeadmin/Makefile --- /usr/ports/sysutils/kdeadmin/Makefile Sat Jan 12 00:05:54 2002 +++ sysutils/kdeadmin/Makefile Sat Mar 16 04:40:50 2002 @@ -23,6 +23,8 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -39,4 +41,4 @@ find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ | xargs ${PERL} -pi -e "s#typedef __off64_t off64_t;##g" -.include +.include diff -urN /usr/ports/x11/kde2/Makefile.kde x11/kde2/Makefile.kde --- /usr/ports/x11/kde2/Makefile.kde Sun Feb 24 17:17:13 2002 +++ x11/kde2/Makefile.kde Sat Mar 16 04:40:50 2002 @@ -8,6 +8,10 @@ CONFIGURE_ARGS?= +.if ${OSVERSION} >= 500029 +_NO_KDE_OBJPRELINK=yes +.endif + .if !defined(_NO_KDE_OBJPRELINK) .if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) BUILD_DEPENDS+= objprelink:${PORTSDIR}/devel/objprelink diff -urN /usr/ports/x11/kdebase2/Makefile x11/kdebase2/Makefile --- /usr/ports/x11/kdebase2/Makefile Sun Mar 3 13:18:00 2002 +++ x11/kdebase2/Makefile Sat Mar 16 04:40:50 2002 @@ -32,9 +32,9 @@ --without-ldap --disable-closure USE_GMAKE= yes -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - .include + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" .if exists(${X11BASE}/include/Xm/Xm.h) WITH_MOTIF= yes diff -urN /usr/ports/x11/kdelibs2/Makefile x11/kdelibs2/Makefile --- /usr/ports/x11/kdelibs2/Makefile Tue Jan 22 00:07:27 2002 +++ x11/kdelibs2/Makefile Sat Mar 16 04:40:50 2002 @@ -37,13 +37,13 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install -.include "${.CURDIR}/../../x11/kde2/Makefile.kde" - USE_GMAKE= yes MAKE_ENV= SOMAJOR="${SOMAJOR}" SOMINOR="${SOMINOR}" PLIST_SUB+= LIBVER="${SOMAJOR}" LDCONFIG="${LDCONFIG}" .include + +.include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-fetch: .if ${OSVERSION} <= 410002 diff -urN /usr/ports/x11-clocks/kdetoys2/Makefile x11-clocks/kdetoys2/Makefile --- /usr/ports/x11-clocks/kdetoys2/Makefile Sat Jan 12 00:07:09 2002 +++ x11-clocks/kdetoys2/Makefile Sat Mar 16 04:40:50 2002 @@ -24,6 +24,8 @@ CONFIGURE_ARGS+=--with-qt-dir=${X11BASE} USE_GMAKE= yes +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -37,4 +39,4 @@ cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include +.include diff -urN /usr/ports/x11-wm/kdeartwork/Makefile x11-wm/kdeartwork/Makefile --- /usr/ports/x11-wm/kdeartwork/Makefile Sat Jan 12 00:07:36 2002 +++ x11-wm/kdeartwork/Makefile Sat Mar 16 04:40:50 2002 @@ -23,6 +23,8 @@ USE_GMAKE= yes INSTALLS_SHLIB= yes +.include + .include "${.CURDIR}/../../x11/kde2/Makefile.kde" pre-configure: @@ -36,4 +38,4 @@ cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.cvs -.include +.include -- SASAKI Katuhiro mailto: sahiro@crest.ocn.ne.jp To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message