Make this work on Interix.

2 files changed, 34 insertions, 15 deletions

diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 7dfc5f131ff..5d17ca30490 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2004/10/01 12:56:33 adam Exp $
+$NetBSD: distinfo,v 1.26 2004/10/21 20:45:52 tv Exp $
 
 SHA1 (netpbm-10.18.15.tgz) = fdb050f24055efdcebb68b441be10559fa9f59be
 Size (netpbm-10.18.15.tgz) = 2098201 bytes
-SHA1 (patch-aa) = f16f261d0812550266a1a857c28966ec3356e5bb
+SHA1 (patch-aa) = 673f49ef0339a23c747a8600cc1d28c84af307d3
 SHA1 (patch-ab) = 1a1acf71faea487fce9fb102509b0aab06950fb7
 SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199
 SHA1 (patch-ad) = 0ca982f5ee83370b367025d5ddef74a984dc07fe
diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index d41130e59f5..6341d1c3192 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
+$NetBSD: patch-aa,v 1.28 2004/10/21 20:45:52 tv Exp $
 
---- Makefile.config.in.orig	2004-01-13 23:12:28.000000000 +0000
+--- Makefile.config.in.orig	Tue Jan 13 18:12:28 2004
 +++ Makefile.config.in
 @@ -33,7 +33,7 @@ BUILD_FIASCO = Y
  #CC = gcc
@@ -29,17 +29,19 @@ $NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
  # If you don't want to strip the binaries, just leave it null:
  #STRIPFLAG = 
  
-@@ -101,7 +101,9 @@ MANPAGE_FORMAT = nroff
+@@ -101,8 +101,10 @@ MANPAGE_FORMAT = nroff
  AR = ar
  RANLIB = ranlib
  # IRIX, SCO don't have Ranlib:
 -#RANLIB = true
+-LEX = flex
 +ifeq ($(OPSYS),IRIX)
 +RANLIB = ar rs
 +endif
- LEX = flex
++#LEX = flex
  # Solaris:
  # LEX = flex -e
+ # Or just skip parts that need Lex:
 @@ -151,7 +153,7 @@ EXE =
    
  # linker options.  
@@ -49,9 +51,18 @@ $NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
  # Eunice users may want to use -noshare so that the executables can
  # run standalone:
  #LDFLAGS = -noshare
-@@ -204,6 +206,14 @@ LDRELOC = NONE
- #LDRELOC = ld -r
+@@ -174,7 +176,7 @@ LDFLAGS =
  
+ # Here, $(SONAME) resolves to the soname for the shared library being created.
+ # The following are gcc options.  This works on GNU libc systems.
+-LDSHLIB = -shared -Wl,-soname,$(SONAME)
++LDSHLIB = -shared -Wl,-h,$(SONAME)
+ # You need -nostart instead of -shared on BeOS.  Though the BeOS compiler is
+ # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc
+ # documentation and doesn't exist in at least one non-BeOS installation.
+@@ -203,6 +205,18 @@ LDRELOC = NONE
+ #LDRELOC = ld --relocateable
+ #LDRELOC = ld -r
  
 +ifeq ($(OPSYS),SunOS)
 +LDSHLIB = -Wl,-B,dynamic,-G,-h,$(SONAME) 
@@ -61,10 +72,14 @@ $NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
 +LDSHLIB = -dynamiclib -install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib
 +endif
 +
++ifeq ($(OPSYS),Interix)
++# random base address between 0x6B000000 and 0x6D000000
++LDSHLIB+= -Wl,--image-base,$$(($$RANDOM %64/2*1048576+1795162112))
++endif
+ 
  # On older systems, you have to make shared libraries out of position
  # independent code, so you need -fpic or fPIC here.  (The rule is: if
- # -fpic works, use it.  If it bombs, go to fPIC).  On newer systems,
-@@ -221,11 +231,19 @@ LDRELOC = NONE
+@@ -221,11 +235,23 @@ LDRELOC = NONE
  CFLAGS_SHLIB = 
  # Solaris or SunOS with gcc, and NetBSD:
  #CFLAGS_SHLIB = -fpic
@@ -82,10 +97,14 @@ $NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
 +CFLAGS_SHLIB = -KPIC
 +endif
 +
++ifeq ($(OPSYS),Interix)
++CFLAGS_SHLIB = # none!
++endif
++
  # SHLIB_CLIB is the link option to include the C library in a shared library,
  # normally "-lc".  On typical systems, this serves no purpose.  On some,
  # though, it causes information about which C library to use to be recorded
-@@ -294,8 +312,8 @@ TIFFHDR_DIR =
+@@ -294,8 +320,8 @@ TIFFHDR_DIR =
  #TIFFLIB = libtiff.so
  #TIFFHDR_DIR = /usr/include/libtiff
  #NetBSD:
@@ -96,7 +115,7 @@ $NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
  # OSF, Tru64:
  #TIFFLIB = /usr/local1/DEC/lib/libtiff.so
  #TIFFHDR_DIR = /usr/local1/DEC/include
-@@ -323,8 +341,8 @@ JPEGHDR_DIR =
+@@ -323,8 +349,8 @@ JPEGHDR_DIR =
  #JPEGLIB = libjpeg.so
  #JPEGHDR_DIR = /usr/include/jpeg
  # Netbsd:
@@ -107,7 +126,7 @@ $NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
  # OSF, Tru64:
  #JPEGLIB = /usr/local1/DEC/libjpeg.so
  #JPEGHDR_DIR = /usr/local1/DEC/include
-@@ -348,8 +366,8 @@ PNGVER = 
+@@ -348,8 +374,8 @@ PNGVER = 
  #PNGLIB = libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/include/libpng$(PNGVER)
  # NetBSD:
@@ -118,7 +137,7 @@ $NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
  # OSF/Tru64:
  #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so
  #PNGHDR_DIR = /usr/local1/DEC/include
-@@ -359,8 +377,8 @@ PNGVER = 
+@@ -359,8 +385,8 @@ PNGVER = 
  # NONE for the PNG library, it doesn't matter what you specify here --
  # it won't get used.
  
@@ -129,7 +148,7 @@ $NetBSD: patch-aa,v 1.27 2004/04/29 08:02:39 adam Exp $
  #ZLIB = libz.so
  
  # The JBIG lossless image compression library (aka JBIG-KIT):
-@@ -401,7 +419,7 @@ OMIT_NETWORK =
+@@ -401,7 +427,7 @@ OMIT_NETWORK =
  # built into the standard C library, so this can be null.  This is irrelevant
  # if OMIT_NETWORK is "y".