4 files changed, 24 insertions, 40 deletions

diff --git a/devel/hypersrc/Makefile b/devel/hypersrc/Makefile
index 21b788790509..8852a532409b 100644
--- a/devel/hypersrc/Makefile
+++ b/devel/hypersrc/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	hypersrc
-PORTVERSION=	5.3.12
-PORTREVISION=	1
+PORTVERSION=	5.4.4
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.jimbrooks.org/hypersrc/%SUBDIR%/ \
 		http://www.home.earthlink.net/~jebrooks1/ftp/hypersrc/%SUBDIR%/
@@ -28,6 +27,7 @@ USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 
 MAN1=		hypersrc.1
+PLIST_FILES=	bin/hypersrc bin/Hypersrc.pl bin/ctags.pl
 
 post-patch:
 	@${PERL} -pi -e 's|"ctags"|"exctags"|g' ${WRKSRC}/Hypersrc.pl
diff --git a/devel/hypersrc/distinfo b/devel/hypersrc/distinfo
index 19b0033022b1..e0627d4dcb38 100644
--- a/devel/hypersrc/distinfo
+++ b/devel/hypersrc/distinfo
@@ -1,2 +1,2 @@
-MD5 (hypersrc-5.3.12.tar.gz) = 1ae9a71dc06008525c29ded0a9615119
-SIZE (hypersrc-5.3.12.tar.gz) = 175421
+MD5 (hypersrc-5.4.4.tar.gz) = 3eaeb94f0a3d7b28be84d65ad847afbf
+SIZE (hypersrc-5.4.4.tar.gz) = 181643
diff --git a/devel/hypersrc/files/patch-Makefile b/devel/hypersrc/files/patch-Makefile
index 430126147703..694cb21ce108 100644
--- a/devel/hypersrc/files/patch-Makefile
+++ b/devel/hypersrc/files/patch-Makefile
@@ -1,5 +1,5 @@
---- GNUmakefile.orig	Wed Aug  6 10:54:35 2003
-+++ GNUmakefile	Sat Oct  4 22:20:22 2003
+--- GNUmakefile.orig	Mon May  3 06:44:47 2004
++++ GNUmakefile	Sun May 16 00:31:40 2004
 @@ -8,11 +8,7 @@
  
  # Where to install.
@@ -13,23 +13,23 @@
  
  INSTALL			= install
  INSTALL_OWNER	=
-@@ -74,7 +70,7 @@
+@@ -75,7 +71,7 @@
  else
  
  ifndef DEBUG
 -C_OPTIMIZE = -O2 -finline-functions
 +C_OPTIMIZE = ${CFLAGS}
  else
- C_OPTIMIZE = -O
- endif
-@@ -145,10 +141,10 @@
+ C_OPTIMIZE = -O2 -finline-functions
+ #C_OPTIMIZE = -O
+@@ -149,10 +145,10 @@
  
  # -----	editing the rest should usually be unnecessary ------------------------
  
 -CC			= gcc -c
--CC_FLAGS	= -I$(INC_DIR) $(PROF_OPTS) $(C_DEBUG) $(C_OPTIMIZE) $(C_OPTS) $(C_WARNINGS) -pipe `$(GTK_CONFIG) --cflags` `gnome-config --cflags gnomeui`
+-CC_FLAGS	= -I$(INC_DIR) $(PROF_OPTS) $(C_DEBUG) $(C_OPTIMIZE) $(C_OPTS) $(C_WARNINGS) `$(GTK_CONFIG) --cflags` `gnome-config --cflags gnomeui`
 -LD			= gcc
--LD_FLAGS	+= $(PROF_OPTS) -pipe `$(GTK_CONFIG) --libs` `gnome-config --libs gnomeui`
+-LD_FLAGS	+= $(PROF_OPTS) `$(GTK_CONFIG) --libs` `gnome-config --libs gnomeui`
 +#CC			= gcc -c
 +CC_FLAGS	= -I$(INC_DIR) $(PROF_OPTS) $(C_DEBUG) $(C_OPTIMIZE) $(C_OPTS) $(C_WARNINGS) `gnome-config --cflags gnomeui`
 +LD			= $(CC)
@@ -37,44 +37,31 @@
  C_SRCS		= $(addprefix $(SRC)/,$(C_SRCS_))
  C_OBJS_		= $(C_SRCS_:.c=.o)
  C_OBJS		= $(addprefix $(OUT)/,$(C_OBJS_))
-@@ -180,7 +176,7 @@
- 		$(LD) -o $(OUT)/hypersrc $(C_OBJS) $(LD_FLAGS) $(LIBS) $(OUT)/libparser.a
+@@ -184,7 +180,7 @@
+ 		$(LD) -o $(OUT)/hypersrc $(C_OBJS) $(LD_FLAGS) $(LIBS)
  
  $(OUT)/%.o:     $(SRC)/%.c
 -		$(CC) -o $@ $(CC_FLAGS) $(subst $(OUT)/,$(SRC)/,$<)
 +		$(CC) -c -o $@ $(CC_FLAGS) $(subst $(OUT)/,$(SRC)/,$<)
  
  # -----------------------------------------------------------------------------
- # parser (lex/yacc code that builds func graph/tree)
-@@ -218,13 +214,13 @@
- 		mv  y.tab.[cho] $(OUT)
  
- $(OUT)/y.tab.o:  $(OUT)/y.tab.c
--		$(CC) -o $@ $(CC_FLAGS_PARSER) $(OUT)/y.tab.c
-+		$(CC) -c -o $@ $(CC_FLAGS_PARSER) $(OUT)/y.tab.c
- 
- $(OUT)/lex.yy.o:  $(OUT)/lex.yy.c
--		$(CC) -o $@ $(CC_FLAGS_PARSER) $(OUT)/lex.yy.c
-+		$(CC) -c -o $@ $(CC_FLAGS_PARSER) $(OUT)/lex.yy.c
- 
- $(OUT)/str_heap.o:  $(SRC)/str_heap.c  $(INC_DIR)/str_heap.h
--		$(CC) -o $@ $(CC_FLAGS_PARSER) $(SRC)/str_heap.c
-+		$(CC) -c -o $@ $(CC_FLAGS_PARSER) $(SRC)/str_heap.c
- 
- # -----------------------------------------------------------------------------
- 
-@@ -242,10 +238,11 @@
+@@ -202,14 +198,11 @@
  		rm -f $(INSTALL_DIR)/ctags.pl
  		cat  Hypersrc.pl  \
  		| sed 's|\$hypersrc = "hypersrc"|\$hypersrc = "${INSTALL_DIR}/hypersrc"|'  \
 -		| sed 's|\$ctags_pl = "ctags.pl"|\$ctags_pl = "${INSTALL_DIR}/ctags.pl"|'  >  $(INSTALL_DIR)/Hypersrc.pl
+-		@
+-		cp  $(OUT)/hypersrc  $(INSTALL_DIR)
+-		cp  ctags.pl  $(INSTALL_DIR)
 +		| sed 's|\$ctags_pl = "ctags.pl"|\$ctags_pl = "${INSTALL_DIR}/ctags.pl"|'  >  $(OUT)/Hypersrc.pl
 +		${BSD_INSTALL_SCRIPT}  $(OUT)/Hypersrc.pl  $(INSTALL_DIR)
  		@
--		cp  $(OUT)/hypersrc  $(INSTALL_DIR)
--		cp  ctags.pl  $(INSTALL_DIR)
+-		chmod  +rx  $(INSTALL_DIR)/hypersrc
+-		chmod  +rx  $(INSTALL_DIR)/Hypersrc.pl
+-		chmod  +rx  $(INSTALL_DIR)/ctags.pl
 +		${BSD_INSTALL_PROGRAM}  $(OUT)/hypersrc  $(INSTALL_DIR)
 +		${BSD_INSTALL_SCRIPT}  ctags.pl  $(INSTALL_DIR)
- 		@
- 		chmod  +rx  $(INSTALL_DIR)/hypersrc
- 		chmod  +rx  $(INSTALL_DIR)/Hypersrc.pl
+ ifeq ($(USER),root)
+ 		@echo "------------------------------------------------------------------"
+ 		@echo "Installing man page"
diff --git a/devel/hypersrc/pkg-plist b/devel/hypersrc/pkg-plist
deleted file mode 100644
index 0e48b8499a0c..000000000000
--- a/devel/hypersrc/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/hypersrc
-bin/Hypersrc.pl
-bin/ctags.pl