From owner-freebsd-ports Wed Feb 23 19:10:28 2000 Delivered-To: freebsd-ports@freebsd.org Received: from m3.cs.berkeley.edu (m3.CS.Berkeley.EDU [128.32.45.179]) by hub.freebsd.org (Postfix) with ESMTP id 3F7D337BAA5; Wed, 23 Feb 2000 19:10:23 -0800 (PST) (envelope-from asami@stampede.cs.berkeley.edu) Received: from bubble.didi.com (sji-ca1-183.ix.netcom.com [209.109.232.183]) by m3.cs.berkeley.edu (8.9.3/8.9.3) with ESMTP id TAA96942; Wed, 23 Feb 2000 19:09:49 -0800 (PST) (envelope-from asami@stampede.cs.berkeley.edu) Received: (from asami@localhost) by bubble.didi.com (8.9.3/8.8.8) id TAA15569; Wed, 23 Feb 2000 19:09:29 -0800 (PST) (envelope-from asami) To: Will Andrews Cc: ports@FreeBSD.ORG, imura@FreeBSD.ORG, se@FreeBSD.ORG Subject: Re: Qt/KDE upgrade path References: <20000220201511.L44834@shadow.blackdawn.com> <20000221020812.P44834@shadow.blackdawn.com> <200002232043.MAA23197@silvia.hip.berkeley.edu> <20000223160949.B33415@shadow.blackdawn.com> <20000223210430.B41879@shadow.blackdawn.com> From: asami@FreeBSD.ORG (Satoshi - Ports Wraith - Asami) Date: 23 Feb 2000 19:09:27 -0800 In-Reply-To: asami@FreeBSD.ORG's message of "23 Feb 2000 18:28:31 -0800" Message-ID: Lines: 146 X-Mailer: Gnus v5.7/Emacs 20.5 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org * I have already put your kdelibs patch in my tree with a few minor * changes. I'll commit it after a bit of testing. Hmm. kdelibs doesn't seem to want its library version changed. Am I doing something wrong here? (I didn't know that SOMAJOR and SOMINOR in MAKE_ENV affects the shlib version number...are you sure about that?) http://bento.FreeBSD.org/errorlogs/errorlogs/e.4.20000222/kdelibs-1.1.2.log (I've commented out PKGNAME for testing -- I'll add it back before committing.) Satoshi ------- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11/kdelibs11/Makefile,v retrieving revision 1.36 diff -u -r1.36 Makefile --- Makefile 2000/02/15 13:44:58 1.36 +++ Makefile 2000/02/24 01:46:42 @@ -7,6 +7,7 @@ # DISTNAME= kdelibs-1.1.2 +#PKGNAME= kdelibs-1.1.2.1 CATEGORIES= x11 kde MASTER_SITES= $(MASTER_SITE_KDE) MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2 @@ -23,26 +24,30 @@ CONFIGURE_ARGS= "--prefix=$(PREFIX)" \ "--with-extra-includes=${PREFIX}/include" \ "--x-inc=$(X11BASE)/include" \ - "--x-lib=$(X11BASE)/lib" + "--x-lib=$(X11BASE)/lib" \ + --enable-shared CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes .include +LIBMAJOR= 3 +LIBMINOR= 0 +.if ${PORTOBJFORMAT} == "aout" +LIBVER= ${LIBMAJOR}.${LIBMINOR} +.else +LIBVER= ${LIBMAJOR} +.endif +PLIST_SUB= LIBVER=${LIBVER} +MAKE_ENV= SOMAJOR=${LIBMAJOR} SOMINOR=${LIBMINOR} + post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +.for LIB in jscript kab kdecore kdeui kfile kfm khtmlw kimgio kspell mediatool + @${LN} -sf ${PREFIX}/lib/lib${LIB}.so.${LIBVER} ${PREFIX}/lib/lib${LIB}.so .if ${PORTOBJFORMAT} == "aout" - ${LN} -sf libjscript.so.2.0 ${PREFIX}/lib/libjscript.so - ${LN} -sf libkab.so.2.0 ${PREFIX}/lib/libkab.so - ${LN} -sf libkdecore.so.2.0 ${PREFIX}/lib/libkdecore.so - ${LN} -sf libkdeui.so.2.0 ${PREFIX}/lib/libkdeui.so - ${LN} -sf libkfile.so.2.0 ${PREFIX}/lib/libkfile.so - ${LN} -sf libkfm.so.2.0 ${PREFIX}/lib/libkfm.so - ${LN} -sf libkhtmlw.so.2.0 ${PREFIX}/lib/libkhtmlw.so - ${LN} -sf libkimgio.so.2.0 ${PREFIX}/lib/libkimgio.so - ${LN} -sf libkspell.so.2.0 ${PREFIX}/lib/libkspell.so - ${LN} -sf libmediatool.so.2.0 ${PREFIX}/lib/libmediatool.so + @${RM} -f ${PREFIX}/lib/lib${LIB}.so.${LIBMAJOR} .endif +.endfor .include Index: pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/x11/kdelibs11/pkg/PLIST,v retrieving revision 1.15 diff -u -r1.15 PLIST --- pkg/PLIST 1999/09/18 09:02:12 1.15 +++ pkg/PLIST 2000/02/24 01:02:17 @@ -124,27 +124,28 @@ include/stl_headers.h include/xview.h lib/libjscript.la -lib/libjscript.so.2 +lib/libjscript.so.%%LIBVER%% lib/libkab.la -lib/libkab.so.2 +lib/libkab.so.%%LIBVER%% lib/libkdecore.la -lib/libkdecore.so.2 +lib/libkdecore.so.%%LIBVER%% lib/libkdeui.la -lib/libkdeui.so.2 +lib/libkdeui.so.%%LIBVER%% lib/libkfile.la -lib/libkfile.so.2 +lib/libkfile.so.%%LIBVER%% lib/libkfm.la -lib/libkfm.so.2 +lib/libkfm.so.%%LIBVER%% lib/libkhtmlw.la -lib/libkhtmlw.so.2 +lib/libkhtmlw.so.%%LIBVER%% lib/libkimgio.la -lib/libkimgio.so.2 +lib/libkimgio.so.%%LIBVER%% lib/libkspell.la -lib/libkspell.so.2 +lib/libkspell.so.%%LIBVER%% lib/libmediatool.la -lib/libmediatool.so.2 +lib/libmediatool.so.%%LIBVER%% share/apps/kab/pics/background_1.jpg share/apps/kab/pics/dialog_background.jpg +share/apps/kab/pics/addressbook_logo.jpg share/apps/kde/pics/arrow_down.xbm share/apps/kde/pics/arrow_left.xbm share/apps/kde/pics/arrow_right.xbm @@ -302,16 +303,16 @@ share/toolbar/viewmag.xpm share/toolbar/viewzoom.xpm @exec ln -sf en %D/share/doc/HTML/default -@exec ln -sf libjscript.so.2 %D/lib/libjscript.so -@exec ln -sf libkab.so.2 %D/lib/libkab.so -@exec ln -sf libkdecore.so.2 %D/lib/libkdecore.so -@exec ln -sf libkdeui.so.2 %D/lib/libkdeui.so -@exec ln -sf libkfile.so.2 %D/lib/libkfile.so -@exec ln -sf libkfm.so.2 %D/lib/libkfm.so -@exec ln -sf libkhtmlw.so.2 %D/lib/libkhtmlw.so -@exec ln -sf libkimgio.so.2 %D/lib/libkimgio.so -@exec ln -sf libkspell.so.2 %D/lib/libkspell.so -@exec ln -sf libmediatool.so.2 %D/lib/libmediatool.so +@exec ln -sf libjscript.so.%%LIBVER%% %D/lib/libjscript.so +@exec ln -sf libkab.so.%%LIBVER%% %D/lib/libkab.so +@exec ln -sf libkdecore.so.%%LIBVER%% %D/lib/libkdecore.so +@exec ln -sf libkdeui.so.%%LIBVER%% %D/lib/libkdeui.so +@exec ln -sf libkfile.so.%%LIBVER%% %D/lib/libkfile.so +@exec ln -sf libkfm.so.%%LIBVER%% %D/lib/libkfm.so +@exec ln -sf libkhtmlw.so.%%LIBVER%% %D/lib/libkhtmlw.so +@exec ln -sf libkimgio.so.%%LIBVER%% %D/lib/libkimgio.so +@exec ln -sf libkspell.so.%%LIBVER%% %D/lib/libkspell.so +@exec ln -sf libmediatool.so.%%LIBVER%% %D/lib/libmediatool.so @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm share/toolbar @dirrm share/locale/zh_TW.Big5/LC_MESSAGES To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message