From 383802e6a04ae2d1e7cd263c8cffccf81abec385 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 5 Jul 2001 23:41:27 +0000 Subject: [PATCH] Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. --- x11/kdebase2/Makefile | 74 ++++++++++++++++++++++------------- x11/kdebase2/distinfo | 6 ++- x11/kdebase2/patches/patch-aa | 36 ++++++++++++++++- x11/kdebase2/patches/patch-ac | 13 ++++++ x11/kdebase2/patches/patch-ad | 15 +++++++ 5 files changed, 113 insertions(+), 31 deletions(-) create mode 100644 x11/kdebase2/patches/patch-ac create mode 100644 x11/kdebase2/patches/patch-ad diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile index 453fba640df1..8d31d6670b78 100644 --- a/x11/kdebase2/Makefile +++ b/x11/kdebase2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/06/12 20:33:10 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2001/07/05 23:41:27 jlam Exp $ DISTNAME= kdebase-2.1 CATEGORIES= x11 kde @@ -7,29 +7,27 @@ COMMENT= Base modules for the KDE 2 integrated X11 desktop DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README -BUILD_DEPENDS+= automake-1.4:../../devel/automake -BUILD_DEPENDS+= qt2-designer>=2.2.4:../../x11/qt2-designer -DEPENDS+= kdelibs-2.1nb1:../../x11/kdelibs2 +BUILD_DEPENDS+= automake-1.4:../../devel/automake +BUILD_DEPENDS+= qt2-designer>=2.2.4:../../x11/qt2-designer + +USE_BUILDLINK_ONLY= yes -USE_XPM= yes -USE_MOTIF= yes -USE_MESA= yes .include "../../x11/kde2/Makefile.part2" +CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" +CONFIGURE_ARGS+= --with-motif-includes="${BUILDLINK_DIR}/include" +CONFIGURE_ARGS+= --with-motif-libraries="${BUILDLINK_DIR}/lib" +CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_DIR}" CONFIGURE_ARGS+= --disable-greet-lib -LIBS= -Wl,--export-dynamic +CONFIGURE_ARGS+= --without-pam +LIBS+= -Wl,--export-dynamic EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} IMAKEDIR= ${WRKDIR}/imake -.include "../../mk/bsd.prefs.mk" +CONFIGURE_ENV+= GL_INCLUDE="${BUILDLINK_DIR}/include" -.if ${HAVE_BUILTIN_MESA} == "NO" -EVAL_PREFIX+= MESABASE=Mesa -.else -MESABASE= ${X11BASE} -.endif -CONFIGURE_ENV+= GL_INCLUDE="${MESABASE}/include" +.include "../../mk/bsd.prefs.mk" .if ${OBJECT_FMT} == "a.out" BROKEN= "This package doesn't build on a.out. This is being worked on." @@ -40,6 +38,21 @@ PLIST_SRC= ${WRKDIR}/PLIST PLIST_DIRS= share/kde/applnk \ share/kde/apps/kappfinder +KDE_RPATH_MAKEFILES= kcontrol/ebrowsing/Makefile.in +KDE_RPATH_MAKEFILES+= kcontrol/ebrowsing/plugins/ikws/Makefile.in +KDE_RPATH_MAKEFILES+= kcontrol/ebrowsing/plugins/shorturi/Makefile.in +KDE_RPATH_MAKEFILES+= kcontrol/kio/Makefile.in +KDE_RPATH_MAKEFILES+= kcontrol/konq/Makefile.in +KDE_RPATH_MAKEFILES+= kcontrol/konqhtml/Makefile.in + +# Add a missing $(KDE_RPATH) to the LDFLAGS setting in several Makefiles. +post-patch: + @cd ${WRKSRC}; \ + for file in ${KDE_RPATH_MAKEFILES}; do \ + ${SED} -e "s,\(^LDFLAGS.*\),\1 \$$(KDE_RPATH)," \ + $${file} > $${file}.add-kde-rpath; \ + ${MV} -f $${file}.add-kde-rpath $${file}; \ + done post-configure: ${MKDIR} ${IMAKEDIR} @@ -62,24 +75,31 @@ post-install: @${CHMOD} u+s ${PREFIX}/bin/konsole_grantpty @${CHMOD} u+s ${PREFIX}/bin/*.kss @${CHMOD} u+s ${PREFIX}/bin/ksysguardd - @(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} \! -type d | sort >>${PLIST_SRC}) - @(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} -type d | sort -r | \ - ${SED} "s/^/\@dirrm /" >>${PLIST_SRC}) - @for DIR in ${KDE_DIRS}; do \ - ${INSTALL_DATA_DIR} ${PREFIX}/${DIR}; \ - ${ECHO} "@exec mkdir -p %D/${DIR}" >>${PLIST_SRC}; \ - ${ECHO} "@dirrm ${DIR}" >>${PLIST_SRC}; \ + @(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} \! -type d | ${SORT}) \ + >> ${PLIST_SRC} + @(cd ${PREFIX}; ${FIND} ${PLIST_DIRS} -type d | ${SORT} -r | \ + ${SED} "s/^/\@dirrm /") \ + >> ${PLIST_SRC} + @for DIR in ${KDE_DIRS}; do \ + ${INSTALL_DATA_DIR} ${PREFIX}/${DIR}; \ + ${ECHO} "@exec mkdir -p %D/${DIR}" >>${PLIST_SRC}; \ + ${ECHO} "@dirrm ${DIR}" >>${PLIST_SRC}; \ done @# NetBSD Advertisement O:-) - @cd ${PREFIX}/share/kde/config ; \ - ${CP} kdmrc kdmrc.new ; \ + @cd ${PREFIX}/share/kde/config; \ + ${CP} kdmrc kdmrc.new; \ ${SED} \ -e 's|^\(GreetString\)=.*|\1=Welcome to ${OPSYS}! [HOSTNAME]|' \ -e 's|^#\(LogoPixmap\)=.*|\1=${PREFIX}/share/kde/icons/Daemon.png|' \ - kdmrc ; \ + kdmrc.new > kdmrc; \ ${RM} kdmrc.new @${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/kde/icons - @${INSTALL_DATA} ${DISTDIR}/Daemon.README \ - ${PREFIX}/share/doc/kde/HTML/en/kdm + @${INSTALL_DATA} ${DISTDIR}/Daemon.README \ + ${PREFIX}/share/doc/kde/HTML/en/kdm +.include "../../graphics/Mesa/buildlink.mk" +.include "../../graphics/xpm/buildlink.mk" +.include "../../security/openssl/buildlink.mk" +.include "../../x11/kdelibs2/buildlink.mk" +.include "../../x11/lesstif/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo index 95f8cd699cfb..e30b6fc8318d 100644 --- a/x11/kdebase2/distinfo +++ b/x11/kdebase2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/05/21 05:27:59 tron Exp $ +$NetBSD: distinfo,v 1.4 2001/07/05 23:41:27 jlam Exp $ SHA1 (kdebase-2.1.tar.bz2) = 08c1e42b5f7616c5d9b8fbe9f26f2b98a7c77a1f Size (kdebase-2.1.tar.bz2) = 9010018 bytes @@ -6,8 +6,10 @@ SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes -SHA1 (patch-aa) = e23b8ed519b6fd9a7b7249dac2c7cb6c0aeeb53d +SHA1 (patch-aa) = 8979e74b64e614071bffa3f9ce168b8b2e2bf456 SHA1 (patch-ab) = 06386d9f87a4782265b00375f4847517be48c1fc +SHA1 (patch-ac) = 535455e9b978c48ac4230b3b9aebec3920674ed9 +SHA1 (patch-ad) = a5d2c077a2239b6cfbd56cc8299fa7545f2e4c3e SHA1 (patch-af) = b91246a123ade7fc354308839e1363a4ee513c7f SHA1 (patch-ag) = 1666f52f9d31f972c49879d8f314c7f93fd992d4 SHA1 (patch-ah) = d30d837719e8bbdf4bc6f5ff377d6febcd85c502 diff --git a/x11/kdebase2/patches/patch-aa b/x11/kdebase2/patches/patch-aa index c1acb6586092..7dbcf9be87c7 100644 --- a/x11/kdebase2/patches/patch-aa +++ b/x11/kdebase2/patches/patch-aa @@ -1,7 +1,39 @@ -$NetBSD: patch-aa,v 1.3 2001/04/29 19:29:37 skrll Exp $ +$NetBSD: patch-aa,v 1.4 2001/07/05 23:41:27 jlam Exp $ ---- configure.orig Thu Feb 22 13:17:34 2001 +--- configure.orig Thu Feb 22 08:17:34 2001 +++ configure +@@ -4460,7 +4460,7 @@ + for dir in $kde_use_extra_libs; do + kde_extra_libs="$kde_extra_libs $dir" + KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir" +- USER_LDFLAGS="$USER_LDFLAGS -L$dir" ++ #USER_LDFLAGS="$USER_LDFLAGS -L$dir" # buildlink.mk + done + IFS=$ac_save_ifs + kde_use_extra_libs="added" +@@ -5654,7 +5654,7 @@ + if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then + QT_LDFLAGS="" + else +- QT_LDFLAGS="-L$qt_libraries" ++ QT_LDFLAGS="-L${QTDIR}/lib" # buildlink.mk + all_libraries="$all_libraries $QT_LDFLAGS" + fi + +@@ -5981,11 +5981,11 @@ + if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes" ; then + KDE_INCLUDES="" + else +- KDE_INCLUDES="-I$kde_includes" ++ KDE_INCLUDES="-I${BUILDLINK_DIR}/include" # buildlink.mk + all_includes="$KDE_INCLUDES $all_includes" + fi + +-KDE_LDFLAGS="-L$kde_libraries" ++KDE_LDFLAGS="-L${BUILDLINK_DIR}/lib" # buildlink.mk + if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then + all_libraries="$all_libraries $KDE_LDFLAGS" + fi @@ -9944,7 +9944,9 @@ diff --git a/x11/kdebase2/patches/patch-ac b/x11/kdebase2/patches/patch-ac new file mode 100644 index 000000000000..84a62db44f74 --- /dev/null +++ b/x11/kdebase2/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.4 2001/07/05 23:41:27 jlam Exp $ + +--- kcontrol/arts/Makefile.in.orig Thu Feb 22 08:16:33 2001 ++++ kcontrol/arts/Makefile.in +@@ -263,7 +263,7 @@ + libkcm_arts_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined + libkcm_arts_la_LIBADD = -lkdeui + +-INCLUDES = $(all_includes) -I$(kde_includes)/arts ++INCLUDES = $(all_includes) -I${BUILDLINK_DIR}/include/arts + + #>- libkcm_arts_la_METASOURCES = AUTO + diff --git a/x11/kdebase2/patches/patch-ad b/x11/kdebase2/patches/patch-ad new file mode 100644 index 000000000000..d7e8dd8894a8 --- /dev/null +++ b/x11/kdebase2/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.3 2001/07/05 23:41:27 jlam Exp $ + +--- kcontrol/konq/Makefile.in.orig Thu Jul 5 13:49:35 2001 ++++ kcontrol/konq/Makefile.in +@@ -642,8 +642,8 @@ + .NOEXPORT: + + #>+ 5 +-uiserver.kidl: $(kde_includes)/kio/uiserver.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(kde_includes)/kio/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) ++uiserver.kidl: ${BUILDLINK_DIR}/include/kio/uiserver.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) ${BUILDLINK_DIR}/include/kio/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) + uiserver_stub.h: uiserver.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-skel uiserver.kidl +