- Use GTK_CONFIG/GLIB_CONFIG instead of hardcoded gtk12-config/glib12-config

- Support CC/CFLAGS/PREIFX/LOCALBASE/X11BASE/MAKE/etc. properly

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

5 files changed, 51 insertions, 16 deletions

diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index b6104d846b0d..07dd7bf37ee7 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -16,9 +16,15 @@ MAINTAINER=	dom@myrddin.demon.co.uk
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
 USE_X_PREFIX=	yes
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 ALL_TARGET=	gxedit
 
+post-patch:
+	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/config.h
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gtk-shell ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/gxedit ${PREFIX}/bin
@@ -29,10 +35,9 @@ do-install:
 .for i in popmail.scr traceroute.scr userinfo.scr www.scr
 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/gxedit
 .endfor
-
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/gxedit/
-.for i in COPYING charmap.txt manual.ps manual.txt quickref.ps quickref.txt
+.for i in charmap.txt manual.ps manual.txt quickref.ps quickref.txt
 	${INSTALL_DATA} ${WRKSRC}/docs/$i ${PREFIX}/share/doc/gxedit/
 .endfor
 .endif
diff --git a/editors/gxedit/files/patch-aa b/editors/gxedit/files/patch-aa
index 1945abcb42ee..d4e7e3c0de27 100644
--- a/editors/gxedit/files/patch-aa
+++ b/editors/gxedit/files/patch-aa
@@ -16,9 +16,9 @@
 -#define EMACS "/usr/bin/emacs"
 -#define DES "/bin/des"
 -#define IDEA "/bin/idea"
-+#define EMACS "/usr/local/bin/emacs"
-+#define DES "/usr/local/bin/des"
-+#define IDEA "/usr/local/bin/idea"
++#define EMACS "%%LOCALBASE%%/bin/emacs"
++#define DES "%%LOCALBASE%%/bin/des"
++#define IDEA "%%LOCALBASE%%/bin/idea"
  #define XTERM "/usr/X11R6/bin/xterm"
  #define AWK "awk"
  #define SED "sed"
diff --git a/editors/gxedit/files/patch-ab b/editors/gxedit/files/patch-ab
index 22343cd85df9..8fbaa5ec96fd 100644
--- a/editors/gxedit/files/patch-ab
+++ b/editors/gxedit/files/patch-ab
@@ -1,15 +1,15 @@
---- Makefile.orig	Fri Mar 19 16:31:49 1999
-+++ Makefile	Mon Apr  5 17:00:51 1999
+--- Makefile.orig	Fri Mar 19 15:01:49 1999
++++ Makefile	Sat Jul  1 16:25:24 2000
 @@ -3,12 +3,13 @@
  INSTALL_DIR = /usr/X11R6/bin/
  DOCS = /usr/doc
  SHARE = /usr/share
 -CFLAGS = `gtk-config --cflags` -I/usr/local/include -I. -O -Wall -DVERSION=\"1.23\"
 +CFLAGS ?= -O2
-+CFLAGS += `gtk12-config --cflags` -I/usr/local/include -I. -Wall -DVERSION=\"1.23\"
++CFLAGS += `$(GTK_CONFIG) --cflags` -I. -DVERSION=\"1.23\"
  GTKEDITOR_CFLAGS = -I../gtkeditor-0.0.6 -I../gtkeditor-0.0.6/gtkeditor
 -LIBS = `gtk-config --libs`
-+LIBS = `gtk12-config --libs`
++LIBS = `$(GTK_CONFIG) --libs`
  OBJS = gxedit.o net.o utils.o
  GTKEDITOR_OBJS = ../gtkeditor-0.0.6/gtkeditor/gtkeditor.o ../gtkeditor-0.0.6/regex/regex.o -L../gtkeditor-0.0.6 -lgtkeditor -lregex -lguile -ldl -ltermcap
 -CC = gcc
@@ -17,19 +17,50 @@
  
  all:
  	@echo "Use ./setup"
-@@ -23,7 +24,6 @@
+@@ -23,8 +24,7 @@
  	$(CC) $(CFLAGS) -c utils.c
  	$(CC) $(CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(LIBS)
  	@(rm -f ./.chk_config)
 -	(cd xproc-src; make BIN_DIR=../; cd ..)
- 	(cd gtk-shell-src; make BIN_DIR=../; cd ..)
+-	(cd gtk-shell-src; make BIN_DIR=../; cd ..)
++	(cd gtk-shell-src; $(MAKE) BIN_DIR=../; cd ..)
  
  gxe-with-gtkeditor:
-@@ -32,7 +32,6 @@
+ 	$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -c gxedit.c
+@@ -32,19 +32,18 @@
  	$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -c utils.c
  	$(CC) $(CFLAGS) $(GTKEDITOR_CFLAGS) -o $(BIN_DIR)gxedit $(OBJS) $(GTKEDITOR_OBJS) $(LIBS)
  	@(rm -f ./.chk_config)
 -	(cd xproc-src; make BIN_DIR=../; cd ..)
- 	(cd gtk-shell-src; make BIN_DIR=../; cd ..)
+-	(cd gtk-shell-src; make BIN_DIR=../; cd ..)
++	(cd gtk-shell-src; $(MAKE) BIN_DIR=../; cd ..)
  
  say:
+-	(cd access; make BIN_DIR=../)
++	(cd access; $(MAKE) BIN_DIR=../)
+ 
+ say-install:
+ 	$(INSTALL) -m 0755 say $(INSTALL_DIR)say
+ 
+ clean:
+ 	rm -f *.o $(BIN_DIR)gxedit $(BIN_DIR)say $(BIN_DIR)xproc $(BIN_DIR)gtk-shell $(BIN_DIR)libbabel.a *.log core
+-	(cd gtk-shell-src; make clean; cd ..)
+-	(cd xproc-src; make clean; cd ..)
++	(cd gtk-shell-src; $(MAKE) clean; cd ..)
++	(cd xproc-src; $(MAKE) clean; cd ..)
+ 
+ install:
+ 	$(INSTALL) -m 0755 $(BIN_DIR)gxedit $(INSTALL_DIR)gxedit
+@@ -75,9 +74,9 @@
+ 	$(CC) $(CFLAGS) -c net.c
+ 	$(CC) $(CFLAGS) -c utils.c
+ 	$(CC) $(CFLAGS) -o gxedit $(OBJS) -L/usr/local/lib -L/usr/X11R6/lib /usr/lib/libgtk.a /usr/lib/libgdk.a /usr/lib/libglib.a /usr/lib/libgmodule.a -lXext -lX11 -lm -ldl
+-	(cd xproc-src; make distro BIN_DIR=../; cd ..)
+-	(cd gtk-shell-src; make distro BIN_DIR=../; cd ..)
+-	(cd access; make BIN_DIR=../; cd ..)
++	(cd xproc-src; $(MAKE) distro BIN_DIR=../; cd ..)
++	(cd gtk-shell-src; $(MAKE) distro BIN_DIR=../; cd ..)
++	(cd access; $(MAKE) BIN_DIR=../; cd ..)
+ 	mv say dist/
+ 	mv gxedit dist/
+ 	mv xproc dist/
diff --git a/editors/gxedit/files/patch-ae b/editors/gxedit/files/patch-ae
index c4d7e1ab3f3f..f80887de5048 100644
--- a/editors/gxedit/files/patch-ae
+++ b/editors/gxedit/files/patch-ae
@@ -6,8 +6,8 @@
 -LIBS = `gtk-config --libs`
 -CC = gcc
 +CFLAGS ?= -O2
-+CFLAGS += `gtk12-config --cflags` -I. -Wall
-+LIBS = `gtk12-config --libs`
++CFLAGS += `$(GTK_CONFIG) --cflags` -I.
++LIBS = `$(GTK_CONFIG) --libs`
 +CC ?= gcc
  
  all:
diff --git a/editors/gxedit/pkg-plist b/editors/gxedit/pkg-plist
index 7a8cd217bc62..2073355419ea 100644
--- a/editors/gxedit/pkg-plist
+++ b/editors/gxedit/pkg-plist
@@ -7,7 +7,6 @@ share/gxedit/popmail.scr
 share/gxedit/traceroute.scr
 share/gxedit/userinfo.scr
 share/gxedit/www.scr
-share/doc/gxedit/COPYING
 share/doc/gxedit/charmap.txt
 share/doc/gxedit/manual.ps
 share/doc/gxedit/manual.txt