aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deskutils/gnome-pim/Makefile7
-rw-r--r--deskutils/gnome-pim/pkg-plist27
-rw-r--r--deskutils/gnomepim/Makefile7
-rw-r--r--deskutils/gnomepim/pkg-plist27
4 files changed, 42 insertions, 26 deletions
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 8e5778376227..49b1d63975c2 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -20,9 +20,11 @@ LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
LIB_DEPENDS+= gpilotd.0:${PORTSDIR}/palm/gnomepilot
PILOTINC= "-I${LOCALBASE}/pilot/include"
PILOTLIB= "-L${LOCALBASE}/pilot/lib"
+PLIST_SUB+= GNOMEPILOT:=""
.else
PILOTARGS= --without-pisock --disable-pilotlinktest
EXTRA_PATCHES= ${FILESDIR}/patch.nopilot
+PLIST_SUB+= GNOMEPILOT:="@comment "
.endif
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@@ -48,9 +50,4 @@ pre-patch:
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-.if defined(WITH_GNOMEPILOT)
-post-install:
- @${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST}
-.endif
-
.include <bsd.port.mk>
diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist
index 19195c2c68ed..ad35d9235e36 100644
--- a/deskutils/gnome-pim/pkg-plist
+++ b/deskutils/gnome-pim/pkg-plist
@@ -1,24 +1,35 @@
+%%GNOMEPILOT:%%bin/address-conduit-capplet
+%%GNOMEPILOT:%%bin/calendar-conduit-control-applet
+%%GNOMEPILOT:%%bin/calendar-pilot-sync
bin/gnomecal
bin/gnomecard
etc/CORBA/servers/gnomecal.gnorba
etc/CORBA/servers/gnomecard.gnorba
+%%GNOMEPILOT:%%lib/gnome-pilot/conduits/libaddress_conduit.so
+%%GNOMEPILOT:%%lib/gnome-pilot/conduits/libcalendar_conduit.so
share/gnome/apps/Applications/gncal.desktop
share/gnome/apps/Applications/gnomecard.desktop
+%%GNOMEPILOT:%%share/gnome/apps/Settings/Peripherals/Conduits/address-conduit-capplet.desktop
+%%GNOMEPILOT:%%share/gnome/apps/Settings/Peripherals/Conduits/calendar-conduit-control-applet.desktop
+%%GNOMEPILOT:%%share/gnome/control-center/Peripherals/Conduits/address-conduit-capplet.desktop
+%%GNOMEPILOT:%%share/gnome/control-center/Peripherals/Conduits/calendar-conduit-control-applet.desktop
+%%GNOMEPILOT:%%share/gnome/gnome-pilot/conduits/gnomecal.conduit
+%%GNOMEPILOT:%%share/gnome/gnome-pilot/conduits/gnomecard.conduit
+share/gnome/help/gnomecal/C/calappoint.html
+share/gnome/help/gnomecal/C/calsetup.html
+share/gnome/help/gnomecal/C/caluse.html
+share/gnome/help/gnomecal/C/cmdline.html
+share/gnome/help/gnomecal/C/docbook.css
+share/gnome/help/gnomecal/C/gcal.html
share/gnome/help/gnomecal/C/gnomecal.html
-share/gnome/help/gnomecal/C/topic.dat
share/gnome/help/gnomecal/C/images/cal-props.gif
share/gnome/help/gnomecal/C/images/calday.gif
share/gnome/help/gnomecal/C/images/calmonth.gif
share/gnome/help/gnomecal/C/images/calweek.gif
share/gnome/help/gnomecal/C/images/calyear.gif
-share/gnome/help/gnomecal/C/calappoint.html
-share/gnome/help/gnomecal/C/calsetup.html
-share/gnome/help/gnomecal/C/caluse.html
-share/gnome/help/gnomecal/C/cmdline.html
-share/gnome/help/gnomecal/C/gcal.html
share/gnome/help/gnomecal/C/ln20.html
share/gnome/help/gnomecal/C/tech.html.html
-share/gnome/help/gnomecal/C/docbook.css
+share/gnome/help/gnomecal/C/topic.dat
share/gnome/idl/GnomeCal.idl
share/gnome/idl/gnome-pim.idl
share/gnome/mime-info/gnome-pim.keys
@@ -50,8 +61,8 @@ share/locale/no/LC_MESSAGES/gnome-pim.mo
share/locale/pl/LC_MESSAGES/gnome-pim.mo
share/locale/pt/LC_MESSAGES/gnome-pim.mo
share/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
-share/locale/sv/LC_MESSAGES/gnome-pim.mo
share/locale/ru/LC_MESSAGES/gnome-pim.mo
+share/locale/sv/LC_MESSAGES/gnome-pim.mo
share/locale/uk/LC_MESSAGES/gnome-pim.mo
share/locale/wa/LC_MESSAGES/gnome-pim.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 8e5778376227..49b1d63975c2 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -20,9 +20,11 @@ LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore
LIB_DEPENDS+= gpilotd.0:${PORTSDIR}/palm/gnomepilot
PILOTINC= "-I${LOCALBASE}/pilot/include"
PILOTLIB= "-L${LOCALBASE}/pilot/lib"
+PLIST_SUB+= GNOMEPILOT:=""
.else
PILOTARGS= --without-pisock --disable-pilotlinktest
EXTRA_PATCHES= ${FILESDIR}/patch.nopilot
+PLIST_SUB+= GNOMEPILOT:="@comment "
.endif
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
@@ -48,9 +50,4 @@ pre-patch:
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-.if defined(WITH_GNOMEPILOT)
-post-install:
- @${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST}
-.endif
-
.include <bsd.port.mk>
diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist
index 19195c2c68ed..ad35d9235e36 100644
--- a/deskutils/gnomepim/pkg-plist
+++ b/deskutils/gnomepim/pkg-plist
@@ -1,24 +1,35 @@
+%%GNOMEPILOT:%%bin/address-conduit-capplet
+%%GNOMEPILOT:%%bin/calendar-conduit-control-applet
+%%GNOMEPILOT:%%bin/calendar-pilot-sync
bin/gnomecal
bin/gnomecard
etc/CORBA/servers/gnomecal.gnorba
etc/CORBA/servers/gnomecard.gnorba
+%%GNOMEPILOT:%%lib/gnome-pilot/conduits/libaddress_conduit.so
+%%GNOMEPILOT:%%lib/gnome-pilot/conduits/libcalendar_conduit.so
share/gnome/apps/Applications/gncal.desktop
share/gnome/apps/Applications/gnomecard.desktop
+%%GNOMEPILOT:%%share/gnome/apps/Settings/Peripherals/Conduits/address-conduit-capplet.desktop
+%%GNOMEPILOT:%%share/gnome/apps/Settings/Peripherals/Conduits/calendar-conduit-control-applet.desktop
+%%GNOMEPILOT:%%share/gnome/control-center/Peripherals/Conduits/address-conduit-capplet.desktop
+%%GNOMEPILOT:%%share/gnome/control-center/Peripherals/Conduits/calendar-conduit-control-applet.desktop
+%%GNOMEPILOT:%%share/gnome/gnome-pilot/conduits/gnomecal.conduit
+%%GNOMEPILOT:%%share/gnome/gnome-pilot/conduits/gnomecard.conduit
+share/gnome/help/gnomecal/C/calappoint.html
+share/gnome/help/gnomecal/C/calsetup.html
+share/gnome/help/gnomecal/C/caluse.html
+share/gnome/help/gnomecal/C/cmdline.html
+share/gnome/help/gnomecal/C/docbook.css
+share/gnome/help/gnomecal/C/gcal.html
share/gnome/help/gnomecal/C/gnomecal.html
-share/gnome/help/gnomecal/C/topic.dat
share/gnome/help/gnomecal/C/images/cal-props.gif
share/gnome/help/gnomecal/C/images/calday.gif
share/gnome/help/gnomecal/C/images/calmonth.gif
share/gnome/help/gnomecal/C/images/calweek.gif
share/gnome/help/gnomecal/C/images/calyear.gif
-share/gnome/help/gnomecal/C/calappoint.html
-share/gnome/help/gnomecal/C/calsetup.html
-share/gnome/help/gnomecal/C/caluse.html
-share/gnome/help/gnomecal/C/cmdline.html
-share/gnome/help/gnomecal/C/gcal.html
share/gnome/help/gnomecal/C/ln20.html
share/gnome/help/gnomecal/C/tech.html.html
-share/gnome/help/gnomecal/C/docbook.css
+share/gnome/help/gnomecal/C/topic.dat
share/gnome/idl/GnomeCal.idl
share/gnome/idl/gnome-pim.idl
share/gnome/mime-info/gnome-pim.keys
@@ -50,8 +61,8 @@ share/locale/no/LC_MESSAGES/gnome-pim.mo
share/locale/pl/LC_MESSAGES/gnome-pim.mo
share/locale/pt/LC_MESSAGES/gnome-pim.mo
share/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
-share/locale/sv/LC_MESSAGES/gnome-pim.mo
share/locale/ru/LC_MESSAGES/gnome-pim.mo
+share/locale/sv/LC_MESSAGES/gnome-pim.mo
share/locale/uk/LC_MESSAGES/gnome-pim.mo
share/locale/wa/LC_MESSAGES/gnome-pim.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo