summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-10-05 06:42:57 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-10-05 06:42:57 +0000
commit99290b0d61db9bcb3c960f5507a8ccb0126a0cf9 (patch)
treebac8f356dc259524716a41398446e5c7d8f95a21 /sysutils
parentImplement USE_GTK, part 1. (diff)
Implement USE_GTK, part 2.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gcombust/Makefile14
-rw-r--r--sysutils/xlogmaster/Makefile9
-rw-r--r--sysutils/xlogmaster/files/patch-af20
-rw-r--r--sysutils/xwatch/Makefile6
4 files changed, 32 insertions, 17 deletions
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 2a56985f7bde..ea97d74e2663 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -12,23 +12,27 @@ MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/
MAINTAINER= bsdx@looksharp.net
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
RUN_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrecord \
mkisofs:${PORTSDIR}/sysutils/mkisofs \
cdlabelgen:${PORTSDIR}/print/cdlabelgen
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
USE_X_PREFIX= yes
+USE_GTK= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
-CONFIGURE_ENV+= GTK_CONFIG=${GTK_CONFIG} CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/include"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+
+pre-patch:
+ @${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
post-configure:
cd ${WRKSRC}/po && ${MAKE} update-po
post-install:
- ${MKDIR} ${PREFIX}/share/doc/gcombust
+ @${MKDIR} ${PREFIX}/share/doc/gcombust
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gcombust
${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/gcombust
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 15c628693e48..6458517557d6 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -16,15 +16,10 @@ MASTER_SITE_SUBDIR= xlogmaster
MAINTAINER= aw1@stade.co.uk
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
-NO_PACKAGE= ignores CFLAGS
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
USE_XLIB= yes
USE_GMAKE= yes
+USE_GTK= yes
+GNU_CONFIGURE= yes
MAN1= xlogmaster.1
diff --git a/sysutils/xlogmaster/files/patch-af b/sysutils/xlogmaster/files/patch-af
new file mode 100644
index 000000000000..c4a9dbb50403
--- /dev/null
+++ b/sysutils/xlogmaster/files/patch-af
@@ -0,0 +1,20 @@
+--- configure.orig Wed Mar 31 08:00:59 1999
++++ configure Fri Feb 11 00:28:01 2000
+@@ -860,7 +860,7 @@
+
+
+
+-CFLAGS=""
++#CFLAGS=""
+ if test x${CXXFLAGS+set} = xset ; then
+ :
+ else
+@@ -2835,7 +2835,7 @@
+ s%@host_os@%$host_os%g
+ s%@LN_S@%$LN_S%g
+ s%@GTK_CONFIG@%$GTK_CONFIG%g
+-s%@GTK_CFLAGS@%$GTK_CFLAGS%g
++s%@GTK_CFLAGS@%$CFLAGS $GTK_CFLAGS%g
+ s%@GTK_LIBS@%$GTK_LIBS%g
+ s%@CPP@%$CPP%g
+ s%@NEED_LIBIMPORT_TRUE@%$NEED_LIBIMPORT_TRUE%g
diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile
index b1f0827bd3a1..3aa69a294942 100644
--- a/sysutils/xwatch/Makefile
+++ b/sysutils/xwatch/Makefile
@@ -12,13 +12,9 @@ MASTER_SITES= http://hem.passagen.se/osk/
MAINTAINER= mph@freebsd.org
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-
USE_XLIB= yes
+USE_GTK= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}"
post-install:
.if !defined(NOPORTDOCS)