FAKE=lib for libslang. Okay, so we no longer need to install libslang

at all while building.

Add a missing MODULE on gettext in slrn, someone else will fix the
configure test presumably...
This commit is contained in:
espie 2005-04-19 09:41:41 +00:00
parent d9e6141a26
commit ea4507e6c2
12 changed files with 64 additions and 25 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.41 2004/10/19 03:07:56 brad Exp $ # $OpenBSD: Makefile,v 1.42 2005/04/19 09:41:41 espie Exp $
COMMENT= "stack-based interpreter for terminal applications" COMMENT= "stack-based interpreter for terminal applications"
VERSION= 1.4.9 VERSION= 1.4.9
DISTNAME= slang-${VERSION} DISTNAME= slang-${VERSION}
PKGNAME= libslang-${VERSION}p1 PKGNAME= libslang-${VERSION}p2
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \ MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \
http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ http://gd.tuwien.ac.at/editors/davis/slang/v1.4/

View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.13 2004/08/10 00:52:44 espie Exp $ @comment $OpenBSD: PLIST,v 1.14 2005/04/19 09:41:42 espie Exp $
%%SHARED%%
include/slang.h include/slang.h
include/slcurses.h include/slcurses.h
lib/libslang.a lib/libslang.a
@endfake
share/doc/slang/ share/doc/slang/
share/doc/slang/COPYING share/doc/slang/COPYING
share/doc/slang/COPYING.ART share/doc/slang/COPYING.ART
@ -13,4 +15,3 @@ share/doc/slang/cslang.txt
share/doc/slang/slang.txt share/doc/slang/slang.txt
share/doc/slang/slangdoc.html share/doc/slang/slangdoc.html
share/doc/slang/slangfun.txt share/doc/slang/slangfun.txt
%%SHARED%%

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.26 2004/11/24 11:08:03 espie Exp $ # $OpenBSD: Makefile,v 1.27 2005/04/19 09:41:42 espie Exp $
COMMENT= "text editor" COMMENT= "text editor"
@ -20,8 +20,10 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m termcap util WANTLIB= c m termcap util
FAKE= lib
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ENV= JED_ROOT="${PREFIX}/lib/jed" CONFIGURE_ENV+= JED_ROOT="${PREFIX}/lib/jed"
CONFIGURE_ENV+= DEPBASE=${DEPBASE}
FLAVORS= no_x11 FLAVORS= no_x11
FLAVOR?= FLAVOR?=

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-configure,v 1.1 2005/04/19 09:41:42 espie Exp $
--- configure.orig Tue Apr 19 11:06:54 2005
+++ configure Tue Apr 19 11:07:22 2005
@@ -2632,6 +2632,7 @@ test "x$exec" = "xNONE" && exec="$ac_def
test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
JD_Search_Dirs="$JD_Search_Dirs \
$includedir,$libdir \
+ $DEPBASE/include,$DEPBASE/lib \
/usr/local/include,/usr/local/lib \
/usr/include,/usr/lib \
/usr/include/slang,/usr/lib \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-lib_jed_rc,v 1.2 2004/01/11 05:14:08 brad Exp $ $OpenBSD: patch-lib_jed_rc,v 1.3 2005/04/19 09:41:42 espie Exp $
--- lib/jed.rc.orig 2002-10-20 02:55:30.000000000 -0400 --- lib/jed.rc.orig Sun Oct 20 08:55:30 2002
+++ lib/jed.rc 2004-01-10 23:56:55.000000000 -0500 +++ lib/jed.rc Tue Apr 19 11:04:41 2005
@@ -152,7 +152,7 @@ CASE_SEARCH = 0; % zero turns off cas @@ -152,7 +152,7 @@ CASE_SEARCH = 0; % zero turns off cas
%--------------------------------------------------------------------------- %---------------------------------------------------------------------------
% C-mode indentation style % C-mode indentation style
@ -10,10 +10,11 @@ $OpenBSD: patch-lib_jed_rc,v 1.2 2004/01/11 05:14:08 brad Exp $
#ifdef IBMPC_SYSTEM #ifdef IBMPC_SYSTEM
% If non-zero, treat file names as case sensitive % If non-zero, treat file names as case sensitive
@@ -241,3 +241,20 @@ define dired_hook () @@ -240,4 +240,21 @@ define dired_hook ()
{
%local_unsetkey ("^K"); %local_unsetkey ("^K");
%local_setkey ("dired_kill_line", "^K"); %local_setkey ("dired_kill_line", "^K");
} +}
+ +
+define c_set_style_hook (style) +define c_set_style_hook (style)
+{ +{
@ -30,4 +31,4 @@ $OpenBSD: patch-lib_jed_rc,v 1.2 2004/01/11 05:14:08 brad Exp $
+ C_Class_Offset = 0; + C_Class_Offset = 0;
+ C_Comment_Column = 0; + C_Comment_Column = 0;
+ } + }
+} }

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2005/02/01 22:15:19 naddy Exp $ # $OpenBSD: Makefile,v 1.44 2005/04/19 09:41:42 espie Exp $
COMMENT= "small, easy to use editor" COMMENT= "small, easy to use editor"
@ -24,15 +24,16 @@ FLAVOR?=
MODULES= devel/gettext MODULES= devel/gettext
FAKE= lib
CONFIGURE_STYLE=autoconf CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.59 AUTOCONF_VERSION=2.59
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${DEPBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" LDFLAGS="-L${DEPBASE}/lib"
CONFIGURE_ARGS= --enable-all CONFIGURE_ARGS= --enable-all
.if ${FLAVOR:L:Mslang} .if ${FLAVOR:L:Mslang}
LIB_DEPENDS+= slang.14::devel/libslang LIB_DEPENDS+= slang.14::devel/libslang
CONFIGURE_ARGS+=--with-slang="${LOCALBASE}" CONFIGURE_ARGS+=--with-slang="${DEPBASE}"
WANTLIB+= m WANTLIB+= m
.endif .endif

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2004/12/22 11:48:33 alek Exp $ # $OpenBSD: Makefile,v 1.9 2005/04/19 09:41:42 espie Exp $
COMMENT= "browse or page through a text file" COMMENT= "browse or page through a text file"
@ -12,6 +12,7 @@ LIB_DEPENDS= slang.14::devel/libslang
MAINTAINER= William Yodlowsky <bsd@openbsd.rutgers.edu> MAINTAINER= William Yodlowsky <bsd@openbsd.rutgers.edu>
FAKE= lib
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
@ -21,6 +22,7 @@ WANTLIB= c m termcap
FAKE_FLAGS= DESTDIR="${WRKINST}" DOC_DIR='$$(prefix)/share/doc/most' FAKE_FLAGS= DESTDIR="${WRKINST}" DOC_DIR='$$(prefix)/share/doc/most'
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ENV+=DEPBASE=${DEPBASE}
NO_REGRESS= Yes NO_REGRESS= Yes

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-configure,v 1.1 2005/04/19 09:41:42 espie Exp $
--- configure.orig Tue Apr 19 11:23:47 2005
+++ configure Tue Apr 19 11:24:04 2005
@@ -2560,6 +2560,7 @@ fi
test "x$exec" = "xNONE" && exec="$ac_default_prefix"
test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
JD_Search_Dirs="$JD_Search_Dirs \
+ $DEPBASE/include,$DEPBASE/lib \
/usr/local/include,/usr/local/lib \
/usr/include,/usr/lib \
/usr/include/slang,/usr/lib \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2004/12/22 11:50:29 alek Exp $ # $OpenBSD: Makefile,v 1.12 2005/04/19 09:41:42 espie Exp $
COMMENT= "simple slang-based menu program" COMMENT= "simple slang-based menu program"
@ -21,10 +21,11 @@ LIB_DEPENDS= slang.14::devel/libslang
FAKE_FLAGS= INSTALL_PREFIX=${WRKINST} FAKE_FLAGS= INSTALL_PREFIX=${WRKINST}
FAKE= lib
CONFIGURE_STYLE= autoconf no-autoheader CONFIGURE_STYLE= autoconf no-autoheader
AUTOCONF_VERSION= 2.13 AUTOCONF_VERSION= 2.13
CONFIGURE_ENV= SLANG_LIB_LOC=${LOCALBASE}/lib \ CONFIGURE_ENV= SLANG_LIB_LOC=${DEPBASE}/lib \
SLANG_H_LOC=${LOCALBASE}/include/slang.h SLANG_H_LOC=${DEPBASE}/include/slang.h
WRKDIST= ${WRKDIR}/pdmenu WRKDIST= ${WRKDIR}/pdmenu
NO_REGRESS= Yes NO_REGRESS= Yes

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2004/12/02 19:19:59 alek Exp $ # $OpenBSD: Makefile,v 1.10 2005/04/19 09:41:42 espie Exp $
# Original from: Curtiss Howard, cereal@schizo.com # Original from: Curtiss Howard, cereal@schizo.com
# #
@ -21,6 +21,7 @@ WANTLIB= c m termcap
MASTER_SITES= ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/dists/potato/main/source/news/ \ MASTER_SITES= ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/dists/potato/main/source/news/ \
http://people.montana.com/~drrom/ http://people.montana.com/~drrom/
FAKE= lib
LIB_DEPENDS= slang.::devel/libslang LIB_DEPENDS= slang.::devel/libslang
WRKDIST= ${WRKDIR}/linleech-2.2.1.orig WRKDIST= ${WRKDIR}/linleech-2.2.1.orig

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.3 2002/09/24 07:43:49 pvalchev Exp $ $OpenBSD: patch-Makefile,v 1.4 2005/04/19 09:41:42 espie Exp $
--- Makefile.orig Wed Dec 30 09:54:52 1998 --- Makefile.orig Wed Dec 30 09:54:52 1998
+++ Makefile Tue Sep 24 01:34:52 2002 +++ Makefile Tue Sep 24 01:34:52 2002
@@ -1,14 +1,13 @@ @@ -1,14 +1,13 @@
@ -7,8 +7,8 @@ $OpenBSD: patch-Makefile,v 1.3 2002/09/24 07:43:49 pvalchev Exp $
-OBJS=objs/linleech_main.o objs/linleech_slang.o \ -OBJS=objs/linleech_main.o objs/linleech_slang.o \
- objs/linleech_socket.o objs/regex.o - objs/linleech_socket.o objs/regex.o
+#CC= gcc +#CC= gcc
+CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${DEPBASE}/include
+LDFLAGS= -L${LOCALBASE}/lib +LDFLAGS= -L${DEPBASE}/lib
+OBJS= linleech_main.o linleech_slang.o linleech_socket.o regex.o +OBJS= linleech_main.o linleech_slang.o linleech_socket.o regex.o
+VPATH= src +VPATH= src

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.39 2005/02/05 08:02:55 sturm Exp $ # $OpenBSD: Makefile,v 1.40 2005/04/19 09:41:42 espie Exp $
COMMENT= "SLang-based newsreader" COMMENT= "SLang-based newsreader"
VERSION= 0.9.8.1 VERSION= 0.9.8.1
DISTNAME= slrn-${VERSION} DISTNAME= slrn-${VERSION}
PKGNAME= ${DISTNAME}p0
CATEGORIES= news CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slrn/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slrn/}
@ -16,6 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto m ssl termcap WANTLIB= c crypto m ssl termcap
FAKE= lib
PFILES= lastchar fetch PFILES= lastchar fetch
MASTER_SITES0= http://slrn.sourceforge.net/patches/ MASTER_SITES0= http://slrn.sourceforge.net/patches/
.for i in ${PFILES} .for i in ${PFILES}
@ -26,9 +28,15 @@ PATCH_DIST_STRIP=-p1
NO_REGRESS= Yes NO_REGRESS= Yes
USE_GMAKE= Yes USE_GMAKE= Yes
LIB_DEPENDS= slang.::devel/libslang LIB_DEPENDS= slang.::devel/libslang
MODULES= devel/gettext
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-inews --with-ssl --with-slrnpull --enable-spool CONFIGURE_ARGS+= --disable-inews --with-ssl --with-slrnpull --enable-spool
CONFIGURE_ARGS+= --with-slang-library=${DEPBASE}/lib \
--with-slang-includes=${DEPBASE}/include \
--with-libiconv-prefix=${DEPBASE} \
--with-libintl-prefix=${DEPBASE}
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autoconf MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autoconf
.include <bsd.port.mk> .include <bsd.port.mk>