$OpenBSD: patch-Makefile_in,v 1.6 2012/04/05 16:08:55 jasper Exp $
--- Makefile.in.orig	Thu Mar 18 20:58:48 2010
+++ Makefile.in	Thu Apr  5 14:03:25 2012
@@ -11,10 +11,10 @@ STATIC		:= @STATIC@
 doc_files	:= docs INSTALL CREDITS FAQ GNUGPL HELP README TODO AGREEMENT remote.help
 
 FILES_TO_INSTALL := *.tcl hotmlog.htm amsn amsn-remote amsn-remote-CLI amsn.desktop langlist
-FILES_TO_INSTALL += $(doc_files)
+FILES_TO_INSTALL += remote.help
 FILES_TO_INSTALL += desktop-icons lang skins utils/des utils/base64 utils/drawboard utils/framec utils/http
 FILES_TO_INSTALL += utils/pixmapscroll utils/pixmapmenu utils/contentmanager
-FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/BWidget-1.9.0 utils/dpbrowser
+FILES_TO_INSTALL += utils/scalable-bg utils/sha1 utils/snit utils/dpbrowser
 FILES_TO_INSTALL += plugins utils/sexytile
 FILES_TO_INSTALL += utils/log utils/uri utils/combobox utils/voipcontrols
 FILES_TO_INSTALL += utils/md4 utils/sasl ca-certs
@@ -82,7 +82,7 @@ USE_MMX		:= @USE_MMX@
 # build final cflags
 CFLAGS   := @CFLAGS@
 ifeq (@DEBUG@,no)
-CFLAGS   += -O2
+#CFLAGS   += -O2
 else
 CFLAGS   += -g3 -DDEBUG
 endif
@@ -104,9 +104,9 @@ CFLAGS   += -DPACKAGE='"$(PACKAGE)"'
 CFLAGS   += -DVERSION='"$(VERSION)"'
 CFLAGS   += -DLIBDIR='"$(LIBDIR)"'
 
-CXXFLAGS := @CXXFLAGS@
+CXXFLAGS := $(CFLAGS) @CXXFLAGS@
 ifeq (@DEBUG@,no)
-CXXFLAGS   += -O2
+#CXXFLAGS   += -O2
 else
 CXXFLAGS   += -g3 -DDEBUG
 endif
@@ -127,8 +127,8 @@ endif
 
 GST_LIBS        := @GST_LIBS@ @GST_INTERFACES_LIBS@
 GST_CFLAGS      := @GST_CFLAGS@ @GST_INTERFACES_CFLAGS@
-FARSIGHT2_LIBS  := @FARSIGHT2_LIBS@
-FARSIGHT2_CFLAGS := @FARSIGHT2_CFLAGS@
+FARSTREAM_LIBS  := @FARSTREAM_LIBS@
+FARSTREAM_CFLAGS := @FARSTREAM_CFLAGS@
 
 
 # for gcc3
@@ -169,7 +169,7 @@ ifeq (@HAVE_GUPNP@,yes)
   FILES_TO_INSTALL += utils/gupnp/gupnp.$(SHLIB_EXTENSION) utils/gupnp/pkgIndex.tcl
 endif
 
-ifeq (@HAVE_FARSIGHT@,yes)
+ifeq (@HAVE_FARSTREAM@,yes)
   FILES_TO_INSTALL += utils/farsight/tcl_farsight.$(SHLIB_EXTENSION) utils/farsight/pkgIndex.tcl
 endif
 
@@ -234,9 +234,9 @@ install:: $(FILES_TO_INSTALL)
 		rm -Rf $(DESTDIR)$(dstdir)/$(PACKAGE)/$$p; \
 	done
 
-	ln -sf $(dstdir)/$(PACKAGE)/amsn $(DESTDIR)$(slnkdir)/amsn
-	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(DESTDIR)$(slnkdir)/amsn-remote
-	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(DESTDIR)$(slnkdir)/amsn-remote-CLI
+#	ln -sf $(dstdir)/$(PACKAGE)/amsn $(DESTDIR)$(slnkdir)/amsn
+#	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote $(DESTDIR)$(slnkdir)/amsn-remote
+#	ln -sf $(dstdir)/$(PACKAGE)/amsn-remote-CLI $(DESTDIR)$(slnkdir)/amsn-remote-CLI
 
 	cp $(srcdir)/amsn.desktop $(DESTDIR)$(dstdir)/applications/
 
@@ -319,7 +319,7 @@ include $(tclISF_dir)/src/Rules.mk
 include $(async_dir)/Rules.mk
 include $(async_dir)/src/Rules.mk
 
-ifeq (@HAVE_FARSIGHT@,yes)
+ifeq (@HAVE_FARSTREAM@,yes)
   include $(tcl_farsight_dir)/Rules.mk
   include $(tcl_farsight_dir)/src/Rules.mk
 endif
