Skip to content
Permalink
Browse files

add configure args to use deps from ${prefix}

patch lib/Mrm/Makefile.in to bring in (dep) libs from ${prefix} instead of /usr/X11/lib
rename 'periodic' to 'om_periodic' per ticket 14313

p.s. yes, this fails lint due the directory name, that's next.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@37843 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
ghosthound committed Jun 25, 2008
1 parent a566661 commit cebf33785cba581a9c484f253931c7385f55e58e
@@ -36,12 +36,27 @@ depends_lib port:jpeg \
port:zlib \
lib:libX11.6:XFree86

patchfiles patch-demos-programs-peridoc-Makefile.in.diff \
patch-lib-Mrm-Makefile.in.diff

post-patch {
reinplace "s|iconv_open|libiconv_open|g" ${worksrcpath}/configure
reinplace -E "/^LDFLAGS/s|\$| @LDFLAGS@|" ${worksrcpath}/lib/Xm/Makefile.in
}

configure.args --mandir=${prefix}/share/man
configure.args --mandir=${prefix}/share/man \
--enable-xft \
--with-fontconfig-config=${prefix}/bin/freetype-config \
--with-fontconfig-includes=${prefix}/include \
--with-fontconfig-lib=${prefix}/lib \
--with-freetype-includes=${prefix}/include \
--with-freetype-lib=${prefix}/lib \
--enable-jpeg \
--with-libjpeg-includes=${prefix}/include \
--with-libjpeg-lib=${prefix}/lib \
--enable-png \
--with-libpng-includes=${prefix}/include \
--with-libpng-lib=${prefix}/lib

build.env LANG=C

@@ -0,0 +1,23 @@
--- demos/programs/periodic/Makefile.in.orig 2008-06-24 22:13:34.000000000 -0700
+++ demos/programs/periodic/Makefile.in 2008-06-24 22:15:12.000000000 -0700
@@ -38,7 +38,8 @@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-bin_PROGRAMS = periodic$(EXEEXT)
+PERIODIC_BIN_NAME = om_periodic$(EXEEXT)
+bin_PROGRAMS = $(PERIODIC_BIN_NAME)
subdir = demos/programs/periodic
DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -295,8 +296,8 @@
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
done
-periodic$(EXEEXT): $(periodic_OBJECTS) $(periodic_DEPENDENCIES)
- @rm -f periodic$(EXEEXT)
+$(PERIODIC_BIN_NAME): $(periodic_OBJECTS) $(periodic_DEPENDENCIES)
+ @rm -f $(PERIODIC_BIN_NAME)
$(LINK) $(periodic_LDFLAGS) $(periodic_OBJECTS) $(periodic_LDADD) $(LIBS)

mostlyclean-compile:
@@ -0,0 +1,11 @@
--- lib/Mrm/Makefile.in.orig 2008-06-25 12:42:27.000000000 -0700
+++ lib/Mrm/Makefile.in 2008-06-25 12:42:55.000000000 -0700
@@ -181,7 +181,7 @@
XRENDER_LIBS = @XRENDER_LIBS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_LIBS = @X_LIBS@
+X_LIBS = -L${prefix}/lib @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
X_XMU = @X_XMU@
YACC = @YACC@

0 comments on commit cebf337

Please sign in to comment.
You can’t perform that action at this time.