3 files changed, 10 insertions, 74 deletions

diff --git a/devel/hypersrc/Makefile b/devel/hypersrc/Makefile
index 8852a532409b..6e7b5fa55f74 100644
--- a/devel/hypersrc/Makefile
+++ b/devel/hypersrc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	hypersrc
-PORTVERSION=	5.4.4
+PORTVERSION=	5.4.6
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.jimbrooks.org/hypersrc/%SUBDIR%/ \
 		http://www.home.earthlink.net/~jebrooks1/ftp/hypersrc/%SUBDIR%/
@@ -22,18 +22,21 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_PERL5=	yes
 USE_GNOME=	gnomelibs
-USE_BISON=	yes
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
+MAKE_ARGS=	CC="${CC}" C_OPTIMIZE="${CFLAGS}"
 
 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
-	@${PERL} -pi -e 's|"-i +m -x -u"|"-x"|g' ${WRKSRC}/ctags.pl
+	@${PERL} -pi -e 's|"ctags"|"${LOCALBASE}/bin/exctags"|g ; \
+		 s|"ctags.pl"|"${PREFIX}/bin/ctags.pl"|g' ${WRKSRC}/Hypersrc.pl
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/out/hypersrc ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/Hypersrc.pl ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/ctags.pl ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/hypersrc.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/hypersrc/distinfo b/devel/hypersrc/distinfo
index e0627d4dcb38..2b5bcbc447c3 100644
--- a/devel/hypersrc/distinfo
+++ b/devel/hypersrc/distinfo
@@ -1,2 +1,2 @@
-MD5 (hypersrc-5.4.4.tar.gz) = 3eaeb94f0a3d7b28be84d65ad847afbf
-SIZE (hypersrc-5.4.4.tar.gz) = 181643
+MD5 (hypersrc-5.4.6.tar.gz) = 815abfbd3cf3bed02015f9ae5a72ae18
+SIZE (hypersrc-5.4.6.tar.gz) = 181726
diff --git a/devel/hypersrc/files/patch-Makefile b/devel/hypersrc/files/patch-Makefile
deleted file mode 100644
index 694cb21ce108..000000000000
--- a/devel/hypersrc/files/patch-Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
---- GNUmakefile.orig	Mon May  3 06:44:47 2004
-+++ GNUmakefile	Sun May 16 00:31:40 2004
-@@ -8,11 +8,7 @@
- 
- # Where to install.
- #
--ifeq ($(USER),root)
--		INSTALL_DIR=/usr/local/bin
--else
--		INSTALL_DIR=$(HOME)/bin
--endif
-+		INSTALL_DIR=${PREFIX}/bin
- 
- INSTALL			= install
- INSTALL_OWNER	=
-@@ -75,7 +71,7 @@
- else
- 
- ifndef DEBUG
--C_OPTIMIZE = -O2 -finline-functions
-+C_OPTIMIZE = ${CFLAGS}
- else
- 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) `$(GTK_CONFIG) --cflags` `gnome-config --cflags gnomeui`
--LD			= gcc
--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)
-+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_))
-@@ -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)/,$<)
- 
- # -----------------------------------------------------------------------------
- 
-@@ -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)
- 		@
--		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)
- ifeq ($(USER),root)
- 		@echo "------------------------------------------------------------------"
- 		@echo "Installing man page"