aboutsummaryrefslogtreecommitdiffstats
path: root/databases/xmysqladmin
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2008-04-20 01:56:05 +0800
committermiwi <miwi@FreeBSD.org>2008-04-20 01:56:05 +0800
commitbce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch)
treef5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /databases/xmysqladmin
parent2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff)
downloadfreebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz
freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.zst
freebsd-ports-gnome-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
Diffstat (limited to 'databases/xmysqladmin')
-rw-r--r--databases/xmysqladmin/Makefile5
-rw-r--r--databases/xmysqladmin/files/patch-aa12
2 files changed, 8 insertions, 9 deletions
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index f3fd0237617d..2a36082c9f16 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xmysqladmin
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_MYSQL}
MASTER_SITE_SUBDIR= Contrib/Old-Versions
@@ -18,8 +18,7 @@ COMMENT= X11 front end to the mysqladmin command of the MySQL database engine
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-USE_X_PREFIX= yes
-USE_XPM= yes
+USE_XORG= xpm
ALL_TARGET= xmysqladmin
pre-su-install:
diff --git a/databases/xmysqladmin/files/patch-aa b/databases/xmysqladmin/files/patch-aa
index 62b1b87bc706..dc9a09072674 100644
--- a/databases/xmysqladmin/files/patch-aa
+++ b/databases/xmysqladmin/files/patch-aa
@@ -5,7 +5,7 @@
#-------------------------------------------------------
#INSTALLPATH = /opt/local/i386/bin
-INSTALLPATH = /usr/local/bin
-+INSTALLPATH = ${X11BASE}/bin
++INSTALLPATH = ${LOCALBASE}/bin
########################################################
@@ -14,7 +14,7 @@
#-------------------------------------------------------
#PIXMAPPATH = /opt/local/lib
-PIXMAPPATH = /usr/local/bin
-+PIXMAPPATH = ${X11BASE}/include/X11/pixmaps
++PIXMAPPATH = ${LOCABASE}/include/X11/pixmaps
########################################################
@@ -51,7 +51,7 @@
# mysql library dir
#-------------------------------------------------------
-MYSQLLOAD = -Wl,-R/usr/local/mysql/lib/mysql -L/usr/local/mysql/lib/mysql -lmysqlclient
-+MYSQLLOAD = -Wl,-R${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib/mysql -lmysqlclient
++MYSQLLOAD = -Wl,-R${LOCALBASE}/lib/mysql -lmysqlclient
########################################################
@@ -60,7 +60,7 @@
#-------------------------------------------------------
#XFORMLIBDIR = -L/opt/local/i386/lib
-XFORMLIBDIR = -L/usr/lib
-+XFORMLIBDIR = -L${X11BASE}/lib
++XFORMLIBDIR = -L${LOCALBASE}/lib
########################################################
@@ -69,7 +69,7 @@
#-------------------------------------------------------
#XFORMINCDIR = -I/opt/local/include
-XFORMINCDIR = -I/usr/X11R6/include
-+XFORMINCDIR = -I${X11BASE}/include -I${X11BASE}/include/X11
++XFORMINCDIR = -I${LOCALBASE}/include -I${LOCALBASE}/include/X11
########################################################
@@ -78,7 +78,7 @@
# Use this for Linux:
XINC =
-XLOAD = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib/libXpm.so.4
-+XLOAD = -L${X11BASE}/lib -lX11
++XLOAD = -L${LOCALBASE}/lib -lX11
########################################################