- Update port

- Add secondary site to MASTER_SITES
- Support CC/CFLAGS/PREFIX properly
- Support install macros

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

6 files changed, 114 insertions, 55 deletions

diff --git a/deskutils/xopps/Makefile b/deskutils/xopps/Makefile
index c26a03e..cd829e7 100644
--- a/deskutils/xopps/Makefile
+++ b/deskutils/xopps/Makefile
@@ -9,22 +9,22 @@
 DISTNAME=	xopps.1.13
 PKGNAME=	xopps-1.13
 CATEGORIES=	deskutils
-MASTER_SITES=	ftp://devvax.jpl.nasa.gov/pub/xopps/
+MASTER_SITES=	ftp://ftp.weird.com/pub/mirror/ \
+		ftp://devvax.jpl.nasa.gov/pub/xopps/
 
 MAINTAINER=	ports@FreeBSD.org
 
 ALL_TARGET=
 USE_X_PREFIX=	yes
 REQUIRES_MOTIF=	yes
-MACH=		FreeBSD
-MAKE_ENV=	'MACH=$(MACH)'
+MAKE_ENV=	'MACH=${OPSYS}'
 
 MAN1=	xopps.1
 
-pre-patch:
-	$(CP) $(WRKSRC)/Defines.spr $(WRKSRC)/Defines.$(MACH)
+post-extract:
+	@${CP} ${WRKSRC}/Defines.spr ${WRKSRC}/Defines.${OPSYS}
 
-pre-install:
-	$(MKDIR) $(PREFIX)/lib/help
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/*.c
 
 .include <bsd.port.mk>
diff --git a/deskutils/xopps/files/patch-aa b/deskutils/xopps/files/patch-aa
index d2baa5b..d817e59 100644
--- a/deskutils/xopps/files/patch-aa
+++ b/deskutils/xopps/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Fri Jan 17 20:22:35 1997
-+++ Makefile	Fri Apr 23 18:28:41 1999
-@@ -142,13 +142,13 @@
+--- Makefile.orig	Sat Jan 18 13:22:35 1997
++++ Makefile	Sat Jan  8 00:42:51 2000
+@@ -142,19 +142,19 @@
  # Installation locations (edit to suit your system)
  #
  
@@ -14,12 +14,41 @@
  MAN1DIR = $(ROOTDIR)/man/man1
 -HELPDIR = $(ROOTDIR)/setup/$(SUBSYS)/help
 -BITDIR = $(ROOTDIR)/setup/bitmaps
-+HELPDIR = $(ROOTDIR)/lib/help
++HELPDIR = $(ROOTDIR)/lib/X11/xopps
 +BITDIR = $(ROOTDIR)/include/X11/bitmaps
  
  #
  # You generally should not edit below this line
-@@ -176,13 +176,16 @@
+ #
+ 
+-OPTIMIZEFLAG = -O
++#OPTIMIZEFLAG = -O
+ SFOCDIR = /SFOC/$(SFOCVER)
+ TPSDIR = /TPS/$(SFOCVER)
+ BLDDIR = .
+@@ -163,27 +163,30 @@
+ LOCAL_INCL = ../../lib_incl_local
+ GLOBAL_INCL = ../../lib_incl_global
+ SYSDEFS = $(MACHDEFS) -D$(MACH) -DRELEASE='"$(RELEASE)"' $(DEFINES)
+-SFOCINCLPATH =	-I. \
+-		-I$(INCLROOT)/lib_incl_local \
+-		-I$(INCLROOT)/lib_incl_global \
+-		-I$(SFOCDIR)/include \
+-		-I$(SFOCDIR)/include/cda \
+-		-I$(SFOCDIR)/include/dts \
+-		-I$(SFOCDIR)/include/smc \
+-		-I$(SFOCDIR)/include/wse \
+-		-I$(TPSDIR)/include
++#SFOCINCLPATH =  -I. \
++#		-I$(INCLROOT)/lib_incl_local \
++#		-I$(INCLROOT)/lib_incl_global \
++#		-I$(SFOCDIR)/include \
++#		-I$(SFOCDIR)/include/cda \
++#		-I$(SFOCDIR)/include/dts \
++#		-I$(SFOCDIR)/include/smc \
++#		-I$(SFOCDIR)/include/wse \
++#		-I$(TPSDIR)/include
+ FULLINCLPATH = $(INCLPATH) $(SFOCINCLPATH) $(MACHINCLPATH)
  
  RM = rm -f
  
@@ -31,10 +60,32 @@
  LDFLAGS = $(OPTIMIZEFLAG) $(MACHDEFS)
  LOCAL_LIB = $(LIBROOT)/lib_incl_local/$(MACH)
 -LIBS = -lXm -lXt -lX11
+-SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib
 +LIBS = -lXm -lXext -lXt -lX11 ${MOTIFLIB}
 +.if $(PORTOBJFORMAT) == "elf"
 +LIBS+= -Wl,-rpath,$(X11BASE)/lib
 +.endif
- SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib
++#SFOCLIBPATH = -L$(SFOCDIR)/lib -L/sfoc/lib -L$(TPSDIR)/lib -L/tps/lib
  FULLLIBPATH = $(LIBPATH) $(SFOCLIBPATH) $(MACHLIBPATH)
  
+ LINT = lint
+@@ -237,12 +240,13 @@
+ 	$(HELP) $(DRAWINGS)
+ 
+ install:
+-	install -c -m 755 $(PROJ) $(BINDIR)
+-	install -c -m 644 $(RSRC) $(RSCDIR)
+-	install -c -m 644 $(MAN1) $(MAN1DIR)
+-	install -c -m 644 $(HELP) $(HELPDIR)
+-	install -c -m 755 $(PERLEXE) $(BINDIR)
+-	install -c -m 444 $(BITMAPS) $(BITDIR)
++	if test ! -f $(HELPDIR); then mkdir -p $(HELPDIR); fi
++	${BSD_INSTALL_PROGRAM} $(PROJ) $(BINDIR)
++	${BSD_INSTALL_DATA} $(RSRC) $(RSCDIR)
++	${BSD_INSTALL_DATA} $(MAN1) $(MAN1DIR)
++	${BSD_INSTALL_DATA} $(HELP) $(HELPDIR)
++	${BSD_INSTALL_SCRIPT} $(PERLEXE) $(BINDIR)
++	${BSD_INSTALL_DATA} $(BITMAPS) $(BITDIR)
+ 
+ $(BLDDIR)/activity.o: beware.h
+ $(BLDDIR)/activity.o: dialog.h
diff --git a/deskutils/xopps/files/patch-ab b/deskutils/xopps/files/patch-ab
index 48b31ba..4d17292 100644
--- a/deskutils/xopps/files/patch-ab
+++ b/deskutils/xopps/files/patch-ab
@@ -1,36 +1,29 @@
-*** Defines.FreeBSD.orig	Sun Jul 27 23:07:08 1997
---- Defines.FreeBSD	Sun Jul 27 23:05:18 1997
-***************
-*** 65,73 ****
-  #
-  # Compiler options
-  #
-! MACHDEFS = -ansi -Dsparc
-! MACHINCLPATH = -I/SFOC/$(SFOCVER)/include/$(MACH) -I/usr/5include
-! MACHLIBPATH = -L/usr/5lib
-  MACHLIBS = 
-  MACHLIBS_SYBCL = -lsybdb -lcs -lct -lcomn -ltcl -lintl -linsck -lm
-  
---- 65,73 ----
-  #
-  # Compiler options
-  #
-! MACHDEFS =	-ansi -fsigned-char
-! MACHINCLPATH =	-I$(X11BASE)/include
-! MACHLIBPATH =	-L$(X11BASE)/lib
-  MACHLIBS = 
-  MACHLIBS_SYBCL = -lsybdb -lcs -lct -lcomn -ltcl -lintl -linsck -lm
-  
-***************
-*** 87,91 ****
-  # loadable shared libraries for Perl modules
-  #
-  MACHPERLLIBSUFFIX = .so
-! MACHPERLLIB = $(PERLLIBHOME)/sun4-sunos/$(PERLVER)
-! MACHPERLINC = $(PERLLIBHOME)/sun4-sunos/$(PERLVER)/CORE
---- 87,91 ----
-  # loadable shared libraries for Perl modules
-  #
-  MACHPERLLIBSUFFIX = .so
-! MACHPERLLIB = $(PERLLIBHOME)/lib
-! MACHPERLINC = $(PERLLIBHOME)/include
+--- Defines.FreeBSD.orig	Sat Jan  8 00:03:30 2000
++++ Defines.FreeBSD	Sat Jan  8 00:03:32 2000
+@@ -60,14 +60,14 @@
+ #
+ # C Compiler
+ #
+-CC = gcc
++#CC = gcc
+ 
+ #
+ # Compiler options
+ #
+-MACHDEFS = -ansi -Dsparc
+-MACHINCLPATH = -I/SFOC/$(SFOCVER)/include/$(MACH) -I/usr/5include
+-MACHLIBPATH = -L/usr/5lib
++MACHDEFS =	-ansi -fsigned-char
++MACHINCLPATH =	-I$(X11BASE)/include
++MACHLIBPATH =	-L$(X11BASE)/lib
+ MACHLIBS = 
+ MACHLIBS_SYBCL = -lsybdb -lcs -lct -lcomn -ltcl -lintl -linsck -lm
+ 
+@@ -87,5 +87,5 @@
+ # loadable shared libraries for Perl modules
+ #
+ MACHPERLLIBSUFFIX = .so
+-MACHPERLLIB = $(PERLLIBHOME)/sun4-sunos/$(PERLVER)
+-MACHPERLINC = $(PERLLIBHOME)/sun4-sunos/$(PERLVER)/CORE
++MACHPERLLIB = $(PERLLIBHOME)/lib
++MACHPERLINC = $(PERLLIBHOME)/include
diff --git a/deskutils/xopps/files/patch-ac b/deskutils/xopps/files/patch-ac
index 6befc08..c5e8c05 100644
--- a/deskutils/xopps/files/patch-ac
+++ b/deskutils/xopps/files/patch-ac
@@ -1,14 +1,14 @@
---- help.c.orig	Mon Jan 25 00:15:18 1999
-+++ help.c	Mon Jan 25 00:16:49 1999
+--- help.c.orig	Sat Jan 18 13:22:29 1997
++++ help.c	Sat Jan  8 01:25:47 2000
 @@ -173,9 +173,9 @@
   * default help path, add cwd when in debug mode
   */
  #ifdef DEBUG
 -#define DEFAULT_HELPPATH ".:/usr/lib/help:/usr/local/lib/help"
-+#define DEFAULT_HELPPATH ".:/usr/X11R6/lib/help:/usr/local/lib/help"
++#define DEFAULT_HELPPATH ".:%%PREFIX%%/lib/X11/xopps"
  #else
 -#define DEFAULT_HELPPATH "/usr/lib/help:/usr/local/lib/help"
-+#define DEFAULT_HELPPATH "/usr/X11R6/lib/help:/usr/local/lib/help"
++#define DEFAULT_HELPPATH "%%PREFIX%%/lib/X11/xopps"
  #endif
  
  /***********************************************************************
diff --git a/deskutils/xopps/files/patch-ad b/deskutils/xopps/files/patch-ad
new file mode 100644
index 0000000..557777b
--- /dev/null
+++ b/deskutils/xopps/files/patch-ad
@@ -0,0 +1,14 @@
+--- dynarray.c.orig	Sat Jan 18 13:22:27 1997
++++ dynarray.c	Sat Jan  8 01:11:56 2000
+@@ -17,7 +17,11 @@
+  *
+  ***********************************************************************/
+ 
++#ifndef __STDC__
+ #include <malloc.h>
++#else
++#include <stdlib.h>
++#endif
+ #include "dynarray.h"
+ 
+ #define NULL 0
diff --git a/deskutils/xopps/pkg-plist b/deskutils/xopps/pkg-plist
index 028d71e..7be39f8 100644
--- a/deskutils/xopps/pkg-plist
+++ b/deskutils/xopps/pkg-plist
@@ -1,6 +1,7 @@
-bin/xopps
 bin/opps2xopps
+bin/xopps
 include/X11/bitmaps/jpl1.bm
 include/X11/bitmaps/jpl2.bm
-lib/help/xopps.info
 lib/X11/app-defaults/XOpps
+lib/X11/xopps/xopps.info
+@dirrm lib/X11/xopps