Fix build

PR:		ports/43686
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

7 files changed, 18 insertions, 15 deletions

diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index c52317ef860a..ae09dda9c673 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -13,15 +13,18 @@ MASTER_SITE_SUBDIR=	X11/desktop
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xforms:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 
-USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 
-post-build:
-	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~ ;\
+post-patch:
+	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~
 	${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
 		${WRKSRC}/xbackdrop/backdrops/index
+	${FIND} ${WRKSRC} -name '*.c' -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's,FL_REVISION>=80,FL_REVISION >= 80 || FL_VERSION != 0,g'
 
 .include <bsd.port.mk>
diff --git a/x11/tycoon/files/patch-aa b/x11/tycoon/files/patch-aa
index 0ed9dae1ac94..15122fe8a0a5 100644
--- a/x11/tycoon/files/patch-aa
+++ b/x11/tycoon/files/patch-aa
@@ -10,12 +10,12 @@
 -XCOMM FOR Solaris
 -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
 +XCOMM FOR FreeBSD
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
++EXTRA_LIBRARIES  = -lforms -lXpm -lm
  
  
 -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
-+EXTRA_INCLUDES  = -I.
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
diff --git a/x11/tycoon/files/patch-ab b/x11/tycoon/files/patch-ab
index 8e483c96c842..9b7852d76641 100644
--- a/x11/tycoon/files/patch-ab
+++ b/x11/tycoon/files/patch-ab
@@ -7,7 +7,7 @@
 -EXTRA_LIBRARIES  = -L/usr/local/lib -L/users/matar/interu/segel/mitnits/lib -lXpm
 -EXTRA_INCLUDES  = -I/usr/local/include -I/users/matar/interu/segel/mitnits/lib -I.
 +EXTRA_LIBRARIES  = -lXpm
-+EXTRA_INCLUDES  = -I.
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
  EXTRA_DEFINES = -DVERSION=\"$(VERSION)\"
  LDLIBS = $(EXTRA_LIBRARIES) $(XAWLIB) $(XMULIB) \
  	$(XTOOLLIB) $(EXTENSIONLIB) $(XLIB) 
diff --git a/x11/tycoon/files/patch-ac b/x11/tycoon/files/patch-ac
index 9f9cff8db188..818830025ad3 100644
--- a/x11/tycoon/files/patch-ac
+++ b/x11/tycoon/files/patch-ac
@@ -16,11 +16,11 @@
 -XCOMM FOR Solaris
 -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
 +XCOMM FOR FreeBSD
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
++EXTRA_LIBRARIES  = -lforms -lXpm -lm
  
  
 -EXTRA_INCLUDES = -I/usr/local/include -I/u/grad/mitnits/lib -I.
-+EXTRA_INCLUDES = -I.
++EXTRA_INCLUDES = -I. -I${INCDIR}/X11
  EXTRA_DEFINES =  -DXBACKDROP_DIR=\"$(XBACKDROP_DIR)\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
diff --git a/x11/tycoon/files/patch-ad b/x11/tycoon/files/patch-ad
index ed7661850710..47aa2a19c484 100644
--- a/x11/tycoon/files/patch-ad
+++ b/x11/tycoon/files/patch-ad
@@ -10,12 +10,12 @@
 -XCOMM FOR Solaris
 -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
 +XCOMM FOR FreeBSD
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
++EXTRA_LIBRARIES  = -lforms -lXpm -lm
  
  
 -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
-+EXTRA_INCLUDES  = -I.
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
diff --git a/x11/tycoon/files/patch-ae b/x11/tycoon/files/patch-ae
index ca3b92afc345..051828969862 100644
--- a/x11/tycoon/files/patch-ae
+++ b/x11/tycoon/files/patch-ae
@@ -7,8 +7,8 @@
 -EXTRA_LIBRARIES  = -L/usr/local/lib -lforms -lXpm -lm
 -EXTRA_INCLUDES  = -I/usr/local/include -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm
-+EXTRA_INCLUDES  = -I.
++EXTRA_LIBRARIES  = -lforms -lXpm -lm
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps/\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)
  
diff --git a/x11/tycoon/files/patch-af b/x11/tycoon/files/patch-af
index 923e111de8fa..ca60cc1153e4 100644
--- a/x11/tycoon/files/patch-af
+++ b/x11/tycoon/files/patch-af
@@ -10,12 +10,12 @@
 -XCOMM FOR Solaris
 -XCOMM EXTRA_LIBRARIES  = -L/usr/local/lib -L/u/grad/mitnits/lib -lforms -lXpm -lm -lnsl
 +XCOMM FOR FreeBSD
-+EXTRA_LIBRARIES  = -lxforms -lXpm -lm 
++EXTRA_LIBRARIES  = -lforms -lXpm -lm 
  
  
 -EXTRA_INCLUDES  = -I/usr/local/include -I/u/grad/mitnits/lib -I.
 -EXTRA_DEFINES  = -DICON_DIR=\"/usr/include/X11/pixmaps\"
-+EXTRA_INCLUDES  = -I.
++EXTRA_INCLUDES  = -I. -I${INCDIR}/X11
 +EXTRA_DEFINES  = -DICON_DIR=\"${INCDIR}/pixmaps/\"
  LDLIBS = $(EXTRA_LIBRARIES) $(EXTENSIONLIB) $(XLIB)