cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up the Makefile and PLISTs.

Browse Source
This commit is contained in:
kevlo 2000-03-08 03:47:40 +00:00
parent d2e310e03d
commit 79e27ae405
14 changed files with 82 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/kde/libs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2000/03/05 18:30:46 espie Exp $
# $OpenBSD: Makefile,v 1.6 2000/03/08 03:47:40 kevlo Exp $
# Original Author: Yanick Cote <yanick@fries.net>
DISTNAME= kdelibs-1.1.2
@ -11,7 +11,7 @@ DIST_SUBDIR= kde
NEED_VERSION= 1.92
BUILD_DEPENDS= msgfmt:devel/gettext
LIB_DEPENDS= qt.1.44:x11/qt \
LIB_DEPENDS= qt.1.45:x11/qt \
gif.4.1:graphics/giflib \
jpeg.62:graphics/jpeg \
png.1.3:graphics/png \

6
x11/kde/libs/patches/patch-aa
View File

@ -1,11 +1,11 @@
--- jscript/Makefile.in.orig Tue Sep 14 17:23:55 1999
+++ jscript/Makefile.in Tue Sep 14 17:24:23 1999
--- jscript/Makefile.in.orig Tue Mar 7 18:15:59 2000
+++ jscript/Makefile.in Tue Mar 7 18:16:39 2000
@@ -189,7 +189,7 @@
####### Files
libjscript_la_SOURCES = t1.c t2.c cpp2bison.cpp jstree.cpp jsexec.cpp builtin.cpp
-libjscript_la_LDFLAGS = -version-info $(SOMAJOR):$(SOMINOR)
+libjscript_la_LDFLAGS = -version-info 1:1
+libjscript_la_LDFLAGS = -version-info 1:2
libjscript_la_LIBADD =
include_HEADERS = bison2cpp.h jstree.h jsexec.h jserror.h builtin.h

6
x11/kde/libs/patches/patch-ab
View File

@ -1,11 +1,11 @@
--- kab/Makefile.in.orig Tue Sep 14 17:26:01 1999
+++ kab/Makefile.in Tue Sep 14 17:26:23 1999
--- kab/Makefile.in.orig Tue Mar 7 18:17:16 2000
+++ kab/Makefile.in Tue Mar 7 18:17:36 2000
@@ -180,7 +180,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 1:1 $(X_LDFLAGS) $(QT_LDFLAGS)
+libkab_la_LDFLAGS = -version-info 1:2 $(X_LDFLAGS) $(QT_LDFLAGS)
libkab_la_LIBADD = -lXext $(LIB_QT)
# just to make sure, automake makes them

6
x11/kde/libs/patches/patch-ac
View File

@ -1,11 +1,11 @@
--- kdecore/Makefile.in.orig Tue Sep 14 17:27:15 1999
+++ kdecore/Makefile.in Tue Sep 14 17:27:36 1999
--- kdecore/Makefile.in.orig Tue Mar 7 18:18:17 2000
+++ kdecore/Makefile.in Tue Mar 7 18:18:33 2000
@@ -189,7 +189,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 1:1
+libkdecore_la_LDFLAGS = -version-info 1:2
# 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

6
x11/kde/libs/patches/patch-ad
View File

@ -1,11 +1,11 @@
--- kdeui/Makefile.in.orig Tue Sep 14 17:28:39 1999
+++ kdeui/Makefile.in Tue Sep 14 17:29:28 1999
--- kdeui/Makefile.in.orig Tue Mar 7 18:19:29 2000
+++ kdeui/Makefile.in Tue Mar 7 18:19:49 2000
@@ -179,7 +179,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 1:1
+libkdeui_la_LDFLAGS = -version-info 1:2
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

6
x11/kde/libs/patches/patch-ae
View File

@ -1,11 +1,11 @@
--- kfile/Makefile.in.orig Tue Sep 14 17:30:43 1999
+++ kfile/Makefile.in Tue Sep 14 17:34:57 1999
--- kfile/Makefile.in.orig Tue Mar 7 18:20:43 2000
+++ kfile/Makefile.in Tue Mar 7 18:20:57 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 1:1 $(LDFLAGS)
+libkfile_la_LDFLAGS = -version-info 1:2 $(LDFLAGS)
libkfile_la_LIBADD = -lXext $(LIB_QT)
check_PROGRAMS = kfstest

6
x11/kde/libs/patches/patch-af
View File

@ -1,11 +1,11 @@
--- khtmlw/Makefile.in.orig Tue Sep 14 17:35:36 1999
+++ khtmlw/Makefile.in Tue Sep 14 17:36:41 1999
--- khtmlw/Makefile.in.orig Tue Mar 7 18:31:51 2000
+++ khtmlw/Makefile.in Tue Mar 7 18:32:04 2000
@@ -185,7 +185,7 @@
noinst_HEADERS = htmlchain.h
-libkhtmlw_la_LDFLAGS = -version-info 2:0
+libkhtmlw_la_LDFLAGS = -version-info 1:1
+libkhtmlw_la_LDFLAGS = -version-info 1:2
data_DATA = khtmlw_dnd.xpm
datadir = $(kde_datadir)/khtmlw/pics

6
x11/kde/libs/patches/patch-ag
View File

@ -1,11 +1,11 @@
--- kimgio/Makefile.in.orig Tue Sep 14 17:38:39 1999
+++ kimgio/Makefile.in Tue Sep 14 17:38:50 1999
--- kimgio/Makefile.in.orig Tue Mar 7 18:32:50 2000
+++ kimgio/Makefile.in Tue Mar 7 18:33:04 2000
@@ -159,7 +159,7 @@
lib_LTLIBRARIES = libkimgio.la
-libkimgio_la_LDFLAGS = -version-info 2:0
+libkimgio_la_LDFLAGS = -version-info 1:1
+libkimgio_la_LDFLAGS = -version-info 1:2
libkimgio_la_SOURCES = jpeg.cpp xview.cpp kimgio.cpp kimgio.h eps.cpp tiffr.cpp pngr.cpp

6
x11/kde/libs/patches/patch-ah
View File

@ -1,11 +1,11 @@
--- kspell/Makefile.in.orig Tue Sep 14 17:39:38 1999
+++ kspell/Makefile.in Tue Sep 14 17:39:53 1999
--- kspell/Makefile.in.orig Tue Mar 7 18:33:43 2000
+++ kspell/Makefile.in Tue Mar 7 18:33:58 2000
@@ -181,7 +181,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 1:1
+libkspell_la_LDFLAGS = -version-info 1:2
include_HEADERS = kspell.h ksconfig.h kprocio.h kspelldlg.h
noinst_HEADERS = version.h

6
x11/kde/libs/patches/patch-ai
View File

@ -1,11 +1,11 @@
--- mediatool/Makefile.in.orig Tue Sep 14 17:51:07 1999
+++ mediatool/Makefile.in Tue Sep 14 17:51:20 1999
--- mediatool/Makefile.in.orig Tue Mar 7 18:34:44 2000
+++ mediatool/Makefile.in Tue Mar 7 18:35:50 2000
@@ -188,7 +188,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 1:1
+libmediatool_la_LDFLAGS = -version-info 1:2
libmediatool_la_LIBADD = $(LIBCOMPAT)
libmediatool_la_METASOURCES = kaudio.moc

6
x11/kde/libs/patches/patch-aj
View File

@ -1,11 +1,11 @@
--- kfmlib/Makefile.in.orig Tue Sep 14 17:51:57 1999
+++ kfmlib/Makefile.in Tue Sep 14 17:52:08 1999
--- kfmlib/Makefile.in.orig Tue Mar 7 18:36:25 2000
+++ kfmlib/Makefile.in Tue Mar 7 18:36:48 2000
@@ -180,7 +180,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 1:1
+libkfm_la_LDFLAGS = -version-info 1:2
libkfm_la_SOURCES = kfm.cpp kfmclient_ipc.cpp kfmclient_ipc2.cpp kfmipc.cpp
include_HEADERS = kfm.h kfmclient_ipc.h kfmipc.h

9
x11/kde/libs/patches/patch-ak
View File

@ -1,9 +1,10 @@
--- admin/ltmain.sh.orig Mon May 31 19:08:57 1999
+++ admin/ltmain.sh Mon May 31 19:09:13 1999
@@ -2633,40 +2633,6 @@
--- admin/ltmain.sh.orig Tue Mar 7 18:37:26 2000
+++ admin/ltmain.sh Tue Mar 7 18:38:16 2000
@@ -2632,41 +2632,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0
-
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do

44
x11/kde/libs/patches/patch-configure
View File

@ -1,5 +1,5 @@
--- configure.orig Tue Sep 7 11:23:19 1999
+++ configure Tue Sep 14 19:08:38 1999
--- configure.orig Tue Sep 7 15:23:19 1999
+++ configure Tue Mar 7 18:50:08 2000
@@ -1861,7 +1861,7 @@
aix*)
ac_symcode='[BCDTU]'
@ -9,11 +9,37 @@
ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
ac_symxfrm='_\1 \1'
;;
@@ -3094,12 +3094,13 @@
The main things grep needs to know about mmap are:
@@ -1907,7 +1907,6 @@
# Now try to grab the symbols.
ac_nlist=conftest.nm
if { (eval echo configure:1910: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
-
# Try sorting and uniquifying the output.
if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
mv -f "$ac_nlist"T "$ac_nlist"
@@ -2626,7 +2625,7 @@
#include "confdefs.h"
int main() {
-} $ac_kw int foo() {
+} int $ac_kw foo() {
; return 0; }
EOF
if { (eval echo configure:2633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -3069,9 +3068,7 @@
cat > conftest.$ac_ext <<EOF
#line 3071 "configure"
#include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
+#include <stdlib.h>
/* Thanks to Mike Haertel and Jim Avera for this test.
Here is a matrix of mmap possibilities:
@@ -3095,11 +3092,11 @@
* does it exist and is it safe to write into the mmap'd area
* how to use it (BSD variants) */
+#include <stdlib.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <fcntl.h>
@ -24,7 +50,7 @@
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif
@@ -3137,14 +3138,6 @@
@@ -3137,14 +3134,6 @@
# endif /* no HAVE_SYS_PARAM_H */
# endif /* no _SC_PAGESIZE */
@ -39,7 +65,7 @@
int
main()
{
@@ -3157,7 +3150,7 @@
@@ -3157,7 +3146,7 @@
/*
* First, make a file with some known garbage in it.
*/
@ -48,7 +74,7 @@
if (!data)
exit(1);
for (i = 0; i < pagesize; ++i)
@@ -3178,7 +3171,7 @@
@@ -3178,7 +3167,7 @@
fd = open("conftestmmap", O_RDWR);
if (fd < 0)
exit(1);
@ -57,7 +83,7 @@
if (!data2)
exit(1);
data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
@@ -3196,7 +3189,7 @@
@@ -3196,7 +3185,7 @@
*/
for (i = 0; i < pagesize; ++i)
*(data2 + i) = *(data2 + i) + 1;

22
x11/kde/libs/pkg/PLIST
View File

@ -125,34 +125,34 @@ include/stl_headers.h
include/xview.h
lib/libjscript.a
lib/libjscript.la
lib/libjscript.so.1.1
lib/libjscript.so.1.2
lib/libkab.a
lib/libkab.la
lib/libkab.so.1.1
lib/libkab.so.1.2
lib/libkdecore.a
lib/libkdecore.la
lib/libkdecore.so.1.1
lib/libkdecore.so.1.2
lib/libkdeui.a
lib/libkdeui.la
lib/libkdeui.so.1.1
lib/libkdeui.so.1.2
lib/libkfile.a
lib/libkfile.la
lib/libkfile.so.1.1
lib/libkfile.so.1.2
lib/libkfm.a
lib/libkfm.la
lib/libkfm.so.1.1
lib/libkfm.so.1.2
lib/libkhtmlw.a
lib/libkhtmlw.la
lib/libkhtmlw.so.1.1
lib/libkhtmlw.so.1.2
lib/libkimgio.a
lib/libkimgio.la
lib/libkimgio.so.1.1
lib/libkimgio.so.1.2
lib/libkspell.a
lib/libkspell.la
lib/libkspell.so.1.1
lib/libkspell.so.1.2
lib/libmediatool.a
lib/libmediatool.la
lib/libmediatool.so.1.1
lib/libmediatool.so.1.2
@exec /sbin/ldconfig -m %B
share/apps/kab/pics/background_1.jpg
share/apps/kab/pics/dialog_background.jpg
@ -218,7 +218,6 @@ share/locale/th/LC_MESSAGES/kde.mo
share/locale/he/LC_MESSAGES/kde.mo
share/locale/et/LC_MESSAGES/kde.mo
share/locale/br/LC_MESSAGES/kde.mo
share/locale/ja/LC_MESSAGES/kde.mo
share/locale/da/charset
share/locale/de/charset
share/locale/es/charset
@ -243,7 +242,6 @@ share/locale/is/charset
share/locale/he/charset
share/locale/et/charset
share/locale/br/charset
share/locale/hs/charset
share/toolbar/add_point.xpm
share/toolbar/airbrush.xpm
share/toolbar/back.xpm