- 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>

6 files changed, 62 insertions, 19 deletions

diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index d28184fc728d..22bfbe473e81 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -19,9 +19,9 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 
 post-install:
-	@strip ${PREFIX}/bin/erwin
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing README in ${PREFIX}/share/doc/erwin"
 	@${MKDIR} ${PREFIX}/share/doc/erwin && ${CHMOD} a+rx ${PREFIX}/share/doc/erwin
diff --git a/www/erwn/files/patch-aa b/www/erwn/files/patch-aa
index c98fcd3edbeb..7d20775801f7 100644
--- a/www/erwn/files/patch-aa
+++ b/www/erwn/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sat Jul 24 15:33:08 1999
-+++ Makefile	Sun Sep 19 13:48:47 1999
+--- Makefile.orig	Sun Jul 25 05:33:08 1999
++++ Makefile	Sat Jul  1 17:57:20 2000
 @@ -2,14 +2,14 @@
  bindir		= $(prefix)/bin
  
@@ -10,23 +10,34 @@
  OBJS		= erwin.o erwinmenu.o erwinfunctions.o erwintoolbar.o \
  		  erwinnotebook.o erwindialogs.o erwintags.o gtkmessage.o
  INSTALL		= install
- DEBUG		= -g -DDEBUG
+-DEBUG		= -g -DDEBUG
++DEBUG		= # -g -DDEBUG
  
 -CFLAGS		= -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -m486 -fno-strength-reduce -malign-functions=4 -malign-jumps=4 -malign-loops=4 -ffast-math -fexpensive-optimizations
-+CFLAGS		= -DNAME=\"$(NAME)\" $(DEBUG) -Wall -O2 -fno-strength-reduce -ffast-math -fexpensive-optimizations
++CFLAGS		+= -DNAME=\"$(NAME)\" $(DEBUG) -fno-strength-reduce -ffast-math -fexpensive-optimizations
  
  all: license $(PROG)
  
-@@ -28,10 +28,10 @@
+@@ -17,8 +17,7 @@
+ 	strip $(PROG)
+ 
+ install:	strip
+-	$(INSTALL) -d $(bindir)
+-	$(INSTALL) -m 0755 $(PROG) $(bindir)
++	${BSD_INSTALL_PROGRAM} $(PROG) $(bindir)
+ 
+ uninstall:
+ 	
+@@ -28,10 +27,10 @@
  	rm -f $(PROG) $(OBJS) *.?~ core license.h
  
  $(PROG):	$(OBJS)
 -	$(CC) $(LDFLAGS) $(shell gtk-config --libs) -o $@ $(OBJS)
-+	$(CC) $(LDFLAGS) $(shell gtk12-config --libs) -o $@ $(OBJS)
++	$(CC) $(LDFLAGS) `$(GTK_CONFIG) --libs` -o $@ $(OBJS)
  
  %.o:		%.c
 -	$(CC) $(CFLAGS) $(shell gtk-config --cflags) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(shell gtk12-config --cflags) -o $@ -c $<
++	$(CC) $(CFLAGS) `$(GTK_CONFIG) --cflags` -o $@ -c $<
  
  tar:	clean
  	cd ..; ln -s erwin $(NAME);tar cf - $(NAME)/* > $(NAME).tar;rm $(NAME);gzip -f $(NAME).tar
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index 03c547ccb6b3..dd7f0f8c6434 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -16,6 +16,15 @@ MAINTAINER=	kris@FreeBSD.org
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-USE_AUTOCONF=	yes
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+USE_AUTOMAKE=	yes
+AUTOMAKE=	automake -a -i
+CONFIGURE_ENV=	CPPFALGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
+
+pre-configure:
+	@cd ${WRKSRC}; aclocal -I ${X11BASE}/share/aclocal
 
 .include <bsd.port.mk>
diff --git a/www/nscache/files/patch-aa b/www/nscache/files/patch-aa
index 9730c34de154..dac7af60e7bc 100644
--- a/www/nscache/files/patch-aa
+++ b/www/nscache/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig	Sat Jan 15 09:40:55 2000
-+++ configure.in	Sun Mar  5 02:00:42 2000
-@@ -41,14 +41,14 @@
+--- configure.in.orig	Sun Jan 16 02:40:55 2000
++++ configure.in	Sat Jul  1 19:10:54 2000
+@@ -41,17 +41,11 @@
  
  AC_CHECK_LIB(c, gettext, CFLAGS="$CFLAGS -DHAVE_GETTEXT -DNLS_DIR=\"\\\"\$(prefix)/share/locale\\\"\"";MSUBDIRS="po", AC_CHECK_LIB(intl, gettext, LIBS="$LIBS -lintl";CFLAGS="$CFLAGS -DHAVE_GETTEXT -DNLS_DIR=\"\\\"\$(prefix)/share/locale\\\"\"";MSUBDIRS="po"))
  
@@ -10,12 +10,13 @@
  AC_CHECK_HEADER(db1/db.h, CFLAGS="$CFLAGS -DHAVE_DB1_H", AC_CHECK_HEADER(db.h, CFLAGS="$CFLAGS -DHAVE_DB_H"))
  
 -AC_CHECK_PROG(GTK_CONFIG, gtk-config, "yes", "no")
-+AC_CHECK_PROG(GTK_CONFIG, gtk12-config, "yes", "no")
- if eval "test x$GTK_CONFIG = xyes"; then
+-if eval "test x$GTK_CONFIG = xyes"; then
 -	CFLAGS="$CFLAGS `gtk-config --cflags`"
 -	LIBS="$LIBS `gtk-config --libs`"
-+	CFLAGS="$CFLAGS `gtk12-config --cflags`"
-+	LIBS="$LIBS `gtk12-config --libs`"
- else
- 	AC_MSG_ERROR("Unable to find \"gtk-config\" program")
- fi
+-else
+-	AC_MSG_ERROR("Unable to find \"gtk-config\" program")
+-fi
++AM_PATH_GTK(1.2.0, , AC_MSG_ERROR(GTK+ is not installed or badly configured on your system...))
+ 
+ AC_SUBST(CFLAGS)
+ AC_SUBST(LIBS)
diff --git a/www/nscache/files/patch-ab b/www/nscache/files/patch-ab
new file mode 100644
index 000000000000..25f015017a95
--- /dev/null
+++ b/www/nscache/files/patch-ab
@@ -0,0 +1,19 @@
+--- Makefile.am.orig	Tue Jan 18 04:49:06 2000
++++ Makefile.am	Sat Jul  1 20:03:06 2000
+@@ -1,5 +1,7 @@
+ SUBDIRS = @MSUBDIRS@
+ 
++INCLUDES = $(GTK_CFLAGS)
++
+ bin_PROGRAMS = nscache
+ 
+ nscache_SOURCES = \
+@@ -12,6 +14,8 @@
+ 	indexdb.h \
+ 	nls.h \
+ 	setup.c
++        
++nscache_LDADD = $(GTK_LIBS)
+ 
+ nscache.pot: $(nscache_SOURCES)
+ 	xgettext --default-domain=nscache -n -E -o $@ $(nscache_SOURCES)
diff --git a/www/nscache/pkg-plist b/www/nscache/pkg-plist
index 35dec41d2145..1e2f9a732f1c 100644
--- a/www/nscache/pkg-plist
+++ b/www/nscache/pkg-plist
@@ -1 +1,4 @@
 bin/nscache
+share/locale/de/LC_MESSAGES/nscache.mo
+share/locale/it/LC_MESSAGES/nscache.mo
+share/locale/sk/LC_MESSAGES/nscache.mo