From babcdc681e3c29dfa91286d1aa73048e230bc145 Mon Sep 17 00:00:00 2001 From: demon Date: Mon, 20 Aug 2001 10:33:21 +0000 Subject: Finish upgrading to version 2.2. --- sysutils/kdeadmin4/Makefile | 2 ++ sysutils/kdeadmin4/files/patch-kcron-Makefile.in | 11 ----------- sysutils/kdeadmin4/files/patch-ksysctrl-Makefile.in | 11 ----------- sysutils/kdeadmin4/files/patch-rpmMessages.c | 10 ---------- 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 sysutils/kdeadmin4/files/patch-kcron-Makefile.in delete mode 100644 sysutils/kdeadmin4/files/patch-ksysctrl-Makefile.in delete mode 100644 sysutils/kdeadmin4/files/patch-rpmMessages.c (limited to 'sysutils/kdeadmin4') diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile index bb1463c..c6378be 100644 --- a/sysutils/kdeadmin4/Makefile +++ b/sysutils/kdeadmin4/Makefile @@ -21,5 +21,7 @@ GNU_CONFIGURE= yes pre-configure: ${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure + find ${WRKSRC}/kpackage -name "*.cpp" -or -name "*.c" -or -name "*.h" \ + | xargs ${PERL} -pi -e "s#typedef __off64_t off64_t;##g" .include diff --git a/sysutils/kdeadmin4/files/patch-kcron-Makefile.in b/sysutils/kdeadmin4/files/patch-kcron-Makefile.in deleted file mode 100644 index 923f6a0..0000000 --- a/sysutils/kdeadmin4/files/patch-kcron-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- kcron/Makefile.in.orig Mon Mar 5 14:10:55 2001 -+++ kcron/Makefile.in Mon Mar 5 14:11:09 2001 -@@ -245,7 +245,7 @@ - - DISTCLEANFILES = $(kcron_METASOURCES) - --kcron_LDADD = -lICE -lkfile -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBSOCKET) -+kcron_LDADD = -lICE -lkfile -lkdeui -lkdecore -lqt2 -lXext -lX11 $(LIBSOCKET) - - appsdir = $(kde_appsdir)/System - diff --git a/sysutils/kdeadmin4/files/patch-ksysctrl-Makefile.in b/sysutils/kdeadmin4/files/patch-ksysctrl-Makefile.in deleted file mode 100644 index 50013c4..0000000 --- a/sysutils/kdeadmin4/files/patch-ksysctrl-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ksysctrl/ksysctrl/Makefile.in.orig Mon Mar 5 14:12:06 2001 -+++ ksysctrl/ksysctrl/Makefile.in Mon Mar 5 14:12:15 2001 -@@ -226,7 +226,7 @@ - - libkcm_ksysctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(KDE_RPATH) - --libkcm_ksysctrl_la_LIBADD = -lkdeui -lkdecore -lz -lqt -lX11 -lXext -+libkcm_ksysctrl_la_LIBADD = -lkdeui -lkdecore -lz -lqt2 -lX11 -lXext - - # LIBS = -Wl,-Bstatic -lqimgio -Wl,-Bdynamic - diff --git a/sysutils/kdeadmin4/files/patch-rpmMessages.c b/sysutils/kdeadmin4/files/patch-rpmMessages.c deleted file mode 100644 index c043cc8..0000000 --- a/sysutils/kdeadmin4/files/patch-rpmMessages.c +++ /dev/null @@ -1,10 +0,0 @@ ---- kpackage/rpmMessages.c.orig Wed Mar 28 18:43:45 2001 -+++ kpackage/rpmMessages.c Wed Mar 28 18:43:55 2001 -@@ -7,7 +7,6 @@ - #include - #include - /* stupid RPM headers! */ --typedef __off64_t off64_t; - #include - #include "rpmMessages.h" - -- cgit v1.1