SHARED_LIBS

This commit is contained in:
espie 2006-01-03 12:27:24 +00:00
parent cf31304a70
commit 57a81a9665
10 changed files with 102 additions and 23 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2005/12/19 09:54:29 espie Exp $
# $OpenBSD: Makefile,v 1.37 2006/01/03 12:27:24 espie Exp $
COMMENT= "K Desktop Environment, edutainment"
CATEGORIES= x11 x11/kde
@ -7,6 +7,12 @@ DISTNAME= kdeedu-${VERSION}
PKGNAME= ${DISTNAME}p0
MODKDE_VERSION?= 3.5
FLAVORS=debug
SHARED_LIBS= extdate 3.0 \
kdeeducore 3.0 \
kdeeduplot 3.0 \
kdeeduui 3.5 \
kiten 1.0 \
kvoctraincore 0.0
LIB_DEPENDS= kdecore.6,DCOP,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kparts,kutils,kjs,kwalletclient,vcard,kabc,kresources::x11/kde/libs3
SEPARATE_BUILD=flavored

View File

@ -1,7 +1,17 @@
$OpenBSD: patch-kiten_Makefile_in,v 1.9 2005/10/17 11:28:25 espie Exp $
--- kiten/Makefile.in.orig Wed Oct 5 22:08:55 2005
+++ kiten/Makefile.in Mon Oct 17 12:15:00 2005
@@ -471,6 +471,7 @@ libkiteninclude_HEADERS = \
$OpenBSD: patch-kiten_Makefile_in,v 1.10 2006/01/03 12:27:24 espie Exp $
--- kiten/Makefile.in.orig Sun Nov 20 21:06:35 2005
+++ kiten/Makefile.in Tue Jan 3 10:57:29 2006
@@ -480,7 +480,8 @@ kiten_LDADD = libkiten.la $(LIB_KIO)
lib_LTLIBRARIES = libkiten.la
#>- libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
#>+ 1
-libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED) -version-info 1:0:0
+LIBkiten_LTVERSION=-version-info 1:0:0
+libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkiten_LTVERSION)
libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
#>- libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \
#>- deinf.cpp kitenconfig.kcfgc
@@ -494,6 +495,7 @@ libkiteninclude_HEADERS = \
kitengen_SOURCES = xjdxgen.c
kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@ -9,7 +19,7 @@ $OpenBSD: patch-kiten_Makefile_in,v 1.9 2005/10/17 11:28:25 espie Exp $
#>- METASOURCES = AUTO
rcdir = $(kde_datadir)/kiten
rc_DATA = kitenui.rc learnui.rc eeditui.rc
@@ -591,7 +592,7 @@ kiten$(EXEEXT): $(kiten_OBJECTS) $(kiten
@@ -614,7 +616,7 @@ kiten$(EXEEXT): $(kiten_OBJECTS) $(kiten
$(CXXLINK) $(kiten_LDFLAGS) $(kiten_OBJECTS) $(kiten_LDADD) $(LIBS)
kitengen$(EXEEXT): $(kitengen_OBJECTS) $(kitengen_DEPENDENCIES)
@rm -f kitengen$(EXEEXT)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kstars_kstars_indi_fli_libfli-sys_c,v 1.1 2004/09/18 09:36:43 espie Exp $
--- kstars/kstars/indi/fli/libfli-sys.c.orig Mon Sep 6 14:39:15 2004
+++ kstars/kstars/indi/fli/libfli-sys.c Mon Sep 6 14:39:23 2004
@@ -256,7 +256,7 @@ long unix_fli_lock(flidev_t dev)
$OpenBSD: patch-kstars_kstars_indi_fli_libfli-sys_c,v 1.2 2006/01/03 12:27:24 espie Exp $
--- kstars/kstars/indi/fli/libfli-sys.c.orig Sat Sep 10 10:17:35 2005
+++ kstars/kstars/indi/fli/libfli-sys.c Tue Jan 3 10:52:51 2006
@@ -267,7 +267,7 @@ long unix_fli_lock(flidev_t dev)
if (snprintf(lockf, PATH_MAX, PUBLIC_DIR "/libfli%s.lock",
name) >= PATH_MAX)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-kstars_kstars_indi_fli_libfli-sys_c,v 1.1 2004/09/18 09:36:43 es
goto done;
}
@@ -324,7 +324,7 @@ long unix_fli_unlock(flidev_t dev)
@@ -335,7 +335,7 @@ long unix_fli_unlock(flidev_t dev)
if (snprintf(lockf, PATH_MAX, PUBLIC_DIR "/libfli%s.lock",
name) >= PATH_MAX)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kstars_kstars_indi_fli_libfli_c,v 1.2 2005/06/02 14:01:26 espie Exp $
--- kstars/kstars/indi/fli/libfli.c.orig Mon May 23 14:04:00 2005
+++ kstars/kstars/indi/fli/libfli.c Thu May 26 16:30:12 2005
@@ -282,7 +282,7 @@ LIBFLIAPI FLIGetLibVersion(char* ver, si
$OpenBSD: patch-kstars_kstars_indi_fli_libfli_c,v 1.3 2006/01/03 12:27:24 espie Exp $
--- kstars/kstars/indi/fli/libfli.c.orig Sat Sep 10 10:17:35 2005
+++ kstars/kstars/indi/fli/libfli.c Tue Jan 3 10:52:51 2006
@@ -283,7 +283,7 @@ LIBFLIAPI FLIGetLibVersion(char* ver, si
return -EINVAL;
if ((size_t) snprintf(ver, len, "%s", version) >= len)
@ -10,7 +10,7 @@ $OpenBSD: patch-kstars_kstars_indi_fli_libfli_c,v 1.2 2005/06/02 14:01:26 espie
else
return 0;
}
@@ -322,7 +322,7 @@ LIBFLIAPI FLIGetModel(flidev_t dev, char
@@ -323,7 +323,7 @@ LIBFLIAPI FLIGetModel(flidev_t dev, char
}
if ((size_t) snprintf(model, len, "%s", DEVICE->devinfo.model) >= len)

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-kvoctrain_kvoctrain_kvt-core_Makefile_in,v 1.1 2006/01/03 12:27:24 espie Exp $
--- kvoctrain/kvoctrain/kvt-core/Makefile.in.orig Tue Jan 3 10:57:42 2006
+++ kvoctrain/kvoctrain/kvt-core/Makefile.in Tue Jan 3 10:59:05 2006
@@ -517,6 +517,7 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
+libkvoctraincore_la_LDFLAGS=$(LIBkvoctraincore_LTVERSION)
libkvoctraincore.la: $(libkvoctraincore_la_OBJECTS) $(libkvoctraincore_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libkvoctraincore_la_LDFLAGS) $(libkvoctraincore_la_OBJECTS) $(libkvoctraincore_la_LIBADD) $(LIBS)

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libkdeedu_extdate_Makefile_in,v 1.1 2006/01/03 12:27:24 espie Exp $
--- libkdeedu/extdate/Makefile.in.orig Tue Jan 3 10:55:23 2006
+++ libkdeedu/extdate/Makefile.in Tue Jan 3 10:55:45 2006
@@ -433,7 +433,8 @@ lib_LTLIBRARIES = libextdate.la
libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
#>- libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
#>+ 1
-libextdate_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+LIBextdate_LTVERSION=-version-info 3:0:2
+libextdate_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) $(LIBextdate_LTVERSION)
libextdate_la_LIBADD = $(LIB_KDEUI)
test_extdate_SOURCES = test_extdate.cc
test_extdate_LDADD = libextdate.la

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libkdeedu_kdeeducore_Makefile_in,v 1.1 2006/01/03 12:27:24 espie Exp $
--- libkdeedu/kdeeducore/Makefile.in.orig Tue Jan 3 10:55:53 2006
+++ libkdeedu/kdeeducore/Makefile.in Tue Jan 3 10:56:09 2006
@@ -429,7 +429,8 @@ lib_LTLIBRARIES = libkdeeducore.la
libkdeeducore_la_SOURCES = keduvocdata.cpp
#>- libkdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
#>+ 1
-libkdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+LIBkdeeducore_LTVERSION=-version-info 3:0:2
+libkdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkdeeducore_LTVERSION)
libkdeeducode_includedir = $(includedir)/libkdeedu
libkdeeducode_include_HEADERS = keduvocdata.h
libkdeeducore_la_LIBADD = $(LIB_KDECORE)

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libkdeedu_kdeeduplot_Makefile_in,v 1.1 2006/01/03 12:27:24 espie Exp $
--- libkdeedu/kdeeduplot/Makefile.in.orig Tue Jan 3 10:56:19 2006
+++ libkdeedu/kdeeduplot/Makefile.in Tue Jan 3 10:56:35 2006
@@ -435,7 +435,8 @@ libkdeeduplotinclude_HEADERS = kplotobje
libkdeeduplot_la_SOURCES = kplotobject.cpp kplotaxis.cpp kplotwidget.cpp
#>- libkdeeduplot_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
#>+ 1
-libkdeeduplot_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:0:2
+LIBkdeeduplot_LTVERSION=-version-info 3:0:2
+libkdeeduplot_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkdeeduplot_LTVERSION)
libkdeeduplot_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
#>- METASOURCES = AUTO
#>- all: all-recursive

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libkdeedu_kdeeduui_Makefile_in,v 1.1 2006/01/03 12:27:24 espie Exp $
--- libkdeedu/kdeeduui/Makefile.in.orig Tue Jan 3 10:56:51 2006
+++ libkdeedu/kdeeduui/Makefile.in Tue Jan 3 10:57:07 2006
@@ -439,7 +439,8 @@ libkdeeduuiincludedir = $(includedir)/li
libkdeeduuiinclude_HEADERS = kdeeduglossary.h
#>- libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
#>+ 1
-libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) -version-info 3:5:0
+LIBkdeeduui_LTVERSION=-version-info 3:5:0
+libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined $(KDE_NO_UNDEFINED) $(LIBkdeeduui_LTVERSION)
libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
#>- METASOURCES = AUTO
#>- all: all-recursive

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2005/11/29 14:11:33 espie Exp $
@comment $OpenBSD: PLIST,v 1.20 2006/01/03 12:27:25 espie Exp $
bin/apmount
bin/blinken
bin/celestrongps
@ -63,17 +63,17 @@ ${KDE}/libkigpart.so
${KDE}/libkmplotpart.la
${KDE}/libkmplotpart.so
lib/libextdate.la
@lib lib/libextdate.so.3.0
@lib lib/libextdate.so.${LIBextdate_VERSION}
lib/libkdeeducore.la
@lib lib/libkdeeducore.so.3.0
@lib lib/libkdeeducore.so.${LIBkdeeducore_VERSION}
lib/libkdeeduplot.la
@lib lib/libkdeeduplot.so.3.0
@lib lib/libkdeeduplot.so.${LIBkdeeduplot_VERSION}
lib/libkdeeduui.la
@lib lib/libkdeeduui.so.3.5
@lib lib/libkdeeduui.so.${LIBkdeeduui_VERSION}
lib/libkiten.la
@lib lib/libkiten.so.1.0
@lib lib/libkiten.so.${LIBkiten_VERSION}
lib/libkvoctraincore.la
@lib lib/libkvoctraincore.so.0.0
@lib lib/libkvoctraincore.so.${LIBkvoctraincore_VERSION}
share/applications/kde/blinken.desktop
share/applications/kde/kalzium.desktop
share/applications/kde/kanagram.desktop