diff options
author | Will Andrews <will@FreeBSD.org> | 2002-01-05 08:57:29 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2002-01-05 08:57:29 +0000 |
commit | 8ad291c33e7fff3167d68403a3fa605b894b3792 (patch) | |
tree | c758c47a3a2a9bc64ea4dc92db5a617606c7b553 /palm | |
parent | Update to 0.3.32 and hand over maintainership to submitter (diff) |
Make pilot-link install directly into PREFIX. This should allow
pilot-link and all dependents to build correctly on bento.
Notes
Notes:
svn path=/head/; revision=52598
Diffstat (limited to 'palm')
-rw-r--r-- | palm/gnome-pilot-conduits/Makefile | 6 | ||||
-rw-r--r-- | palm/gnome-pilot/Makefile | 6 | ||||
-rw-r--r-- | palm/gnomepilot-conduits/Makefile | 6 | ||||
-rw-r--r-- | palm/gnomepilot-conduits2/Makefile | 6 | ||||
-rw-r--r-- | palm/gnomepilot/Makefile | 6 | ||||
-rw-r--r-- | palm/gnomepilot2/Makefile | 6 | ||||
-rw-r--r-- | palm/pilot-link-devel/Makefile | 10 | ||||
-rw-r--r-- | palm/pilot-link-devel/pkg-plist | 180 | ||||
-rw-r--r-- | palm/pilot-link/Makefile | 10 | ||||
-rw-r--r-- | palm/pilot-link/pkg-plist | 180 | ||||
-rw-r--r-- | palm/syncal/Makefile | 12 |
11 files changed, 203 insertions, 225 deletions
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile index 713e996b4265..b1a2e3341719 100644 --- a/palm/gnome-pilot-conduits/Makefile +++ b/palm/gnome-pilot-conduits/Makefile @@ -21,9 +21,9 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOMECTRL= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ - LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" +CONFIGURE_ARGS= --with-pisock=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index 0d79eafcbf80..38c7b04564e0 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -24,9 +24,9 @@ USE_GMAKE= yes USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ - LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" +CONFIGURE_ARGS= --with-pisock=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile index 713e996b4265..b1a2e3341719 100644 --- a/palm/gnomepilot-conduits/Makefile +++ b/palm/gnomepilot-conduits/Makefile @@ -21,9 +21,9 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOMECTRL= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ - LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" +CONFIGURE_ARGS= --with-pisock=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile index 713e996b4265..b1a2e3341719 100644 --- a/palm/gnomepilot-conduits2/Makefile +++ b/palm/gnomepilot-conduits2/Makefile @@ -21,9 +21,9 @@ USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOMECTRL= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ - LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" +CONFIGURE_ARGS= --with-pisock=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile index 0d79eafcbf80..38c7b04564e0 100644 --- a/palm/gnomepilot/Makefile +++ b/palm/gnomepilot/Makefile @@ -24,9 +24,9 @@ USE_GMAKE= yes USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ - LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" +CONFIGURE_ARGS= --with-pisock=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile index 0d79eafcbf80..38c7b04564e0 100644 --- a/palm/gnomepilot2/Makefile +++ b/palm/gnomepilot2/Makefile @@ -24,9 +24,9 @@ USE_GMAKE= yes USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --with-pisock=${LOCALBASE}/pilot -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/pilot/include" \ - LIBS="-L${LOCALBASE}/lib -L${LOCALBASE}/pilot/lib" +CONFIGURE_ARGS= --with-pisock=${LOCALBASE} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile index 6305881158ea..8cf6f2c55803 100644 --- a/palm/pilot-link-devel/Makefile +++ b/palm/pilot-link-devel/Makefile @@ -7,9 +7,9 @@ PORTNAME= pilot-link PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= palm comms tk83 -MASTER_SITES= http://www.gnu-designs.com/pilot-link/source/ +MASTER_SITES= http://www.pilot-link.org/source/ DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= dima@freebsd.org @@ -28,6 +28,7 @@ MAN1= dlpsh.1 ietf2datebook.1 install-datebook.1 \ MAN7= pilot-link.7 CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ARGS= --with-perl5=${PERL5} --with-libiconv=${LOCALBASE} post-patch: # FreeBSD installs -lgiconv instead of -liconv. Patch configure. @@ -47,8 +48,3 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/pilot-link.sh .include <bsd.port.mk> - -# Leave this here -- we need to override the default CONFIGURE_ARGS. -CONFIGURE_ARGS= --with-perl5=${PERL5} --with-libiconv=${LOCALBASE} \ - --prefix=${PREFIX}/pilot ${CONFIGURE_TARGET} \ - --mandir=${PREFIX}/man diff --git a/palm/pilot-link-devel/pkg-plist b/palm/pilot-link-devel/pkg-plist index abe5bd449fa1..4b29e229d96f 100644 --- a/palm/pilot-link-devel/pkg-plist +++ b/palm/pilot-link-devel/pkg-plist @@ -1,93 +1,89 @@ etc/rc.d/pilot-link.sh -pilot/bin/addresses -pilot/bin/ccexample -pilot/bin/debugsh -pilot/bin/dlpsh -pilot/bin/getrom -pilot/bin/hinotes -pilot/bin/iambicexample -pilot/bin/ietf2datebook -pilot/bin/install-datebook -pilot/bin/install-hinote -pilot/bin/install-memo -pilot/bin/install-todos -pilot/bin/install-user -pilot/bin/memos -pilot/bin/money2qif -pilot/bin/pi-csd -pilot/bin/pi-getram -pilot/bin/pi-getrom -pilot/bin/pi-nredir -pilot/bin/pi-port -pilot/bin/pilot-addresses -pilot/bin/pilot-clip -pilot/bin/pilot-debug -pilot/bin/pilot-dedupe -pilot/bin/pilot-file -pilot/bin/pilot-mail -pilot/bin/pilot-prc -pilot/bin/pilot-schlep -pilot/bin/pilot-undelete -pilot/bin/pilot-xfer -pilot/bin/read-expenses -pilot/bin/read-ical -pilot/bin/read-todos -pilot/bin/reminders -pilot/bin/sync-plan -pilot/include/pi-address.h -pilot/include/pi-address.hxx -pilot/include/pi-appinfo.h -pilot/include/pi-appinfo.hxx -pilot/include/pi-args.h -pilot/include/pi-cmp.h -pilot/include/pi-config-win32.h -pilot/include/pi-config.h -pilot/include/pi-datebook.h -pilot/include/pi-datebook.hxx -pilot/include/pi-dlp.h -pilot/include/pi-dlp.hxx -pilot/include/pi-expense.h -pilot/include/pi-file.h -pilot/include/pi-header.h -pilot/include/pi-hinote.h -pilot/include/pi-iambicExpense.h -pilot/include/pi-iambicExpense.hxx -pilot/include/pi-inet.h -pilot/include/pi-inetserial.h -pilot/include/pi-macros.h -pilot/include/pi-mail.h -pilot/include/pi-memo.h -pilot/include/pi-memo.hxx -pilot/include/pi-money.h -pilot/include/pi-padp.h -pilot/include/pi-serial.h -pilot/include/pi-slp.h -pilot/include/pi-sockaddr-win32.h -pilot/include/pi-sockaddr.h -pilot/include/pi-socket.h -pilot/include/pi-source.h -pilot/include/pi-sync.h -pilot/include/pi-syspkt.h -pilot/include/pi-todo.h -pilot/include/pi-todo.hxx -pilot/include/pi-util.h -pilot/include/pi-version.h -pilot/lib/libpicc.a -pilot/lib/libpisock.a -pilot/lib/libpisock.so -pilot/lib/libpisock.so.4.0 -pilot/lib/pix/b1.gif -pilot/lib/pix/b2.gif -pilot/lib/pix/b3.gif -pilot/lib/pix/b4.gif -pilot/lib/pix/b5.gif -pilot/lib/pix/b6.gif -pilot/lib/pix/b7.gif -pilot/lib/pix/case.gif -pilot/lib/pix/case.xbm -pilot/lib/pix/casemask.xbm -@dirrm pilot/lib/pix -@dirrm pilot/lib -@dirrm pilot/include -@dirrm pilot/bin -@dirrm pilot +bin/addresses +bin/ccexample +bin/debugsh +bin/dlpsh +bin/getrom +bin/hinotes +bin/iambicexample +bin/ietf2datebook +bin/install-datebook +bin/install-hinote +bin/install-memo +bin/install-todos +bin/install-user +bin/memos +bin/money2qif +bin/pi-csd +bin/pi-getram +bin/pi-getrom +bin/pi-nredir +bin/pi-port +bin/pilot-addresses +bin/pilot-clip +bin/pilot-debug +bin/pilot-dedupe +bin/pilot-file +bin/pilot-mail +bin/pilot-prc +bin/pilot-schlep +bin/pilot-undelete +bin/pilot-xfer +bin/read-expenses +bin/read-ical +bin/read-todos +bin/reminders +bin/sync-plan +include/pi-address.h +include/pi-address.hxx +include/pi-appinfo.h +include/pi-appinfo.hxx +include/pi-args.h +include/pi-cmp.h +include/pi-config-win32.h +include/pi-config.h +include/pi-datebook.h +include/pi-datebook.hxx +include/pi-dlp.h +include/pi-dlp.hxx +include/pi-expense.h +include/pi-file.h +include/pi-header.h +include/pi-hinote.h +include/pi-iambicExpense.h +include/pi-iambicExpense.hxx +include/pi-inet.h +include/pi-inetserial.h +include/pi-macros.h +include/pi-mail.h +include/pi-memo.h +include/pi-memo.hxx +include/pi-money.h +include/pi-padp.h +include/pi-serial.h +include/pi-slp.h +include/pi-sockaddr-win32.h +include/pi-sockaddr.h +include/pi-socket.h +include/pi-source.h +include/pi-sync.h +include/pi-syspkt.h +include/pi-todo.h +include/pi-todo.hxx +include/pi-util.h +include/pi-version.h +lib/libpicc.a +lib/libpisock.a +lib/libpisock.so +lib/libpisock.so.4.0 +lib/pix/b1.gif +lib/pix/b2.gif +lib/pix/b3.gif +lib/pix/b4.gif +lib/pix/b5.gif +lib/pix/b6.gif +lib/pix/b7.gif +lib/pix/case.gif +lib/pix/case.xbm +lib/pix/casemask.xbm +@dirrm lib/pix diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile index 6305881158ea..8cf6f2c55803 100644 --- a/palm/pilot-link/Makefile +++ b/palm/pilot-link/Makefile @@ -7,9 +7,9 @@ PORTNAME= pilot-link PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= palm comms tk83 -MASTER_SITES= http://www.gnu-designs.com/pilot-link/source/ +MASTER_SITES= http://www.pilot-link.org/source/ DISTNAME= ${PORTNAME}.${PORTVERSION} MAINTAINER= dima@freebsd.org @@ -28,6 +28,7 @@ MAN1= dlpsh.1 ietf2datebook.1 install-datebook.1 \ MAN7= pilot-link.7 CFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ARGS= --with-perl5=${PERL5} --with-libiconv=${LOCALBASE} post-patch: # FreeBSD installs -lgiconv instead of -liconv. Patch configure. @@ -47,8 +48,3 @@ post-install: @${CHMOD} 750 ${PREFIX}/etc/rc.d/pilot-link.sh .include <bsd.port.mk> - -# Leave this here -- we need to override the default CONFIGURE_ARGS. -CONFIGURE_ARGS= --with-perl5=${PERL5} --with-libiconv=${LOCALBASE} \ - --prefix=${PREFIX}/pilot ${CONFIGURE_TARGET} \ - --mandir=${PREFIX}/man diff --git a/palm/pilot-link/pkg-plist b/palm/pilot-link/pkg-plist index abe5bd449fa1..4b29e229d96f 100644 --- a/palm/pilot-link/pkg-plist +++ b/palm/pilot-link/pkg-plist @@ -1,93 +1,89 @@ etc/rc.d/pilot-link.sh -pilot/bin/addresses -pilot/bin/ccexample -pilot/bin/debugsh -pilot/bin/dlpsh -pilot/bin/getrom -pilot/bin/hinotes -pilot/bin/iambicexample -pilot/bin/ietf2datebook -pilot/bin/install-datebook -pilot/bin/install-hinote -pilot/bin/install-memo -pilot/bin/install-todos -pilot/bin/install-user -pilot/bin/memos -pilot/bin/money2qif -pilot/bin/pi-csd -pilot/bin/pi-getram -pilot/bin/pi-getrom -pilot/bin/pi-nredir -pilot/bin/pi-port -pilot/bin/pilot-addresses -pilot/bin/pilot-clip -pilot/bin/pilot-debug -pilot/bin/pilot-dedupe -pilot/bin/pilot-file -pilot/bin/pilot-mail -pilot/bin/pilot-prc -pilot/bin/pilot-schlep -pilot/bin/pilot-undelete -pilot/bin/pilot-xfer -pilot/bin/read-expenses -pilot/bin/read-ical -pilot/bin/read-todos -pilot/bin/reminders -pilot/bin/sync-plan -pilot/include/pi-address.h -pilot/include/pi-address.hxx -pilot/include/pi-appinfo.h -pilot/include/pi-appinfo.hxx -pilot/include/pi-args.h -pilot/include/pi-cmp.h -pilot/include/pi-config-win32.h -pilot/include/pi-config.h -pilot/include/pi-datebook.h -pilot/include/pi-datebook.hxx -pilot/include/pi-dlp.h -pilot/include/pi-dlp.hxx -pilot/include/pi-expense.h -pilot/include/pi-file.h -pilot/include/pi-header.h -pilot/include/pi-hinote.h -pilot/include/pi-iambicExpense.h -pilot/include/pi-iambicExpense.hxx -pilot/include/pi-inet.h -pilot/include/pi-inetserial.h -pilot/include/pi-macros.h -pilot/include/pi-mail.h -pilot/include/pi-memo.h -pilot/include/pi-memo.hxx -pilot/include/pi-money.h -pilot/include/pi-padp.h -pilot/include/pi-serial.h -pilot/include/pi-slp.h -pilot/include/pi-sockaddr-win32.h -pilot/include/pi-sockaddr.h -pilot/include/pi-socket.h -pilot/include/pi-source.h -pilot/include/pi-sync.h -pilot/include/pi-syspkt.h -pilot/include/pi-todo.h -pilot/include/pi-todo.hxx -pilot/include/pi-util.h -pilot/include/pi-version.h -pilot/lib/libpicc.a -pilot/lib/libpisock.a -pilot/lib/libpisock.so -pilot/lib/libpisock.so.4.0 -pilot/lib/pix/b1.gif -pilot/lib/pix/b2.gif -pilot/lib/pix/b3.gif -pilot/lib/pix/b4.gif -pilot/lib/pix/b5.gif -pilot/lib/pix/b6.gif -pilot/lib/pix/b7.gif -pilot/lib/pix/case.gif -pilot/lib/pix/case.xbm -pilot/lib/pix/casemask.xbm -@dirrm pilot/lib/pix -@dirrm pilot/lib -@dirrm pilot/include -@dirrm pilot/bin -@dirrm pilot +bin/addresses +bin/ccexample +bin/debugsh +bin/dlpsh +bin/getrom +bin/hinotes +bin/iambicexample +bin/ietf2datebook +bin/install-datebook +bin/install-hinote +bin/install-memo +bin/install-todos +bin/install-user +bin/memos +bin/money2qif +bin/pi-csd +bin/pi-getram +bin/pi-getrom +bin/pi-nredir +bin/pi-port +bin/pilot-addresses +bin/pilot-clip +bin/pilot-debug +bin/pilot-dedupe +bin/pilot-file +bin/pilot-mail +bin/pilot-prc +bin/pilot-schlep +bin/pilot-undelete +bin/pilot-xfer +bin/read-expenses +bin/read-ical +bin/read-todos +bin/reminders +bin/sync-plan +include/pi-address.h +include/pi-address.hxx +include/pi-appinfo.h +include/pi-appinfo.hxx +include/pi-args.h +include/pi-cmp.h +include/pi-config-win32.h +include/pi-config.h +include/pi-datebook.h +include/pi-datebook.hxx +include/pi-dlp.h +include/pi-dlp.hxx +include/pi-expense.h +include/pi-file.h +include/pi-header.h +include/pi-hinote.h +include/pi-iambicExpense.h +include/pi-iambicExpense.hxx +include/pi-inet.h +include/pi-inetserial.h +include/pi-macros.h +include/pi-mail.h +include/pi-memo.h +include/pi-memo.hxx +include/pi-money.h +include/pi-padp.h +include/pi-serial.h +include/pi-slp.h +include/pi-sockaddr-win32.h +include/pi-sockaddr.h +include/pi-socket.h +include/pi-source.h +include/pi-sync.h +include/pi-syspkt.h +include/pi-todo.h +include/pi-todo.hxx +include/pi-util.h +include/pi-version.h +lib/libpicc.a +lib/libpisock.a +lib/libpisock.so +lib/libpisock.so.4.0 +lib/pix/b1.gif +lib/pix/b2.gif +lib/pix/b3.gif +lib/pix/b4.gif +lib/pix/b5.gif +lib/pix/b6.gif +lib/pix/b7.gif +lib/pix/case.gif +lib/pix/case.xbm +lib/pix/casemask.xbm +@dirrm lib/pix diff --git a/palm/syncal/Makefile b/palm/syncal/Makefile index 34fe8d216a8a..41652ee46ccf 100644 --- a/palm/syncal/Makefile +++ b/palm/syncal/Makefile @@ -18,19 +18,13 @@ RUN_DEPENDS= ical:${PORTSDIR}/deskutils/ical NO_PACKAGE= patches installed ical port -PREFIX= ${LOCALBASE}/pilot - MAN1= syncal.1 post-patch: - ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.patched - ${SED} -e "s:@@PREFIX@@:${PREFIX}:g" ${WRKSRC}/Makefile.patched > ${WRKSRC}/Makefile - ${MV} ${WRKSRC}/user.tcl ${WRKSRC}/user.tcl.patched - ${SED} -e "s:@@PREFIX@@:${PREFIX}:g" ${WRKSRC}/user.tcl.patched > ${WRKSRC}/user.tcl - ${MV} ${WRKSRC}/ical.patch ${WRKSRC}/ical.patch.patched - ${SED} -e "s:@@PREFIX@@:${PREFIX}:g" ${WRKSRC}/ical.patch.patched > ${WRKSRC}/ical.patch +.for file in Makefile user.tcl ical.patch + ${PERL} -pi -e "s|\@\@PREFIX\@\@|${LOCALBASE}|g" ${WRKSRC}/${file} +.endfor -# # ical V2.2 needs a little patch, don't know how to do better # perhaps the patch should be included int ical port by default # Please have a look at this experts :-) |