diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-07-01 18:24:05 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-07-01 18:24:05 +0000 |
| commit | 3c32c2b6333b34bb6b6186b5a6c993539fc23c89 (patch) | |
| tree | 3130849da2e4750c967fa6b500c03566e9ae00bf /x11 | |
| parent | 8a4b2f03c74090d8200c17f089c95922e6b1ae41 (diff) | |
| download | ports-3c32c2b6333b34bb6b6186b5a6c993539fc23c89.tar.gz ports-3c32c2b6333b34bb6b6186b5a6c993539fc23c89.zip | |
- Convert to USES=libtool
- Replace -L/usr/X11R6/lib with -L/usr/local/lib in patch
Notes
Notes:
svn path=/head/; revision=360074
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/tkXwin/Makefile | 4 | ||||
| -rw-r--r-- | x11/tkXwin/files/patch-Makefile.in | 2 | ||||
| -rw-r--r-- | x11/tkXwin/files/patch-config-ltconfig | 11 | ||||
| -rw-r--r-- | x11/tkXwin/files/patch-configure | 9 | ||||
| -rw-r--r-- | x11/tkXwin/pkg-plist | 2 |
5 files changed, 4 insertions, 24 deletions
diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile index 447230ded680..c50ed2a9d1a9 100644 --- a/x11/tkXwin/Makefile +++ b/x11/tkXwin/Makefile @@ -3,7 +3,7 @@ PORTNAME= tkXwin PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11 MASTER_SITES= http://beepcore-tcl.sourceforge.net/ EXTRACT_SUFX= .tgz @@ -11,8 +11,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= dsh@vlink.ru COMMENT= Tcl/Tk library to detect idle periods of an X session -USES= tk:84 GNU_CONFIGURE= yes +USES= libtool tk:84 USE_XORG= xt xscrnsaver USE_LDCONFIG= yes diff --git a/x11/tkXwin/files/patch-Makefile.in b/x11/tkXwin/files/patch-Makefile.in index 6a7f61b86768..b396912ba9d7 100644 --- a/x11/tkXwin/files/patch-Makefile.in +++ b/x11/tkXwin/files/patch-Makefile.in @@ -7,7 +7,7 @@ -#CFLAGS_XSS = -DHAVE_SHARED_XSS -#LIB_XSS = -L/usr/X11R6/lib -lXss +CFLAGS_XSS = -DHAVE_SHARED_XSS -+LIB_XSS = -L/usr/X11R6/lib -lXss ++LIB_XSS = -L/usr/local/lib -lXss SHELL = @SHELL@ diff --git a/x11/tkXwin/files/patch-config-ltconfig b/x11/tkXwin/files/patch-config-ltconfig deleted file mode 100644 index 707833a6379e..000000000000 --- a/x11/tkXwin/files/patch-config-ltconfig +++ /dev/null @@ -1,11 +0,0 @@ ---- config/ltconfig.orig Mon Feb 25 08:42:15 2002 -+++ config/ltconfig Sat Feb 10 15:38:23 2007 -@@ -1115,7 +1115,7 @@ - ;; - - freebsd*) -- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` -+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) diff --git a/x11/tkXwin/files/patch-configure b/x11/tkXwin/files/patch-configure index 92498d01c824..71e0b6db1571 100644 --- a/x11/tkXwin/files/patch-configure +++ b/x11/tkXwin/files/patch-configure @@ -1,14 +1,5 @@ --- configure.orig 2002-08-25 08:29:53.000000000 +0200 +++ configure 2014-01-09 09:46:12.000000000 +0100 -@@ -1798,7 +1798,7 @@ - AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ - objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ - deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \ --${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -+$ac_aux_dir/ltconfig --no-reexec \ - $libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } - @@ -3534,7 +3534,7 @@ diff --git a/x11/tkXwin/pkg-plist b/x11/tkXwin/pkg-plist index 2aca4c00833a..3fc2e72979a1 100644 --- a/x11/tkXwin/pkg-plist +++ b/x11/tkXwin/pkg-plist @@ -1,6 +1,6 @@ -lib/libtkXwin.la lib/libtkXwin.so lib/libtkXwin.so.1 +lib/libtkXwin.so.1.0.0 lib/tkXwin/pkgIndex.tcl lib/tkXwin/test.tcl @dirrm lib/tkXwin |