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

- Fix libintl/libiconv detection

Browse Source 
- Fix Python detection
- Use -pthread, not -lpthread
- Don't use bundled libintl headers
- Bump PKGNAME

ok sturm@
This commit is contained in:
alek 2005-02-13 14:18:06 +00:00
parent ee161d808f
commit 55f4643b2a
6 changed files with 143 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editors/cooledit/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2004/11/24 11:08:02 espie Exp $
# $OpenBSD: Makefile,v 1.17 2005/02/13 14:18:06 alek Exp $
COMMENT= "easy to use, graphical editor"
@ -6,6 +6,7 @@ CATEGORIES= editors
MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://cooledit.sourceforge.net/
DISTNAME= cooledit-3.17.7
PKGNAME= ${DISTNAME}p0
MAINTAINER= Marc Espie <espie@openbsd.org>
@ -28,7 +29,7 @@ MODULES= gettext
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV+= XTERM_CMD=xterm
CONFIGURE_ENV+= XTERM_CMD=xterm LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --disable-mail-author
@ -37,4 +38,8 @@ PERMIT_DISTFILES_FTP=Yes
PERMIT_PACKAGE_CDROM=Yes
PERMIT_DISTFILES_CDROM=Yes
pre-configure:
@perl -pi -e "s,!!PYTHON_VER!!,${PYTHON_VER},g" ${WRKSRC}/configure
@perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g" ${WRKSRC}/configure
.include <bsd.port.mk>

96
editors/cooledit/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.3 2003/08/01 19:13:25 espie Exp $
--- configure.orig 2002-08-03 13:04:13.000000000 +0200
+++ configure 2003-08-01 20:40:40.000000000 +0200
$OpenBSD: patch-configure,v 1.4 2005/02/13 14:18:07 alek Exp $
--- configure.orig Sat Aug 3 13:04:13 2002
+++ configure Sat Feb 12 18:15:38 2005
@@ -8157,15 +8157,17 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.3 2003/08/01 19:13:25 espie Exp $
cat >>confdefs.h <<_ACEOF
#define XTERM_CMD "${XTERM_CMD}"
@@ -9365,6 +9367,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
@@ -9365,30 +9367,24 @@ LDFLAGS="$LDFLAGS $X_LIBS"
have_python_config=no
have_python_include=no
@ -35,11 +35,91 @@ $OpenBSD: patch-configure,v 1.3 2003/08/01 19:13:25 espie Exp $
echo "$as_me:$LINENO: checking for python" >&5
echo $ECHO_N "checking for python... $ECHO_C" >&6
EPATH=`echo $PATH | sed -e 's+/bin:+ +g' -e 's+:+ +g'`
@@ -9389,6 +9392,7 @@ for i in / /opt /usr /usr/local /home $E
done
done
done
-for i in / /opt /usr /usr/local /home $EPATH ; do
- for j in . gnu local python ; do
- for k in . gnu local python ; do
- for l in lib . ; do
- pylib=$i/$j/$k/$l/python[0-9].[0-9]/config/libpython[0-9].[0-9].a
+ pylib=!!LOCALBASE!!/lib/python!!PYTHON_VER!!/config/libpython!!PYTHON_VER!!.a
if test -f $pylib ; then
PYTHON_LIBDIR=`echo $pylib | sed -e 's,/[^/]*$,,'`
LIBPY=`echo $pylib | sed -e 's,^.*/lib\(python.[.].\)[.]a$,\1,'`
have_python_config=yes
fi
- done
- pyinclude=$i/$j/$k/include/python[0-9].[0-9]/Python.h
+ pyinclude=!!LOCALBASE!!/include/python!!PYTHON_VER!!/Python.h
if test -f $pyinclude ; then
PYTHON_INCLUDEDIR=`echo $pyinclude | sed -e 's,/[^/]*$,,'`
have_python_include=yes
fi
- done
- done
-done
+fi
if test x$have_python_config = xyes && test x$have_python_include = xyes ; then
@@ -9692,13 +9688,13 @@ if test $ac_cv_lib_pthreads_pthread_crea
else
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -9749,7 +9745,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
if test $ac_cv_lib_pthread_pthread_create = yes; then
- PT="-lpthread"
+ PT="-pthread"
else
@@ -14514,7 +14510,7 @@ if test "${ac_cv_lib_intl_tolower+set}"
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
@@ -14568,7 +14564,7 @@ if test $ac_cv_lib_intl_tolower = yes; t
#define HAVE_LIBINTL 1
_ACEOF
- LIBS="-lintl $LIBS"
+ LIBS="-lintl -liconv $LIBS"
fi
@@ -18526,11 +18522,11 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_l
if test "$nls_cv_use_gnu_gettext" = "yes"; then
INTLOBJS="\$(GETTOBJS)"
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
- LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
- LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+ BUILD_INCLUDED_LIBINTL=no
+ USE_INCLUDED_LIBINTL=no
+ LIBINTL="$LIBINTL $LIBICONV"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ #LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
fi
if test "$gt_use_preinstalled_gnugettext" = "yes" \

12
editors/cooledit/patches/patch-editor_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-editor_Makefile_in,v 1.1 2005/02/13 14:18:07 alek Exp $
--- editor/Makefile.in.orig Fri Feb 11 15:39:07 2005
+++ editor/Makefile.in Fri Feb 11 15:39:16 2005
@@ -142,7 +142,7 @@ rxvt_u_intp_define = @rxvt_u_intp_define
bin_PROGRAMS = cooledit smalledit coolman
bin_SCRIPTS = cooledit-gdb coolproject
-INCLUDES = -I$(top_srcdir)/widget -I$(top_srcdir) -I$(top_srcdir)/intl @PYTHON_INCLUDES@
+INCLUDES = -I$(top_srcdir)/widget -I$(top_srcdir) @PYTHON_INCLUDES@
cooledit_SOURCES = cooledit.c find.c editoptions.c mancmd.c options.c \
debug.c cooleditmenus.c shell.c shell.h copyright.h mail.c complete.c \

12
editors/cooledit/patches/patch-icon_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-icon_Makefile_in,v 1.1 2005/02/13 14:18:07 alek Exp $
--- icon/Makefile.in.orig Fri Feb 11 15:42:16 2005
+++ icon/Makefile.in Fri Feb 11 15:42:24 2005
@@ -141,7 +141,7 @@ rxvt_u_int64_typedef = @rxvt_u_int64_typ
rxvt_u_intp_define = @rxvt_u_intp_define@
bin_PROGRAMS = coolicon coolbrowse coolmessage coollistbox coolquery coolinput
-INCLUDES = -I$(top_srcdir)/widget -I$(top_srcdir) -I$(top_srcdir)/intl
+INCLUDES = -I$(top_srcdir)/widget -I$(top_srcdir)
coolicon_SOURCES = icon.c coolicon.c iconmanager.c percentsubs.c trivoptions.c
coolbrowse_SOURCES = coolbrowse.c trivoptions.c

12
editors/cooledit/patches/patch-rxvt_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-rxvt_Makefile_in,v 1.1 2005/02/13 14:18:07 alek Exp $
--- rxvt/Makefile.in.orig Fri Feb 11 15:37:38 2005
+++ rxvt/Makefile.in Fri Feb 11 15:37:47 2005
@@ -147,7 +147,7 @@ librxvt_a_SOURCES = _rxvtlib.h grkelot.c
rxvtlib_xdefaults.c rxvtlib_xpm.c rxvtlibproto.h rxvtlibtypedef.h
-INCLUDES = -I$(top_srcdir)/widget -I$(top_srcdir) -I$(top_srcdir)/intl
+INCLUDES = -I$(top_srcdir)/widget -I$(top_srcdir)
DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"${exec_prefix}/lib/cooledit\" @DEFS@
subdir = rxvt

12
editors/cooledit/patches/patch-widget_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-widget_Makefile_in,v 1.1 2005/02/13 14:18:07 alek Exp $
--- widget/Makefile.in.orig Fri Feb 11 15:38:14 2005
+++ widget/Makefile.in Fri Feb 11 15:38:24 2005
@@ -147,7 +147,7 @@ libC3d_a_SOURCES = swtriangle.c triangl
3dinit.c 3dinit.h 3dtext.c 3dkit.c 3dkit.h grlib.c quickmath.c
-INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/intl
+INCLUDES = -I. -I$(top_srcdir)
libCw_la_SOURCES = initapp.c coolwidget.c dirtools.c menu.c mathfuncs.c \
filebrowser.c coolnext.c bitmapbutton.c pixmap.c \