- Fix building with XF4; some input from Heikki Korpela <heko@saitti.net>.

- Bring this port into the 21st century.
This commit is contained in:
naddy 2001-04-17 14:57:10 +00:00
parent 849de92d50
commit f5c3f23e6b
7 changed files with 56 additions and 61 deletions

View File

@ -1,31 +1,35 @@
# $OpenBSD: Makefile,v 1.13 2000/10/22 15:43:45 espie Exp $
# $OpenBSD: Makefile,v 1.14 2001/04/17 14:57:10 naddy Exp $
COMMENT= "quick start-up utility for applications on an X11 display"
#BROKEN="Port obviously not finished, documentation terse, half-baked packaging"
DISTNAME= bricons
PKGNAME= bricons-3.0
DISTNAME= bricons-athena-3.0
CATEGORIES= x11
NEED_VERSION= 1.305
MASTER_SITES= ftp://ftp.uni-paderborn.de/unix/X11/ftp.x.org/R5contrib/ \
ftp://ftp.pasteur.fr/pub/computing/unix/X11/R5contrib/
EXTRACT_SUFX= -athena-3.0.tar.gz
NEED_VERSION= 1.363
MAINTAINER= ports@openbsd.org
LICENSE_TYPE= NONE
# BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
CONFIGURE_STYLE= imake
MASTER_SITES= ftp://ftp.uni-paderborn.de/unix/X11/ftp.x.org/R5contrib/ \
ftp://ftp.pasteur.fr/pub/computing/unix/X11/R5contrib/
CONFIGURE_STYLE= imake
WRKDIST= ${WRKDIR}/bricons
USE_X11= Yes
post-install:
${INSTALL_DATA} ${WRKDIST}/Xbricons $(PREFIX)/lib/X11/app-defaults
${INSTALL_DATA_DIR} $(PREFIX)/include/X11/pixmaps
${INSTALL_DATA_DIR} $(PREFIX)/include/X11/bitmaps
${INSTALL_DATA} ${WRKDIST}/bitmaps/* $(PREFIX)/include/X11/bitmaps
${INSTALL_DATA} ${WRKDIST}/*.xpm $(PREFIX)/include/X11/pixmaps/
${INSTALL_DATA_DIR} ${PREFIX}/lib/bricons
${INSTALL_DATA} ${FILESDIR}/DOTbriconsrc ${PREFIX}/lib/bricons/briconsrc.sample
${INSTALL_DATA} ${WRKSRC}/Xbricons ${PREFIX}/lib/X11/app-defaults
${INSTALL_DATA_DIR} ${PREFIX}/include/X11/bitmaps
${INSTALL_DATA} ${WRKSRC}/bitmaps/*.xbm ${PREFIX}/include/X11/bitmaps
${INSTALL_DATA_DIR} ${PREFIX}/include/X11/pixmaps
${INSTALL_DATA} ${WRKSRC}/*.xpm ${PREFIX}/include/X11/pixmaps/
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bricons
${INSTALL_DATA} ${FILESDIR}/DOTbriconsrc \
${PREFIX}/share/examples/bricons/dot.briconsrc
.include <bsd.port.mk>

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Imakefile,v 1.1 2001/04/17 14:57:11 naddy Exp $
--- Imakefile.orig Thu Jan 21 21:27:31 1993
+++ Imakefile Fri Mar 31 23:59:44 2000
@@ -4,40 +4,17 @@
+++ Imakefile Tue Apr 17 16:39:02 2001
@@ -4,40 +4,16 @@
/**/# MTI: Build srcs
/**/#
@ -29,8 +30,7 @@
DEPLIBS = XawClientDepLibs
-EXTRA_INCLUDES = -I$(XPM_INCLUDE_DIR)
-LOCAL_LIBRARIES = -L$(XPM_LIB_DIR) -lXpm XawClientLibs
+EXTRA_INCLUDES = -I$(XPMINCDIR)/X11
+LOCAL_LIBRARIES = -L$(XPMLIBDIR) -lXpm XawClientLibs
+LOCAL_LIBRARIES = XawClientLibs
SRCS = main.c \
action.c \

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-Xbricons,v 1.1 2001/04/17 14:57:11 naddy Exp $
--- Xbricons.orig Thu Jan 21 21:27:32 1993
+++ Xbricons Sat Apr 1 00:02:13 2000
+++ Xbricons Tue Apr 17 16:18:59 2001
@@ -1,9 +1,8 @@
! Application resources file for bricons program
! B.R. Ingram 9th Sept 1991

View File

@ -1,38 +0,0 @@
*** gen.h.orig Thu Jan 21 21:27:33 1993
--- gen.h Sat Aug 3 15:14:37 1996
***************
*** 11,18 ****
#include <X11/Xaw/MenuButton.h>
#include <X11/Shell.h>
#include <X11/Xaw/Cardinals.h>
! /* #include <stdlib.h> */
! #include <malloc.h>
#include <ctype.h>
#include <unistd.h>
#include "xpm.h"
--- 11,18 ----
#include <X11/Xaw/MenuButton.h>
#include <X11/Shell.h>
#include <X11/Xaw/Cardinals.h>
! #include <stdlib.h>
! /* #include <malloc.h> */
#include <ctype.h>
#include <unistd.h>
#include "xpm.h"
***************
*** 32,38 ****
#define NO_OF_COLS 18 /* default number of columns */
#define EDITOR "xterm -e " /* editor used to edit icon file. */
! #define FORMATTER "xterm -e vi " /* text formatter for help file */
#define HELP_VIEWER " " /* viewer for help file */
#define MAXPROCS 20
--- 32,38 ----
#define NO_OF_COLS 18 /* default number of columns */
#define EDITOR "xterm -e " /* editor used to edit icon file. */
! #define FORMATTER "xterm -e man " /* text formatter for help file */
#define HELP_VIEWER " " /* viewer for help file */
#define MAXPROCS 20

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-gen_h,v 1.1 2001/04/17 14:57:12 naddy Exp $
--- gen.h.orig Thu Jan 21 21:27:33 1993
+++ gen.h Tue Apr 17 16:26:58 2001
@@ -11,11 +11,11 @@ static char* sccs_gen_h = "%W%%G%";
#include <X11/Xaw/MenuButton.h>
#include <X11/Shell.h>
#include <X11/Xaw/Cardinals.h>
-/* #include <stdlib.h> */
-#include <malloc.h>
+#include <X11/xpm.h>
+#include <stdlib.h>
+/* #include <malloc.h> */
#include <ctype.h>
#include <unistd.h>
-#include "xpm.h"
/*
Macro for using prototypes if ANSI C is available.
@@ -32,7 +32,7 @@ static char* sccs_gen_h = "%W%%G%";
#define NO_OF_COLS 18 /* default number of columns */
#define EDITOR "xterm -e " /* editor used to edit icon file. */
-#define FORMATTER "xterm -e vi " /* text formatter for help file */
+#define FORMATTER "xterm -e man " /* text formatter for help file */
#define HELP_VIEWER " " /* viewer for help file */
#define MAXPROCS 20

View File

@ -1 +0,0 @@
quick start-up utility for applications on an X11 display

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2001/04/17 14:57:12 naddy Exp $
bin/bricons
man/cat1/bricons.0
lib/X11/app-defaults/Xbricons
@ -9,4 +10,5 @@ include/X11/pixmaps/clock.xpm
include/X11/pixmaps/editor.xpm
include/X11/pixmaps/mail.xpm
include/X11/pixmaps/news.xpm
lib/bricons/briconsrc.sample
share/examples/bricons/dot.briconsrc
@dirrm share/examples/bricons