head	1.18;
access;
symbols
	RELEASE_8_3_0:1.16
	RELEASE_9_0_0:1.16
	RELEASE_7_4_0:1.15
	RELEASE_8_2_0:1.15
	RELEASE_6_EOL:1.15
	RELEASE_8_1_0:1.15
	RELEASE_7_3_0:1.14
	RELEASE_8_0_0:1.14
	RELEASE_7_2_0:1.13
	RELEASE_7_1_0:1.12
	RELEASE_6_4_0:1.12
	RELEASE_5_EOL:1.12
	RELEASE_7_0_0:1.10
	RELEASE_6_3_0:1.10
	PRE_XORG_7:1.8
	RELEASE_4_EOL:1.8
	RELEASE_6_2_0:1.6
	RELEASE_6_1_0:1.5
	RELEASE_5_5_0:1.5
	RELEASE_6_0_0:1.4
	RELEASE_5_4_0:1.4
	RELEASE_4_11_0:1.4
	RELEASE_5_3_0:1.4
	RELEASE_4_10_0:1.2;
locks; strict;
comment	@# @;


1.18
date	2012.12.21.14.29.32;	author svnexp;	state Exp;
branches;
next	1.17;

1.17
date	2012.04.29.07.26.45;	author mva;	state Exp;
branches;
next	1.16;

1.16
date	2011.02.27.08.58.12;	author mva;	state Exp;
branches;
next	1.15;

1.15
date	2010.03.07.17.26.09;	author mva;	state Exp;
branches;
next	1.14;

1.14
date	2009.05.07.16.49.26;	author mva;	state Exp;
branches;
next	1.13;

1.13
date	2009.03.26.08.20.49;	author mva;	state Exp;
branches;
next	1.12;

1.12
date	2008.05.31.10.29.00;	author itetcu;	state Exp;
branches;
next	1.11;

1.11
date	2008.04.04.20.42.06;	author pav;	state Exp;
branches;
next	1.10;

1.10
date	2007.07.28.19.09.27;	author pav;	state Exp;
branches;
next	1.9;

1.9
date	2007.05.27.19.49.38;	author miwi;	state Exp;
branches;
next	1.8;

1.8
date	2006.11.22.15.42.17;	author rafan;	state Exp;
branches;
next	1.7;

1.7
date	2006.11.05.10.09.23;	author rafan;	state Exp;
branches;
next	1.6;

1.6
date	2006.08.10.03.53.42;	author rafan;	state Exp;
branches;
next	1.5;

1.5
date	2005.09.14.18.50.40;	author pav;	state Exp;
branches;
next	1.4;

1.4
date	2004.08.16.11.43.27;	author pav;	state Exp;
branches;
next	1.3;

1.3
date	2004.05.03.21.56.55;	author pav;	state Exp;
branches;
next	1.2;

1.2
date	2004.03.29.14.21.05;	author pav;	state Exp;
branches;
next	1.1;

1.1
date	2004.03.03.21.08.29;	author krion;	state Exp;
branches;
next	;


desc
@@


1.18
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/309355
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r309355 | mva | 2012-12-21 14:10:24 +0000 (Fri, 21 Dec 2012) | 4 lines
## SVN ##
## SVN ## - Update to 0.8.2
## SVN ## - Convert to OptionsNG framework
## SVN ## - Trim Makefile headers
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@--- Makefile.orig	2012-12-05 02:03:10.000000000 +0100
+++ Makefile	2012-12-21 10:29:40.000000000 +0100
@@@@ -288,7 +288,7 @@@@
  lLIBS += $(shell pkg-config --libs gmodule-2.0)
 endif
 # -lrt needed for clock_gettime(), explicit -lm, -ldl needed for some arch-linux distros
-lLIBS += -lrt -lm -ldl
+lLIBS += -lrt -lm
 ifeq ($(USE_GAMIN), 1)
 #gamin code is a superset of FAM code, so gamin needs fam as well
 lLIBS += -lfam
@@@@ -305,7 +305,7 @@@@
  ifeq ($(EXTDBUS), 1)
   lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
  else
-  lLIBS += $(shell pkg-config --libs dbus-1 hal hal-storage)
+  lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
  endif
 endif
 endif
@@@@ -333,10 +333,6 @@@@
 	@@for file in `ls $(ICONS)/ |grep -v svn`; do \
 		install -m 644 $(ICONS)/$$file $(ICON_DIR); \
 	done
-	@@install -d $(DOC_DIR)
-	@@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v emelfm2.1`; do \
-		install -m 644 $(DOCS)/$$file $(DOC_DIR); \
-	done
 	@@install -d $(MAN_DIR)
 	@@install -m 644 $(DOCS)/emelfm2.1 $(MAN_DIR)/$(TARGET).1;
 
@


1.17
log
@- Update to 0.8.1
@
text
@d1 3
a3 3
--- Makefile.orig	2012-03-16 09:11:47.000000000 +0100
+++ Makefile	2012-04-23 08:12:55.000000000 +0200
@@@@ -274,7 +274,7 @@@@
d12 10
a21 1
@@@@ -319,10 +319,6 @@@@
d26 1
a26 1
-	@@for file in `ls $(DOCS)/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
d30 1
a30 1
 	@@install -m 644 $(DOCS)/$(TARGET).1 $(MAN_DIR);
@


1.16
log
@- Update to 0.7.5
@
text
@d1 4
a4 5
--- Makefile.orig	2011-02-03 23:47:50.000000000 +0100
+++ Makefile	2011-02-20 08:50:16.000000000 +0100
@@@@ -236,8 +236,6 @@@@
 else
 lLIBS += $(shell pkg-config --libs gthread-2.0 gmodule-2.0)
d6 3
a8 2
-# -lrt needed for clock_gettime()
-lLIBS += -lrt
d12 1
a12 1
@@@@ -277,10 +275,6 @@@@
@


1.15
log
@- Update to 0.7.2
@
text
@d1 10
a10 9
--- Makefile.orig	2010-03-04 19:18:39.000000000 +0100
+++ Makefile	2010-03-04 19:19:42.000000000 +0100
@@@@ -228,7 +228,7 @@@@
 
 #setup linking
 # -lrt needed for clock_gettime()
-lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0) -lrt
+lLIBS = $(shell pkg-config --libs gtk+-2.0 gthread-2.0 gmodule-2.0)
 ifeq ($(USE_FAM),1)
d12 1
a12 2
 endif
@@@@ -266,10 +266,6 @@@@
d22 1
a22 1
 #	@@bzip2 -f $(MAN_DIR)/$(TARGET).1;
@


1.14
log
@Update to 0.6.0.

Approved by:	miwi (mentor)
@
text
@d1 3
a3 3
--- Makefile.orig	2009-05-05 17:59:32.000000000 +0200
+++ Makefile	2009-05-06 21:49:06.000000000 +0200
@@@@ -213,7 +213,7 @@@@
d12 1
a12 1
@@@@ -247,10 +247,6 @@@@
@


1.13
log
@Update to 0.5.1.

Approved by:	miwi (mentor)
@
text
@d1 3
a3 3
--- Makefile.orig	2009-02-12 04:47:20.000000000 +0100
+++ Makefile	2009-02-20 09:13:43.000000000 +0100
@@@@ -211,7 +211,7 @@@@
d12 1
a12 16
@@@@ -223,10 +223,10 @@@@
 endif
 # should not need translation
 OPSYS := $(shell uname)
-ifeq ($(OPSYS),FreeBSD)
-OSREL = $(shell sysctl -n kern.osreldate)
-lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
-endif
+#ifeq ($(OPSYS),FreeBSD)
+#OSREL = $(shell sysctl -n kern.osreldate)
+#lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
+#endif
 
 .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
         clean clean_plugins deps i18n install_i18n uninstall_i18n \
@@@@ -245,10 +245,6 @@@@
@


1.12
log
@- Respect NOPORTDOCS and NOPORTEXAMPLES knobs as reported by itetcu@@.
- Bump PORTREVISION.

PR:		ports/123999
Submitted by:	Marcus von Appen (maintainer)
@
text
@d1 3
a3 3
--- Makefile.orig	2008-05-12 02:04:41.000000000 +0200
+++ Makefile	2008-05-26 08:45:53.000000000 +0200
@@@@ -51,7 +51,7 @@@@
d5 1
a5 10
 #these are only used here for installation purposes
 BIN_DIR = $(PREFIX)/bin
-MAN_DIR = $(PREFIX)/share/man/man1
+MAN_DIR = $(PREFIX)/man/man1
 #as well as usage here, all in-code uses of these is assumed localised
 ifeq ($(DOCS_VERSION), 1)
 DOC_DIR = $(PREFIX)/share/doc/$(TARGET)-$(VERSION)
@@@@ -215,7 +215,7 @@@@
 
 lLDFLAGS = $(LDFLAGS)
d12 1
a12 9
@@@@ -232,6 +232,7 @@@@
 lLIBS += -lacl
 endif
 ifeq ($(WITH_HAL),1)
+lCFLAGS += $(shell pkg-config --cflags dbus-1 dbus-glib-1 hal hal-storage)
 lLIBS += $(shell pkg-config --libs dbus-1 dbus-glib-1 hal hal-storage)
 endif
 # for vfs & gvfs development
@@@@ -244,10 +245,10 @@@@
d26 4
a29 4
         clean deps i18n install_i18n uninstall_i18n \
@@@@ -266,10 +267,6 @@@@
 	@@for file in `ls icons/ |grep -v svn`; do \
 		install -m 644 icons/$$file $(ICON_DIR); \
d32 2
a33 2
-	@@for file in `ls docs/ |grep -v svn |grep -v desktop_environment |grep -v api |grep -v $(TARGET).1`; do \
-		install -m 644 docs/$$file $(DOC_DIR); \
d36 1
a36 1
 	@@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
@


1.11
log
@- Update to 0.4

PR:		ports/122426
Submitted by:	Marcus von Appen <mva@@sysfault.org> (maintainer)
@
text
@d1 3
a3 3
--- Makefile.orig	2008-02-09 23:22:11.000000000 +0100
+++ Makefile	2008-04-04 21:47:47.000000000 +0200
@@@@ -56,7 +56,7 @@@@
d12 1
a12 1
@@@@ -217,7 +217,7 @@@@
d21 1
a21 1
@@@@ -234,6 +234,7 @@@@
d29 1
a29 1
@@@@ -246,10 +247,10 @@@@
d43 12
a54 1
         clean deps marshals gettext i18n install_i18n uninstall_i18n \
@


1.10
log
@- Update to 0.3.5

PR:		ports/114987
Submitted by:	Marcus von Appen <mva@@sysfault.org> (maintainer)
@
text
@d1 2
a2 2
--- Makefile.orig	Sat Jul 28 10:40:12 2007
+++ Makefile	Sat Jul 28 10:42:14 2007
d12 1
a12 1
@@@@ -203,7 +203,7 @@@@
d21 9
a29 1
@@@@ -221,10 +221,10 @@@@
d42 2
a43 10
 #for gvfs development
 ifeq ($(WITH_GVFS),1)
@@@@ -254,7 +254,6 @@@@
 	done
 	@@install -d $(MAN_DIR)
 	@@install -m 644 docs/$(TARGET).1 $(MAN_DIR);
-	@@bzip2 -f $(MAN_DIR)/$(TARGET).1;
 
 ifeq ($(XDG_INTEGRATION), 1)
 		@@install -d $(XDG_DESKTOP_DIR)
@


1.9
log
@- Update to 0.3.4

PR:		113039
Submitted by:	Marcus von Appen<mva@@sysfault.org> (maintainer)
@
text
@d1 2
a2 2
--- Makefile.orig	Sat May 26 16:15:40 2007
+++ Makefile	Sat May 26 16:17:20 2007
d12 1
a12 1
@@@@ -202,7 +202,7 @@@@
d21 1
a21 1
@@@@ -220,10 +220,10 @@@@
d36 1
a36 1
@@@@ -253,7 +253,6 @@@@
@


1.8
log
@- Update 0.3.1

PR:		ports/105747
Submitted by:	Marcus von Appen <mva at sysfault.org> (maintainer)
@
text
@d1 3
a3 8
--- Makefile.orig	Tue Nov 14 23:36:30 2006
+++ Makefile	Wed Nov 22 12:54:18 2006
@@@@ -57,7 +57,7 @@@@
 endif
 ICON_DIR ?= $(PREFIX)/share/pixmaps/$(TARGET)/
 LOCALE_DIR ?= $(PREFIX)/share/locale/
-MAN_DIR ?= $(PREFIX)/share/man/man1/
+MAN_DIR ?= $(PREFIX)/man/man1/
d5 8
a12 3
 OBJECTS_DIR = objs
 # object directories that have to be created
@@@@ -147,17 +147,17 @@@@
d19 1
a19 1
 	lLIBS += -lfam
d21 1
a21 2
 ifeq ($(EDITOR_SPELLCHECK),1)
 	lLIBS += -lgtkspell
d23 5
a27 3
-ifeq ($(OPSY),FreeBSD)
-	OSREL = $(shell sysctl -n kern.osreldate)
-	lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
d29 3
a31 3
+#ifeq ($(OPSY),FreeBSD)
+#	OSREL = $(shell sysctl -n kern.osreldate)
+#	lLIBS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
d34 3
a36 3
 .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc \
         clean deps marshals gettext i18n install_i18n uninstall_i18n \
@@@@ -182,7 +182,6 @@@@
d40 1
a40 1
-	@@bzip2 -f $(MAN_DIR)$(TARGET).1;
d42 2
a43 2
 ifeq ($(XGD_INTEGRATION), 1)
 		@@install -d $(XGD_DESKTOP_DIR)
@


1.7
log
@- Update 0.3.0

PR:		ports/105115
Submitted by:	Marcus von Appen (maintainer)
@
text
@d1 2
a2 2
--- Makefile.orig	Fri Nov  3 00:35:33 2006
+++ Makefile	Fri Nov  3 00:36:25 2006
d12 6
a17 1
@@@@ -147,10 +147,10 @@@@
d21 3
d35 1
a35 1
@@@@ -175,7 +175,6 @@@@
@


1.6
log
@- Update to 0.1.8

PR:		ports/101614
Submitted by:	Marcus von Appen <mva at sysfault.org> (maintainer)
@
text
@d1 2
a2 2
--- Makefile.orig	Thu Jul 27 02:20:13 2006
+++ Makefile	Mon Aug  7 23:26:10 2006
d12 1
a12 1
@@@@ -148,10 +148,10 @@@@
d27 1
a27 1
@@@@ -176,7 +176,6 @@@@
d32 1
a32 1
 	
@


1.5
log
@- Update to 0.1.2

PR:		ports/86133
Submitted by:	Marcus von Appen <mva@@sysfault.org> (maintainer)
@
text
@d1 12
a12 3
--- Makefile.orig	Tue Sep 13 02:06:53 2005
+++ Makefile	Wed Sep 14 19:42:41 2005
@@@@ -124,10 +124,10 @@@@
d14 1
a14 1
 	lLDFLAGS += -lfam
d18 1
a18 1
-	lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
d22 1
a22 1
+#	lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
d27 8
@


1.4
log
@- Update to 0.0.9

PR:		ports/70498
Submitted by:	Marcus von Appen <mva@@sysfault.org> (maintainer)
@
text
@d1 6
a6 6
--- Makefile.orig	Tue Aug 10 01:43:19 2004
+++ Makefile	Sun Aug 15 20:25:56 2004
@@@@ -98,10 +98,10 @@@@
 lLIBS_CFLAGS += -shared -fPIC -DPIC
 lLDFLAGS = $(LDFLAGS)
 lLDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0`
d8 2
a9 2
-OSREL = $(shell sysctl -n kern.osreldate)
-lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
d12 2
a13 2
+#OSREL = $(shell sysctl -n kern.osreldate)
+#lLDFLAGS += $(shell if test $(OSREL) -lt 500041 ; then echo "-lgnugetopt"; fi)
@


1.3
log
@- Update to 0.0.8

PR:		ports/66206
Submitted by:	Marcus von Appen <mva@@sysfault.org> (maintainer)
@
text
@d1 4
a4 3
--- Makefile.orig	Fri Apr 30 13:17:57 2004
+++ Makefile	Mon May  3 00:31:28 2004
@@@@ -97,10 +97,10 @@@@
d6 1
a6 2
 lLDFLAGS += `pkg-config --libs gtk+-2.0`
 # gthread-2.0
d17 1
a17 1
         clean deps marshals gettext i18n install_i18n uninstall_i18n test test2
@


1.2
log
@- Update to 0.0.7

PR:		ports/64894
Submitted by:	Marcus von Appen <mva@@sysfault.org> (maintainer)
@
text
@d1 3
a3 4
--- Makefile.orig	Fri Feb 27 11:23:08 2004
+++ Makefile	Wed Mar  3 16:32:42 2004
@@@@ -79,13 +79,6 @@@@
 lLIBS_CFLAGS += -shared -fPIC -DPIC
d6 1
a7 1
-#FIXME: is there a better way to do that?
d9 1
a9 3
-ifneq ($(shell awk 'BEGIN { if ($(OSREL) < 500041) print "yes" }'), "")
-lLDFLAGS += -lgnugetopt
-endif
d11 4
a14 1
 # gthread-2.0
d16 2
a17 1
 .PHONY: all plugins install install_plugins uninstall uninstall_plugins doc clean dist-src dist-bin dist dist-pre deps marshals test test2
@


1.1
log
@- Update to version 0.0.6

PR:		ports/63707
Submitted by:	maintainer
@
text
@d3 1
a3 1
@@@@ -78,9 +78,6 @@@@
d8 3
d13 1
a16 9
@@@@ -92,7 +89,7 @@@@
 
 install: all install_plugins
 	@@echo "installing $(TARGET) to prefix '$(PREFIX)'"
-	@@install -D -c -s -m 755 $(TARGET) $(BIN_DIR)/$(TARGET)
+	@@install -c -s -m 755 $(TARGET) $(BIN_DIR)/$(TARGET)
 	@@install -d $(ICON_DIR)
 	@@for file in `ls icons/ |grep -v CVS`; do \
 		install -c -m 644 icons/$$file $(ICON_DIR); \
@

