summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorDmitry Sivachenko <demon@FreeBSD.org>2001-08-20 10:33:21 +0000
committerDmitry Sivachenko <demon@FreeBSD.org>2001-08-20 10:33:21 +0000
commit40fc1c1564816480962d8459577563bdc8b55a59 (patch)
tree4608df2457d9e05de9e021ee3368df10ab7b34ad /sysutils
parentUpgrade the apache13-fp to Apache 1.3.20. (diff)
Finish upgrading to version 2.2.
Notes
Notes: svn path=/head/; revision=46524
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/kdeadmin/Makefile2
-rw-r--r--sysutils/kdeadmin/files/patch-kcron-Makefile.in11
-rw-r--r--sysutils/kdeadmin/files/patch-ksysctrl-Makefile.in11
-rw-r--r--sysutils/kdeadmin/files/patch-rpmMessages.c10
-rw-r--r--sysutils/kdeadmin3/Makefile2
-rw-r--r--sysutils/kdeadmin3/files/patch-kcron-Makefile.in11
-rw-r--r--sysutils/kdeadmin3/files/patch-ksysctrl-Makefile.in11
-rw-r--r--sysutils/kdeadmin3/files/patch-rpmMessages.c10
-rw-r--r--sysutils/kdeadmin4/Makefile2
-rw-r--r--sysutils/kdeadmin4/files/patch-kcron-Makefile.in11
-rw-r--r--sysutils/kdeadmin4/files/patch-ksysctrl-Makefile.in11
-rw-r--r--sysutils/kdeadmin4/files/patch-rpmMessages.c10
12 files changed, 6 insertions, 96 deletions
diff --git a/sysutils/kdeadmin/Makefile b/sysutils/kdeadmin/Makefile
index bb1463c7a72c..c6378be0789a 100644
--- a/sysutils/kdeadmin/Makefile
+++ b/sysutils/kdeadmin/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 <bsd.port.mk>
diff --git a/sysutils/kdeadmin/files/patch-kcron-Makefile.in b/sysutils/kdeadmin/files/patch-kcron-Makefile.in
deleted file mode 100644
index 923f6a07c7c9..000000000000
--- a/sysutils/kdeadmin/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/kdeadmin/files/patch-ksysctrl-Makefile.in b/sysutils/kdeadmin/files/patch-ksysctrl-Makefile.in
deleted file mode 100644
index 50013c431926..000000000000
--- a/sysutils/kdeadmin/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/kdeadmin/files/patch-rpmMessages.c b/sysutils/kdeadmin/files/patch-rpmMessages.c
deleted file mode 100644
index c043cc81faec..000000000000
--- a/sysutils/kdeadmin/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 <stdio.h>
- #include <string.h>
- /* stupid RPM headers! */
--typedef __off64_t off64_t;
- #include <rpm/rpmlib.h>
- #include "rpmMessages.h"
-
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index bb1463c7a72c..c6378be0789a 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/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 <bsd.port.mk>
diff --git a/sysutils/kdeadmin3/files/patch-kcron-Makefile.in b/sysutils/kdeadmin3/files/patch-kcron-Makefile.in
deleted file mode 100644
index 923f6a07c7c9..000000000000
--- a/sysutils/kdeadmin3/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/kdeadmin3/files/patch-ksysctrl-Makefile.in b/sysutils/kdeadmin3/files/patch-ksysctrl-Makefile.in
deleted file mode 100644
index 50013c431926..000000000000
--- a/sysutils/kdeadmin3/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/kdeadmin3/files/patch-rpmMessages.c b/sysutils/kdeadmin3/files/patch-rpmMessages.c
deleted file mode 100644
index c043cc81faec..000000000000
--- a/sysutils/kdeadmin3/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 <stdio.h>
- #include <string.h>
- /* stupid RPM headers! */
--typedef __off64_t off64_t;
- #include <rpm/rpmlib.h>
- #include "rpmMessages.h"
-
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index bb1463c7a72c..c6378be0789a 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 <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/files/patch-kcron-Makefile.in b/sysutils/kdeadmin4/files/patch-kcron-Makefile.in
deleted file mode 100644
index 923f6a07c7c9..000000000000
--- 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 50013c431926..000000000000
--- 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 c043cc81faec..000000000000
--- 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 <stdio.h>
- #include <string.h>
- /* stupid RPM headers! */
--typedef __off64_t off64_t;
- #include <rpm/rpmlib.h>
- #include "rpmMessages.h"
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 09:30:14 +0000