diff options
| -rw-r--r-- | japanese/xlockmore/Makefile | 1 | ||||
| -rw-r--r-- | x11/xlockmore/Makefile | 14 | ||||
| -rw-r--r-- | x11/xlockmore/distinfo | 4 | ||||
| -rw-r--r-- | x11/xlockmore/files/patch-configure | 11 |
4 files changed, 10 insertions, 20 deletions
diff --git a/japanese/xlockmore/Makefile b/japanese/xlockmore/Makefile index 945563e6301d..b19626f6bea8 100644 --- a/japanese/xlockmore/Makefile +++ b/japanese/xlockmore/Makefile @@ -10,5 +10,4 @@ MASTERDIR= ${.CURDIR}/../../x11/xlockmore WITH_MB= yes XLOCKMORE_LANG= ja -NO_STAGE= yes .include "${MASTERDIR}/Makefile" diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile index f27a2a80a0b9..63a13a43e729 100644 --- a/x11/xlockmore/Makefile +++ b/x11/xlockmore/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xlockmore -PORTVERSION= 5.42 +PORTVERSION= 5.43 CATEGORIES?= x11 MASTER_SITES= http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \ ftp://ibiblio.org/pub/Linux/X11/screensavers/ \ @@ -20,10 +20,9 @@ CONFIGURE_ARGS= --without-motif --without-ttf --without-editres \ USE_GNOME= # USE_XORG= x11 xaw ice -LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 +LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 -MAN1= xlock.1 -PLIST_FILES= bin/xlock lib/X11/app-defaults/XLock +PLIST_FILES= bin/xlock lib/X11/app-defaults/XLock man/man1/xlock.1.gz OPTIONS_DEFINE= MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \ KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK @@ -45,7 +44,10 @@ OPTIONS_RADIO_ONE= PAM XLOCK_GROUP NO_OPTIONS_SORT=yes -NO_STAGE= yes +MAKE_ARGS+= bindir=${STAGEDIR}${PREFIX}/bin \ + mandir=${STAGEDIR}${PREFIX}/man/man1 \ + xapploaddir=${STAGEDIR}${PREFIX}/lib/X11/app-defaults + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MKERBEROS4} @@ -123,7 +125,7 @@ CONFIGURE_ARGS+= --enable-customization .endif .if ${PORT_OPTIONS:MMAGICK} -LIB_DEPENDS+= MagickCore:${PORTSDIR}/graphics/ImageMagick +LIB_DEPENDS+= libMagickCore.so:${PORTSDIR}/graphics/ImageMagick .else CONFIGURE_ARGS+= --without-magick .endif diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo index 62786f754ee9..b7813579bbab 100644 --- a/x11/xlockmore/distinfo +++ b/x11/xlockmore/distinfo @@ -1,2 +1,2 @@ -SHA256 (xlockmore-5.42.tar.bz2) = 1fe4170e35c9a41744effcff7ed790ffefba024db398f9cf19092a91f465b19f -SIZE (xlockmore-5.42.tar.bz2) = 1963974 +SHA256 (xlockmore-5.43.tar.bz2) = 29911f21aaf682aa61f358ca36dadf20091ad919d19b4d55e3f4c8503ab266d0 +SIZE (xlockmore-5.43.tar.bz2) = 1965448 diff --git a/x11/xlockmore/files/patch-configure b/x11/xlockmore/files/patch-configure deleted file mode 100644 index 1f4ac91a6b11..000000000000 --- a/x11/xlockmore/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Wed Jan 24 11:03:50 2007 -+++ configure Sun Jun 10 16:25:11 2007 -@@ -791,7 +791,7 @@ - psdir='${docdir}' - libdir='${exec_prefix}/lib' - localedir='${datarootdir}/locale' --mandir='${datarootdir}/man' -+mandir='${exec_prefix}/man' - - ac_prev= - ac_dashdash= |