diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2004-06-04 17:29:38 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2004-06-04 17:29:38 +0000 |
| commit | 1a628ded35ecbbc5eeb75598dd844d830aca8cb2 (patch) | |
| tree | 128ce8505dc266bea10a8cf389f38de197424aed /deskutils | |
| parent | 639a61155c89af6b9b01d796a82cbd2ad643a299 (diff) | |
| download | ports-1a628ded35ecbbc5eeb75598dd844d830aca8cb2.tar.gz ports-1a628ded35ecbbc5eeb75598dd844d830aca8cb2.zip | |
Notes
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/krss/Makefile | 15 | ||||
| -rw-r--r-- | deskutils/multisync/Makefile | 13 |
2 files changed, 11 insertions, 17 deletions
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile index 8e0f495f8f68..59bfa71e9215 100644 --- a/deskutils/krss/Makefile +++ b/deskutils/krss/Makefile @@ -16,9 +16,8 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= KDE Rich Site Summary viewer -BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \ - automake14:${PORTSDIR}/devel/automake14 - +WANT_AUTOMAKE_VER=14 +WANT_AUTOCONF_VER=213 USE_KDEBASE_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes @@ -29,12 +28,10 @@ QTCFGLIBS+= ${PTHREAD_LIBS} pre-configure: ${MKDIR} ${WRKSRC}/auto-bin -.for AC in autoconf autoheader - ${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC} -.endfor -.for AM in automake aclocal - ${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM} -.endfor + ${LN} -sf ${AUTOCONF} ${WRKSRC}/auto-bin/autoconf + ${LN} -sf ${AUTOHEADER} ${WRKSRC}/auto-bin/autoheader + ${LN} -sf ${AUTOMAKE} ${WRKSRC}/auto-bin/automake + ${LN} -sf ${ACLOCAL} ${WRKSRC}/auto-bin/aclocal cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \ ${GMAKE} -f Makefile.dist diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile index 2a0d1f0908c7..4e636574b915 100644 --- a/deskutils/multisync/Makefile +++ b/deskutils/multisync/Makefile @@ -14,24 +14,21 @@ DISTNAME= multisync-${PORTVERSION} MAINTAINER?= pav@FreeBSD.org COMMENT?= Synchronize calendars, addressbooks and other PIM data -PATCH_DEPENDS+= ${LOCALBASE}/share/automake17/depcomp:${PORTSDIR}/devel/automake17 - WRKSRC?= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION} USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix libgnomeui USE_GMAKE= yes USE_LIBTOOL_VER=15 +WANT_AUTOMAKE_VER=17 USE_X_PREFIX= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" -AUTOMAKE_FILES= missing install-sh mkinstalldirs config.guess config.sub depcomp - -post-patch: +pre-configure: @${FIND} ${WRKDIR} -type l -delete -.for FILE in ${AUTOMAKE_FILES} - @${CP} -f ${LOCALBASE}/share/automake17/${FILE} ${WRKSRC} - @${CP} -f ${LOCALBASE}/share/automake17/${FILE} ${WRKSRCMASTER} +.for FILE in missing install-sh mkinstalldirs config.guess config.sub depcomp + @${CP} -f ${AUTOMAKE_DIR}/${FILE} ${WRKSRC} + @${CP} -f ${AUTOMAKE_DIR}/${FILE} ${WRKSRCMASTER} .endfor @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-lpthread||' |