4 files changed, 47 insertions, 30 deletions

diff --git a/devel/hypersrc/Makefile b/devel/hypersrc/Makefile
index c30910912111..d96313229916 100644
--- a/devel/hypersrc/Makefile
+++ b/devel/hypersrc/Makefile
@@ -7,25 +7,23 @@
 #
 
 PORTNAME=	hypersrc
-PORTVERSION=	4.4.8
+PORTVERSION=	4.4.15
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.jimbrooks.org/hypersrc/latest/
+MASTER_SITES=	ftp://ftp.jimbrooks.org/hypersrc/%SUBDIR%/
+MASTER_SITE_SUBDIR=	latest old
 
 MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 USE_BISON=	yes
-USE_GTK=	yes
 USE_GNOME=	yes
-
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
-	@${PERL} -pi -e "s,/usr/local,${PREFIX},g ;\
-		s,gtk-config,${GTK_CONFIG},g ; \
-		s,gnome-config,${GNOME_CONFIG},g" ${WRKSRC}/Makefile
-	@${PERL} -pi -e "s,/usr/bin/ctags,${LOCALBASE}/bin/exctags,g" ${WRKSRC}/Hypersrc.pl
+	@${PERL} -pi -e 's|/usr/bin/ctags|${LOCALBASE}/bin/exctags|g' ${WRKSRC}/Hypersrc.pl
+	@${PERL} -pi -e 's|"-i +m -x -u"|"-x"|g' ${WRKSRC}/ctags.pl
 
 .include <bsd.port.mk>
diff --git a/devel/hypersrc/distinfo b/devel/hypersrc/distinfo
index d1893a55fcf4..c64eac0b21a4 100644
--- a/devel/hypersrc/distinfo
+++ b/devel/hypersrc/distinfo
@@ -1 +1 @@
-MD5 (hypersrc-4.4.8.tar.gz) = a8370b10cd9b1b97ee3f1070c9c87459
+MD5 (hypersrc-4.4.15.tar.gz) = 8f4fbc8e5228dc34f29b652b82600ea6
diff --git a/devel/hypersrc/files/patch-Makefile b/devel/hypersrc/files/patch-Makefile
index f410751d5b5a..aa5522be48f5 100644
--- a/devel/hypersrc/files/patch-Makefile
+++ b/devel/hypersrc/files/patch-Makefile
@@ -1,6 +1,19 @@
---- Makefile.orig	Tue Mar 13 04:05:59 2001
-+++ Makefile	Mon Apr 30 00:39:37 2001
-@@ -59,7 +59,7 @@
+--- Makefile.orig	Wed Sep  5 13:10:43 2001
++++ Makefile	Sat Sep  8 03:47:05 2001
+@@ -6,11 +6,7 @@
+ 
+ # Where to install.
+ #
+-ifeq ($(USER),root)
+-		INSTALL_DIR=/usr/local/bin
+-else
+-		INSTALL_DIR=$(HOME)/bin
+-endif
++		INSTALL_DIR=${PREFIX}/bin
+ 
+ C_SRCS_		=	main.c		\
+ 				widgets.c	\
+@@ -59,7 +55,7 @@
  else
  
  ifndef DEBUG
@@ -9,21 +22,22 @@
  else
  C_OPTIMIZE = -O
  endif
-@@ -112,10 +112,10 @@
+@@ -112,10 +108,10 @@
  
  # -----	editing the rest should usually be unnecessary ------------------------
  
 -CC			= gcc -c
-+#CC		= gcc -c
 -CC_FLAGS	= $(PROF_OPTS) $(C_DEBUG) $(C_OPTIMIZE) $(C_OPTS) $(C_WARNINGS) -ansi -pipe `gtk-config --cflags` `gnome-config --cflags gnomeui` -Isrc
-+CC_FLAGS	= $(PROF_OPTS) $(C_DEBUG) $(C_OPTS) $(C_WARNINGS) -ansi -pipe `gtk-config --cflags` `gnome-config --cflags gnomeui` $(C_OPTIMIZE) -Isrc
 -LD			= gcc
+-LD_FLAGS	= $(PROF_OPTS) -pipe `gtk-config --libs` `gnome-config --libs gnomeui`
++#CC		= gcc -c
++CC_FLAGS	= $(PROF_OPTS) $(C_DEBUG) $(C_OPTS) $(C_WARNINGS) `gnome-config --cflags gnomeui` $(C_OPTIMIZE) -Isrc
 +LD			= $(CC)
- LD_FLAGS	= $(PROF_OPTS) -pipe `gtk-config --libs` `gnome-config --libs gnomeui`
++LD_FLAGS	= $(PROF_OPTS) `gnome-config --libs gnomeui`
  C_SRCS		= $(addprefix src/,$(C_SRCS_))
  C_OBJS_		= $(C_SRCS_:.c=.o)
  C_OBJS		= $(addprefix $(OUT)/,$(C_OBJS_))
-@@ -144,7 +144,7 @@
+@@ -144,7 +140,7 @@
  		$(LD) -o $(OUT)/hypersrc $(C_OBJS) $(LD_FLAGS) $(LIBS) $(OUT)/libparser.a
  
  $(OUT)/%.o:     src/%.c
@@ -32,7 +46,7 @@
  
  # -----------------------------------------------------------------------------
  # parser (lex/yacc code that builds func graph/tree)
-@@ -179,13 +179,13 @@
+@@ -179,13 +175,13 @@
  		mv  y.tab.[cho] $(OUT)
  
  $(OUT)/y.tab.o:  $(OUT)/y.tab.c
@@ -49,3 +63,19 @@
  
  # -----------------------------------------------------------------------------
  
+@@ -204,11 +200,11 @@
+ 		@
+ 		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
+-		chmod  +x  $(INSTALL_DIR)/Hypersrc.pl
++		| 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)
++		${BSD_INSTALL_PROGRAM}  $(OUT)/hypersrc  $(INSTALL_DIR)
++		${BSD_INSTALL_SCRIPT}  ctags.pl  $(INSTALL_DIR)
+ 
+ $(INSTALL_DIR):
+ 		mkdir -p $(INSTALL_DIR)
diff --git a/devel/hypersrc/files/patch-ctags.pl b/devel/hypersrc/files/patch-ctags.pl
deleted file mode 100644
index d254c2051554..000000000000
--- a/devel/hypersrc/files/patch-ctags.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- ctags.pl.orig	Mon Apr  9 15:54:06 2001
-+++ ctags.pl	Mon Apr  9 15:54:19 2001
-@@ -23,7 +23,7 @@
- #
- $debug        = 0;
- $ctags        = "";					# DO NOT DEFAULT THIS AS "ctags" (might be GNU ctags)
--$ctags_args   = "-i +m -x -u";      # default ctags args
-+$ctags_args   = "-x";      # default ctags args
- $enableNonTag = 0;
- 
- #---------------------------------------------------------------------------