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

look up in fake-dir for already installed files.

Browse Source 
Fix packaging problems that show up when an older kdemultimedia is
already installed.
This commit is contained in:
espie 2002-06-04 09:52:45 +00:00
parent 71851bbe85
commit cddf56390a
5 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/kde/multimedia3/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.2 2002/05/23 14:37:22 espie Exp $
--- configure.in.orig Mon Mar 25 00:12:29 2002
+++ configure.in Sat Apr 20 14:57:26 2002
$OpenBSD: patch-configure_in,v 1.3 2002/06/04 09:52:45 espie Exp $
--- configure.in.orig Tue May 14 02:52:35 2002
+++ configure.in Thu May 30 17:30:44 2002
@@ -1070,7 +1070,7 @@ dnl else
dnl lib_xaw_opt=-lXaw
dnl fi
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/05/23 14:37:22 espie Exp $
dnl if test "x$have_xext" = xyes; then
dnl a_so_libs="-lXext -lX11"
dnl else
@@ -1222,7 +1223,7 @@ dnl this does not work, but to have no e
@@ -1223,7 +1223,7 @@ dnl this does not work, but to have no e
dnl Checks for header files.
AC_CHECK_HEADERS(pthread.h pthread/mit/pthread.h)
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/05/23 14:37:22 espie Exp $
AC_C_BIGENDIAN
@@ -1400,8 +1401,13 @@ AC_MSG_RESULT($OS_TYPE)
@@ -1401,8 +1401,13 @@ AC_MSG_RESULT($OS_TYPE)
case "$ARCH_TYPE" in
i?86)
@ -35,7 +35,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/05/23 14:37:22 espie Exp $
;;
*)
@@ -1416,6 +1422,9 @@ case "$OS_TYPE" in
@@ -1417,6 +1422,9 @@ case "$OS_TYPE" in
FreeBSD)
kde_mpeglib_compiles=yes
;;
@ -45,7 +45,7 @@ $OpenBSD: patch-configure_in,v 1.2 2002/05/23 14:37:22 espie Exp $
Linux)
kde_mpeglib_compiles=yes
;;
@@ -1443,6 +1452,12 @@ case "$OS_TYPE" in
@@ -1444,6 +1452,12 @@ case "$OS_TYPE" in
Linux)
AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
AC_DEFINE(OS_Linux,1,[Define if you have linux pthread])

12
x11/kde/multimedia3/patches/patch-kmidi_BITMAPS_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kmidi_BITMAPS_Makefile_am,v 1.1 2002/06/04 09:52:45 espie Exp $
--- kmidi/BITMAPS/Makefile.am.orig Tue Jun 4 11:46:33 2002
+++ kmidi/BITMAPS/Makefile.am Tue Jun 4 11:46:43 2002
@@ -12,7 +12,7 @@ install-data-local:
$(mkinstalldirs) $(TIMID_DIR)
$(mkinstalldirs) $(TIMID_DIR)/BITMAPS
@for i in $(CONFIG_FILES); do \
- if [ ! -f "$(TIMID_DIR)/BITMAPS/$$i" ] ; then \
+ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/BITMAPS/$$i" ] ; then \
echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)/BITMAPS"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)/BITMAPS ; \
fi ; \

12
x11/kde/multimedia3/patches/patch-kmidi_BITMAPS_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kmidi_BITMAPS_Makefile_in,v 1.1 2002/06/04 09:52:45 espie Exp $
--- kmidi/BITMAPS/Makefile.in.orig Tue Jun 4 11:46:18 2002
+++ kmidi/BITMAPS/Makefile.in Tue Jun 4 11:46:29 2002
@@ -447,7 +447,7 @@ install-data-local:
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(TIMID_DIR)/BITMAPS
@for i in $(CONFIG_FILES); do \
- if [ ! -f "$(TIMID_DIR)/BITMAPS/$$i" ] ; then \
+ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/BITMAPS/$$i" ] ; then \
echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)/BITMAPS"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)/BITMAPS ; \
fi ; \

12
x11/kde/multimedia3/patches/patch-kmidi_config_Makefile_am Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kmidi_config_Makefile_am,v 1.1 2002/06/04 09:52:45 espie Exp $
--- kmidi/config/Makefile.am.orig Tue Jun 4 11:47:15 2002
+++ kmidi/config/Makefile.am Tue Jun 4 11:47:23 2002
@@ -11,7 +11,7 @@ SUBDIRS = patch
install-data-local:
$(mkinstalldirs) $(TIMID_DIR)
@for i in $(CONFIG_FILES); do \
- if [ ! -f "$(TIMID_DIR)/$$i" ] ; then \
+ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/$$i" ] ; then \
echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR) ; \
fi ; \

12
x11/kde/multimedia3/patches/patch-kmidi_config_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kmidi_config_Makefile_in,v 1.1 2002/06/04 09:52:45 espie Exp $
--- kmidi/config/Makefile.in.orig Tue Jun 4 11:46:58 2002
+++ kmidi/config/Makefile.in Tue Jun 4 11:47:11 2002
@@ -560,7 +560,7 @@ install-data-local:
#>+ 1
$(mkinstalldirs) $(DESTDIR)$(TIMID_DIR)
@for i in $(CONFIG_FILES); do \
- if [ ! -f "$(TIMID_DIR)/$$i" ] ; then \
+ if [ ! -f "$(DESTDIR)$(TIMID_DIR)/$$i" ] ; then \
echo "$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR)"; \
$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(TIMID_DIR) ; \
fi ; \