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

Repair port broken by new bsd.port.mk

Browse Source
This commit is contained in:
rohee 1999-04-03 13:39:01 +00:00
parent 5581e5c629
commit a4cd875d01
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/amaya/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 1999/02/09 17:08:53 rohee Exp $ # $OpenBSD: Makefile,v 1.2 1999/04/03 13:39:01 rohee Exp $
# #
# Amaya, the W3C http://www.w3.org browser # Amaya, the W3C http://www.w3.org browser
# #
@ -14,10 +14,12 @@ MAINTAINER = rohee@OpenBSD.ORG
MASTER_SITES = ftp://ftp.w3.org/pub/amaya/ \ MASTER_SITES = ftp://ftp.w3.org/pub/amaya/ \
ftp://ftp-eu.w3.org/pub/amaya/ ftp://ftp-eu.w3.org/pub/amaya/
NEED_VERSION = 1.60 NEED_VERSION = 1.80
USE_MOTIF = yes USE_MOTIF = yes
#SEPARATE_BUILD= concurrent
WRKSRC = ${WRKDIR}/Thot WRKSRC = ${WRKDIR}/Thot
WRKBUILD = ${WRKSRC}/obj WRKBUILD = ${WRKSRC}/obj
@ -26,8 +28,8 @@ GNU_CONFIGURE = yes
USE_GMAKE = yes USE_GMAKE = yes
CONFIGURE_ARGS = -with-amaya CONFIGURE_ARGS = -with-amaya
#get rid of -g, really too big do-configure:
post-configure: ${MKDIR} ${WRKBUILD} && cd ${WRKBUILD} && ../configure ${CONFIGURE_ARGS}
${SED} 's/^CFLAGS.*$\/CFLAGS = -O2/' ${WRKBUILD}/Options.orig >${WRKBUILD}/Options ${SED} 's/^CFLAGS.*$\/CFLAGS = -O2/' ${WRKBUILD}/Options.orig >${WRKBUILD}/Options
.include <bsd.port.mk> .include <bsd.port.mk>

24
www/amaya/patches/patch-ab
View File

@ -1,13 +1,11 @@
This one is due to the strange build process for amaya --- amaya/Makefile.in.orig Fri Apr 2 22:26:51 1999
+++ amaya/Makefile.in Fri Apr 2 22:27:31 1999
--- Makefile.in.orig Wed Feb 3 21:44:06 1999 @@ -15,7 +15,7 @@
+++ Makefile.in Wed Feb 3 21:44:12 1999 $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) $(AMAYA_ILU_LIBS) \
@@ -170,7 +170,7 @@ -L../tablelib -L../thotlib -L.. -lThotTable -lThotEditor \
@(localdir=`pwd` ; libwwwdir="$(THOTDIR)/$(LIBWWW)" ; cd $(LIBWWW) ; \ $(AMAYA_OPTION_EXTRA_LIBS) $(IMGLIBS) \
unset LANG; \ - $(MOTIF_LIBRARIES) $(XMLIB) $(X_LIBS) -lXt $(X_PRE_LIBS) \
if [ ! -x Makefile ] ; then \ + -L/usr/X11R6/lib -lXm -lXt $(X_PRE_LIBS) \
- ../$$libwwwdir/configure --disable-shared \ -lXext -lX11 $(X_EXTRA_LIBS) @LIBS@ @EXTRA_LIBS@ -lm
+ $$libwwwdir/configure --disable-shared \
-with-zlib="$$localdir/libz.a"; \ CONFIGFILES=XKeysymDB thot.ini amaya.keyboard \
fi)
@(cd $(LIBWWW)/Library/src ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)")