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

fix broken port

Browse Source 
- move from X11 to local broke it
- rename patches to something more sensible
- fake
This commit is contained in:
turan 2000-04-09 09:44:07 +00:00
parent a3977a0c88
commit 38cb47ee5d
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
databases/xmysqladmin/Makefile
View File

@ -1,5 +1,5 @@
# $FreeBSD: ports/databases/xmysqladmin/Makefile,v 1.25 1999/11/23 02:59:09 billf Exp $
# $OpenBSD: Makefile,v 1.6 2000/03/24 23:28:05 espie Exp $
# $OpenBSD: Makefile,v 1.7 2000/04/09 09:44:07 turan Exp $
DISTNAME= xmysqladmin-1.0
CATEGORIES= databases
@ -15,6 +15,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
FAKE= Yes
FAKE_FLAGS= PREFIX=${WRKINST}${PREFIX}
LIB_DEPENDS= xforms.0::x11/xforms \
mysqlclient.6::databases/mysql

22
databases/xmysqladmin/patches/patch-aa → databases/xmysqladmin/patches/patch-Makefile
View File

@ -1,13 +1,11 @@
# $OpenBSD: patch-aa,v 1.1.1.1 2000/01/31 06:45:26 form Exp $
--- Makefile.orig Mon Dec 7 17:52:39 1998
+++ Makefile Mon Jan 31 12:33:37 2000
--- Makefile.orig Mon Dec 7 04:52:39 1998
+++ Makefile Sun Apr 9 03:34:57 2000
@@ -34,7 +34,7 @@
# This is used by 'make install' command
#-------------------------------------------------------
#INSTALLPATH = /opt/local/i386/bin
-INSTALLPATH = /usr/local/bin
+INSTALLPATH = ${X11BASE}/bin
+INSTALLPATH = ${PREFIX}/bin
########################################################
@ -16,7 +14,7 @@
#-------------------------------------------------------
#PIXMAPPATH = /opt/local/lib
-PIXMAPPATH = /usr/local/bin
+PIXMAPPATH = ${X11BASE}/include/X11/pixmaps
+PIXMAPPATH = ${PREFIX}/include/X11/pixmaps
########################################################
@ -62,7 +60,7 @@
#-------------------------------------------------------
#XFORMLIBDIR = -L/opt/local/i386/lib
-XFORMLIBDIR = -L/usr/lib
+XFORMLIBDIR = -L${X11BASE}/lib
+XFORMLIBDIR = -L${LOCALBASE}/lib
########################################################
@ -71,7 +69,7 @@
#-------------------------------------------------------
#XFORMINCDIR = -I/opt/local/include
-XFORMINCDIR = -I/usr/X11R6/include
+XFORMINCDIR = -I${X11BASE}/include/X11
+XFORMINCDIR = -I${LOCALBASE}/include/X11
########################################################
@ -96,3 +94,11 @@
.c.o:
$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(MYSQLDBDIR) $(XINC)
@@ -227,6 +225,7 @@
install:
strip $(PROGRAM)
$(INSTALL) -m 711 $(PROGRAM) $(INSTALLPATH)
+ mkdir -p $(PIXMAPPATH)
cp mysql.xpm $(PIXMAPPATH)
version: