* Modified patches to support ARCH/CFLAGS/PREFIX properly

* Modified patches to support INSTALL_MACROS instead of cp/mv command
* Moved install path of data files from lib/ to share/
* Fixed pkg/PLIST

PR:		15335
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

11 files changed, 288 insertions, 42 deletions

diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index de3935265759..20f396cb6f4a 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -11,14 +11,22 @@ CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.Z
 
+MAINTAINER=	ports@FreeBSD.org
+
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/dore
-EXTRACT_CMD=	${MKDIR} dore; cd dore; ${GZIP_CMD}
-EXTRACT_BEFORE_ARGS=	-dc
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
+EXTRACT_CMD=	${MKDIR} ${WRKSRC}; cd ${WRKSRC}; ${GZIP_CMD}
 MAKEFILE=	mk.stdx
-MAKE_FLAGS=	DORE_LOC=${WRKDIR} CFLAGS=-O2 MAKEFLAGS=m -f
-ALL_TARGET=
+MAKE_ENV=	DORE_LOC=${WRKDIR}
+
+post-extract:
+	@${MKDIR} ${WRKSRC}/lib
+
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/subsys/*.c
+
+pre-install:
+	@${MKDIR} ${PREFIX}/share/dore
 
 .include <bsd.port.mk>
diff --git a/graphics/dore/files/patch-aa b/graphics/dore/files/patch-aa
index 91aa01e1c468..3716ff8b9d5f 100644
--- a/graphics/dore/files/patch-aa
+++ b/graphics/dore/files/patch-aa
@@ -13,7 +13,7 @@
   # EXPRESS OR IMPLIED.
   
   SHELL = /bin/sh
-! CCCOM = $(CC) $(CFLAGS) -DERRCHK -I${ROOT}/usr/local/X11 -I${DORE_LOC}/dore/include -I${ROOT}/usr/include
+! CCCOM = $(CC) $(CFLAGS) -DERRCHK -I${DORE_LOC}/dore/include -I${PREFIX}/include
   LDCOM = $(LD) $(LDFLAGS)
   ARCOM = $(AR) $(ARFLAGS)
   SRC_PATH = $(DORE_LOC)/dore/src/device_config/stdx11
diff --git a/graphics/dore/files/patch-ab b/graphics/dore/files/patch-ab
index 0f3abf7e6303..eac0397cba8d 100644
--- a/graphics/dore/files/patch-ab
+++ b/graphics/dore/files/patch-ab
@@ -13,7 +13,7 @@
   # EXPRESS OR IMPLIED.
   
   SHELL = /bin/sh
-! CCCOM = $(CC) $(CFLAGS) -DERRCHK -I${DORE_LOC}/dore/include -I/usr/local/X11 -I${ROOT}/usr/include
+! CCCOM = $(CC) $(CFLAGS) -DERRCHK -I${DORE_LOC}/dore/include -I${PREFIX}/include
   LDCOM = $(LD) $(LDFLAGS)
   ARCOM = $(AR) $(ARFLAGS)
   SRC_PATH = $(DORE_LOC)/dore/src/device_config/stdx11/prom
diff --git a/graphics/dore/files/patch-ac b/graphics/dore/files/patch-ac
index 73928dfa9063..ea3312856be1 100644
--- a/graphics/dore/files/patch-ac
+++ b/graphics/dore/files/patch-ac
@@ -13,7 +13,7 @@
   # EXPRESS OR IMPLIED.
   
   SHELL = /bin/sh
-! CCCOM = $(CC) $(CFLAGS) -DERRCHK -DXLIB_ILLEGAL_ACCESS -I${DORE_LOC}/dore/include -I${ROOT}/usr/local/X11 -I${ROOT}/usr/include
+! CCCOM = $(CC) $(CFLAGS) -DERRCHK -DXLIB_ILLEGAL_ACCESS -I${DORE_LOC}/dore/include -I${PREFIX}/include
   LDCOM = $(LD) $(LDFLAGS)
   ARCOM = $(AR) $(ARFLAGS)
   SRC_PATH = $(DORE_LOC)/dore/src/device_config/stdx11/dcm
diff --git a/graphics/dore/files/patch-ad b/graphics/dore/files/patch-ad
index fd0f82d6e8b7..1bcf0ede6cbd 100644
--- a/graphics/dore/files/patch-ad
+++ b/graphics/dore/files/patch-ad
@@ -1,7 +1,7 @@
-*** mk.stdx.orig	Thu Jan 12 14:14:12 1995
---- mk.stdx	Sat Feb 18 20:07:09 1995
+*** mk.stdx.orig	Fri Jan 13 07:14:12 1995
+--- mk.stdx	Tue Dec  7 21:33:21 1999
 ***************
-*** 24,33 ****
+*** 24,51 ****
   #
   
   # DORE_LOC is the full pathname of directory containing the dore directory
@@ -12,19 +12,10 @@
   
   # DORE_LIB_NAME specifies the name of the library to be created
   DORE_LIB_NAME=libdore.a
---- 24,33 ----
-  #
-  
-  # DORE_LOC is the full pathname of directory containing the dore directory
-! DORE_LOC= ${PREFIX}/lib
   
-  # DORE_OBJTYPE is the machine object type
-! DORE_OBJTYPE= i386
-  
-  # DORE_LIB_NAME specifies the name of the library to be created
-  DORE_LIB_NAME=libdore.a
-***************
-*** 38,51 ****
+  # Compile options
+! CC=cc
+! CFLAGS=
   
   # Link options when combining .o's
   LD=ld
@@ -39,7 +30,21 @@
   
   # Name of system module from doresys_config to be included in build
   DORE_SYSTEM=stdx
---- 38,51 ----
+--- 24,51 ----
+  #
+  
+  # DORE_LOC is the full pathname of directory containing the dore directory
+! #DORE_LOC=
+  
+  # DORE_OBJTYPE is the machine object type
+! DORE_OBJTYPE=${ARCH}
+  
+  # DORE_LIB_NAME specifies the name of the library to be created
+  DORE_LIB_NAME=libdore.a
+  
+  # Compile options
+! #CC=cc
+! #CFLAGS=
   
   # Link options when combining .o's
   LD=ld
@@ -77,7 +82,7 @@
   DORE_FONTTYPE=default_type
   
   # Install directory for fonts and error message file used by Dore
-! DORE_DATADIR=${PREFIX}/lib/dore/data
+! DORE_DATADIR=${PREFIX}/share/dore
   
   # 
   # Installing Dore
@@ -100,35 +105,96 @@
   
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
   
---- 90,103 ----
+--- 90,98 ----
   
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
   
-! all: dore
+! all:	dore
 ! 
-! dore:	pre-make compile library data prep-for-examples
-! 
-! pre-make:
-! 	mkdir -p ${DORE_DATADIR}
-! 	mkdir -p ${DORE_LIBDIR}
-! 	mkdir -p ${DORE_INCDIR}
+! dore:	compile library data prep-for-examples
   
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
   
 ***************
-*** 170,175 ****
---- 177,184 ----
+*** 170,181 ****
   
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
   
-+ install: install_dore install_data install_example
+  install_dore: check_doreloc  
+  	@ echo "Installing Dore' library and include files..."
+  	@ if [ -n "$(DORE_LIBDIR)"  ]; then			\
+  	     if [ -d $(DORE_LIBDIR) ]; then			\
+  		if [ -f $(LIB_PATH)/$(DORE_LIB_NAME) ]; then	\
+! 		    mv $(LIB_PATH)/$(DORE_LIB_NAME) $(DORE_LIBDIR); \
+  		    echo "$(DORE_LIB_NAME) installed in $(DORE_LIBDIR)";\
+  		else						\
+  		    echo "$(LIB_PATH)/$(DORE_LIB_NAME) does not exist";\
+--- 172,185 ----
+  
+  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+  
++ install: install_dore install_data install_example  
 + 
   install_dore: check_doreloc  
   	@ echo "Installing Dore' library and include files..."
   	@ if [ -n "$(DORE_LIBDIR)"  ]; then			\
+  	     if [ -d $(DORE_LIBDIR) ]; then			\
+  		if [ -f $(LIB_PATH)/$(DORE_LIB_NAME) ]; then	\
+! 		    ${BSD_INSTALL_DATA} $(LIB_PATH)/$(DORE_LIB_NAME) $(DORE_LIBDIR); \
+  		    echo "$(DORE_LIB_NAME) installed in $(DORE_LIBDIR)";\
+  		else						\
+  		    echo "$(LIB_PATH)/$(DORE_LIB_NAME) does not exist";\
+***************
+*** 192,205 ****
+  	@ if [ -n "$(DORE_INCDIR)" ]; then			\
+  	    if [ -d $(DORE_INCDIR) ]; then			\
+  		(cd $(DORE_LOC)/dore/include;			\
+! 		cp dore.h $(DORE_INCDIR);			\
+  		find dore_develop -print | 			\
+  				cpio -padmu $(DORE_INCDIR));	\
+  		echo "C include files installed in $(DORE_INCDIR)"; \
+  	        if [ ! -d $(DORE_INCDIR)/fortran ]; then	\
+  		    mkdir -p $(DORE_INCDIR)/fortran;		\
+  		fi;						\
+! 		cp $(DORE_LOC)/dore/include/fortran/* 		\
+  					$(DORE_INCDIR)/fortran;	\
+  		echo "Fortran include files installed in $(DORE_INCDIR)/fortran"; \
+  	    else						\
+--- 196,209 ----
+  	@ if [ -n "$(DORE_INCDIR)" ]; then			\
+  	    if [ -d $(DORE_INCDIR) ]; then			\
+  		(cd $(DORE_LOC)/dore/include;			\
+! 		${BSD_INSTALL_DATA} dore.h $(DORE_INCDIR);			\
+  		find dore_develop -print | 			\
+  				cpio -padmu $(DORE_INCDIR));	\
+  		echo "C include files installed in $(DORE_INCDIR)"; \
+  	        if [ ! -d $(DORE_INCDIR)/fortran ]; then	\
+  		    mkdir -p $(DORE_INCDIR)/fortran;		\
+  		fi;						\
+! 		${BSD_INSTALL_DATA} $(DORE_LOC)/dore/include/fortran/* 		\
+  					$(DORE_INCDIR)/fortran;	\
+  		echo "Fortran include files installed in $(DORE_INCDIR)/fortran"; \
+  	    else						\
+***************
+*** 221,227 ****
+  		if [ ! -d $(DORE_DATADIR)/errmsg ]; then	\
+  		    mkdir -p $(DORE_DATADIR)/errmsg;		\
+  		fi;						\
+! 	    	cp $(DORE_LOC)/dore/src/data/errmsg/errmsgfile 	\
+  					$(DORE_DATADIR)/errmsg;	\
+  	        echo "Error message file installed in $(DORE_DATADIR)/errmsg"; \
+  		if [ ! -d $(DORE_DATADIR)/fonts ]; then		\
+--- 225,231 ----
+  		if [ ! -d $(DORE_DATADIR)/errmsg ]; then	\
+  		    mkdir -p $(DORE_DATADIR)/errmsg;		\
+  		fi;						\
+! 	    	${BSD_INSTALL_DATA} $(DORE_LOC)/dore/src/data/errmsg/errmsgfile 	\
+  					$(DORE_DATADIR)/errmsg;	\
+  	        echo "Error message file installed in $(DORE_DATADIR)/errmsg"; \
+  		if [ ! -d $(DORE_DATADIR)/fonts ]; then		\
 ***************
 *** 331,336 ****
---- 340,356 ----
+--- 335,351 ----
   
   
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -139,7 +205,7 @@
 + 	@( cd examples/programs/simple; ${MAKE} )
 + 
 + install_example:
-+ 	@install -c -m 755 -s examples/programs/simple/render ${PREFIX}/bin/dore_example
++ 	@${BSD_INSTALL_PROGRAM} examples/programs/simple/render ${PREFIX}/bin/dore_example
 + 	@echo "Ok, look at ${PREFIX}/bin/dore_example for an example of"
 + 	@echo "Dore in action.  You may also wish to look in the work/dore/examples"
 + 	@echo "directory for more dore examples."
diff --git a/graphics/dore/files/patch-ae b/graphics/dore/files/patch-ae
index 480f5e09a036..5f366e4c1bda 100644
--- a/graphics/dore/files/patch-ae
+++ b/graphics/dore/files/patch-ae
@@ -55,7 +55,7 @@
   # EXPRESS OR IMPLIED.
    
   PRECISION= SINGLE
-! DORELIB = -L../../../lib/i386 -ldore
+! DORELIB = -L../../../lib/${ARCH} -ldore
   
 ! INCDIR=../../../include
   CFLAGS= -DDORE_REAL_$(PRECISION) -I$(INCDIR) 
diff --git a/graphics/dore/files/patch-ag b/graphics/dore/files/patch-ag
new file mode 100644
index 000000000000..960138954525
--- /dev/null
+++ b/graphics/dore/files/patch-ag
@@ -0,0 +1,19 @@
+*** src/device_config/pex/makefile.orig	Fri Jan 13 07:04:38 1995
+--- src/device_config/pex/makefile	Tue Dec  7 07:19:09 1999
+***************
+*** 15,21 ****
+  # EXPRESS OR IMPLIED.
+  
+  SHELL = /bin/sh
+! CCCOM = $(CC) $(CFLAGS) -DERRCHK -I${DORE_LOC}/dore/include -I${ROOT}/usr/local/X11/include -I${ROOT}/usr/include
+  LDCOM = $(LD) $(LDFLAGS)
+  ARCOM = $(AR) $(ARFLAGS)
+  SRC_PATH = $(DORE_LOC)/dore/src/device_config/pex
+--- 15,21 ----
+  # EXPRESS OR IMPLIED.
+  
+  SHELL = /bin/sh
+! CCCOM = $(CC) $(CFLAGS) -DERRCHK -I${DORE_LOC}/dore/include -I${PREFIX}/include
+  LDCOM = $(LD) $(LDFLAGS)
+  ARCOM = $(AR) $(ARFLAGS)
+  SRC_PATH = $(DORE_LOC)/dore/src/device_config/pex
diff --git a/graphics/dore/files/patch-ah b/graphics/dore/files/patch-ah
new file mode 100644
index 000000000000..840719b9ffa8
--- /dev/null
+++ b/graphics/dore/files/patch-ah
@@ -0,0 +1,19 @@
+*** src/device_config/pex/drom/makefile.orig	Fri Jan 13 07:04:34 1995
+--- src/device_config/pex/drom/makefile	Tue Dec  7 07:20:59 1999
+***************
+*** 15,21 ****
+  # EXPRESS OR IMPLIED.
+  
+  SHELL = /bin/sh
+! CCCOM = $(CC) $(CFLAGS) -DERRCHK -I${DORE_LOC}/dore/include -I${ROOT}/usr/local/X11/include -I${ROOT}/usr/include
+  LDCOM = $(LD) $(LDFLAGS)
+  ARCOM = $(AR) $(ARFLAGS)
+  SRC_PATH = $(DORE_LOC)/dore/src/device_config/pex/drom
+--- 15,21 ----
+  # EXPRESS OR IMPLIED.
+  
+  SHELL = /bin/sh
+! CCCOM = $(CC) $(CFLAGS) -DERRCHK -I${DORE_LOC}/dore/include -I${PREFIX}/include
+  LDCOM = $(LD) $(LDFLAGS)
+  ARCOM = $(AR) $(ARFLAGS)
+  SRC_PATH = $(DORE_LOC)/dore/src/device_config/pex/drom
diff --git a/graphics/dore/files/patch-ai b/graphics/dore/files/patch-ai
new file mode 100644
index 000000000000..e45737b51521
--- /dev/null
+++ b/graphics/dore/files/patch-ai
@@ -0,0 +1,19 @@
+*** src/subsys/font.c.orig	Mon Feb 27 13:33:40 1995
+--- src/subsys/font.c	Mon Feb 27 13:34:04 1995
+***************
+*** 70,76 ****
+  void dor_font_initialize (void)
+  {
+      if ( ! (doe_font_library_name = DDgetenv("DORE_FONTDATA")))
+! 	    doe_font_library_name = "/usr/dore/data/fonts";
+  
+      doe_text_max_font = 0;	/* maximum font index in use */
+  
+--- 70,76 ----
+  void dor_font_initialize (void)
+  {
+      if ( ! (doe_font_library_name = DDgetenv("DORE_FONTDATA")))
+! 	    doe_font_library_name = "%%PREFIX%%/share/dore/fonts";
+  
+      doe_text_max_font = 0;	/* maximum font index in use */
+ 
diff --git a/graphics/dore/files/patch-aj b/graphics/dore/files/patch-aj
new file mode 100644
index 000000000000..8becf4907e72
--- /dev/null
+++ b/graphics/dore/files/patch-aj
@@ -0,0 +1,19 @@
+*** src/subsys/error.c.orig	Mon Feb 27 13:33:44 1995
+--- src/subsys/error.c	Mon Feb 27 13:34:37 1995
+***************
+*** 80,86 ****
+  #ifdef WIN32
+          errpath = "c:\\windows\\dore";
+  #else
+! 	    errpath = "/usr/dore/data/errmsg";
+  #endif
+  
+      errmsgfilename = dor_space_allocate (strlen(errpath) + 20);
+--- 80,86 ----
+  #ifdef WIN32
+          errpath = "c:\\windows\\dore";
+  #else
+! 	    errpath = "%%PREFIX%%/share/dore/errmsg";
+  #endif
+  
+      errmsgfilename = dor_space_allocate (strlen(errpath) + 20);
diff --git a/graphics/dore/pkg-plist b/graphics/dore/pkg-plist
index c0f9ed087f7c..c7944158adaf 100644
--- a/graphics/dore/pkg-plist
+++ b/graphics/dore/pkg-plist
@@ -1,5 +1,101 @@
-lib/libdore.a
-lib/dore
 bin/dore_example
 include/dore.h
-include/dore_develop
+include/dore_develop/develop.h
+include/dore_develop/error.h
+include/dore_develop/private/anntxt.h
+include/dore_develop/private/cammat.h
+include/dore_develop/private/clpvol.h
+include/dore_develop/private/datptr.h
+include/dore_develop/private/datval.h
+include/dore_develop/private/device.h
+include/dore_develop/private/filerstr.h
+include/dore_develop/private/frame.h
+include/dore_develop/private/group.h
+include/dore_develop/private/linlst.h
+include/dore_develop/private/lokatfrm.h
+include/dore_develop/private/mapbmp.h
+include/dore_develop/private/mapdifclr.h
+include/dore_develop/private/mapenv.h
+include/dore_develop/private/maptrnint.h
+include/dore_develop/private/nurbsurf.h
+include/dore_develop/private/parmat.h
+include/dore_develop/private/patch.h
+include/dore_develop/private/patchmat.h
+include/dore_develop/private/permat.h
+include/dore_develop/private/ply.h
+include/dore_develop/private/plylin.h
+include/dore_develop/private/plymkr.h
+include/dore_develop/private/plymsh.h
+include/dore_develop/private/pntlst.h
+include/dore_develop/private/prisrf.h
+include/dore_develop/private/prjmat.h
+include/dore_develop/private/quadgrid.h
+include/dore_develop/private/quadlst.h
+include/dore_develop/private/quadmsh.h
+include/dore_develop/private/rayintmtr.h
+include/dore_develop/private/rayintsph.h
+include/dore_develop/private/rayinttri.h
+include/dore_develop/private/rotate.h
+include/dore_develop/private/rstr.h
+include/dore_develop/private/scale.h
+include/dore_develop/private/shear.h
+include/dore_develop/private/simply.h
+include/dore_develop/private/simplymsh.h
+include/dore_develop/private/sphlst.h
+include/dore_develop/private/stdtexatt.h
+include/dore_develop/private/text.h
+include/dore_develop/private/tfmmat.h
+include/dore_develop/private/torus.h
+include/dore_develop/private/transl.h
+include/dore_develop/private/trilst.h
+include/dore_develop/private/trimsh.h
+include/dore_develop/private/tristrip.h
+include/dore_develop/private/varlinlst.h
+include/dore_develop/private/varpntlst.h
+include/dore_develop/private/varquadgrd.h
+include/dore_develop/private/varquadmsh.h
+include/dore_develop/private/varsplymsh.h
+include/dore_develop/private/vartrilst.h
+include/dore_develop/private/vartrimsh.h
+include/dore_develop/private/vartristrp.h
+include/dore_develop/private/view.h
+include/dore_develop/private/zbuffer.h
+include/fortran/DORE
+include/fortran/DOREMETHODS
+include/fortran/DORETEXT
+include/fortran/DORETYPES
+lib/libdore.a
+share/dore/errmsg/errmsgfile
+share/dore/fonts/astrology.df
+share/dore/fonts/cyrillic.df
+share/dore/fonts/gothgbt.df
+share/dore/fonts/gothgrt.df
+share/dore/fonts/gothitt.df
+share/dore/fonts/greekc.df
+share/dore/fonts/greekcs.df
+share/dore/fonts/greekp.df
+share/dore/fonts/greeks.df
+share/dore/fonts/helvetica.df
+share/dore/fonts/italicc.df
+share/dore/fonts/italiccs.df
+share/dore/fonts/italict.df
+share/dore/fonts/lcmath.df
+share/dore/fonts/meteorology.df
+share/dore/fonts/music.df
+share/dore/fonts/romanc.df
+share/dore/fonts/romancs.df
+share/dore/fonts/romand.df
+share/dore/fonts/romanp.df
+share/dore/fonts/romans.df
+share/dore/fonts/romant.df
+share/dore/fonts/scriptc.df
+share/dore/fonts/scripts.df
+share/dore/fonts/symbols.df
+share/dore/fonts/ucmath.df
+share/dore/fonts/unused.df
+@dirrm share/dore/fonts
+@dirrm share/dore/errmsg
+@dirrm share/dore
+@dirrm include/dore_develop/private
+@dirrm include/dore_develop
+@unexec rmdir %D/include/fortran 2>/dev/null || true