aboutsummaryrefslogtreecommitdiffstats
path: root/lang
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-10-14 16:54:54 +0800
committermarcus <marcus@FreeBSD.org>2006-10-14 16:54:54 +0800
commit0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch)
tree17937489af4c767844fc63b684ae3e7b31948812 /lang
parente959473966b963953d63d5f00fae8751f2decf0f (diff)
downloadfreebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz
freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst
freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed. Submitted by: mezz, ahze, pav, and many others Approved by: portmgr (implicit, kris)
Diffstat (limited to 'lang')
-rw-r--r--lang/librep/Makefile20
-rw-r--r--lang/librep/files/patch-aa3
2 files changed, 3 insertions, 20 deletions
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index b6b982dcea0e..c74f8575120f 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -3,11 +3,11 @@
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
-#
+# $MCom: ports/lang/librep/Makefile,v 1.2 2006/09/10 00:51:12 mezz Exp $
PORTNAME= librep
PORTVERSION= 0.16.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= lang elisp gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= librep
@@ -21,7 +21,7 @@ PLIST_SUB= GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//} VERSION=${PORTVERSION}
USE_GETTEXT= yes
USE_GMAKE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl ${PTHREAD_LIBS}"
@@ -30,14 +30,6 @@ CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//}
INFO= librep
-# Don't use USE_X_PREFIX - the port doesn't really require X11 to run.
-# The reason why it should be in X11BASE is that sawfish (primary user of
-# librep) installs shared object into one of the librep's directories, so
-# they have to live in the same BASE to make PLISTs working.
-# This looks like a little hack, because we have to tweak MTREE_FILE as well,
-# thus partially duplicating bsd.port.mk, but what other choices do we have???
-PREFIX?= ${X11BASE}
-
.include <bsd.port.pre.mk>
.if ${ARCH} == ia64
@@ -50,12 +42,6 @@ LIB_DEPENDS+= gmp.7:${PORTSDIR}/math/libgmp4
EXTRA_PATCHES+= ${FILESDIR}/stable-patch-src_numbers.c
.endif
-.if ${X_WINDOW_SYSTEM:L} == xfree86-3
-MTREE_FILE= /etc/mtree/BSD.x11.dist
-.else
-MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-.endif
-
post-extract:
@${RM} ${WRKSRC}/test
diff --git a/lang/librep/files/patch-aa b/lang/librep/files/patch-aa
index 997a2290722a..9894354ed64b 100644
--- a/lang/librep/files/patch-aa
+++ b/lang/librep/files/patch-aa
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- configure.orig Mon Oct 29 06:19:47 2001
+++ configure Thu Jan 24 17:54:12 2002
@@ -4659,7 +4659,7 @@