- Update MASTER_SITES and WWW: line of pkg/DESCR

- Support CFLAGS properly

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

3 files changed, 72 insertions, 27 deletions

diff --git a/misc/xenmenu/Makefile b/misc/xenmenu/Makefile
index 2625085b7373..d12795fe90f4 100644
--- a/misc/xenmenu/Makefile
+++ b/misc/xenmenu/Makefile
@@ -9,54 +9,59 @@
 DISTNAME=	xenmenu-0.8b
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
-		http://www.cs.purdue.edu/homes/steinkf/software/xenmenu/
+		http://freeport.xenos.net/~xenon/software/xenmenu/
 MASTER_SITE_SUBDIR=	apps/misc
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
+ALL_TARGET=	# empty
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-sys-config=${PREFIX}/etc/xenmenurc --with-secure-config=${PREFIX}/etc/xenmenurc.secure --with-support-dir=${PREFIX}/share/xenmenu/bin --with-menu-dir=${PREFIX}/share/xenmenu/menus --with-view-dir=${PREFIX}/share/xenmenu/text --with-path=${PREFIX}/bin:/usr/bin:/bin
+CONFIGURE_ARGS=	--with-sys-config=${PREFIX}/etc/xenmenurc \
+		--with-secure-config=${PREFIX}/etc/xenmenurc.secure \
+		--with-support-dir=${PREFIX}/share/xenmenu/bin \
+		--with-menu-dir=${PREFIX}/share/xenmenu/menus \
+		--with-view-dir=${PREFIX}/share/xenmenu/text \
+		--with-path=${PREFIX}/bin:/usr/bin:/bin
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xenmenu ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/xenmenu
-	@ ${MKDIR} ${PREFIX}/share/xenmenu/bin
-	@ ${MKDIR} ${PREFIX}/share/xenmenu/menus
-	@ ${MKDIR} ${PREFIX}/share/xenmenu/text
-	@ ${MKDIR} ${PREFIX}/share/examples/xenmenu/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xenmenu ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/xenmenu
+	@${MKDIR} ${PREFIX}/share/xenmenu/bin
+	@${MKDIR} ${PREFIX}/share/xenmenu/menus
+	@${MKDIR} ${PREFIX}/share/xenmenu/text
+	@${MKDIR} ${PREFIX}/share/examples/xenmenu/bin
 .for file in Makefile README get_backspace.c set_cols.c set_rows.c show_backspace.c show_cols.c show_rows.c
-	@ ${INSTALL_DATA} ${WRKSRC}/contrib/${file} ${PREFIX}/share/examples/xenmenu/bin
+	${INSTALL_DATA} ${WRKSRC}/contrib/${file} ${PREFIX}/share/examples/xenmenu/bin
 .endfor
 .for file in bbs finger ftp party ssh talk telegram telnet
-	@ ${INSTALL_SCRIPT} ${WRKSRC}/contrib/${file} ${PREFIX}/share/examples/xenmenu/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/${file} ${PREFIX}/share/examples/xenmenu/bin
 .endfor
-	@ ${MKDIR} ${PREFIX}/share/examples/xenmenu/menus
-	@ ${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/games_menus
-	@ ${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/help_menus
+	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus
+	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/games_menus
+	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/help_menus
 .for file in bbs config freeport freeportb freeportc games help helpb internet mail mainmenu other party telmenu telmenu_changecurrent telmenu_changedefault
-	@ ${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus
+	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus
 .endfor
-	@ ${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/bbs_menus
+	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/bbs_menus
 .for file in bbs_menus/technical bbs_menus/general_interest bbs_menus/sig bbs_menus/literary bbs_menus/misc
-	@ ${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/bbs_menus
+	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/bbs_menus
 .endfor
-	@ ${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/games_menus
+	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/games_menus
 .for file in games_menus/multiplayer games_menus/amusements games_menus/singleplayer games_menus/singleplayer2 games_menus/amusements2
-	@ ${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/games_menus
+	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/games_menus
 .endfor
-	@ ${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/help_menus
+	@${MKDIR} ${PREFIX}/share/examples/xenmenu/menus/help_menus
 .for file in help_menus/partyb help_menus/party help_menus/bbs help_menus/bbsb help_menus/mail help_menus/mailb help_menus/abuse help_menus/games help_menus/abuseb help_menus/bbsc help_menus/partyc help_menus/mailc
-	@ ${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/help_menus
+	${INSTALL_DATA} ${WRKSRC}/sample_menus/${file} ${PREFIX}/share/examples/xenmenu/menus/help_menus
 .endfor
-	@ ${MKDIR} ${PREFIX}/share/examples/xenmenu/text
+	@${MKDIR} ${PREFIX}/share/examples/xenmenu/text
 .for file in backspace_help.txt col_help.txt shell_help.txt
-	@ ${INSTALL_DATA} ${WRKSRC}/sample_text/${file} ${PREFIX}/share/examples/xenmenu/text
+	${INSTALL_DATA} ${WRKSRC}/sample_text/${file} ${PREFIX}/share/examples/xenmenu/text
 .endfor
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/xenmenu
-.for file in BUGS CHANGELOG COPYRIGHT README README.html TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xenmenu
+	@${MKDIR} ${PREFIX}/share/doc/xenmenu
+.for file in BUGS COPYRIGHT CHANGELOG README README.html TODO
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xenmenu
 .endfor
 .endif
 
diff --git a/misc/xenmenu/files/patch-ab b/misc/xenmenu/files/patch-ab
new file mode 100644
index 000000000000..5e09a4008e43
--- /dev/null
+++ b/misc/xenmenu/files/patch-ab
@@ -0,0 +1,40 @@
+--- Makefile.in.orig	Sun Mar  1 20:52:43 1998
++++ Makefile.in	Fri Mar 31 04:11:51 2000
+@@ -5,6 +5,7 @@
+ 
+ # Name of the program with which to compile
+ CC=@CC@
++CFLAGS=@CFLAGS@
+ 
+ # Location of the directory in which menu should be installed
+ prefix=@prefix@
+@@ -27,22 +28,22 @@
+ 
+ 
+ xenmenu: xenmenu.o menu_func.o opt_func.o get_input.o dochoice.o rpmenu.o
+-	$(CC) -o xenmenu xenmenu.o menu_func.o opt_func.o get_input.o \
++	$(CC) $(CFLAGS) -o xenmenu xenmenu.o menu_func.o opt_func.o get_input.o \
+ 	dochoice.o rpmenu.o
+ xenmenu.o: xenmenu.c config.h xenmenu.h menu_func.h opt_func.h get_input.h \
+ 	dochoice.h rpmenu.h
+-	$(CC) -c xenmenu.c -o xenmenu.o
++	$(CC) $(CFLAGS) -c xenmenu.c -o xenmenu.o
+ 
+ dochoice.o: dochoice.c xenmenu.h opt_func.h menu_func.h dochoice.h
+-	$(CC) -c dochoice.c -o dochoice.o
++	$(CC) $(CFLAGS) -c dochoice.c -o dochoice.o
+ get_input.o: get_input.c
+-	$(CC) -c get_input.c -o get_input.o
++	$(CC) $(CFLAGS) -c get_input.c -o get_input.o
+ menu_func.o: menu_func.c config.h xenmenu.h menu_func.h get_input.h
+-	$(CC) -c menu_func.c -o menu_func.o
++	$(CC) $(CFLAGS) -c menu_func.c -o menu_func.o
+ opt_func.o: opt_func.c opt_func.h xenmenu.h menu_func.h
+-	$(CC) -c opt_func.c -o opt_func.o
++	$(CC) $(CFLAGS) -c opt_func.c -o opt_func.o
+ rpmenu.o: rpmenu.c config.h rpmenu.h xenmenu.h menu_func.h
+-	$(CC) -c rpmenu.c -o rpmenu.o
++	$(CC) $(CFLAGS) -c rpmenu.c -o rpmenu.o
+ 
+ rpmenu.h: opt_func.h
+ xenmenu.h: opt_func.h
diff --git a/misc/xenmenu/pkg-descr b/misc/xenmenu/pkg-descr
index 8188c7e8ea08..ea099f45376a 100644
--- a/misc/xenmenu/pkg-descr
+++ b/misc/xenmenu/pkg-descr
@@ -5,4 +5,4 @@ modified on the fly and reinstalled without having to recompile
 anything or halting xenmenu while reconfiguring.  Xenmenu can 
 also be used as a secure user shell.
 
-WWW: http://www.cs.purdue.edu/homes/steinkf/software/xenmenu
+WWW: http://freeport.xenos.net/~xenon/software/xenmenu/