diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2001-03-17 21:47:58 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2001-03-17 21:47:58 +0000 |
commit | 8a66426a42730f121a42d37f61ae990fa2ca752e (patch) | |
tree | 2a96a6e8759cb794e54d504d7d9844e3391b3acf | |
parent | Update to 20010315. (diff) |
port did not install with NDEBUG=1
Some of INSTALL_PROGRAM's must got replaced with INSTALL_SCRIPT.
PR: 25825
Submitted by: sf
-rw-r--r-- | emulators/wine-devel/files/patch-ba | 18 | ||||
-rw-r--r-- | emulators/wine-devel/files/patch-tools_Makefile.in | 15 | ||||
-rw-r--r-- | emulators/wine-devel/files/patch-tools_specmaker_Makefile.in | 11 | ||||
-rw-r--r-- | emulators/wine/files/patch-ba | 18 | ||||
-rw-r--r-- | emulators/wine/files/patch-tools_Makefile.in | 15 | ||||
-rw-r--r-- | emulators/wine/files/patch-tools_specmaker_Makefile.in | 11 |
6 files changed, 70 insertions, 18 deletions
diff --git a/emulators/wine-devel/files/patch-ba b/emulators/wine-devel/files/patch-ba index 664cf844b121..e8a12001bc36 100644 --- a/emulators/wine-devel/files/patch-ba +++ b/emulators/wine-devel/files/patch-ba @@ -1,11 +1,6 @@ -Index: Make.rules.in -=================================================================== -RCS file: /home/wine/wine/Make.rules.in,v -retrieving revision 1.17 -diff -u -u -r1.17 Make.rules.in ---- Make.rules.in 1999/08/15 12:45:53 1.17 -+++ Make.rules.in 1999/09/24 23:39:10 -@@ -21,7 +21,7 @@ +--- Make.rules.in.orig Fri Jan 12 07:32:44 2001 ++++ Make.rules.in Sat Mar 10 09:16:59 2001 +@@ -25,7 +25,7 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ @@ -14,7 +9,12 @@ diff -u -u -r1.17 Make.rules.in X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ -@@ -69,7 +69,7 @@ +@@ -75,11 +75,12 @@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ diff --git a/emulators/wine-devel/files/patch-tools_Makefile.in b/emulators/wine-devel/files/patch-tools_Makefile.in new file mode 100644 index 000000000000..cf5751021b65 --- /dev/null +++ b/emulators/wine-devel/files/patch-tools_Makefile.in @@ -0,0 +1,15 @@ +--- tools/Makefile.in.orig Fri Jan 5 04:45:50 2001 ++++ tools/Makefile.in Sat Mar 10 09:31:33 2001 +@@ -44,9 +44,9 @@ + install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__) + [ -d $(bindir) ] || $(MKDIR) $(bindir) + $(INSTALL_PROGRAM) fnt2bdf $(bindir)/fnt2bdf +- $(INSTALL_PROGRAM) winelauncher $(bindir)/winelauncher +- $(INSTALL_PROGRAM) $(SRCDIR)/winemaker $(bindir)/winemaker +- $(INSTALL_PROGRAM) $(SRCDIR)/wineshelllink $(bindir)/wineshelllink ++ $(INSTALL_SCRIPT) winelauncher $(bindir)/winelauncher ++ $(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker ++ $(INSTALL_SCRIPT) $(SRCDIR)/wineshelllink $(bindir)/wineshelllink + + uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) + $(RM) $(bindir)/fnt2bdf $(bindir)/winelauncher $(bindir)/winemaker $(bindir)/wineshelllink diff --git a/emulators/wine-devel/files/patch-tools_specmaker_Makefile.in b/emulators/wine-devel/files/patch-tools_specmaker_Makefile.in new file mode 100644 index 000000000000..51587237d15e --- /dev/null +++ b/emulators/wine-devel/files/patch-tools_specmaker_Makefile.in @@ -0,0 +1,11 @@ +--- tools/specmaker/Makefile.in.orig Mon Jan 8 06:52:39 2001 ++++ tools/specmaker/Makefile.in Sat Mar 10 09:12:03 2001 +@@ -26,7 +26,7 @@ + install:: $(PROGRAMS) + [ -d $(bindir) ] || $(MKDIR) $(bindir) + $(INSTALL_PROGRAM) specmaker $(bindir)/specmaker +- $(INSTALL_PROGRAM) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl ++ $(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl + + uninstall:: + $(RM) $(bindir)/specmaker diff --git a/emulators/wine/files/patch-ba b/emulators/wine/files/patch-ba index 664cf844b121..e8a12001bc36 100644 --- a/emulators/wine/files/patch-ba +++ b/emulators/wine/files/patch-ba @@ -1,11 +1,6 @@ -Index: Make.rules.in -=================================================================== -RCS file: /home/wine/wine/Make.rules.in,v -retrieving revision 1.17 -diff -u -u -r1.17 Make.rules.in ---- Make.rules.in 1999/08/15 12:45:53 1.17 -+++ Make.rules.in 1999/09/24 23:39:10 -@@ -21,7 +21,7 @@ +--- Make.rules.in.orig Fri Jan 12 07:32:44 2001 ++++ Make.rules.in Sat Mar 10 09:16:59 2001 +@@ -25,7 +25,7 @@ CC = @CC@ CPP = @CPP@ CFLAGS = @CFLAGS@ @@ -14,7 +9,12 @@ diff -u -u -r1.17 Make.rules.in X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ -@@ -69,7 +69,7 @@ +@@ -75,11 +75,12 @@ + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_DATA = @INSTALL_DATA@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ diff --git a/emulators/wine/files/patch-tools_Makefile.in b/emulators/wine/files/patch-tools_Makefile.in new file mode 100644 index 000000000000..cf5751021b65 --- /dev/null +++ b/emulators/wine/files/patch-tools_Makefile.in @@ -0,0 +1,15 @@ +--- tools/Makefile.in.orig Fri Jan 5 04:45:50 2001 ++++ tools/Makefile.in Sat Mar 10 09:31:33 2001 +@@ -44,9 +44,9 @@ + install:: $(PROGRAMS) $(INSTALLSUBDIRS:%=%/__install__) + [ -d $(bindir) ] || $(MKDIR) $(bindir) + $(INSTALL_PROGRAM) fnt2bdf $(bindir)/fnt2bdf +- $(INSTALL_PROGRAM) winelauncher $(bindir)/winelauncher +- $(INSTALL_PROGRAM) $(SRCDIR)/winemaker $(bindir)/winemaker +- $(INSTALL_PROGRAM) $(SRCDIR)/wineshelllink $(bindir)/wineshelllink ++ $(INSTALL_SCRIPT) winelauncher $(bindir)/winelauncher ++ $(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker ++ $(INSTALL_SCRIPT) $(SRCDIR)/wineshelllink $(bindir)/wineshelllink + + uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) + $(RM) $(bindir)/fnt2bdf $(bindir)/winelauncher $(bindir)/winemaker $(bindir)/wineshelllink diff --git a/emulators/wine/files/patch-tools_specmaker_Makefile.in b/emulators/wine/files/patch-tools_specmaker_Makefile.in new file mode 100644 index 000000000000..51587237d15e --- /dev/null +++ b/emulators/wine/files/patch-tools_specmaker_Makefile.in @@ -0,0 +1,11 @@ +--- tools/specmaker/Makefile.in.orig Mon Jan 8 06:52:39 2001 ++++ tools/specmaker/Makefile.in Sat Mar 10 09:12:03 2001 +@@ -26,7 +26,7 @@ + install:: $(PROGRAMS) + [ -d $(bindir) ] || $(MKDIR) $(bindir) + $(INSTALL_PROGRAM) specmaker $(bindir)/specmaker +- $(INSTALL_PROGRAM) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl ++ $(INSTALL_SCRIPT) $(SRCDIR)/function_grep.pl $(bindir)/function_grep.pl + + uninstall:: + $(RM) $(bindir)/specmaker |