*** core/make/target.make.orig	Fri Aug  2 06:18:03 2002
--- core/make/target.make	Tue Aug  6 11:26:40 2002
***************
*** 757,772 ****
  #
  ifeq ($(findstring netbsdelf, $(GNUSTEP_TARGET_OS)), netbsdelf)
  HAVE_SHARED_LIBS	= yes
  SHARED_LIB_LINK_CMD = \
  	$(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
! 	   -o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
  	(cd $(GNUSTEP_OBJ_DIR); \
  	  rm -f $(LIBRARY_FILE); \
  	  $(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
  SHARED_FRAMEWORK_LINK_CMD = \
  	$(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
! 	   -o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
! 	$^ ;\
  	(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
  	  rm -f $(FRAMEWORK_LIBRARY_FILE); \
  	  $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
--- 757,776 ----
  #
  ifeq ($(findstring netbsdelf, $(GNUSTEP_TARGET_OS)), netbsdelf)
  HAVE_SHARED_LIBS	= yes
+ SHARED_LD_POSTFLAGS	= -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
  SHARED_LIB_LINK_CMD = \
  	$(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
! 	  -o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) \
!           $^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
!           $(SHARED_LD_POSTFLAGS); \
  	(cd $(GNUSTEP_OBJ_DIR); \
  	  rm -f $(LIBRARY_FILE); \
  	  $(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
  SHARED_FRAMEWORK_LINK_CMD = \
  	$(CC) -shared -Wl,-soname,$(VERSION_FRAMEWORK_LIBRARY_FILE) \
! 	  -o $(FRAMEWORK_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) \
! 	  $^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
!           $(SHARED_LD_POSTFLAGS); \
  	(cd $(FRAMEWORK_LIBRARY_DIR_NAME); \
  	  rm -f $(FRAMEWORK_LIBRARY_FILE); \
  	  $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(FRAMEWORK_LIBRARY_FILE))
***************
*** 782,790 ****
  BUNDLE_LD	= $(CC)
  BUNDLE_CFLAGS	+= -fPIC
  BUNDLE_LDFLAGS	+= -shared
! ADDITIONAL_LDFLAGS += -rdynamic
  ifeq ($(shared), no)
! ADDITIONAL_LDFLAGS += -static
  endif
  endif
  #
--- 786,795 ----
  BUNDLE_LD	= $(CC)
  BUNDLE_CFLAGS	+= -fPIC
  BUNDLE_LDFLAGS	+= -shared
! ADDITIONAL_LDFLAGS += -rdynamic -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
! ADDITIONAL_INCLUDE_DIRS += -I/usr/pkg/include
  ifeq ($(shared), no)
! ADDITIONAL_LDFLAGS += -static -L/usr/pkg/lib
  endif
  endif
  #
*** core/make/configure.ac.orig	Fri May 10 10:47:58 2002
--- core/make/configure.ac	Tue Aug  6 11:23:50 2002
***************
*** 54,59 ****
--- 54,61 ----
  case "$target_os" in
    freebsd*)	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  		LIBS="$LIBS -L/usr/local/lib";;
+   netbsd*)	FORCE_CPPFLAGS="-I/usr/pkg/include"
+ 		LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
  esac
  
  #--------------------------------------------------------------------
*** core/base/configure.ac.orig	Thu Jul  4 05:21:51 2002
--- core/base/configure.ac	Tue Aug  6 11:23:50 2002
***************
*** 63,68 ****
--- 63,70 ----
  case "$target_os" in
    freebsd*)	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
  		LIBS="$LIBS -L/usr/local/lib";;
+   netbsd*)	CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+ 		LIBS="$LIBS -L/usr/pkg/lib";;
  
  esac
  
*** core/gui/configure.ac.orig	Thu Aug  1 20:58:32 2002
--- core/gui/configure.ac	Tue Aug  6 11:23:50 2002
***************
*** 59,64 ****
--- 59,71 ----
  LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
  
  #--------------------------------------------------------------------
+ # Add target OS directories as necessary
+ case "$target_os" in
+   netbsd*)   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+               LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
+ esac
+ 
+ #--------------------------------------------------------------------
  # Find the compiler
  #--------------------------------------------------------------------
  AC_PROG_CC
*** core/back/configure.ac.orig	Sat Aug  3 05:32:19 2002
--- core/back/configure.ac	Tue Aug  6 11:23:50 2002
***************
*** 60,65 ****
--- 60,72 ----
  LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
  
  #--------------------------------------------------------------------
+ # Add target OS directories as necessary
+ case "$target_os" in
+   netbsd*)   CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+               LDFLAGS="$LDFLAGS -L/usr/pkg/lib";;
+ esac
+ 
+ #--------------------------------------------------------------------
  # Look for WindowMaker's wraster library
  #--------------------------------------------------------------------
  AC_ARG_WITH(wraster,