Date: Sat, 8 Jan 2000 02:32:12 -0500 (EST) From: Will Andrews <andrews@technologist.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/15978: update port: x11/kdelibs11 [USE_NEWGCC] Message-ID: <200001080732.CAA55943@shadow.blackdawn.com>
next in thread | raw e-mail | index | archive | help
>Number: 15978
>Category: ports
>Synopsis: update port: x11/kdelibs11 [USE_NEWGCC]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 7 23:40:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Will Andrews
>Release: FreeBSD 3.4-STABLE i386
>Organization:
none
>Environment:
FreeBSD shadow.blackdawn.com 3.4-STABLE FreeBSD 3.4-STABLE #0: Sat Jan 1 10:41:51 EST 2000 root@shadow.blackdawn.com:/usr/src/sys/compile/SHADOW i386
>Description:
This is the long-awaited kdelibs11 upgrade. Note
that it requires manually making a new "patches"
dir in the port itself. Then you can rm -f
patches/*.orig after applying the patch.
(the maintainer bit is up to se@FreeBSD.org, but
I would still like to be the maintainer for this.)
${SETENV} in post-install is obsoleted by @exec ldconfig
and so and so in pkg/PLIST.
I felt that the version bump in both PKGNAME and
shared library version were both appropriate.
See email from me, Message-Id XFMail.000108022745.andrews@TECHNOLOGIST.COM.
>How-To-Repeat:
Use the diff below to fix the current port.
>Fix:
diff -urN kdelibs11/Makefile kdelibs11.new/Makefile
--- kdelibs11/Makefile Sat Sep 18 05:02:11 1999
+++ kdelibs11.new/Makefile Sat Jan 8 00:53:29 2000
@@ -7,11 +7,12 @@
#
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
-MAINTAINER= se@freebsd.org
+MAINTAINER= andrews@technologist.com
LIB_DEPENDS= gif.5:${PORTSDIR}/graphics/giflib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -20,30 +21,32 @@
USE_BZIP2= yes
USE_QT= yes
+USE_NEWGCC= yes
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= "--prefix=$(PREFIX)" \
- "--with-extra-includes=${PREFIX}/include" \
- "--x-inc=$(X11BASE)/include" \
- "--x-lib=$(X11BASE)/lib"
+CONFIGURE_ARGS= --prefix=$(PREFIX) --with-extra-includes=${PREFIX}/include \
+ --x-inc=$(X11BASE)/include --x-lib=$(X11BASE)/lib --enable-shared
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
.include <bsd.port.pre.mk>
+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 <bsd.port.post.mk>
diff -urN kdelibs11/patches/patch-aa kdelibs11.new/patches/patch-aa
--- kdelibs11/patches/patch-aa Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-aa Sun Jan 2 08:55:11 2000
@@ -0,0 +1,13 @@
+--- jscript/Makefile.in Tue Sep 7 11:23:08 1999
++++ jscript/Makefile.in.new Sun Jan 2 08:54:50 2000
+@@ -183,8 +183,8 @@
+ YACC = bison -y
+ LEX = flex
+ YFLAGS = -d -p yyjscript
+-SOMAJOR = 2
+-SOMINOR = 0
++SOMAJOR ?= 2
++SOMINOR ?= 0
+
+ ####### Files
+
diff -urN kdelibs11/patches/patch-ab kdelibs11.new/patches/patch-ab
--- kdelibs11/patches/patch-ab Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-ab Sun Jan 2 09:00:54 2000
@@ -0,0 +1,20 @@
+--- kab/Makefile.in Tue Sep 7 11:23:12 1999
++++ kab/Makefile.in.new Sun Jan 2 09:00:20 2000
+@@ -137,6 +137,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -180,7 +182,7 @@
+ include_HEADERS = stl_headers.h kabapi.h kab.h addressbook.h configDB.h keyvaluemap.h sections.h
+
+
+-libkab_la_LDFLAGS = -version-info 2:0 $(X_LDFLAGS) $(QT_LDFLAGS)
++libkab_la_LDFLAGS = -version-info ${SOMAJOR}:${SOMINOR} $(X_LDFLAGS) $(QT_LDFLAGS)
+ libkab_la_LIBADD = -lXext $(LIB_QT)
+
+ # just to make sure, automake makes them
diff -urN kdelibs11/patches/patch-ac kdelibs11.new/patches/patch-ac
--- kdelibs11/patches/patch-ac Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-ac Sun Jan 2 09:12:08 2000
@@ -0,0 +1,20 @@
+--- kdecore/Makefile.in Tue Sep 7 11:23:13 1999
++++ kdecore/Makefile.in.new Sun Jan 2 09:02:31 2000
+@@ -151,6 +151,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -189,7 +191,7 @@
+ libkdecore_la_SOURCES = kconfig.cpp kconfigbase.cpp ksimpleconfig.cpp kcolorgroup.cpp kapp.cpp kurl.cpp ksock.cpp drag.cpp kprocess.cpp kprocctrl.cpp klocale.cpp libintl.cpp fakes.cpp kiconloader.cpp kdebug.cpp kstdaccel.cpp kwm.cpp krootprop.cpp kcharsets.cpp kcharsetsdata.cpp kchartables.cpp kstring.cpp kpixmap.cpp dither.cpp kckey.cpp kaccel.cpp kglobalaccel.cpp kclipboard.cpp krect.cpp ksize.cpp kpoint.cpp
+
+
+-libkdecore_la_LDFLAGS = -version-info 2:0
++libkdecore_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+ # libkdecore_la_LIBADD =
+
+ libkdecore_la_METASOURCES = drag.moc kapp.moc kclipboard.moc kconfig.moc kconfigbase.moc kdebugdialog.moc kglobalaccel.moc kiconloader.moc kprocctrl.moc kprocess.moc ksimpleconfig.moc ksock.moc
diff -urN kdelibs11/patches/patch-ad kdelibs11.new/patches/patch-ad
--- kdelibs11/patches/patch-ad Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-ad Sun Jan 2 09:31:26 2000
@@ -0,0 +1,20 @@
+--- kdeui/Makefile.in Tue Sep 7 11:23:16 1999
++++ kdeui/Makefile.in.new Sun Jan 2 09:30:39 2000
+@@ -150,6 +150,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -179,7 +181,7 @@
+ EXTRA_DIST = $(data_DATA) CHANGES.kdatepicker USERS.kdatepicker
+
+ lib_LTLIBRARIES = libkdeui.la
+-libkdeui_la_LDFLAGS = -version-info 2:0
++libkdeui_la_LDFLAGS = -version-info ${SOMAJOR}:${SOMINOR}
+
+ include_HEADERS = kledlamp.h kprogress.h kpanner.h kcolordlg.h kselect.h kdatepik.h kdatetbl.h kfontdialog.h kmsgbox.h kpopmenu.h ktabctl.h ktreelist.h kstatusbar.h ktopwidget.h ktmainwindow.h ktoolbar.h kmenubar.h kbutton.h kslider.h kseparator.h klined.h kcombo.h krestrictedline.h kintegerline.h kspinbox.h kcolorbtn.h kiconloaderdialog.h kwmmapp.h kbuttonbox.h ktablistbox.h kcontainer.h knewpanner.h kcontrol.h keditcl.h ktoolboxmgr.h kled.h kdbtn.h knotebook.h ktabbar.h kwizard.h kkeydialog.h kurllabel.h kruler.h kquickhelp.h kcursor.h
+
diff -urN kdelibs11/patches/patch-ae kdelibs11.new/patches/patch-ae
--- kdelibs11/patches/patch-ae Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-ae Sun Jan 2 09:32:10 2000
@@ -0,0 +1,11 @@
+--- kfile/Makefile.in Tue Sep 7 11:23:17 1999
++++ kfile/Makefile.in.new Sun Jan 2 09:31:54 2000
+@@ -199,7 +199,7 @@
+ toolbardir = $(kde_toolbardir)
+
+ LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS)
+-libkfile_la_LDFLAGS = -version-info 2:0 $(LDFLAGS)
++libkfile_la_LDFLAGS = -version-info ${SOMAJOR}:${SOMINOR} $(LDFLAGS)
+ libkfile_la_LIBADD = -lXext $(LIB_QT)
+
+ check_PROGRAMS = kfstest
diff -urN kdelibs11/patches/patch-af kdelibs11.new/patches/patch-af
--- kdelibs11/patches/patch-af Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-af Sun Jan 2 09:35:22 2000
@@ -0,0 +1,20 @@
+--- kfmlib/Makefile.in Tue Sep 7 11:23:17 1999
++++ kfmlib/Makefile.in.new Sun Jan 2 09:35:10 2000
+@@ -150,6 +150,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -180,7 +182,7 @@
+ libkfm_la_METASOURCES = kfm.moc kfmclient_ipc.moc
+
+ lib_LTLIBRARIES = libkfm.la
+-libkfm_la_LDFLAGS = -version-info 2:0
++libkfm_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+
+ libkfm_la_SOURCES = kfm.cpp kfmclient_ipc.cpp kfmclient_ipc2.cpp kfmipc.cpp
+ include_HEADERS = kfm.h kfmclient_ipc.h kfmipc.h
diff -urN kdelibs11/patches/patch-ag kdelibs11.new/patches/patch-ag
--- kdelibs11/patches/patch-ag Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-ag Sun Jan 2 09:37:06 2000
@@ -0,0 +1,20 @@
+--- khtmlw/Makefile.in Tue Sep 7 11:23:17 1999
++++ khtmlw/Makefile.in.new Sun Jan 2 09:36:48 2000
+@@ -150,6 +150,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -185,7 +187,7 @@
+
+
+ noinst_HEADERS = htmlchain.h
+-libkhtmlw_la_LDFLAGS = -version-info 2:0
++libkhtmlw_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+
+ data_DATA = khtmlw_dnd.xpm
+ datadir = $(kde_datadir)/khtmlw/pics
diff -urN kdelibs11/patches/patch-ah kdelibs11.new/patches/patch-ah
--- kdelibs11/patches/patch-ah Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-ah Sun Jan 2 09:37:56 2000
@@ -0,0 +1,20 @@
+--- kimgio/Makefile.in Tue Sep 7 11:23:07 1999
++++ kimgio/Makefile.in.new Sun Jan 2 09:37:34 2000
+@@ -132,6 +132,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -159,7 +161,7 @@
+
+ lib_LTLIBRARIES = libkimgio.la
+
+-libkimgio_la_LDFLAGS = -version-info 2:0
++libkimgio_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+
+ libkimgio_la_SOURCES = jpeg.cpp xview.cpp kimgio.cpp kimgio.h eps.cpp tiffr.cpp pngr.cpp
+
diff -urN kdelibs11/patches/patch-ai kdelibs11.new/patches/patch-ai
--- kdelibs11/patches/patch-ai Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-ai Sun Jan 2 09:38:47 2000
@@ -0,0 +1,20 @@
+--- kspell/Makefile.in Tue Sep 7 11:23:18 1999
++++ kspell/Makefile.in.new Sun Jan 2 09:38:32 2000
+@@ -153,6 +153,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -181,7 +183,7 @@
+ INCLUDES = -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdeui $(QT_INCLUDES) $(X_INCLUDES)
+
+ lib_LTLIBRARIES = libkspell.la
+-libkspell_la_LDFLAGS = -version-info 2:0
++libkspell_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+
+ include_HEADERS = kspell.h ksconfig.h kprocio.h kspelldlg.h
+ noinst_HEADERS = version.h
diff -urN kdelibs11/patches/patch-aj kdelibs11.new/patches/patch-aj
--- kdelibs11/patches/patch-aj Wed Dec 31 19:00:00 1969
+++ kdelibs11.new/patches/patch-aj Sun Jan 2 09:41:05 2000
@@ -0,0 +1,20 @@
+--- mediatool/Makefile.in Tue Sep 7 11:23:18 1999
++++ mediatool/Makefile.in.new Sun Jan 2 09:40:22 2000
+@@ -150,6 +150,8 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_INCLUDES = @X_INCLUDES@
+ X_LDFLAGS = @X_LDFLAGS@
++SOMAJOR ?= 2
++SOMINOR ?= 0
+ all_includes = @all_includes@
+ all_libraries = @all_libraries@
+ install_root = @install_root@
+@@ -188,7 +190,7 @@
+ include_HEADERS = mediatool.h kaudio.h
+ noinst_HEADERS = chunk.h playlist.h
+
+-libmediatool_la_LDFLAGS = -version-info 2:0
++libmediatool_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+ libmediatool_la_LIBADD = $(LIBCOMPAT)
+
+ libmediatool_la_METASOURCES = kaudio.moc
diff -urN kdelibs11/pkg/PLIST kdelibs11.new/pkg/PLIST
--- kdelibs11/pkg/PLIST Sat Sep 18 05:02:12 1999
+++ kdelibs11.new/pkg/PLIST Sat Jan 8 00:52:13 2000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001080732.CAA55943>