- Support CFLAGS/CXX/CXXFLAGS/PREFIX/X11BASE properly

- Support install macros
- Add USE_BISON
- Remove unneeded USE_GMAKE
- Change install path of data files from lib/ to share/

PR:		17529
Submitted by:	tkato@prontomail.ne.jp

3 files changed, 137 insertions, 50 deletions

diff --git a/x11-fm/jafm/Makefile b/x11-fm/jafm/Makefile
index c90e37164067..25169395eafa 100644
--- a/x11-fm/jafm/Makefile
+++ b/x11-fm/jafm/Makefile
@@ -1,7 +1,7 @@
-# New ports collection makefile for:   jafm
+# New ports collection makefile for:	jafm
 # Version required:		0.5
-# Date created:                31 August 1998
-# Whom:                        brett@peloton.physics.montana.edu
+# Date created:			31 August 1998
+# Whom:				brett@peloton.physics.montana.edu
 #
 # $FreeBSD$
 #
@@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR=	X11/desktop
 MAINTAINER=	brett@peloton.runet.edu
 
 USE_QT=		yes
-USE_GMAKE=	yes
+USE_BISON=	yes
+MAKE_ENV=	Cxx="${CXX}" CxxFLAGS="${CXXFLAGS}"
 ALL_TARGET=	jafm
 
 MAN8=	jafm.8
diff --git a/x11-fm/jafm/files/patch-aa b/x11-fm/jafm/files/patch-aa
index 9967687ca92f..e23c241ade27 100644
--- a/x11-fm/jafm/files/patch-aa
+++ b/x11-fm/jafm/files/patch-aa
@@ -1,29 +1,115 @@
-*** Makefile.bak	Thu Oct 23 22:44:05 1997
---- Makefile	Fri Jul 31 17:38:01 1998
+*** Makefile.orig	Fri Oct 24 13:44:05 1997
+--- Makefile	Sat Mar 18 21:41:42 2000
 ***************
-*** 11,16 ****
---- 11,17 ----
-  JAFMDIR=$(INSTALLDIR)/lib/jafm
+*** 5,16 ****
+  # requires GNU make
+  
+  
+! INSTALLDIR=/usr/local
+  #INSTALLDIR=/nb/rupert
+  
+! JAFMDIR=$(INSTALLDIR)/lib/jafm
   ZICDIR=$(JAFMDIR)/zic
   APPLDIR=$(JAFMDIR)/appl
-+ QTDIR=/usr/X11R6
+  
+  
+  .SUFFIXES: .cc .o .cc.o
+--- 5,17 ----
+  # requires GNU make
+  
+  
+! INSTALLDIR=${PREFIX}
+  #INSTALLDIR=/nb/rupert
+  
+! JAFMDIR=$(INSTALLDIR)/share/jafm
+  ZICDIR=$(JAFMDIR)/zic
+  APPLDIR=$(JAFMDIR)/appl
++ QTDIR=${X11BASE}
   
   
   .SUFFIXES: .cc .o .cc.o
 ***************
-*** 30,36 ****
+*** 26,40 ****
+  M%.cc:	%.hh
+  	$(MOC) $< -o $@
+  
+! CC  = gcc
   MOC = ${QTDIR}/bin/moc
-  Cxx =g++ 
+! Cxx =g++ 
   
 ! INCFLAGS=-I${QTDIR}/include
-  CxxFLAGS= -Wall #-pipe
-  CFLAGS= -Wall #-pipe
-  OPT=-g
---- 31,37 ----
+! CxxFLAGS= -Wall #-pipe
+! CFLAGS= -Wall #-pipe
+! OPT=-g
+! DEFINES=
+  # FILES
+  
+  HEADERS= iconview.hh menus.hh icon.hh dirbar.hh icondesk.hh deskicon.hh
+--- 27,41 ----
+  M%.cc:	%.hh
+  	$(MOC) $< -o $@
+  
+! CC  ?= gcc
   MOC = ${QTDIR}/bin/moc
-  Cxx =g++ 
+! Cxx ?= g++ 
+  
+! INCFLAGS = -I${QTDIR}/include/X11/qt -I${QTDIR}/include
+! CxxFLAGS ?= -Wall #-pipe
+! CFLAGS ?= -Wall #-pipe
+! #OPT = -g
+! #DEFINES =
+  # FILES
+  
+  HEADERS= iconview.hh menus.hh icon.hh dirbar.hh icondesk.hh deskicon.hh
+***************
+*** 50,77 ****
+  
+  MOBJS=  Miconview.o Mmenus.o Micon.o Mdirbar.o Micondesk.o Msfm.o Mdeskicon.o
+  
+! LIBDIR=-L${QTDIR}/lib -L/usr/X11/lib
+  
+  jafm	: $(OBJS) $(MOBJS)
+  	$(Cxx) $(CxxLFAGS) -o jafm $(OBJS) $(MOBJS) $(LIBDIR) -lqt -lX11 -lXext
+  
+  # must do this properly next time...
+  install: jafm
+! 	mkdir -p -m 755 $(JAFMDIR)
+! 	mkdir -p -m 755 $(INSTALLDIR)/bin
+! 	mkdir -p -m 755 $(APPLDIR)
+! 	mkdir -p -m 755 $(ZICDIR) 
+! 	cp system.jafmrules $(JAFMDIR)/system.jafmrules
+! 	chmod 755 $(JAFMDIR)/system.jafmrules
+! 	cp jafm $(INSTALLDIR)/bin/jafm
+! 	chmod 755 $(INSTALLDIR)/bin/jafm
+! 	cp zic/*.zic $(ZICDIR)
+! 	chmod 644 $(ZICDIR)/*
+! 	cp  appl/* $(APPLDIR)
+! 	chmod 644 $(APPLDIR)/*
+! 	mkdir -p -m 755 $(INSTALLDIR)/man/man8
+! 	cp jafm.8 $(INSTALLDIR)/man/man8
+! 	chmod 644 $(INSTALLDIR)/man/man8/jafm.8
+  
+  dep: $(MSOURCES)
+  	makedepend -I. -I$(QTDIR)/include $(SOURCES) $(MSOURCES) >/dev/null 2>&1
+--- 51,71 ----
+  
+  MOBJS=  Miconview.o Mmenus.o Micon.o Mdirbar.o Micondesk.o Msfm.o Mdeskicon.o
+  
+! LIBDIR=-L${QTDIR}/lib
+  
+  jafm	: $(OBJS) $(MOBJS)
+  	$(Cxx) $(CxxLFAGS) -o jafm $(OBJS) $(MOBJS) $(LIBDIR) -lqt -lX11 -lXext
+  
+  # must do this properly next time...
+  install: jafm
+! 	mkdir -p $(JAFMDIR)
+! 	mkdir -p $(APPLDIR)
+! 	mkdir -p $(ZICDIR) 
+! 	${BSD_INSTALL_DATA} system.jafmrules $(JAFMDIR)/system.jafmrules
+! 	${BSD_INSTALL_PROGRAM} jafm $(INSTALLDIR)/bin/jafm
+! 	${BSD_INSTALL_DATA} zic/*.zic $(ZICDIR)
+! 	${BSD_INSTALL_DATA} appl/* $(APPLDIR)
+! 	${BSD_INSTALL_MAN} jafm.8 $(INSTALLDIR)/man/man8
   
-! INCFLAGS=-I${QTDIR}/include/X11/qt -I${QTDIR}/include
-  CxxFLAGS= -Wall #-pipe
-  CFLAGS= -Wall #-pipe
-  OPT=-g
+  dep: $(MSOURCES)
+  	makedepend -I. -I$(QTDIR)/include $(SOURCES) $(MSOURCES) >/dev/null 2>&1
diff --git a/x11-fm/jafm/pkg-plist b/x11-fm/jafm/pkg-plist
index ccea51c1b486..467592743bed 100644
--- a/x11-fm/jafm/pkg-plist
+++ b/x11-fm/jafm/pkg-plist
@@ -1,30 +1,30 @@
 bin/jafm
-lib/jafm/appl/Applications
-lib/jafm/zic/core.zic
-lib/jafm/zic/trash.zic
-lib/jafm/zic/targz.zic
-lib/jafm/zic/skip.zic
-lib/jafm/zic/rubbish.zic
-lib/jafm/zic/printer2.zic
-lib/jafm/zic/printer.zic
-lib/jafm/zic/print.zic
-lib/jafm/zic/people.zic
-lib/jafm/zic/pencil.zic
-lib/jafm/zic/old-exec.zic
-lib/jafm/zic/object.zic
-lib/jafm/zic/null.zic
-lib/jafm/zic/netscape.zic
-lib/jafm/zic/netsc.zic
-lib/jafm/zic/nav.zic
-lib/jafm/zic/mail.zic
-lib/jafm/zic/folder.zic
-lib/jafm/zic/exec.zic
-lib/jafm/zic/edit.zic
-lib/jafm/zic/doc.zic
-lib/jafm/zic/dir.zic
-lib/jafm/zic/cswap.zic
-lib/jafm/zic/try.zic
-lib/jafm/system.jafmrules
-@dirrm lib/jafm/zic
-@dirrm lib/jafm/appl
-@dirrm lib/jafm
+share/jafm/appl/Applications
+share/jafm/zic/core.zic
+share/jafm/zic/trash.zic
+share/jafm/zic/targz.zic
+share/jafm/zic/skip.zic
+share/jafm/zic/rubbish.zic
+share/jafm/zic/printer2.zic
+share/jafm/zic/printer.zic
+share/jafm/zic/print.zic
+share/jafm/zic/people.zic
+share/jafm/zic/pencil.zic
+share/jafm/zic/old-exec.zic
+share/jafm/zic/object.zic
+share/jafm/zic/null.zic
+share/jafm/zic/netscape.zic
+share/jafm/zic/netsc.zic
+share/jafm/zic/nav.zic
+share/jafm/zic/mail.zic
+share/jafm/zic/folder.zic
+share/jafm/zic/exec.zic
+share/jafm/zic/edit.zic
+share/jafm/zic/doc.zic
+share/jafm/zic/dir.zic
+share/jafm/zic/cswap.zic
+share/jafm/zic/try.zic
+share/jafm/system.jafmrules
+@dirrm share/jafm/zic
+@dirrm share/jafm/appl
+@dirrm share/jafm