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

add jpeg dependency for now. xforms has it as BUILD_DEPENDS, anything

Browse Source 
linked with -lxforms requires -ljpeg at least when linking with new
binutils ld.
This commit is contained in:
pvalchev 2002-07-19 18:42:49 +00:00
parent bb3f51a147
commit 0531412ec7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
databases/xmysqladmin/Makefile
View File

@ -1,11 +1,10 @@
# $FreeBSD: ports/databases/xmysqladmin/Makefile,v 1.25 1999/11/23 02:59:09 billf Exp $
# $OpenBSD: Makefile,v 1.16 2002/05/26 15:09:07 naddy Exp $
# $OpenBSD: Makefile,v 1.17 2002/07/19 18:42:49 pvalchev Exp $
COMMENT= "X11 front end to the mysqladmin command"
DISTNAME= xmysqladmin-1.0
CATEGORIES= databases
NEED_VERSION= 1.515
# public domain
PERMIT_PACKAGE_CDROM= Yes
@ -18,7 +17,8 @@ MASTER_SITES= http://www.tcx.se/Contrib/ \
http://web.tryc.on.ca/mysql/Downloads/Contrib/
LIB_DEPENDS= forms.0::x11/xforms \
lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql
lib/mysql/mysqlclient.10:mysql-client-3.23.*:databases/mysql \
jpeg.::graphics/jpeg
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}

10
databases/xmysqladmin/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.3 2002/05/26 15:09:07 naddy Exp $
--- Makefile.orig Mon Dec 7 12:52:39 1998
+++ Makefile Sun May 26 17:04:14 2002
$OpenBSD: patch-Makefile,v 1.4 2002/07/19 18:42:49 pvalchev Exp $
--- Makefile.orig Mon Dec 7 04:52:39 1998
+++ Makefile Fri Jul 19 12:17:04 2002
@@ -34,7 +34,7 @@ INSTALL = install
# This is used by 'make install' command
#-------------------------------------------------------
@ -81,7 +81,7 @@ $OpenBSD: patch-Makefile,v 1.3 2002/05/26 15:09:07 naddy Exp $
-XINC =
-XLOAD = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib/libXpm.so.4
+XINC = -I${X11BASE}/include
+XLOAD = -L${X11BASE}/lib -lX11
+XLOAD = -L${X11BASE}/lib -lX11 -lGL -lXext
########################################################
@ -91,7 +91,7 @@ $OpenBSD: patch-Makefile,v 1.3 2002/05/26 15:09:07 naddy Exp $
$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
- $(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS)
- ./$(PROGRAM)
+ $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm $(LIBS)
+ $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -ljpeg $(LIBS)
.c.o:
$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(MYSQLDBDIR) $(XINC)