cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 2.0.13

Browse Source 
- install ht as hte to remove conflict with print/texlive/base
  (note in pkg/MESSAGE)
- respect CFLAGS and X11BASE
- add OpenBSD target

based on patches from Paul Irofti and Genadijus Paleckis

feedback and ok merdely@
This commit is contained in:
okan 2008-05-04 20:43:55 +00:00
parent f9780a38fb
commit 54d00433f0
8 changed files with 69 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
editors/ht/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.9 2007/11/06 06:33:51 bernd Exp $
# $OpenBSD: Makefile,v 1.10 2008/05/04 20:43:55 okan Exp $
COMMENT= file editor/viewer/analyzer for executables
DISTNAME= ht-0.7.4
PKGNAME= ${DISTNAME}p1
DISTNAME= ht-2.0.13
CATEGORIES= editors
HOMEPAGE= http://hte.sourceforge.net/
@ -15,6 +14,7 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m ncurses stdc++
CONFIGURE_STYLE= gnu
@ -23,23 +23,27 @@ USE_GMAKE= Yes
FLAVORS= no_x11
FLAVOR?=
LIB_DEPENDS= lzo::archivers/lzo
CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --program-transform-name='s/ht/hte/'
.if ${FLAVOR:Mno_x11}
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS+= --disable-x11-textmode
.else
USE_X11= Yes
CONFIGURE_ENV= X11BASE=${X11BASE} CPPFLAGS=-I${X11BASE}/include
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include \
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
X11BASE=${X11BASE}
CONFIGURE_ARGS+= --enable-x11-textmode \
--x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib
WANTLIB+= X11
.endif
DOCS= README ht.html
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ht
cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} \
${PREFIX}/share/doc/ht
NO_REGRESS= Yes
${INSTALL_DATA} ${WRKSRC}/doc/{README,ht.html} ${PREFIX}/share/doc/ht
.include <bsd.port.mk>

10
editors/ht/distinfo
View File

@ -1,5 +1,5 @@
MD5 (ht-0.7.4.tar.gz) = zbe0LLja7fEiQlQGuzzP3g==
RMD160 (ht-0.7.4.tar.gz) = zXv7Gxj/yRRdcjYQ+z/7F+wIfgU=
SHA1 (ht-0.7.4.tar.gz) = 8Dkgkr7iRPda5KREal17YmKLVTA=
SHA256 (ht-0.7.4.tar.gz) = ONZpYiHuGoAQkrKfbs41kwbtSLjOMtSfYnIIaGefLPk=
SIZE (ht-0.7.4.tar.gz) = 809899
MD5 (ht-2.0.13.tar.gz) = m6n7CA7YC4NRNi7iM6F1Kg==
RMD160 (ht-2.0.13.tar.gz) = BNncBFByKMV3+ri11TDo06aJ2xA=
SHA1 (ht-2.0.13.tar.gz) = 8zzDt+Rt2UFL7oNt18463mpZ670=
SHA256 (ht-2.0.13.tar.gz) = zj/7EZ4Ju7YBtL2n8yVQhCPWbihTeuCnDq86PNrcK2M=
SIZE (ht-2.0.13.tar.gz) = 1052678

51
editors/ht/patches/patch-configure
View File

@ -1,21 +1,44 @@
$OpenBSD: patch-configure,v 1.3 2004/01/04 17:27:48 sturm Exp $
--- configure.orig 2003-11-06 22:07:50.000000000 +0100
+++ configure 2004-01-04 17:54:41.000000000 +0100
@@ -1420,7 +1420,7 @@ fi;
if test "x$enable_release" = "xyes"; then
FLAGS_ALL="-O2 -fomit-frame-pointer -Wall -fsigned-char"
else
- FLAGS_ALL="-g -O0 -Wall -fsigned-char"
+ FLAGS_ALL="${CFLAGS} -fsigned-char"
fi
$OpenBSD: patch-configure,v 1.4 2008/05/04 20:43:55 okan Exp $
--- configure.orig Wed Mar 5 16:43:50 2008
+++ configure Fri Apr 11 23:11:49 2008
@@ -1979,7 +1979,7 @@ fi
if test "x$enable_profiling" = "xyes"; then
@@ -3835,7 +3835,7 @@ HAVE_X11=0
if test "x$enable_maintainermode" = "xno"; then
if test "x$enable_release" = "xyes"; then
- FLAGS_ALL="-O3 -fomit-frame-pointer -Wall -fsigned-char"
+ FLAGS_ALL="${CFLAGS} -fomit-frame-pointer -Wall -fsigned-char"
else
FLAGS_ALL="-ggdb -g3 -O0 -Wall -fsigned-char"
fi
@@ -2447,6 +2447,13 @@ linux*)
HAVE_PIPE=1
FLAGS_ALL="$FLAGS_ALL -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
;;
+*openbsd*)
+ IO_DIR=posix
+ echo "*** OpenBSD, building native OpenBSD version. we need (n)curses." 1>&2
+ NEED_CURSES=1
+ HAVE_PIPE=1
+ FLAGS_ALL="$FLAGS_ALL -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+;;
cygwin*)
IO_DIR=win32
echo "*** CYGWIN, building native Win32 version (no cygwin.dll)" 1>&2
@@ -5728,7 +5735,7 @@ HAVE_X11=0
if test "x$enable_x11_textmode" = "xyes"; then
TEMP_LDFLAGS=$LDFLAGS
- LDFLAGS="$HT_LDFLAGS -L/usr/X11/lib -L/usr/X11R6/lib"
+ LDFLAGS="$HT_LDFLAGS -L${X11BASE}/lib"
echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
{ echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; }
if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
@@ -5802,7 +5809,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
HT_LIBS="$HT_LIBS -lX11"
- HT_LDFLAGS="$HT_LDFLAGS -L/usr/X11/lib -L/usr/X11R6/lib"
+ HT_LDFLAGS="$HT_LDFLAGS -L${X11BASE}/lib"
fi
fi

11
editors/ht/patches/patch-io_htio_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-io_htio_h,v 1.1 2003/06/18 01:54:49 avsm Exp $
--- io/htio.h.orig Tue Jun 17 02:11:15 2003
+++ io/htio.h Tue Jun 17 02:11:37 2003
@@ -25,6 +25,7 @@
// include sys/types.h _before_ dirent.h because Darwin needs this (!)
#include <sys/types.h>
+#include <sys/param.h>
#include <dirent.h>
#include <time.h>

12
editors/ht/patches/patch-io_posix_htsys_cc
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-io_posix_htsys_cc,v 1.1 2004/01/04 17:27:48 sturm Exp $
--- io/posix/htsys.cc.orig 2004-01-04 17:55:28.000000000 +0100
+++ io/posix/htsys.cc 2004-01-04 17:59:08.000000000 +0100
@@ -209,7 +209,7 @@ int sys_ipc_exec(ht_streamfile **in, ht_
close(in_fds[0]);
close(out_fds[1]);
close(err_fds[1]);
- execl(cmd, cmd, NULL);
+ execl(cmd, cmd, (void *)NULL);
exit(1);
} else return errno;
}

17
editors/ht/pkg/DESCR
View File

@ -1,12 +1,7 @@
HT is a file editor/viewer/analyzer for executables.
The goal is to combine the low-level functionality of a debugger
and the usability of IDEs.
HT is a file editor/viewer/analyzer for executables. The goal is to
combine the low-level functionality of a debugger and the usability of
IDEs.
- Supported formats
Support means that HT will be able to correctly display and modify
the executable header, image and other extensions specific to the
file (import/export sections, relocations, debugging information
etc.).
Support includes the following file formats:
* Win32 portable executables (PE) (good support)
@ -18,4 +13,8 @@ Support includes the following file formats:
* OS2 linear executables (LX)
* M$ object files (.obj)
Suports 'copy', 'paste', histories, as well as 'undo'.
Support means that HT will be able to correctly display and modify the
executable header, image and other extensions specific to the file
(import/export sections, relocations, debugging information etc.).
Supports 'copy', 'paste', histories, as well as 'undo'.

2
editors/ht/pkg/MESSAGE Normal file
View File

@ -0,0 +1,2 @@
The `ht' binary has been renamed to `hte' to remove a conflict with
another popular port.

5
editors/ht/pkg/PLIST
View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2007/11/06 06:33:51 bernd Exp $
@conflict texlive_base-*
bin/ht
@comment $OpenBSD: PLIST,v 1.4 2008/05/04 20:43:55 okan Exp $
bin/hte
share/doc/ht/
share/doc/ht/README
share/doc/ht/ht.html