diff options
| author | lioux <lioux@FreeBSD.org> | 2001-11-28 14:00:26 +0800 |
|---|---|---|
| committer | lioux <lioux@FreeBSD.org> | 2001-11-28 14:00:26 +0800 |
| commit | cb7ffcbd0b89bba6322f0209f43e369387dbbcbb (patch) | |
| tree | 5fb3e11120e1628c94b0ae3cd8ed61ab8a1dff99 /multimedia | |
| parent | ccac23c001df66217d03826b598f1ae07dc70c31 (diff) | |
| download | freebsd-ports-gnome-cb7ffcbd0b89bba6322f0209f43e369387dbbcbb.tar.gz freebsd-ports-gnome-cb7ffcbd0b89bba6322f0209f43e369387dbbcbb.tar.zst freebsd-ports-gnome-cb7ffcbd0b89bba6322f0209f43e369387dbbcbb.zip | |
o Work around and reduce dependency list (remove automake)
o Also, get this port back to compiling (has been broken since
autoconf was repocopied to autoconf213) with help of new code as
of bsd.port.mk rev 1.394
- fix it by using {ACLOCAL,AUTO{CONF,HEADER}}
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ogle-gui/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/ogle-gui/files/patch-Makefile.am | 10 | ||||
| -rw-r--r-- | multimedia/ogle-gui/files/patch-Makefile.in | 11 |
3 files changed, 16 insertions, 12 deletions
diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile index bdbeefd451ec..1c173b9fc609 100644 --- a/multimedia/ogle-gui/Makefile +++ b/multimedia/ogle-gui/Makefile @@ -14,8 +14,7 @@ DISTNAME= ${PORTNAME}_gui-${PORTVERSION} MAINTAINER= lioux@FreeBSD.org -BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake \ - ${LOCALBASE}/lib/ogle/libdvdcontrol.so.4:${PORTSDIR}/graphics/ogle +BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.4:${PORTSDIR}/graphics/ogle LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ jpeg.9:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ogle:${PORTSDIR}/graphics/ogle @@ -34,8 +33,12 @@ CONFIGURE_ARGS= --with-dvd-includes=${LOCALBASE}/include \ post-patch: @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} + @${PERL} -pi -e "s/aclocal/${ACLOCAL}/;s/autoconf/${AUTOCONF}/; \ + s/autoheader/${AUTOHEADER}/" \ + ${CONFIGURE_WRKSRC}/aclocal.m4 pre-configure: + @${TOUCH} `find -E ${WRKSRC} -regex ".*Makefile\.(am|in)"` .for file in intl/Makefile.in po/Makefile.in.in @${ECHO} 'all:' > ${WRKSRC}/${file} @${ECHO} 'install:' >> ${WRKSRC}/${file} diff --git a/multimedia/ogle-gui/files/patch-Makefile.am b/multimedia/ogle-gui/files/patch-Makefile.am deleted file mode 100644 index ad90adf3b110..000000000000 --- a/multimedia/ogle-gui/files/patch-Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.am.orig Mon Oct 22 16:42:37 2001 -+++ Makefile.am Mon Oct 22 16:42:40 2001 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --SUBDIRS = intl po macros src doc -+SUBDIRS = intl po src - - install-data-local: - @$(NORMAL_INSTALL) diff --git a/multimedia/ogle-gui/files/patch-Makefile.in b/multimedia/ogle-gui/files/patch-Makefile.in new file mode 100644 index 000000000000..d8187aafb4b6 --- /dev/null +++ b/multimedia/ogle-gui/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Wed Nov 28 03:37:29 2001 ++++ Makefile.in Wed Nov 28 03:37:59 2001 +@@ -121,7 +121,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-SUBDIRS = intl po macros src doc ++SUBDIRS = intl po src + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h |