summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorFUJISHIMA Satsuki <sf@FreeBSD.org>2001-02-14 22:21:27 +0000
committerFUJISHIMA Satsuki <sf@FreeBSD.org>2001-02-14 22:21:27 +0000
commit3fe50c2986c0ab3c93cb42c080831fc2791fba36 (patch)
tree8e312a4528732ea6ea174aa22676571c780a758a /x11-wm
parentfix typo: (diff)
o update to 2.3.28.
o add run/build depends on gm4 to parse config correctly. o add WANT_GTK to build gtk module. o sort MAN1 variable. for update: PR: 24985 Submitted by: Martti Kuparinen <martti.kuparinen@iki.fi> for Gtk+ stuff: PR: 24908 Submitted by: Oyvind Albrigtsen <e-devil@e-devil.org> Approved by: maintainer
Notes
Notes: svn path=/head/; revision=38348
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/fvwm2-beta/Makefile25
-rw-r--r--x11-wm/fvwm2-beta/distinfo2
-rw-r--r--x11-wm/fvwm2-beta/files/patch-FvwmM4.c11
-rw-r--r--x11-wm/fvwm2-beta/pkg-plist1
-rw-r--r--x11-wm/fvwm2-devel/Makefile25
-rw-r--r--x11-wm/fvwm2-devel/distinfo2
-rw-r--r--x11-wm/fvwm2-devel/files/patch-FvwmM4.c11
-rw-r--r--x11-wm/fvwm2-devel/pkg-plist1
8 files changed, 64 insertions, 14 deletions
diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index 49f38401967a..c93cd6519185 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fvwm
-PORTVERSION= 2.3.27
+PORTVERSION= 2.3.28
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
@@ -15,22 +15,35 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= Cy.Schubert@uumail.gov.bc.ca
+BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
+
USE_X_PREFIX= yes
USE_XPM= yes
+WANT_GTK= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
PLIST_SUB= VER=${PORTVERSION}
CONFIGURE_ARGS= --enable-gnome
-MAN1= FvwmAuto.1 FvwmAnimate.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
+MAN1= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmGtk.1 FvwmIconBox.1 \
FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 \
- fvwm-menu-xlock.1 fvwm-menu-directory.1 fvwm-menu-desktop.1 \
- fvwm-menu-headlines.1 fvwm2.1 fvwm24_convert.1 fvwmbug.1 \
- fvwmrc_convert.1 xpmroot.1
+ fvwm-menu-desktop.1 fvwm-menu-directory.1 fvwm-menu-headlines.1 \
+ fvwm-menu-xlock.1 fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 \
+ xpmroot.1
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK) && !defined(WITHOUT_GTK)
+USE_GTK= yes
+PLIST_SUB+= GTK=""
+.else
+PLIST_SUB+= GTK="@comment "
+.endif
post-extract:
@if ! (cd ${WRKDIR}/${DISTNAME} && ${MKDIR} icons && cd icons && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/fvwm_icons.tgz ${EXTRACT_AFTER_ARGS}); then \
@@ -42,4 +55,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
${PREFIX}/lib/X11/fvwm2/pixmaps
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fvwm2-beta/distinfo b/x11-wm/fvwm2-beta/distinfo
index 46c97407463f..de0abfbbcc28 100644
--- a/x11-wm/fvwm2-beta/distinfo
+++ b/x11-wm/fvwm2-beta/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.3.27.tar.gz) = 91d2decdedbe4491197643f5ca8cf9d1
+MD5 (fvwm-2.3.28.tar.gz) = 3fd0a220efa699049ed02a02befc2a39
MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm2-beta/files/patch-FvwmM4.c b/x11-wm/fvwm2-beta/files/patch-FvwmM4.c
new file mode 100644
index 000000000000..2fbfddf37465
--- /dev/null
+++ b/x11-wm/fvwm2-beta/files/patch-FvwmM4.c
@@ -0,0 +1,11 @@
+--- modules/FvwmM4/FvwmM4.c.orig Fri Feb 2 16:04:52 2001
++++ modules/FvwmM4/FvwmM4.c Fri Feb 2 16:05:02 2001
+@@ -69,7 +69,7 @@
+ int m4_prefix; /* Do GNU m4 prefixing (-P) */
+ char m4_options[BUFSIZ]; /* Command line options to m4 */
+ char m4_outfile[BUFSIZ] = ""; /* The output filename for m4 */
+-char *m4_prog = "m4"; /* Name of the m4 program */
++char *m4_prog = "gm4"; /* Name of the m4 program */
+ int m4_default_quotes; /* Use default m4 quotes */
+ char *m4_startquote = "`"; /* Left quote characters for m4 */
+ char *m4_endquote = "'"; /* Right quote characters for m4 */
diff --git a/x11-wm/fvwm2-beta/pkg-plist b/x11-wm/fvwm2-beta/pkg-plist
index 0665de79a2c1..4358cf928c1b 100644
--- a/x11-wm/fvwm2-beta/pkg-plist
+++ b/x11-wm/fvwm2-beta/pkg-plist
@@ -344,6 +344,7 @@ libexec/fvwm/%%VER%%/FvwmDebug
libexec/fvwm/%%VER%%/FvwmDragWell
libexec/fvwm/%%VER%%/FvwmEvent
libexec/fvwm/%%VER%%/FvwmForm
+%%GTK%%libexec/fvwm/%%VER%%/FvwmGtk
libexec/fvwm/%%VER%%/FvwmIconBox
libexec/fvwm/%%VER%%/FvwmIconMan
libexec/fvwm/%%VER%%/FvwmIdent
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 49f38401967a..c93cd6519185 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= fvwm
-PORTVERSION= 2.3.27
+PORTVERSION= 2.3.28
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
@@ -15,22 +15,35 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= Cy.Schubert@uumail.gov.bc.ca
+BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
+RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
+
USE_X_PREFIX= yes
USE_XPM= yes
+WANT_GTK= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
PLIST_SUB= VER=${PORTVERSION}
CONFIGURE_ARGS= --enable-gnome
-MAN1= FvwmAuto.1 FvwmAnimate.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
+MAN1= FvwmAnimate.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmButtons.1 \
FvwmCommand.1 FvwmConsole.1 FvwmConsoleC.pl.1 FvwmCpp.1 FvwmDebug.1 \
FvwmDragWell.1 FvwmEvent.1 FvwmForm.1 FvwmGtk.1 FvwmIconBox.1 \
FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 FvwmRearrange.1 \
FvwmSave.1 FvwmSaveDesk.1 FvwmScript.1 FvwmScroll.1 FvwmTaskBar.1 \
FvwmTheme.1 FvwmWharf.1 FvwmWinList.1 \
- fvwm-menu-xlock.1 fvwm-menu-directory.1 fvwm-menu-desktop.1 \
- fvwm-menu-headlines.1 fvwm2.1 fvwm24_convert.1 fvwmbug.1 \
- fvwmrc_convert.1 xpmroot.1
+ fvwm-menu-desktop.1 fvwm-menu-directory.1 fvwm-menu-headlines.1 \
+ fvwm-menu-xlock.1 fvwm2.1 fvwm24_convert.1 fvwmbug.1 fvwmrc_convert.1 \
+ xpmroot.1
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GTK) && !defined(WITHOUT_GTK)
+USE_GTK= yes
+PLIST_SUB+= GTK=""
+.else
+PLIST_SUB+= GTK="@comment "
+.endif
post-extract:
@if ! (cd ${WRKDIR}/${DISTNAME} && ${MKDIR} icons && cd icons && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/fvwm_icons.tgz ${EXTRACT_AFTER_ARGS}); then \
@@ -42,4 +55,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
${PREFIX}/lib/X11/fvwm2/pixmaps
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo
index 46c97407463f..de0abfbbcc28 100644
--- a/x11-wm/fvwm2-devel/distinfo
+++ b/x11-wm/fvwm2-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.3.27.tar.gz) = 91d2decdedbe4491197643f5ca8cf9d1
+MD5 (fvwm-2.3.28.tar.gz) = 3fd0a220efa699049ed02a02befc2a39
MD5 (fvwm_icons.tgz) = 7b254da269a236d77c790581701442cb
diff --git a/x11-wm/fvwm2-devel/files/patch-FvwmM4.c b/x11-wm/fvwm2-devel/files/patch-FvwmM4.c
new file mode 100644
index 000000000000..2fbfddf37465
--- /dev/null
+++ b/x11-wm/fvwm2-devel/files/patch-FvwmM4.c
@@ -0,0 +1,11 @@
+--- modules/FvwmM4/FvwmM4.c.orig Fri Feb 2 16:04:52 2001
++++ modules/FvwmM4/FvwmM4.c Fri Feb 2 16:05:02 2001
+@@ -69,7 +69,7 @@
+ int m4_prefix; /* Do GNU m4 prefixing (-P) */
+ char m4_options[BUFSIZ]; /* Command line options to m4 */
+ char m4_outfile[BUFSIZ] = ""; /* The output filename for m4 */
+-char *m4_prog = "m4"; /* Name of the m4 program */
++char *m4_prog = "gm4"; /* Name of the m4 program */
+ int m4_default_quotes; /* Use default m4 quotes */
+ char *m4_startquote = "`"; /* Left quote characters for m4 */
+ char *m4_endquote = "'"; /* Right quote characters for m4 */
diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist
index 0665de79a2c1..4358cf928c1b 100644
--- a/x11-wm/fvwm2-devel/pkg-plist
+++ b/x11-wm/fvwm2-devel/pkg-plist
@@ -344,6 +344,7 @@ libexec/fvwm/%%VER%%/FvwmDebug
libexec/fvwm/%%VER%%/FvwmDragWell
libexec/fvwm/%%VER%%/FvwmEvent
libexec/fvwm/%%VER%%/FvwmForm
+%%GTK%%libexec/fvwm/%%VER%%/FvwmGtk
libexec/fvwm/%%VER%%/FvwmIconBox
libexec/fvwm/%%VER%%/FvwmIconMan
libexec/fvwm/%%VER%%/FvwmIdent
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 01:56:03 +0000