diff options
author | Steve Price <steve@FreeBSD.org> | 1998-10-05 04:49:51 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1998-10-05 04:49:51 +0000 |
commit | 0850a38f1861ab476b886647e6675886f0d40272 (patch) | |
tree | 460bb9b391d0cdb2c2bd0f3adc5a36b917863112 /graphics/urt/files | |
parent | Update to version 4.05. (diff) |
Make this deinstall friendly.
Notes
Notes:
svn path=/head/; revision=13662
Diffstat (limited to 'graphics/urt/files')
-rw-r--r-- | graphics/urt/files/patch-aa | 13 | ||||
-rw-r--r-- | graphics/urt/files/patch-ab | 39 | ||||
-rw-r--r-- | graphics/urt/files/patch-ad | 18 | ||||
-rw-r--r-- | graphics/urt/files/patch-ae | 53 | ||||
-rw-r--r-- | graphics/urt/files/patch-af | 10 |
5 files changed, 81 insertions, 52 deletions
diff --git a/graphics/urt/files/patch-aa b/graphics/urt/files/patch-aa index 49bae83dca5f..d54cac3ac94f 100644 --- a/graphics/urt/files/patch-aa +++ b/graphics/urt/files/patch-aa @@ -1,5 +1,5 @@ ---- config/urt.orig Wed Jul 15 15:47:15 1992 -+++ config/urt Wed Feb 11 01:01:24 1998 +--- config/urt.orig Wed Jul 15 14:47:15 1992 ++++ config/urt Sun Oct 4 22:57:47 1998 @@ -1,3 +1,7 @@ +# Configuration for HP 9000/300 series running BSD4.3 + @@ -144,7 +144,7 @@ #endif #ifdef SUNRASTER|SUNTOOLS|TAAC1 -@@ -216,9 +221,9 @@ +@@ -216,9 +219,12 @@ #ifdef TIFF # Location of tiff library and include files. Relative to URT root directory. @@ -153,11 +153,14 @@ -LIBTIFF = $(TIFFDIR)/libtiff.a +##defpath TIFFDIR +INCTIFF = -I${PREFIX}/include/tiff34 -+LIBTIFF = -L${PREFIX}/lib -ltiff34 -ljpeg ++LIBTIFF = -L${PREFIX}/lib -ltiff34 ++.if ${PORTOBJFORMAT} == "elf" ++LIBTIFF +=-Wl,-rpath,${PREFIX}/lib ++.endif #endif #ifdef X10 -@@ -227,6 +232,6 @@ +@@ -227,6 +233,6 @@ #endif #ifdef X11 diff --git a/graphics/urt/files/patch-ab b/graphics/urt/files/patch-ab index bb0a51a01bf6..e724cd23f37a 100644 --- a/graphics/urt/files/patch-ab +++ b/graphics/urt/files/patch-ab @@ -58,45 +58,6 @@ diff -ur ../urt-3.1b-orig/makefile.src ./makefile.src done -diff -ur ../urt-3.1b-orig/makefile.tlr ./makefile.tlr ---- ../urt-3.1b-orig/makefile.tlr Tue Aug 4 13:17:57 1992 -+++ ./makefile.tlr Sat Sep 16 10:35:58 1995 -@@ -7,7 +7,7 @@ - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'set -e ; for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Make ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) ) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ - done' ; \ - else \ - true ; \ -@@ -46,7 +46,7 @@ - @sh -c "if test 'x$(DIRS)' != x ; then eval \ - 'for dir in $(DIRS) ; do \ - (cd \$$dir ; echo Install ${HERE}\$$dir ; \ -- make $(MFLAGS) $(DIRMFLAGS) install) ; \ -+ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ - done' ; \ - else \ - true ; \ -@@ -105,7 +105,7 @@ - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Make ${HERE}$$dir pristine ; \ -- make $(MFLAGS) pristine); \ -+ $(MAKE) $(MFLAGS) pristine); \ - else \ - true; \ - fi; \ -@@ -124,7 +124,7 @@ - 'for dir in $(ALLDIRS); do \ - if test -d $$dir ; then \ - (cd $$dir; echo Clean ${HERE}$$dir ; \ -- make $(MFLAGS) clean); \ -+ $(MAKE) $(MFLAGS) clean); \ - else \ - true; \ - fi; \ diff -ur ../urt-3.1b-orig/tools/into.c ./tools/into.c --- ../urt-3.1b-orig/tools/into.c Thu Apr 30 10:10:15 1992 +++ ./tools/into.c Sat Sep 16 10:32:26 1995 diff --git a/graphics/urt/files/patch-ad b/graphics/urt/files/patch-ad index 4ca49d6b5d8e..2574fb66b0a2 100644 --- a/graphics/urt/files/patch-ad +++ b/graphics/urt/files/patch-ad @@ -1,5 +1,5 @@ --- lib/makefile.src.orig Wed Mar 4 13:32:53 1992 -+++ lib/makefile.src Sat Oct 3 23:57:51 1998 ++++ lib/makefile.src Sun Oct 4 23:38:40 1998 @@ -26,7 +26,14 @@ vaxshort.o \ $(OPT_OBJS) @@ -16,7 +16,7 @@ # Just rebuild the object files. objs: $(OBJS) -@@ -37,23 +44,14 @@ +@@ -37,40 +44,46 @@ # Do nothing if $(DEST) is empty (or not defined) install: buildlib @sh -c "if test '$(DEST)x' != x ; then \ @@ -47,8 +47,10 @@ else \ true ; \ fi ; \ -@@ -63,14 +61,30 @@ - touch install + else \ + true ; \ + fi" +- touch install # Rebuild the library from all the .o files. -buildlib: $(OBJS) @@ -59,7 +61,7 @@ + +$(LIBANAME): $(OBJS) + -rm -f $@ -+ ar rc $@ $? ++ ar rc $@ $(OBJS) #ifndef NO_RANLIB - ranlib $(LIBNAME) + ranlib $@ @@ -75,16 +77,16 @@ +.if $(PORTOBJFORMAT) == "elf" +$(LIBSONAME): $(SOOBJS) + -rm -f $@ -+ ld -shared -soname $@ -o $@ $> ++ ld -shared -soname $@ -o $@ $(SOOBJS) +.else +$(LIBSONAME): $(SOOBJS) + -rm -f $@ -+ ld -Bshareable -o $@ $> ++ ld -Bshareable -o $@ $(SOOBJS) +.endif # Clean up installed stuff and binaries pristine: clean -@@ -86,9 +100,12 @@ +@@ -86,9 +99,12 @@ # Get rid of everything which must be recompiled on a different computer. clean: -rm -f *.o diff --git a/graphics/urt/files/patch-ae b/graphics/urt/files/patch-ae new file mode 100644 index 000000000000..6e33d2878bfd --- /dev/null +++ b/graphics/urt/files/patch-ae @@ -0,0 +1,53 @@ +--- makefile.tlr.orig Tue Aug 4 12:17:57 1992 ++++ makefile.tlr Sun Oct 4 23:37:05 1998 +@@ -7,7 +7,7 @@ + @sh -c "if test 'x$(DIRS)' != x ; then eval \ + 'set -e ; for dir in $(DIRS) ; do \ + (cd \$$dir ; echo Make ${HERE}\$$dir ; \ +- make $(MFLAGS) $(DIRMFLAGS) ) ; \ ++ $(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \ + done' ; \ + else \ + true ; \ +@@ -24,7 +24,6 @@ + else \ + true ; \ + fi" +- touch install-pgm + + # Install all scripts + install-script: $(SCRIPTS) +@@ -39,14 +38,13 @@ + else \ + true ; \ + fi" +- touch install-pgm + + # Install subdirectories + install-subdirs: subdirs + @sh -c "if test 'x$(DIRS)' != x ; then eval \ + 'for dir in $(DIRS) ; do \ + (cd \$$dir ; echo Install ${HERE}\$$dir ; \ +- make $(MFLAGS) $(DIRMFLAGS) install) ; \ ++ $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \ + done' ; \ + else \ + true ; \ +@@ -105,7 +103,7 @@ + 'for dir in $(ALLDIRS); do \ + if test -d $$dir ; then \ + (cd $$dir; echo Make ${HERE}$$dir pristine ; \ +- make $(MFLAGS) pristine); \ ++ $(MAKE) $(MFLAGS) pristine); \ + else \ + true; \ + fi; \ +@@ -124,7 +122,7 @@ + 'for dir in $(ALLDIRS); do \ + if test -d $$dir ; then \ + (cd $$dir; echo Clean ${HERE}$$dir ; \ +- make $(MFLAGS) clean); \ ++ $(MAKE) $(MFLAGS) clean); \ + else \ + true; \ + fi; \ diff --git a/graphics/urt/files/patch-af b/graphics/urt/files/patch-af new file mode 100644 index 000000000000..31ba46440793 --- /dev/null +++ b/graphics/urt/files/patch-af @@ -0,0 +1,10 @@ +--- include/makefile.src.orig Sun Oct 4 23:45:39 1998 ++++ include/makefile.src Sun Oct 4 23:45:50 1998 +@@ -44,7 +44,6 @@ + else \ + true ; \ + fi" +- touch install + + # Nothing to clean + clean: |