aboutsummaryrefslogtreecommitdiff
path: root/palm
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-10-05 18:59:31 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-10-05 18:59:31 +0000
commit7300a6f9f4daba29ce7ba4da445b799554f9cf1d (patch)
treed4a69ad2adde45d4e390c88728ba112887f1d068 /palm
parentc003f70ee1606b2f9adf495be04741f10987c0dc (diff)
downloadports-7300a6f9f4daba29ce7ba4da445b799554f9cf1d.tar.gz
ports-7300a6f9f4daba29ce7ba4da445b799554f9cf1d.zip
- Add USES=libtool and INSTALL_TARGET=install-strip
- Remove pthread patching
Notes
Notes: svn path=/head/; revision=370103
Diffstat (limited to 'palm')
-rw-r--r--palm/pilot-link/Makefile13
-rw-r--r--palm/pilot-link/files/patch-ltmain.sh17
-rw-r--r--palm/pilot-link/pkg-plist2
3 files changed, 6 insertions, 26 deletions
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index 21c76bf44941..0dea1209694c 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -3,22 +3,24 @@
PORTNAME= pilot-link
PORTVERSION= 0.12.5
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= palm comms
MASTER_SITES= http://downloads.pilot-link.org/ \
http://miwibox.org/distfiles/
MAINTAINER= samm@os2.kiev.ua
-COMMENT= Suite of tools used to connect and sync your Palm handled
+COMMENT= Suite of tools to connect and sync your Palm handheld
LICENSE= GPLv2
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
-USES= pathfix pkgconfig iconv tar:bzip2
GNU_CONFIGURE= yes
CFLAGS+= -I${WRKSRC}/popt -I${LOCALBASE}/include
CONFIGURE_ARGS+=${ICONV_CONFIGURE_BASE} --with-included-popt --enable-conduits --enable-xsltproc
+INSTALL_TARGET= install-strip
+USES= iconv libtool pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
OPTIONS_DEFINE= PNG THREADS USB
@@ -28,8 +30,6 @@ USB_DESC= Compile with USB via libusb support (READ MANUAL!)
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+= --enable-threads
-CFLAGS+= ${PTHREAD_LIBS}
-CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
.endif
.if ${PORT_OPTIONS:MUSB}
@@ -38,8 +38,6 @@ LDFLAGS+= -L${PREFIX}/lib -lusb
.if ! ${PORT_OPTIONS:MTHREADS}
IGNORE= cannot be built: USB support requires THREADS turned on. Please reconfigure using 'make config'
-.else
-LDFLAGS+= ${PTHREAD_LIBS}
.endif
.endif
@@ -57,8 +55,5 @@ post-patch:
${WRKSRC}/src/pilot-read-palmpix.c \
${WRKSRC}/src/pilot-read-screenshot.c \
${WRKSRC}/src/pilot-read-veo.c
-.if ${PORT_OPTIONS:MTHREADS}
- @${REINPLACE_CMD} -e 's|Libs: |Libs: ${PTHREAD_LIBS} |' ${WRKSRC}/pilot-link.pc.in ${WRKSRC}/pilot-link-pp.pc.in
-.endif
.include <bsd.port.mk>
diff --git a/palm/pilot-link/files/patch-ltmain.sh b/palm/pilot-link/files/patch-ltmain.sh
deleted file mode 100644
index 704786259129..000000000000
--- a/palm/pilot-link/files/patch-ltmain.sh
+++ /dev/null
@@ -1,17 +0,0 @@
---- ltmain.sh.orig 2009-05-25 07:33:24.000000000 +0300
-+++ ltmain.sh 2009-09-08 01:58:54.000000000 +0300
-@@ -2077,10 +2077,10 @@
- fi
-
- # Install the pseudo-library for information purposes.
-- func_basename "$file"
-- name="$func_basename_result"
-- instname="$dir/$name"i
-- func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-+# func_basename "$file"
-+# name="$func_basename_result"
-+# instname="$dir/$name"i
-+# func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/palm/pilot-link/pkg-plist b/palm/pilot-link/pkg-plist
index 5411399616be..4d48838a6b13 100644
--- a/palm/pilot-link/pkg-plist
+++ b/palm/pilot-link/pkg-plist
@@ -80,9 +80,11 @@ include/pi-location.h
lib/libpisock.a
lib/libpisock.so
lib/libpisock.so.9
+lib/libpisock.so.9.0.2
lib/libpisync.a
lib/libpisync.so
lib/libpisync.so.1
+lib/libpisync.so.1.0.3
libdata/pkgconfig/pilot-link.pc
share/aclocal/pilot-link.m4
%%DATADIR%%/pix/b1.gif